Commit graph

21100 commits

Author SHA1 Message Date
QMK Bot
bcb7e471d5 Merge remote-tracking branch 'origin/master' into develop 2022-04-21 16:34:10 +00:00
Simon Arlott
1e389c7904
rgblight: Fix rgblight_blink_layer when multiple layers are active (#16824) 2022-04-21 09:33:29 -07:00
QMK Bot
7d83445309 Merge remote-tracking branch 'origin/develop' into xap 2022-04-21 16:10:16 +00:00
QMK Bot
f3ce93fe00 Merge remote-tracking branch 'origin/master' into develop 2022-04-21 16:09:36 +00:00
Dasky
fb4f25c0b5
[Keyboard] Fix kin80 default keymap (#16893) 2022-04-21 09:08:47 -07:00
zvecr
4d895892e5 Stubs for ENCODER_MAP 2022-04-20 22:38:06 +01:00
QMK Bot
1306d58774 Merge remote-tracking branch 'origin/develop' into xap 2022-04-20 17:11:54 +00:00
QMK Bot
12d1eb0415 Merge remote-tracking branch 'origin/master' into develop 2022-04-20 17:11:12 +00:00
jpe230
81be7bb7b5
Fix i2c driver doc: Incorrect name (#16898) 2022-04-20 18:10:20 +01:00
QMK Bot
a49a2e3f34 Merge remote-tracking branch 'origin/develop' into xap 2022-04-20 07:47:48 +00:00
QMK Bot
332d7f00c5 Merge remote-tracking branch 'origin/master' into develop 2022-04-20 07:47:19 +00:00
jels
580a5d25cb
Fixed error in config (#16895) 2022-04-20 08:46:30 +01:00
QMK Bot
68c8e61c6a Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 19:20:00 +00:00
peepeetee
bd8220e9fc
move amj keyboards into amjkeyboard vendor folder (#15733)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-04-20 05:19:34 +10:00
peepeetee
314865f833
move melody96 to ymdk vendor folder (#15680)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-04-20 05:19:16 +10:00
QMK Bot
bcd9b23a65 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 19:16:03 +00:00
Dasky
40a7714ce5
rename define checks (#16892) 2022-04-19 20:15:34 +01:00
QMK Bot
f7f9a9affe Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 19:01:18 +00:00
Nick Brassel
c76a23c37a
Fix build. (#16891) 2022-04-19 20:00:37 +01:00
QMK Bot
e69de0637a Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 17:59:14 +00:00
QMK Bot
7976779e6c Merge remote-tracking branch 'origin/master' into develop 2022-04-19 17:58:36 +00:00
Danny
b310bf6ca3
[Keyboard] Add notes on Iris rev6a firmware (#16878) 2022-04-19 10:57:58 -07:00
QMK Bot
620c4e6eb0 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:31:14 +00:00
QMK Bot
682dbb21a7 Merge remote-tracking branch 'origin/master' into develop 2022-04-19 11:30:46 +00:00
Dmitry Nosachev
83709e7dbe
kin80 (#16754)
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-04-19 21:30:15 +10:00
QMK Bot
9ffd4505a0 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:28:45 +00:00
QMK Bot
c3a03b6423
[CI] Format code according to conventions (#16888) 2022-04-19 21:28:14 +10:00
QMK Bot
d3a4adefc4 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:21:15 +00:00
Joy Lee
25f849b397
Update wb32-dfu (#16438) 2022-04-19 21:21:12 +10:00
QMK Bot
b88d04eb62 Merge remote-tracking branch 'origin/master' into develop 2022-04-19 11:20:43 +00:00
LegoWolf
499060a9a5
Dactyl manuform 5x6 5 via (#16741) 2022-04-19 21:20:11 +10:00
QMK Bot
3a8ea8a683 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:19:04 +00:00
Drashna Jaelre
9056775e20
Add hacky via support for RGB Matrix (#16086) 2022-04-19 21:18:28 +10:00
QMK Bot
6a4de6a962 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:06:27 +00:00
QMK Bot
d938ccb2fd Merge remote-tracking branch 'origin/master' into develop 2022-04-19 11:05:51 +00:00
gourdo1
be7198ca49
New custom keymap for Glorious GMMK Pro ANSI layout (#16199)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-04-19 21:05:13 +10:00
QMK Bot
34ff3ed1ba Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:04:53 +00:00
QMK Bot
2b23237da1 Merge remote-tracking branch 'origin/master' into develop 2022-04-19 11:04:21 +00:00
jack
ad31ea3f51
boardsource/microdox V2 (#16569) 2022-04-19 21:03:51 +10:00
QMK Bot
a0ebf624f1 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:02:55 +00:00
KoenGoe
671b62efab
Fixes #16705 : digital rain follows val (#16716)
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-04-19 21:02:21 +10:00
QMK Bot
0c153a4751 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 11:01:11 +00:00
QMK Bot
2a4db15f62 Merge remote-tracking branch 'origin/master' into develop 2022-04-19 11:00:36 +00:00
Allen Choi
9ead40db0c
Fix broken build for users/curry (#16492) 2022-04-19 21:00:01 +10:00
QMK Bot
e1ccd6cbd2 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 10:56:53 +00:00
Stefan Kerkmann
7712a286dc
[Core] Use a mutex guard for split shared memory (#16647) 2022-04-19 20:56:16 +10:00
QMK Bot
a80d0036f3 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 10:54:18 +00:00
QMK Bot
176ab14649 Merge remote-tracking branch 'origin/master' into develop 2022-04-19 10:53:44 +00:00
jpe230
1acb37db7f
Add initial support for the Makey Makey Classic (#16658) 2022-04-19 20:53:09 +10:00
QMK Bot
e95ce2fab4 Merge remote-tracking branch 'origin/develop' into xap 2022-04-19 10:40:57 +00:00