summaryrefslogtreecommitdiffstats
path: root/keyboards
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1116-11/+366
|\
| * [Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499)AKiwi922021-09-1016-11/+366
| | | | | | | | | | | | | | Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ash <ash@splitpixel.co.uk>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-114-0/+472
|\|
| * [Keymap] Add keymap for crkbd/rarick (#13240)rarick2021-09-104-0/+472
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added new keymap for crkbd/rarick * Delete flash.sh Deleted rarick crkbd flashing script, as it will not be used by most users. * Applied feedback, and fixed build error caused by builder updates * Update keyboards/crkbd/keymaps/rarick/config.h Removed USE_MATRIX_I2C, no longer used. 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-09-1112-4/+442
|\|
| * [Keymap] moults31 userspace and keymaps (#12025)Zac Moulton2021-09-1012-4/+442
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1011-0/+340
|\|
| * [Keyboard] Add RS60 (#14073)Xelus222021-09-1011-0/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * initial rs60 * update * remove * Include rs60.h Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * List form readme. Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * change layout name Co-authored-by: Joel Challis <git@zvecr.com> * add layout Co-authored-by: Joel Challis <git@zvecr.com> * add license Co-authored-by: Joel Challis <git@zvecr.com> * 2021 update Co-authored-by: Joel Challis <git@zvecr.com> * add license Co-authored-by: Joel Challis <git@zvecr.com> * sigprof suggested changes * Remove redundant define Co-authored-by: Ryan <fauxpark@gmail.com> * Fixup readme Co-authored-by: Sergey Vlasov <sigprof@gmail.com> * Update keyboards/xelus/rs60/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Joel Challis <git@zvecr.com> Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1036-36/+0
|\|
| * Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375)Ryan2021-09-1036-36/+0
| |
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-1097-101/+99
|\|
| * Change USBasp and bootloadHID bootloaders to lowercase (#14354)Ryan2021-09-1097-101/+99
| |
* | Move non-assignment code to post_rules.mk (#14207)Zach White2021-09-0934-155/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 40percentclub/ut47: move non-assignment code to post_rules.mk * converter/palm_usb: move non-assignment code to post_rules.mk * converter/sun_usb: move non-assignment code to post_rules.mk * dm9records/ergoinu: move non-assignment code to post_rules.mk * ergotaco: move non-assignment code to post_rules.mk * handwired/symmetric70_proto: move non-assignment code to post_rules.mk * hhkb/ansi: move non-assignment code to post_rules.mk * hhkb/jp: move non-assignment code to post_rules.mk * lfkeyboards/lfk78: move non-assignment code to post_rules.mk * lfkeyboards/lfk87: move non-assignment code to post_rules.mk * lfkeyboards/lfkpad: move non-assignment code to post_rules.mk * lfkeyboards/mini1800: move non-assignment code to post_rules.mk * manta60: move non-assignment code to post_rules.mk * mschwingen/modelm: move non-assignment code to post_rules.mk * newgame40: move non-assignment code to post_rules.mk * numatreus: move non-assignment code to post_rules.mk * rgbkb/zen: move non-assignment code to post_rules.mk * rgbkb/zen/rev2: move non-assignment code to post_rules.mk * Revert "handwired/symmetric70_proto: move non-assignment code to post_rules.mk" This reverts commit cffaf0075c3c9b2473a660ba4af8835a9162311b.
* | Fix number of elements in info.json does not match errors (#14213)Zach White2021-09-0911-489/+406
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * evyd13/atom47/rev3: best guess at fixing info.json * evyd13/atom47: best guess at fixing info.json * eyeohdesigns/sprh: best guess at fixing info.json * handwired/unicomp_mini_m: best guess at fixing info.json * lazydesigners/the60/rev2: best guess at fixing info.json * melgeek/mj6xy: best guess at fixing info.json * pizzakeyboards/pizza65: best guess at fixing info.json * plx: best guess at fixing info.json * rojectcain/vault45: best guess at fixing info.json * sidderskb/majbritt/rev2: best guess at fixing info.json * spacey: best guess at fixing info.json
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-10765-5233/+34
|\|
| * Remove bootloader listings from rules.mk (#14330)Ryan2021-09-10765-5233/+34
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-1017-17/+0
|\|
| * Remove commented out BLUETOOTH_ENABLE rules (#14361)Ryan2021-09-1017-17/+0
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0911-0/+706
|\|
| * [Keyboard] Add custom pcb for Polaris (#14347)Uy Bui2021-09-0911-0/+706
| | | | | | | | | | | | | | | | | | | | | | * [Keyboard] pcb for Polaris * [Keyboard] pcb for Polaris: update layout * Update keyboards/wekey/polaris/info.json Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'upstream/master' into developfauxpark2021-09-091-17/+17
|\|
| * Fix CRLF in lyra/rev1 (#14360)Ryan2021-09-091-17/+17
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0915-0/+540
|\|
| * [Keyboard] add lyra (#13977)Malevolti2021-09-0815-0/+540
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0913-0/+926
|\|
| * [Keyboard] Add Olly JF PCB (#14056)mechlovin2021-09-0813-0/+926
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-091-4/+4
|\|
| * [Keymap] Fix Maker Keyboards Alexa Keymap (#14355)Felix Jen2021-09-081-4/+4
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-099-0/+423
|\|
| * [Keyboard] Add 61Key (#14259)Ethan Yates2021-09-089-0/+423
| | | | | | | | Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-092-14/+14
|\|
| * [Keyboard] Minor tweaks to Work Board layout (#14351)Drashna Jaelre2021-09-082-14/+14
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-091-1/+1
|\|
| * Bugfix for Joystick and JSON schema (#14295)Ryan2021-09-091-1/+1
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-089-0/+295
|\|
| * [Keyboard] Add new Mokey keyboard (#14329)rhmokey2021-09-089-0/+295
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-084-0/+160
|\|
| * [Keymap] Add Gaston's Lily58 custom keymap (#14334)Gastón Jorquera2021-09-084-0/+160
| | | | | | | | Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-0811-118/+141
|\|
| * [Keyboard] Tractyl Manuform - configuration updates (#14314)Drashna Jaelre2021-09-0811-118/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | * [Keyboard] Tractyl Manuform - configuration updates * Update readmes * Add more details * Fix issues with encoder pins * Additional fixes for pin config * Fix up some comments
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-082-0/+56
|\|
| * [Keyboard] Add VIA keymap for the reviung39 (#14234)Keenan Brock2021-09-082-0/+56
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-084-5/+6
|\|
| * Fixes for recent i2c migrations (#14352)Joel Challis2021-09-084-5/+6
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-081-20/+20
|\|
| * [Keyboard] Update VIA support for lazydesigners/the40 (#14240)jackytrabbit2021-09-081-20/+20
| | | | | | Co-authored-by: Joel Challis <git@zvecr.com>
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-084-0/+268
|\|
| * [Keymap] New keymap for bm40 (#14182)Gabriel Bustamante2021-09-074-0/+268
| |
* | Merge remote-tracking branch 'origin/master' into developQMK Bot2021-09-089-0/+224
|\|
| * [Keyboard] add wang ergo (#14245)Rifaa Subekti2021-09-079-0/+224
| | | | | | Co-authored-by: Ryan <fauxpark@gmail.com>