summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-051-1/+1
|\
| * Modified config.h default configuration (#15387)Joy Lee2021-12-061-1/+1
| | | | | | | | | | * Modified config.h default configuration * Modified config.h default configuration
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-022-4/+4
|\|
| * Update ReadMe for the Roopad (#15380)Wolf Van Herreweghe2021-12-022-4/+4
| |
* | Tidy up existing i2c_master implementations (#15376)Joel Challis2021-12-025-81/+71
| | | | | | | | | | * Move chibios defines out of header * Make some avr defines internal
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0215-15/+0
|\|
| * Remove pointless `CUSTOM_MATRIX = no` (#15383)Ryan2021-12-0215-15/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0214-14/+14
|\|
| * Remove manual enable of LTO within keyboards (#15377)Joel Challis2021-12-0214-14/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0110-0/+752
|\|
| * [Keyboard] Han60 QMK / VIA Support (#15332)Farhan Rob2021-12-0110-0/+752
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-12-021783-3458/+37
|\|
| * Tidy up `SLEEP_LED_ENABLE` rules (#15362)Ryan2021-12-011785-3464/+37
| |
* | Convert ai03/orbit to SPLIT_KEYBOARD (#15340)Joel Challis2021-12-0115-1544/+115
| |
* | Convert not_so_minidox to SPLIT_KEYBOARD (#15306)Joel Challis2021-12-0110-929/+21
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-0124-0/+963
|\|
| * [Keyboard] Add support for Mode SixtyFive M65HA and M65HI (#14685)Álvaro A. Volpato2021-12-0124-0/+963
| |
* | Implement MAGIC_TOGGLE_CONTROL_CAPSLOCK (#15368)Joel Challis2021-11-304-0/+9
| |
* | 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
|\|