summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-151-29/+22
|\
| * [Keyboard] Fix Jot50 compilation errors (#15478)Drashna Jaelre2021-12-141-29/+22
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-158-0/+258
|\|
| * [Keyboard] Add pluto12 (#15369)Will McGloughlin2021-12-148-0/+258
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developDrashna Jael're2021-12-14391-4500/+5744
|\|
| * [Keyboard] New PCB MB-65S from MechBrewery (#15422)AnthonyNguyen1682021-12-1413-0/+733
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * [Keyboard] Add La+ (#15460)Xelus222021-12-1414-0/+608
| |
| * Remove unnecessary backslash-escapes in default keymaps (#15472)Ryan2021-12-14366-4536/+4439
| | | | | | | | | | | | | | * Remove unnecessary backslash-escapes in default keymaps * Remove unnecessary backslash-escapes in via keymaps * Remove unnecessary backslash-escapes in default-ish keymaps
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-1411-0/+537
|\|
| * Add support for the crkbd r2g by mechboards (#15283)Elliot Powell2021-12-1411-0/+537
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * r2g folder groundwork * Default mb keymap featuring mb logos * Migrate Oled to keyboard folder * Move rules configs to support config better * update readmes * Liscnece update * Update config and fix issues caused by redef errs * funciton name adjusts, define specific rgb modes * move default oled font to postconfig * update oled in line with develop merge * fix return value * Add some default rgb matrix defines * del ugfx * remove #include <stdio.h>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-143-8/+14
|\|
| * Update noroadsleft userspace and keymaps (2021-12-13) (#15470)James Young2021-12-133-8/+14
| | | | | | | | | | | | | | | | * remove macroMode functionality * update kbdfans/kbd75/rev1:noroadsleft keymap - replace `_______` instances with `XXXXXXX` on System layer - add line breaks between keymap layers
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-12-13265-245/+397
|\|
| * Fix up build options comments (#15463)Ryan2021-12-12265-245/+397
| |
* | 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-1161-7/+2228
|\|
| * 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
* | 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-091835-3296/+1835
|\|
| * Tidy up NKRO_ENABLE rules (#15382)Ryan2021-12-091837-3296/+1837
| |
* | 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-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-08150-665/+514
|\|
| * [Keyboard] Add Contender (#15403)sotoba2021-12-089-0/+421
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
| * Remove references to Makefile in keyboard-level rules.mk (#15427)Ryan2021-12-07145-679/+95
| |
* | 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
|\|