b49b3b3dcc
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 05:50:19 +00:00
047291728d
[Keyboard] New PCB Canary60RGB from CanaryTeam ( #14321 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-10 22:49:45 -07:00
fcda0a7ff0
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 04:59:55 +00:00
46f15cd1a5
[Keyboard] owl8 bugfix ( #14020 )
2021-09-10 21:59:28 -07:00
f72a358931
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 04:21:16 +00:00
d0b1d9f548
[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>
2021-09-10 21:20:43 -07:00
a433ce36eb
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 03:52:49 +00:00
6213989c32
[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>
2021-09-10 20:52:17 -07:00
0ca04e6852
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 01:57:21 +00:00
d7747a2d70
[Keymap] moults31 userspace and keymaps ( #12025 )
2021-09-10 18:56:50 -07:00
f197b30a47
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 19:15:37 +00:00
759d1927f0
[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>
2021-09-10 20:14:39 +01:00
b6a6217f85
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 13:11:50 +00:00
7277f1febe
Remove BLUETOOTH_ENABLE from defaultish keymaps ( #14375 )
2021-09-10 14:11:17 +01:00
a7c972b329
Merge remote-tracking branch 'upstream/master' into develop
2021-09-10 17:36:17 +10:00
d5cb7de5e4
Change USBasp and bootloadHID bootloaders to lowercase ( #14354 )
2021-09-10 17:17:54 +10:00
c94cc1effa
Move non-assignment code to post_rules.mk ( #14207 )
...
* 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-09 21:37:31 -07:00
d971020cd8
Fix number of elements in info.json does not match errors ( #14213 )
...
* 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-09 21:33:23 -07:00
e6ff638abf
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 03:36:14 +00:00
7eea780a7d
Remove bootloader listings from rules.mk ( #14330 )
2021-09-10 13:35:46 +10:00
504c00c2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 03:32:53 +00:00
2cb9219a3e
Remove commented out BLUETOOTH_ENABLE rules ( #14361 )
2021-09-10 13:32:22 +10:00
fc10e5e6b9
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 02:58:12 +00:00
7f80076d04
Align rgb/led matrix docs with current behaviour ( #14367 )
2021-09-10 03:57:36 +01:00
767836fb9c
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 17:03:21 +00:00
2249963687
[Keyboard] Add custom pcb for Polaris ( #14347 )
...
* [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-09 10:02:45 -07:00
93387f8941
Merge remote-tracking branch 'upstream/master' into develop
2021-09-09 16:54:39 +10:00
d6dd2e0d51
Fix CRLF in lyra/rev1 ( #14360 )
2021-09-09 16:50:52 +10:00
4e8f064c27
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 06:35:29 +00:00
4c88f76be8
[Keyboard] add lyra ( #13977 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-08 23:34:32 -07:00
9ce3d1a7d4
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 05:23:52 +00:00
82ee9bd475
[Keyboard] Add Olly JF PCB ( #14056 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-08 22:23:26 -07:00
ac4849df13
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 03:20:08 +00:00
6d43a5daf4
Backport F_CPU/F_USB hack from system76 ( #14286 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-08 20:19:06 -07:00
f03e78e888
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 02:45:20 +00:00
cb4006c0b4
[Keymap] Fix Maker Keyboards Alexa Keymap ( #14355 )
2021-09-08 19:44:52 -07:00
588a3afe40
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 02:14:37 +00:00
891ddd9a30
[Keyboard] Add 61Key ( #14259 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-08 19:14:03 -07:00
1837d98425
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 01:35:09 +00:00
f3bef84dac
`ST7565_TIMEOUT 0` and `ST7565_DISABLE_TIMEOUT` should behave the same ( #14315 )
2021-09-08 18:34:49 -07:00
da81e5c7cd
`OLED TIMEOUT 0` and `OLED_DISABLE_TIMEOUT` should behave the same ( #14302 )
2021-09-08 18:34:34 -07:00
d961d8df83
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 01:11:20 +00:00
853e56d080
[Keyboard] Minor tweaks to Work Board layout ( #14351 )
2021-09-08 18:10:43 -07:00
8fa2a7ea2a
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 00:28:34 +00:00
9e77cdf4e6
Bugfix for Joystick and JSON schema ( #14295 )
2021-09-09 10:27:58 +10:00
60c985ac8e
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:58:10 +00:00
3f2a030de6
[Keyboard] Add new Mokey keyboard ( #14329 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-08 16:57:43 -07:00
cab0d7955f
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:55:47 +00:00
d510f6afa9
[Keymap] Add Gaston's Lily58 custom keymap ( #14334 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Gaston Jorquera <gjorquera@gmail.com>
2021-09-08 16:55:12 -07:00
24000ef2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:53:13 +00:00
QMK Bot
AnthonyNguyen168
yfuku
AKiwi92
rarick
Zac Moulton
Xelus22
Ryan
Zach White
Joel Challis
Uy Bui
Malevolti
mechlovin
Drashna Jaelre
Felix Jen
Ethan Yates
JayceFayne
rhmokey
Gastón Jorquera