QMK Bot
52b017b593
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 14:33:43 +00:00
alittlepeace
99d465bee0
[keyboard] Add hotswap YMDK Wings ( #14176 )
...
* Add files via upload
* Update keyboards/ymdk/wingshs/readme.md
Co-authored-by: Joel Challis <git@zvecr.com>
* Delete wingshs.json
* Update keyboards/ymdk/wingshs/config.h
Co-authored-by: Drashna Jaelre <drashna@live.com>
* Update keyboards/ymdk/wingshs/rules.mk
Co-authored-by: Ryan <fauxpark@gmail.com>
* Update keyboards/ymdk/wingshs/info.json
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-11 07:33:13 -07:00
QMK Bot
3540d374fc
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 14:31:54 +00:00
john-ezra
5eb500a877
[Keymap] Add john-ezra Kyria Keymap ( #14338 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-11 07:31:24 -07:00
QMK Bot
e1540a41b7
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 07:32:58 +00:00
Seth
35bff470f7
[Keyboard] Update rocketboard_16 with *most* of its final features ( #12537 )
2021-09-11 00:32:29 -07:00
QMK Bot
a27df035ee
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 06:25:03 +00:00
rhmokey
5f94191075
[Keyboard] Add mokey63 ( #14357 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-10 23:24:37 -07:00
QMK Bot
40fa562fb1
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 06:01:41 +00:00
Sebastian Laube
9630a7bde2
[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>
2021-09-10 23:01:14 -07:00
QMK Bot
b49b3b3dcc
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 05:50:19 +00:00
AnthonyNguyen168
047291728d
[Keyboard] New PCB Canary60RGB from CanaryTeam ( #14321 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-10 22:49:45 -07:00
QMK Bot
fcda0a7ff0
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 04:59:55 +00:00
yfuku
46f15cd1a5
[Keyboard] owl8 bugfix ( #14020 )
2021-09-10 21:59:28 -07:00
QMK Bot
f72a358931
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 04:21:16 +00:00
AKiwi92
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
QMK Bot
a433ce36eb
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 03:52:49 +00:00
rarick
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
QMK Bot
0ca04e6852
Merge remote-tracking branch 'origin/master' into develop
2021-09-11 01:57:21 +00:00
Zac Moulton
d7747a2d70
[Keymap] moults31 userspace and keymaps ( #12025 )
2021-09-10 18:56:50 -07:00
QMK Bot
f197b30a47
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 19:15:37 +00:00
Xelus22
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
QMK Bot
b6a6217f85
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 13:11:50 +00:00
Ryan
7277f1febe
Remove BLUETOOTH_ENABLE from defaultish keymaps ( #14375 )
2021-09-10 14:11:17 +01:00
fauxpark
a7c972b329
Merge remote-tracking branch 'upstream/master' into develop
2021-09-10 17:36:17 +10:00
Ryan
d5cb7de5e4
Change USBasp and bootloadHID bootloaders to lowercase ( #14354 )
2021-09-10 17:17:54 +10:00
Zach White
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
Zach White
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
QMK Bot
e6ff638abf
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 03:36:14 +00:00
Ryan
7eea780a7d
Remove bootloader listings from rules.mk ( #14330 )
2021-09-10 13:35:46 +10:00
QMK Bot
504c00c2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-10 03:32:53 +00:00
Ryan
2cb9219a3e
Remove commented out BLUETOOTH_ENABLE rules ( #14361 )
2021-09-10 13:32:22 +10:00
QMK Bot
767836fb9c
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 17:03:21 +00:00
Uy Bui
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
fauxpark
93387f8941
Merge remote-tracking branch 'upstream/master' into develop
2021-09-09 16:54:39 +10:00
Ryan
d6dd2e0d51
Fix CRLF in lyra/rev1 ( #14360 )
2021-09-09 16:50:52 +10:00
QMK Bot
4e8f064c27
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 06:35:29 +00:00
Malevolti
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
QMK Bot
9ce3d1a7d4
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 05:23:52 +00:00
mechlovin
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
QMK Bot
f03e78e888
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 02:45:20 +00:00
Felix Jen
cb4006c0b4
[Keymap] Fix Maker Keyboards Alexa Keymap ( #14355 )
2021-09-08 19:44:52 -07:00
QMK Bot
588a3afe40
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 02:14:37 +00:00
Ethan Yates
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
QMK Bot
d961d8df83
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 01:11:20 +00:00
Drashna Jaelre
853e56d080
[Keyboard] Minor tweaks to Work Board layout ( #14351 )
2021-09-08 18:10:43 -07:00
QMK Bot
8fa2a7ea2a
Merge remote-tracking branch 'origin/master' into develop
2021-09-09 00:28:34 +00:00
Ryan
9e77cdf4e6
Bugfix for Joystick and JSON schema ( #14295 )
2021-09-09 10:27:58 +10:00
QMK Bot
60c985ac8e
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:58:10 +00:00
rhmokey
3f2a030de6
[Keyboard] Add new Mokey keyboard ( #14329 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-08 16:57:43 -07:00
QMK Bot
cab0d7955f
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:55:47 +00:00
Gastón Jorquera
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
QMK Bot
24000ef2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:53:13 +00:00
Drashna Jaelre
4294aa0f1e
[Keyboard] Tractyl Manuform - configuration updates ( #14314 )
...
* [Keyboard] Tractyl Manuform - configuration updates
* Update readmes
* Add more details
* Fix issues with encoder pins
* Additional fixes for pin config
* Fix up some comments
2021-09-08 16:52:43 -07:00
QMK Bot
983580322f
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 23:03:20 +00:00
Keenan Brock
8f8411a98a
[Keyboard] Add VIA keymap for the reviung39 ( #14234 )
2021-09-08 16:02:50 -07:00
QMK Bot
38afc7e4cc
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 22:44:49 +00:00
Joel Challis
2e0659f7fd
Fixes for recent i2c migrations ( #14352 )
2021-09-08 15:44:18 -07:00
QMK Bot
9b3e973aa2
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 07:35:06 +00:00
jackytrabbit
9c175f1801
[Keyboard] Update VIA support for lazydesigners/the40 ( #14240 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
2021-09-08 00:34:36 -07:00
QMK Bot
4164f4148b
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 06:54:03 +00:00
Gabriel Bustamante
541e101291
[Keymap] New keymap for bm40 ( #14182 )
2021-09-07 23:53:33 -07:00
QMK Bot
6482fb9911
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 04:07:40 +00:00
Rifaa Subekti
3ef01a3482
[Keyboard] add wang ergo ( #14245 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-07 21:07:00 -07:00
QMK Bot
1498ecaa24
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 03:24:22 +00:00
James Young
1ebaec96e7
Sneakbox Ava tidy-up ( #14298 )
2021-09-07 20:23:45 -07:00
QMK Bot
456f7019de
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 03:02:25 +00:00
IFo Hancroft
267ffb9914
[Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap ( #14342 )
2021-09-07 20:01:58 -07:00
QMK Bot
4ba8305a5c
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 01:54:23 +00:00
Drashna Jaelre
0b8d6df390
[Keyboard] Fix issues with 3w6 rev2 matrix ( #14346 )
2021-09-08 02:53:55 +01:00
QMK Bot
f6b0484f0f
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 01:23:43 +00:00
Joel Challis
60c5bd7b5e
handwired/dactyl - Refactor use of legacy i2c implementation ( #14344 )
2021-09-07 18:23:11 -07:00
QMK Bot
af19461a02
Merge remote-tracking branch 'origin/master' into develop
2021-09-07 15:35:32 +00:00
Joel Challis
04c0704b28
3w6 - Refactor use of AVR only I2C functions ( #14339 )
...
* Refactor use of legacy i2c functions
* Align rev2
* Review fixes
2021-09-07 16:35:13 +01:00
Joel Challis
e7a5c006d9
Refactor use of legacy i2c implementation ( #14341 )
2021-09-07 16:34:59 +01:00
QMK Bot
c669c43769
Merge remote-tracking branch 'origin/master' into develop
2021-09-07 15:33:58 +00:00
Joel Challis
2d6635214a
ergodone - Refactor use of legacy i2c implementation ( #14340 )
...
* Refactor use of legacy i2c implementation
* copy-paste error
2021-09-07 16:33:29 +01:00
QMK Bot
f98f23d6d6
Merge remote-tracking branch 'origin/master' into develop
2021-09-06 19:45:19 +00:00
shiftux
1dbe4e7dd0
[Keyboard] Redox media ( #13084 )
...
* adding a new revision 'media' to the redox keyboard
* readme update
* encoder fix
* video link
* drashna change requests
* removing SPLIT_USB_TIMEOUT
* intermediate rename
* lowercase
* drashna comments
* include if defined KEYBOARD_redox_media
* lowercase readme, tmp step
* lowercase readme
* drashna changes
* more drashna comments
* readme update
* readme update
* fauxpark and drashna comments
* fauxpark comments
* Update keyboards/redox/media/readme.md
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-06 12:44:39 -07:00
QMK Bot
943e413f76
Merge remote-tracking branch 'origin/master' into develop
2021-09-06 13:49:44 +00:00
Monksoffunk
85a14ac25b
[Keyboard] Zinc: fix RGBLED_NUM bug ( #13287 )
2021-09-06 06:49:09 -07:00
QMK Bot
d72f29556a
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 22:36:16 +00:00
Drashna Jaelre
1e1be4c229
[Bug] Fix compile issues for boards with custom matrix ( #14323 )
2021-09-05 23:35:42 +01:00
QMK Bot
147289e173
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 20:37:03 +00:00
Joel Challis
8d6d8cfadf
Tidy up defines within STM EEPROM emulation ( #14275 )
...
* Tidy up defines within stm eeprom emulation
* Fix tests
* Resolve todo
* Still use page notion in clear
* Remove more f4 refs
2021-09-05 21:36:43 +01:00
Ryan
fe6d6cf76d
Remove empty override functions ( #14312 )
...
* Remove empty override functions, 0-9
* Remove empty override functions, A-D
* Remove empty override functions, E-H
* Remove empty override functions, handwired
* Remove empty override functions, I-L
* Remove empty override functions, M-P
* Remove empty override functions, Q-T
* Remove empty override functions, U-Z
2021-09-05 21:36:31 +01:00
QMK Bot
a66e8c884f
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 16:06:24 +00:00
kb-elmo
0471429c01
[Keyboard] Fix rotary encoder function for Voice65 ( #14316 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-05 09:05:55 -07:00
QMK Bot
e4fcdf57cf
Merge remote-tracking branch 'origin/master' into develop
2021-09-04 02:02:43 +00:00
Albert Y
c9262cf7f8
Enable extra keys for Technik ortho and stagger ( #14282 )
...
* Extra keys for technik ortho
* Extra keys for technik staggered
Co-authored-by: filterpaper <filterpaper@localhost>
2021-09-04 03:02:15 +01:00
QMK Bot
d272bf2dc2
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 20:03:43 +00:00
James Young
b15bd128a5
FJLabs Ready100 Configurator Fixes ( #14291 )
...
* grid-align keycodes; use short-form keycodes
No logic change.
* info.json: correct layout macro reference
* info.json: correct LAYOUT_64key data
Removes an extra key from the layout data.
* 64_ansi Community Layout support
* rename LAYOUT_64key to LAYOUT_64_ansi (with alias for backwards compatibility)
* add LAYOUTS = 64_ansi to rules.mk
* remove width and height keys from info.json
2021-09-03 21:03:15 +01:00
QMK Bot
9f17f9b2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 20:02:20 +00:00
James Young
06c89e8abf
Naiping NPhhkb: 60_tsangan_hhkb Community Layout support ( #14292 )
...
* 60_tsangan_hhkb Community Layout support
* rename LAYOUT to LAYOUT_60_tsangan_hhkb
* add LAYOUTS = 60_tsangan_hhkb to rules.mk
* correct maintainer field in info.json
* remove width and height keys from info.json
* fix GitHub account link on readme
2021-09-03 21:01:50 +01:00
QMK Bot
88bb29fb17
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 20:00:59 +00:00
James Young
90909fbaf7
takashicompany/endzone34: correct QMK Configurator key sequence ( #14290 )
...
* update info.json formatting
* convert tabs to spaces
* apply human-friendly formatting
* correct Configurator key sequence
* remove width and height keys from info.json
2021-09-03 21:00:29 +01:00
QMK Bot
f95706810a
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 18:48:40 +00:00
James Young
5f6d9913f8
OwLab Voice65 Hotswap: 65_ansi_blocker Community Layout support ( #14293 )
...
* 65_ansi_blocker Community Layout support
* rename LAYOUT to LAYOUT_65_ansi_blocker (with alias for backwards compatibility)
* add LAYOUTS = 65_ansi_blocker to rules.mk
* remove width and height keys from info.json
2021-09-03 11:48:10 -07:00
QMK Bot
337be283ca
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 16:10:08 +00:00
Ryan
8574bf20d3
Remove more cruft in keyboard files ( #14288 )
2021-09-03 17:09:30 +01:00