e1ad9432b6
Merge remote-tracking branch 'origin/master' into develop
2021-09-05 16:09:51 +00:00
767f2c0284
[Core] Add `is_oled_scrolling` ( #14305 )
2021-09-05 09:09:20 -07: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
0b1dee6c50
Merge remote-tracking branch 'origin/master' into develop
2021-09-04 14:02:25 +00:00
014aa0661e
Fix Space Cadet md link ( #14300 )
2021-09-04 15:01:56 +01: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
d8a2142f24
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 17:10:14 +00:00
ebfa7e14f3
Matrix Falcon info.json fixes ( #14273 )
...
* apply human-friendly formatting to info.json
* update key labels; correct maintainer field
* add LAYOUT_all data to info.json
* remove width and height keys from info.json (per fauxpark)
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-02 18:09:38 +01:00
c2da0da1dc
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 17:09:13 +00:00
0290dd3547
Yoichiro Lunakey Macro: correct Configurator key sequence ( #14276 )
...
* apply human-friendly formatting to info.json
* correct Configurator key sequence
2021-09-02 18:08:35 +01:00
0ed4002c19
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 04:13:12 +00:00
98a2e9dc0e
[Keymap] new murphpad landscape keymap with encoder enhanced functions ( #14103 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Jonavin <=>
2021-09-01 21:12:57 -07:00
e056ae58a0
[Keymap] Fine-tuning Nyquist keymap. ( #14269 )
2021-09-01 21:12:15 -07:00
98436577d7
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 04:09:36 +00:00
37aef4ebe1
[Keymap] Fix Drashna Keymap issues missed before Develop merge ( #14271 )
2021-09-01 21:08:58 -07:00
cfedd3054e
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 03:51:21 +00:00
c1e5c920a9
naiping/np64: 64_ansi Community Layout support and codebase touch-up ( #14264 )
2021-09-01 20:50:44 -07:00
e597469964
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 03:47:31 +00:00
b55154fb0a
neson design/n6: Extended Community Layout Support and Layout Macro Fix ( #14266 )
2021-09-01 20:47:28 -07:00
c0eab2a504
wuque/serneity65: Layout Macro rework and Configurator fix ( #14267 )
2021-09-01 20:46:53 -07:00
f77602b8fb
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 03:44:58 +00:00
cb53c4fd41
[Keymap] hvp keymap for Cornelius, updated ut47.2 and userspace ( #14187 )
2021-09-01 20:44:36 -07:00
872414f454
[Keymap] Add peott-fr H87 keymap ( #14232 )
2021-09-01 20:44:12 -07:00
7847acdded
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 03:43:04 +00:00
b6ca21c65c
[Keymap] Jonavin keymap gmmk pro ( #14220 )
...
add rgb nightmode and optional colemak layer
Co-authored-by: Jonavin <=>
2021-09-01 20:42:31 -07:00
b0104e99a5
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 03:41:44 +00:00
cded3b7582
[Keymap] own scylla keymap ( #14224 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2021-09-01 20:41:17 -07:00
d437f78f57
Merge remote-tracking branch 'origin/master' into develop
2021-09-02 03:41:03 +00:00
bb356a1584
[Docs] Update path to keycode.h ( #14263 )
2021-09-01 20:40:12 -07:00
48a7b50238
Merge remote-tracking branch 'origin/master' into develop
2021-09-01 17:44:43 +00:00
7575bc23a6
MatchstickWorks SouthPad: correct Configurator key sequence ( #14255 )
...
* matchstickworks/southpad: correct Configurator key sequence
* replace tabs with spaces; apply four-space indent
2021-09-01 10:44:03 -07:00
b4065c557a
Merge remote-tracking branch 'origin/master' into develop
2021-09-01 12:21:39 +00:00
QMK Bot
JayceFayne
kb-elmo
Albert Y
James Young
Ryan
jhauh
Drashna Jaelre
jonavin
peott-fr
hvp
Christian Eiden
qieq