summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-3010-28/+28
|\
| * Rename Layout Macros for TKLs with F13 keys (#15361)James Young2021-11-3010-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dyz/dyz_tkl: rename F13 layouts - rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi - rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso * kopibeng/mnk88: rename F13 layouts - rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi - rename LAYOUT_tkl_ansi_tsangan_f13 to LAYOUT_tkl_f13_ansi_tsangan - rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso - rename LAYOUT_tkl_iso_tsangan_f13 to LAYOUT_tkl_f13_iso_tsangan * mechlovin/infinity88: rename F13 layouts - rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi - rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso * mechlovin/infinity88: rename F13 layouts - rename LAYOUT_tkl_ansi_f13 to LAYOUT_tkl_f13_ansi - rename LAYOUT_tkl_ansi_tsangan_f13 to LAYOUT_tkl_f13_ansi_tsangan - rename LAYOUT_tkl_iso_f13 to LAYOUT_tkl_f13_iso - rename LAYOUT_tkl_iso_tsangan_f13 to LAYOUT_tkl_f13_iso_tsangan
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-301-28/+30
|\|
| * [Docs] Reorder functions in Understanding QMK (#15357)thesecretmaster2021-11-301-28/+30
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-304-152/+64
|\|
| * [Keyboard] Fix up Endgame34 (#15366)Drashna Jaelre2021-12-014-152/+64
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-301-2/+0
|\|
| * [Keyboard] Fix compilation issues for Ploopy Trackball classic (#15364)Drashna Jaelre2021-12-011-2/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-301-0/+2
|\|
| * [Keyboard] Add missng define for 4x6 Tractyl Manuform (#15363)Drashna Jaelre2021-12-011-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-301-0/+26
|\|
| * [Core] Added chconf.h for WB32 (#15359)Joy Lee2021-11-301-0/+26
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-302-0/+38
|\|
| * [Keyboard] kangaroo improvements (#15350)Xelus222021-11-302-0/+38
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-303-0/+129
|\|
| * [Keymap] Keebio Sinc layout with macOS support (#15324)Adam Lickel2021-11-303-0/+129
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Keyboard] Convert ergoinu to SPLIT_KEYBOARD (#15305)Joel Challis2021-11-3018-878/+77
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-303-5/+5
|\|
| * Fixup paths for `ramonimbao/wete/v2`. (#15360)Nick Brassel2021-11-303-5/+5
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-301-0/+2
|\|
| * Add missing virtser_init() to ChibiOS code (#15356)Ryan2021-11-301-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-303-12/+12
|\|
| * Remove deprecated defines from my keymaps (#15353)Mats Nilsson2021-11-303-12/+12
| |
* | Change default USB Polling rate to 1kHz (#15352)Drashna Jaelre2021-11-291-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-298-0/+337
|\|
| * [Keyboard] Adapt downsteam Ghost Squid support to latest QMK (#14607)fenuks2021-11-298-0/+337
| | | | | | Co-authored-by: fenuks <fenuks>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-299-0/+306
|\|
| * [Keymap] XD60 Finnish/Swedish layout (#15153)Minna2021-11-292-0/+45
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add bongopad (#15212)ll3macorn2021-11-297-0/+261
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-299-0/+326
|\|
| * [Keyboard] Add RooPad (#15215)Wolf Van Herreweghe2021-11-299-0/+326
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Wolf Van Herreweghe <wolfvh@getupgamesofficial.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-299-44/+109
|\|
| * [Keyboard] Ploopy improvements (#15348)Drashna Jaelre2021-11-299-44/+109
| |
* | [Keyboard] Added Wakizashi 40 (#15336)xiao2021-11-297-0/+268
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | [Core] Remove matrix_is_modified() and debounce_is_active() (#15349)Stefan Kerkmann2021-11-2952-298/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2911-33/+21
|\|
| * Fix 'format-c --core-only' matching keyboard level folders (#15337)Joel Challis2021-11-291-1/+1
| |
| * Remove unnecessary ENCODER_DIRECTION_FLIP at keyboard level (#15342)Joel Challis2021-11-2910-32/+20
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-291-4/+4
|\|
| * Fix bit loss in cie_lightness() when doing division to resolve #15331 (#15344)Karl Shea2021-11-291-4/+4
| | | | | | | | | | | | | | | | | | * Fix bit loss in cie_lightness() when doing division. * Use the right types * Format Co-authored-by: zvecr <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2929-33/+1087
|\|
| * [Keyboard] Minor typo and broken link fix (#14847)tangowithfoxtrot2021-11-291-2/+2
| |
| * [Keyboard] Add Wete R2 (#14873)Ramon Imbao2021-11-2928-31/+1085
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2914-2/+543
|\|
| * [Keyboard] Add Meow65 PCB (#14937)Hai-Ninh Dang2021-11-2911-0/+428
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
| * Update VIA keymap for "EndZone34" (#15077)takashicompany2021-11-293-2/+115
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-2920-0/+584
|\|
| * [Keyboard] add odin keyboard (#15150)moyi46812021-11-2920-0/+584
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-11-299-0/+405
|\|
| * [Keyboard] Add FJLabs 7V Hotswap PCBs (#15175)Felix Jen2021-11-299-0/+405
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>