summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09[Keyboard] Add sowbug/68keys and sowbug/ansi_tkl (#11589)Mike Tsao
2021-02-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09Play Keyboard Helen 80: fix matrix mapping (#11585)LSChyi
2021-02-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-10Fix VENDOR_ID for ymd67 (#11838)Konstantin Shpits
2021-02-09Remove FAUXCLICKY feature (deprecated) (#11829)Drashna Jaelre
2021-02-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09[Keyboard] Add Splitty keyboard (#11613)Nicolas Schodet
2021-02-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09Simplify NIBBLE encoder code and clean up keymaps (#11808)Jay Greco
* Simplify encoder code and clean up keymaps. -Removed overly complex VIA encoder code. It wasn't adding any value and was confusing users who were trying to customize encoder functionality on VIA keymaps. -Replaced KC_TILDE with KC_HOME in all keymaps, as KC_TILDE sends a left shift, which was confusing some folks as they tested their build. -Move layer names to enum * Change encoder_update_kb to encoder_update_user per PR feedback
2021-02-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-09ws2812: Fix number of nops for AVR at 8 MHz (#9559)Sergey Vlasov
* ws2812: Fix number of nops for AVR at 8 MHz When trying to calculate the number of nops for AVR running at 8 MHz, the value of `w3` is expected to be negative; however, because `F_CPU` is defined in tmk_core/avr.mk with the `UL` suffix, the preprocessor performs its calculations using `unsigned long`, getting a very large positive number instead of the expected negative number; this then results in generating code with a huge number of nops. Fix the broken calculations by performing a comparison before subtraction, so that the unsigned number wraparound does not occur. The keyboard which triggers the problem is `handwired/promethium`; the buggy code silently compiles, but the resulting timings would be completely wrong. * ws2812: Clean up the code after the 8 MHz fix Remove old code which was unsuccessfully trying to clamp negative w1, w2 and w3 values to 0, and set w1_nops, w2_nops and w3_nops directly.
2021-02-08remove deprecated qmk json-keymap (#11823)Zach White
2021-02-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-08Fix RGBLIGHT_LIMIT_VAL typo (#11826)Ryan
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07Migrate some tmk_core files to quantum (#11791)Joel Challis
* Migrate some tmk_core files to quantum * Fix build errors
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07via support for bat43 (#11729)yfuku
* via support for bat43 * add adjust layer for via
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Update] Allow APM32 on TrinityXTtkl (#11715)Xelus22
* amp32 initial change * fix spacing
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07Allow flash/compile to accept relative json paths (#11767)Joel Challis
* Allow flash/compile to accept relative paths * Review suggestions * Review comments * Put back exists check otherwise stdin fails * fix lint
2021-02-08Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-02-07Add DSP40 (#11579)Danny
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-08Rework I2C driver docs (#11658)Ryan
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keyboard] Add The Stick keyboard (#11745)Danny
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Docs] Update isp_flashing_guide.md (#11777)moritz-john
Added wiring for USBasp and changed the order of the documentation accordingly
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keymap] Update keymap for keebio/nyquist (#11734)George Petri
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keymap] Shadyproject/bfo9000 (#11753)Chris M
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keymap] Update community ortholinear 4x12 keymap: junonum (#11757)Juno Nguyen
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keyboard] Add my keymap for Mark65 (#11717)stanrc85
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keyboard] Add nknl7jp keyboard (#11591)Salicylic-acid3
* Add nknl7jp keyboard A 73 keys JIS Layout split keyboard. Salicylic-acid3 * Keymap Update Fixed default keymap. * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7jp/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keyboard] Add nknl7en keyboard (#11590)Salicylic-acid3
* Add nknl7en keyboard A 70 keys ANSI Layout split keyboard. Salicylic-acid3 * Update readme.md The name, photo, and link were wrong, so they have been corrected. * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/nknl7en/keymaps/salicylic/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keyboard] Add ergoarrows keyboard (#11592)Salicylic-acid3
A 76 keys Ergo Layout split keyboard. Salicylic-acid3
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keyboard] Add Hi-Tek AIM-65 keyboard (#11623)Matteo Bonora
* Add Hi-Tek AIM-65 keyboard * Add bootloader selection * Update keyboards/handwired/aim65/readme.md Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboards/handwired/aim65/rules.mk Co-authored-by: Joel Challis <git@zvecr.com> * Update keyboard image Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/aim65/rules.mk Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/aim65/keymaps/default/keymap.c Fix indentation Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/aim65/keymaps/default/keymap.c Fix indentation Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: Ryan <fauxpark@gmail.com> * Update keyboards/handwired/aim65/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/keymaps/bonnee/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/handwired/aim65/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-02-07[Keyboard] Add earth_rover keyboard (#11405)k.bigwheel
* Just ./util/new_keyboard.sh earth_rover * Update readme.md * Create key layout * Setup config.h * Add default keymap * Fix pins * Update flash command * Write info.json * Add reset instruction * Change bootloader setting * Format new C files * Empty commit for kicking CI * Update keyboards/earth_rover/config.h Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update keyboards/earth_rover/keymaps/default/keymap.c Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> * Update readme.md * Update keyboards/earth_rover/readme.md Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2021-02-07Merge remote-tracking branch 'origin/master' into developQMK Bot