38afc7e4cc
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 22:44:49 +00:00
2e0659f7fd
Fixes for recent i2c migrations ( #14352 )
2021-09-08 15:44:18 -07:00
9b3e973aa2
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 07:35:06 +00:00
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
4164f4148b
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 06:54:03 +00:00
541e101291
[Keymap] New keymap for bm40 ( #14182 )
2021-09-07 23:53:33 -07:00
6482fb9911
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 04:07:40 +00:00
3ef01a3482
[Keyboard] add wang ergo ( #14245 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-07 21:07:00 -07:00
1498ecaa24
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 03:24:22 +00:00
1ebaec96e7
Sneakbox Ava tidy-up ( #14298 )
2021-09-07 20:23:45 -07:00
456f7019de
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 03:02:25 +00:00
267ffb9914
[Keymap] Adding IFo Hancroft's ErgoDox EZ Keymap ( #14342 )
2021-09-07 20:01:58 -07:00
4ba8305a5c
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 01:54:23 +00:00
0b8d6df390
[Keyboard] Fix issues with 3w6 rev2 matrix ( #14346 )
2021-09-08 02:53:55 +01:00
f6b0484f0f
Merge remote-tracking branch 'origin/master' into develop
2021-09-08 01:23:43 +00:00
60c5bd7b5e
handwired/dactyl - Refactor use of legacy i2c implementation ( #14344 )
2021-09-07 18:23:11 -07:00
af19461a02
Merge remote-tracking branch 'origin/master' into develop
2021-09-07 15:35:32 +00:00
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
e7a5c006d9
Refactor use of legacy i2c implementation ( #14341 )
2021-09-07 16:34:59 +01:00
c669c43769
Merge remote-tracking branch 'origin/master' into develop
2021-09-07 15:33:58 +00:00
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
f98f23d6d6
Merge remote-tracking branch 'origin/master' into develop
2021-09-06 19:45:19 +00:00
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
943e413f76
Merge remote-tracking branch 'origin/master' into develop
2021-09-06 13:49:44 +00:00
85a14ac25b
[Keyboard] Zinc: fix RGBLED_NUM bug ( #13287 )
2021-09-06 06:49:09 -07:00
d72f29556a
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 22:36:16 +00:00
1e1be4c229
[Bug] Fix compile issues for boards with custom matrix ( #14323 )
2021-09-05 23:35:42 +01:00
147289e173
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 20:37:03 +00:00
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
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
a66e8c884f
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 16:06:24 +00:00
0471429c01
[Keyboard] Fix rotary encoder function for Voice65 ( #14316 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-05 09:05:55 -07:00
e4fcdf57cf
Merge remote-tracking branch 'origin/master' into develop
2021-09-04 02:02:43 +00:00
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
d272bf2dc2
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 20:03:43 +00:00
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
9f17f9b2e1
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 20:02:20 +00:00
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
88bb29fb17
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 20:00:59 +00:00
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
f95706810a
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 18:48:40 +00:00
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
337be283ca
Merge remote-tracking branch 'origin/master' into develop
2021-09-03 16:10:08 +00:00
8574bf20d3
Remove more cruft in keyboard files ( #14288 )
2021-09-03 17:09:30 +01:00
5bb9da6bca
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 17:50:50 +00:00
a01057d19d
[Keymap] Update iris fluffactually keymap ( #14265 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-02 10:50:17 -07:00
751dc35546
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 17:50:12 +00:00
956cf8d7bf
[Keyboard] Work Louder board fixup ( #14247 )
...
* [Keyboard] Add some last minute tweaks to Work board
* Additional fixes
* Fix rgb pin
* Fix ws2812 hackery
* additional led tweaks
* Add indicator LEDs
* fix bootmagic settings
* Fix up RGB stuff
* Limit power draw for entire board
* fixup lights and such
* change LED order on loop
* Fix indicators if via is not enabled
* Enable Sleep for rgb matrix
* Even more LED tweaks
* Final tweaks?
* Tweak keycodes
2021-09-02 10:49:44 -07:00
d68d34644a
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 17:18:08 +00:00
d36a7c512d
PistachioPro: correct Configurator key sequence ( #14277 )
...
* info.json: apply human-friendly formatting
* correct LAYOUT key sequence
Moves the Enter key object to the correct place in sequence.
2021-09-02 10:17:35 -07:00
QMK Bot
Joel Challis
jackytrabbit
Gabriel Bustamante
Rifaa Subekti
James Young
IFo Hancroft
Drashna Jaelre
shiftux
Monksoffunk
Ryan
kb-elmo
Albert Y
jhauh