Commit Graph

22637 Commits

Author SHA1 Message Date
QMK Bot
4689c5ebcb Merge remote-tracking branch 'origin/develop' into xap 2022-07-30 02:47:40 +00:00
QMK Bot
a97c61074e Merge remote-tracking branch 'origin/master' into develop 2022-07-30 02:47:09 +00:00
James Young
d2aa8e6bb8
KBDfans Bounce Pad: Correct QMK Configurator Implementation (#17845) 2022-07-29 19:46:32 -07:00
QMK Bot
d121b3a04b Merge remote-tracking branch 'origin/develop' into xap 2022-07-30 02:18:02 +00:00
QMK Bot
ed719d5d8d Merge remote-tracking branch 'origin/master' into develop 2022-07-30 02:17:19 +00:00
GG
0aec4203e7
[Keyboard] add Zoom87 (#17831) 2022-07-29 19:16:50 -07:00
QMK Bot
0bf412adbe Merge remote-tracking branch 'origin/develop' into xap 2022-07-30 00:33:19 +00:00
QMK Bot
0c487cbeba Merge remote-tracking branch 'origin/master' into develop 2022-07-30 00:32:42 +00:00
Drashna Jaelre
d93dfbff3c
Fix check when compiling HID Joystick with digital driver (#17844) 2022-07-30 01:32:06 +01:00
QMK Bot
95cb0e7662 Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 22:43:12 +00:00
Frank Tackitt
21603c5142
Enable mousekeys by default for RGBKB Sol3 (#17842) 2022-07-29 23:42:34 +01:00
QMK Bot
ff1ce9ade7 Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 21:04:08 +00:00
QMK Bot
3f1b61ba55 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 21:03:24 +00:00
James Young
7f2ddf1711
kbdfans/bounce/75: correct typos of keyboard name (#17841) 2022-07-29 22:02:45 +01:00
QMK Bot
9cfb30fa3c Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 18:14:10 +00:00
Stefan Kerkmann
a204523bbb
[Core] RP2040 disable PIO IRQs on serial timeout (#17839) 2022-07-29 20:13:16 +02:00
QMK Bot
a28c75c747 Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 16:31:23 +00:00
zvecr
ade2eb1e75 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 17:30:33 +01:00
Ryan
394cf7c41e
Move keyboard USB IDs and strings to data driven: J (#17837) 2022-07-29 13:49:01 +01:00
Ryan
bcb8600a31
Move keyboard USB IDs and strings to data driven: I (#17836) 2022-07-29 13:40:16 +01:00
QMK Bot
1c3c7c89d3 Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 12:20:20 +00:00
QMK Bot
1050cf2453 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 12:19:39 +00:00
James Young
1ded7ad460
KBDfans Bounce75 Touch-Up (#17834)
* kbdfans/bounce/75/hotswap: keymap readability fix

Update grid alignment to disambiguate which keycodes correspond in different layers.

----

Layer 0 had 13 and 9 keycodes on the bottom two rows respectively, while Layers 1-3 had 14 and 8.

* kbdfans/bounce/75/soldered: keymap readability fix

Update grid alignment to disambiguate which keycodes correspond in different layers.

----

Layer 0 had 14 and 9 keycodes on the bottom two rows respectively, while Layers 1-3 had 15 and 8.

* kbdfans/bounce/75/soldered: fix layer index in keymaps

Layer indexes were 0,1,2,1 instead of 0,1,2,3.
2022-07-29 13:18:28 +01:00
QMK Bot
6b3c2fa051 Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 06:45:11 +00:00
QMK Bot
a7d0e01e5b Merge remote-tracking branch 'origin/master' into develop 2022-07-29 06:44:32 +00:00
James Young
5c90f7ae14
Wuque Promise87 WKL Refactor (#17828) 2022-07-28 23:43:54 -07:00
QMK Bot
2ba9045bbc Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 04:51:35 +00:00
precondition
95c1cc425e
Rename postprocess_steno_user → post_process_steno_user (#17823) 2022-07-28 21:51:01 -07:00
QMK Bot
587f750fce Merge remote-tracking branch 'origin/develop' into xap 2022-07-29 04:43:19 +00:00
QMK Bot
2d0443ec25 Merge remote-tracking branch 'origin/master' into develop 2022-07-29 04:42:45 +00:00
GG
b5452581da
[Keyboard] fix mistakes in promise87 config (#17830) 2022-07-28 21:41:42 -07:00
QMK Bot
7a706678d2 Merge remote-tracking branch 'origin/develop' into xap 2022-07-28 13:14:19 +00:00
QMK Bot
c2f68e3232 Merge remote-tracking branch 'origin/master' into develop 2022-07-28 13:13:39 +00:00
Ryan
920f983767
Move keyboard USB IDs and strings to data driven: H (#17821) 2022-07-28 14:12:40 +01:00
QMK Bot
9b48ca332c Merge remote-tracking branch 'origin/develop' into xap 2022-07-28 01:03:01 +00:00
Stefan Kerkmann
157ea96411
ChibiOS: use correct status codes in i2c_master.c (#17808)
msg_t is MSG_OK in the success case and either MSG_RESET or MSG_TIMEOUT
in case of errors. So actually use them in the comparison.
2022-07-28 02:02:10 +01:00
QMK Bot
09db67eeac Merge remote-tracking branch 'origin/develop' into xap 2022-07-28 00:57:44 +00:00
QMK Bot
476d709fa5 Merge remote-tracking branch 'origin/master' into develop 2022-07-28 00:57:13 +00:00
Less/Rikki
e7affd0541
feat: encoder map, OLED & encoder kb-level config (#17809) 2022-07-28 01:56:37 +01:00
zvecr
81ac1a5df5 Patch up fnv use in dynamic keymap 2022-07-28 01:43:23 +01:00
QMK Bot
0d0a3a938b Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 23:52:47 +00:00
QMK Bot
b029252e76 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 23:52:09 +00:00
Arthur
1e745c48b6
[Keymap] Add artflag kyria layout (#17778)
* Initial firmware

* feedback

* updates

* update map
2022-07-27 16:51:13 -07:00
QMK Bot
63515f8515 Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 21:45:14 +00:00
QMK Bot
7bb73306d6 Merge remote-tracking branch 'origin/master' into develop 2022-07-27 21:44:42 +00:00
Ryan
23f365b601
Move keyboard USB IDs and strings to data driven: F (#17816) 2022-07-27 22:44:05 +01:00
QMK Bot
08f1e8592f Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 21:13:00 +00:00
QMK Bot
5055c9a74b Merge remote-tracking branch 'origin/master' into develop 2022-07-27 21:12:28 +00:00
Kevin Zhao
6731712cc1
Fix SKErgo Keymap (#17812) 2022-07-27 22:10:57 +01:00
QMK Bot
4a2610df8f Merge remote-tracking branch 'origin/develop' into xap 2022-07-27 19:20:32 +00:00