summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-09-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10[Keyboard] New PCB Canary60RGB from CanaryTeam (#14321)AnthonyNguyen168
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10[Keyboard] owl8 bugfix (#14020)yfuku
2021-09-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10[Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499)AKiwi92
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>
2021-09-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10[Keymap] Add keymap for crkbd/rarick (#13240)rarick
* 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>
2021-09-11Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10[Keymap] moults31 userspace and keymaps (#12025)Zac Moulton
2021-09-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10[Keyboard] Add RS60 (#14073)Xelus22
* 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>
2021-09-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375)Ryan
2021-09-10Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-09-10Change USBasp and bootloadHID bootloaders to lowercase (#14354)Ryan
2021-09-09Move non-assignment code to post_rules.mk (#14207)Zach White
* 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.
2021-09-09Fix number of elements in info.json does not match errors (#14213)Zach White
* 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
2021-09-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10Remove bootloader listings from rules.mk (#14330)Ryan
2021-09-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10Remove commented out BLUETOOTH_ENABLE rules (#14361)Ryan
2021-09-10Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-10Align rgb/led matrix docs with current behaviour (#14367)Joel Challis
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-09[Keyboard] Add custom pcb for Polaris (#14347)Uy Bui
* [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>
2021-09-09Merge remote-tracking branch 'upstream/master' into developfauxpark
2021-09-09Fix CRLF in lyra/rev1 (#14360)Ryan
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08[Keyboard] add lyra (#13977)Malevolti
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08[Keyboard] Add Olly JF PCB (#14056)mechlovin
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08Backport F_CPU/F_USB hack from system76 (#14286)Drashna Jaelre
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08[Keymap] Fix Maker Keyboards Alexa Keymap (#14355)Felix Jen
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08[Keyboard] Add 61Key (#14259)Ethan Yates
Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08`ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should behave the same (#14315)JayceFayne
2021-09-08`OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave the same (#14302)JayceFayne
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08[Keyboard] Minor tweaks to Work Board layout (#14351)Drashna Jaelre
2021-09-09Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-09Bugfix for Joystick and JSON schema (#14295)Ryan
2021-09-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08[Keyboard] Add new Mokey keyboard (#14329)rhmokey
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-08Merge remote-tracking branch 'origin/master' into developQMK Bot
2021-09-08[Keymap] Add Gaston's Lily58 custom keymap (#14334)Gastón Jorquera
Co-authored-by: Ryan <fauxpark@gmail.com> Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
2021-09-08Merge remote-tracking branch 'origin/master' into developQMK Bot
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 14:00:14 +0000