summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1113-0/+439
|\
| * [Keyboard] Add XS60 (#15248)Xelus222021-12-1113-0/+439
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-12-1164-8/+2236
|\|
| * bugfix (I don't know what's changed yet but something changed) (#15455)peepeetee2021-12-111-1/+1
| |
| * [Keyboard] Add KPrepublic BM60hsrgb/rev2 (#15177)peepeetee2021-12-1018-2/+590
| | | | | | | | | | acting in lieu of bdtc123 Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add ginkgo65hot (#15404)Runheme2021-12-109-0/+325
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] add Radialex (#14949)takashicompany2021-12-1010-0/+612
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: takashicompany <takashicompany@TMPB2021.local>
| * [Keyboard] Add Waka60 keyboard (#15173)Kyle McCreery2021-12-1018-0/+644
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * Add via support for spacey (#15437)lukeski142021-12-093-2/+52
| |
| * Add wait_ms to encoder_update_user (#15436)Ramon Imbao2021-12-091-0/+2
| |
| * [Keyboard] Pachi RGB update (#15440)Xelus222021-12-092-3/+3
| | | | | | | | | | * update * update rev1 description
| * [Core] Add configuration of PMW3360 lift off distance (#15424)Xelus222021-12-083-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | * sensor code add * update documentation * add default #define * Update drivers/sensors/pmw3360.c Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-091-1/+1
|\|
| * Change "Chinese" to "Simplified Chinese" in langs.md (#15441)peepeetee2021-12-091-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-092-2/+18
|\|
| * Add test filter to 'qmk pytest' (#15432)Joel Challis2021-12-092-2/+18
| | | | | | | | | | | | | | * Add test filter to 'qmk pytest' * Bodge for some test filters not resolving qmk * Update docs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-097-43/+188
|\|
| * [Keyboard] Update Fortitude60 and add VIA support (#15265)Pekaso2021-12-087-43/+188
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-12-091836-3298/+1836
|\|
| * Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-091838-3298/+1838
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-09235-3915/+0
|\|
| * Remove empty config.h from default-ish keymaps (#15429)Ryan2021-12-09235-3915/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-091-3/+3
|\|
| * [Docs] Fix Header formatting in compatible mcu doc (#15438)Drashna Jaelre2021-12-091-3/+3
| |
* | Add support for 21.11.x, remove 21.6.x as ChibiOS "canceled" it. (#15435)Nick Brassel2021-12-091-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-081-1/+1
|\|
| * [Keyboard] Fix minor typo in Ploopy Trackball Docs (#14846)tangowithfoxtrot2021-12-081-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-082-2/+4
|\|
| * [Keyboard] Flip encoder and fix weird volume behavior for Herringbone Pro ↵Ramon Imbao2021-12-082-2/+4
| | | | | | | | | | (#15423) Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-12-08152-667/+516
|\|
| * [Keyboard] Add Contender (#15403)sotoba2021-12-089-0/+421
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Fix RESET not working for keyboards with Kiibohd bootloader (#15430)Andrew-Fahmy2021-12-072-2/+2
| |
| * Remove references to Makefile in keyboard-level rules.mk (#15427)Ryan2021-12-07145-679/+95
| |
* | Expand rotational range for PMW3360 Optical Sensor (#15431)Drashna Jaelre2021-12-082-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-071-2/+2
|\|
| * [Keyboard] Fix minor typo in Ploopy Trackball Mini Docs (#14845)tangowithfoxtrot2021-12-071-2/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-075-22/+105
|\|
| * [Keymap] 3w6 helltm keymap combos (#15393)HellTM2021-12-075-22/+105
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0719-0/+954
|\|
| * [Keyboard] Add stickey4 keyboard (#15396)yfuku2021-12-0710-0/+416
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add jolofsor folder and denial75 subfolder under QMK keyboards ↵jolofsor2021-12-079-0/+538
| | | | | | | | | | | | (#15334) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0711-0/+513
|\|
| * [Keyboard] Add Eternal keypad (#15413)Duccio2021-12-0711-0/+513
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0716-652/+94
|\|
| * [keyboard] Update lighting effects on XBows board (#15358)X-Bows Tech2021-12-0716-652/+94
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Shulin <mumu@x-bows.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-078-50/+31
|\|
| * Iron180 LED fix (#15411)Álvaro A. Volpato2021-12-078-50/+31
| |
* | Remove Deprecated USB Polling comment from vusb.c (#15420)Drashna Jaelre2021-12-071-1/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0730-6/+903
|\|
| * Extended Community Layout Support (#15371)James Young2021-12-0630-6/+903
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add tkl_f13_ansi Community Layout * add tkl_f13_ansi_tsangan Community Layout * add tkl_f13_iso Community Layout * add tkl_f13_iso_tsangan Community Layout * add missing layout diagrams to readme.md * fix layout macro references in info.json files * add tkl_nofrow_iso Community Layout * enable Community Layout support: dyz/dyz_tkl * enable Community Layout support: kopibeng/mnk88 * enable Community Layout support: mechlovin/infinity88 * enable Community Layout support: tgr/jane/v2ce * tgr/jane/v2ce: rename/add layouts The ANSI Tsangan and ISO Tsangan layout macros did not note that Split Right Shift was supported. This commit notes the Split Right Shift in the macro name, and adds Tsangan layouts without Split Right Shift for ANSI and ISO, which fixes the Community Layout support.