summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-261-2/+2
|\
| * Fix bug when 'info.json' lookup escapes keyboard dir (#16734)Erovia2022-03-261-2/+2
| |
* | Joystick feature updates (#16732)Ryan2022-03-2610-45/+52
| | | | | | | | | | | | | | * Joystick feature updates * Move new functions to joystick.h * Docs
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-267-0/+203
|\|
| * [Keyboard] Add nt210 (#16461)Evelien Dekkers2022-03-257-0/+203
| | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-2610-0/+473
|\|
| * [Keyboard] Add YDKB Grape PCB (#16661)somepin2022-03-2510-0/+473
| | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-2610-0/+986
|\|
| * [Keymap] corne and planck keyboards keymaps (#15570)Anton2022-03-2510-0/+986
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-245-2/+176
|\|
| * CLI: Add 'via2json' subcommand (#16468)Erovia2022-03-245-2/+176
| |
* | add the ability to change the pwm frequency for the IS31FL3737B (#16718)Simon2022-03-242-1/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-242-0/+2
|\|
| * update kprepublic/bm60hsrgb_poker/rev1/keymaps/carlosala keymap (#16725)Carlo Sala2022-03-242-0/+2
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-243-1/+60
|\|
| * [Keymap] ergodox: updating osx_whiskey_tango_foxtrot_capslock to use ↵Nathan Johnson2022-03-232-1/+46
| | | | | | | | process_record_user (#16715)
| * [Keyboard] Add keyboard level encoder function for GMMK Pro (#16721)jack2022-03-231-0/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-239-0/+389
|\|
| * [Keyboard] Add support for XT60 (#16708)kopibeng2022-03-239-0/+389
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-2312-2/+279
|\|
| * [Bug] Fix unused variable error when using ChibiOS Bitbang serial driver ↵Drashna Jaelre2022-03-231-1/+2
| | | | | | | | (#16709)
| * [Keymap] Xiudi XD75 Finnish/Swedish keymap (#16311)Minna Pallari2022-03-234-0/+100
| |
| * [Keymap] Add dhertz keychron map v0 (#16571)Dan Hertz2022-03-235-1/+110
| |
| * [Keyboard] Waffling60 - readme update (#16707)4pplet2022-03-231-0/+7
| | | | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: 4pplet <4pplet@protonmail.com> Co-authored-by: 4pplet <stefan.ess@gmail.com>
| * [Keymap] Input Club's Whitefox "True Fox" (#16711)Dan Beste2022-03-231-0/+60
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-2311-0/+429
|\|
| * [Keyboard] Graystudio Apollo80 (#16469)ChrisBeswick2022-03-2211-0/+429
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-239-0/+436
|\|
| * [Keyboard] Add Axolstudio Foundation Gamma (#15948)kb-elmo2022-03-229-0/+436
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-222-27/+82
|\|
| * [Keymap] personal keymap, ergodox_ez and atreus / dvorak_42_key (#16695)Luc2022-03-222-27/+82
| |
* | Ignore transport defaults if SPLIT_KEYBOARD is unset (#16706)Joel Challis2022-03-221-2/+4
| | | | | | | | | | * Ignore transport defaults if SPLIT_KEYBOARD is unset * keep exists check
* | Extend 'qmk info' to handle keymap level overrides (#16702)Joel Challis2022-03-214-27/+58
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-213-4/+30
|\|
| * [Keyboard] add oled_task_kb() into keyboards/helix/rev2/rev2.c (#16697)Takeshi ISHII2022-03-213-4/+30
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-204-0/+134
|\|
| * Droxx keymap (#16607)Droxx2022-03-204-0/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add droxx kaymap * add droxx keymap * fixed config.h * fixed rules.mk * fixed rules.mk * updated readme.md * Update config.h * Update keymap.c * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update readme.md * Update config.h * Update readme.md * Update keymap.c
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-209-0/+385
|\|
| * Add Rart75 hotswap and support via (#16619)Alabahuy2022-03-209-0/+385
| | | | | | | | | | | | | | | | | | | | | | * Add Keyboard Rart75 Hotswap version * Update readme * Update config and readme * Update info.json * update readme and keymaps
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-208-0/+224
|\|
| * Add MutePad keyboard (Handwired) (#16590)Joshua Barber2022-03-208-0/+224
| | | | | | | | | | | | | | | | | | * Add MutePad keyboard * Update info.json and readme * Move mutepad to handwired folder * Address PR comments
* | MS Sculpt Mobile refactor (#16038)Ryan2022-03-209-134/+124
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-191-2/+4
|\|
| * qmk.path.FileType: fix argument handling (#16693)Ryan2022-03-191-2/+4
| | | | | | | | | | | | | | * qmk.path.FileType: pass in mode as first argument * Better solution * Grammar...
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-191-1/+1
|\|
| * VUSB - Use correct endpoint poll for VIA (#16691)Joel Challis2022-03-191-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-191-1/+1
|\|
| * Fix typo in docs/ref_functions.md (#16690)leviport2022-03-191-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2022-03-1912-15/+15
|\|
| * `device_ver` -> `device_version` for some more boards (#16685)Ryan2022-03-1912-15/+15
| |