Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add mokey63 (#14357) Co-authored-by: Drashna Jaelre <drashna@live.com>
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] added KPs BM43 RGB board (#13888) Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com> Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] New PCB Canary60RGB from CanaryTeam (#14321) Co-authored-by: Ryan <fauxpark@gmail.com>
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] owl8 bugfix (#14020)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] KiwiKeebs Macro V2 (QMK/VIA) and update to V1 (#13499) 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 develop
[Keymap] Add keymap for crkbd/rarick (#13240) * 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 develop
[Keymap] moults31 userspace and keymaps (#12025)
Merge remote-tracking branch 'origin/master' into develop
[Keyboard] Add RS60 (#14073) * 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 develop
Remove BLUETOOTH_ENABLE from defaultish keymaps (#14375)
Merge remote-tracking branch 'upstream/master' into develop
Change USBasp and bootloadHID bootloaders to lowercase (#14354)