Commit Graph

13304 Commits

Author SHA1 Message Date
QMK Bot
e5a294495d Merge remote-tracking branch 'origin/develop' into xap 2022-08-06 05:51:00 +00:00
QMK Bot
ec5186f0f9 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 05:50:30 +00:00
Ryan
10ad238944
Move keyboard USB IDs and strings to data driven: W (#17903) 2022-08-06 15:49:44 +10:00
QMK Bot
09311d8131 Merge remote-tracking branch 'origin/develop' into xap 2022-08-06 02:38:47 +00:00
Jeff Epler
7bbc1b21dd
Add kb2040 onkey keyboard that works with the oled keymap (#17786) 2022-08-05 19:38:10 -07:00
QMK Bot
47c9e647b7 Merge remote-tracking branch 'origin/develop' into xap 2022-08-06 01:58:37 +00:00
Drashna Jaelre
ad4ef47d2b
[Keyboard] use correct function in Dilemma splinky (#17923) 2022-08-06 02:58:06 +01:00
QMK Bot
e4a35c5a25 Merge remote-tracking branch 'origin/develop' into xap 2022-08-06 01:55:27 +00:00
QMK Bot
758a0a0902 Merge remote-tracking branch 'origin/master' into develop 2022-08-06 01:54:55 +00:00
Less/Rikki
660dedfb17
[Keyboard] encoder map on more mechwild boards (#17894) 2022-08-05 18:54:22 -07:00
QMK Bot
ea42ec5f2d Merge remote-tracking branch 'origin/develop' into xap 2022-08-04 23:42:32 +00:00
QMK Bot
217bd431e9 Merge remote-tracking branch 'origin/master' into develop 2022-08-04 23:41:59 +00:00
Joel Challis
8978960a87
Tidy up ez_maker (#17910) 2022-08-05 00:41:29 +01:00
QMK Bot
c83efdf8af Merge remote-tracking branch 'origin/develop' into xap 2022-08-04 13:08:27 +00:00
QMK Bot
7093846319 Merge remote-tracking branch 'origin/master' into develop 2022-08-04 13:07:34 +00:00
ebastler
efd3b1e0bd
added missing indicator defines for dolice (#17906) 2022-08-04 14:06:50 +01:00
QMK Bot
2c2dabb725 Merge remote-tracking branch 'origin/develop' into xap 2022-08-04 11:06:03 +00:00
Nick Brassel
543f54a483
[Core] STM32_USB_USE_OTG1 => USB_ENDPOINTS_ARE_REORDERABLE (#17647) 2022-08-04 21:05:16 +10:00
QMK Bot
8ec6e21625 Merge remote-tracking branch 'origin/develop' into xap 2022-08-04 01:36:49 +00:00
QMK Bot
88cfd55b8c Merge remote-tracking branch 'origin/master' into develop 2022-08-04 01:36:14 +00:00
Ryan
17176daf26
Move keyboard USB IDs and strings to data driven: T (#17899) 2022-08-04 02:35:08 +01:00
QMK Bot
d0e737c686 Merge remote-tracking branch 'origin/develop' into xap 2022-08-04 00:23:20 +00:00
QMK Bot
4e50de3a4b Merge remote-tracking branch 'origin/master' into develop 2022-08-04 00:22:37 +00:00
James Young
5a631ed9ac
Balloondogcaps TR90 and TR90PM: rename LAYOUT to LAYOUT_ortho_3x3 (#17879)
* balloondogcaps/tr90: rename LAYOUT to LAYOUT_ortho_3x3

* balloondogcaps/tr90pm: rename LAYOUT to LAYOUT_ortho_3x3
2022-08-04 01:21:59 +01:00
QMK Bot
4b807a0d8a Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:56:37 +00:00
QMK Bot
42a36a2095 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:55:51 +00:00
QMK Bot
dced141e2f Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:55:08 +00:00
James Young
b01814bf68
boardsource/the_mark: add QMK Configurator layout data (#17898)
* boardsource/the_mark: add QMK Configurator layout data

* add keyboard maintainers to info.json

Adds the individual and organization accounts as listed maintainers.
2022-08-03 23:54:50 +01:00
QMK Bot
d8a15ce5bb Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:54:33 +00:00
QMK Bot
7d8fdfb412 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:53:56 +00:00
Ryan
a30c1884c7
Move keyboard USB IDs and strings to data driven: U (#17900) 2022-08-03 23:53:46 +01:00
QMK Bot
adf8218399 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:53:16 +00:00
Ryan
1fd8d5c322
Move keyboard USB IDs and strings to data driven: V (#17901) 2022-08-03 23:52:24 +01:00
QMK Bot
d664fbac28 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:13:54 +00:00
QMK Bot
0a198b59a3 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:13:21 +00:00
Ryan
a8744b1630
Move keyboard USB IDs and strings to data driven: S (#17889) 2022-08-04 08:12:37 +10:00
QMK Bot
67cf91dcea Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 22:06:50 +00:00
QMK Bot
237039cdcd Merge remote-tracking branch 'origin/master' into develop 2022-08-03 22:06:14 +00:00
Ryan
b40c03140e
Move keyboard USB IDs and strings to data driven: R (#17885) 2022-08-04 08:05:40 +10:00
QMK Bot
f8c7eafaf6 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 20:08:44 +00:00
QMK Bot
c6a6f987c9 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 20:08:10 +00:00
Joel Challis
92bcbee226
Fix up splittest/bluepill (#17897) 2022-08-03 21:06:54 +01:00
QMK Bot
fcdaabd3cf Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 17:24:30 +00:00
QMK Bot
f326b0b40e Merge remote-tracking branch 'origin/master' into develop 2022-08-03 17:23:55 +00:00
Stephen J Bush
df8a538489
Userspace: muppetjones (#1) (#13461)
* Userspace: muppetjones (#1)

Add and update lily58 to work with userspace
Add and update kyria keymap to work with userspace
Add and update planck keymap with userspace
Add etchamouse code and docs to userpace
Add userspace
Update mouse encoder for smoother movement.
Encoder + mouse
Added casemodes by andrewjrae

* Rollback lily58 state reader and add missing GPL

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>

* fix lily58 keymap

* Updates to user and lily for muppetjones.

Updated parameters for etchamouse for smoother mouse movement. Updated lily keymap and userspace to actually work together.

* Update keyboards/lily58/keymaps/muppetjones/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Updated keymaps and userspace

* Little more cleanup.

* Update keyboards/lily58/keymaps/muppetjones/rules.mk

Co-authored-by: Ryan <fauxpark@gmail.com>

* Rollback accidental libchibios update

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Update kyria keymap

* Move kyria keymap to splitkb/kyria

* Update planck keymap

* Remove all changes to keyboards/lily58/lib/layer_state_reader.c

* Update lily58 keymap

* Recommended change

* Update keymap readme

* Update kyria keymap and userspace

* Apply suggestions from code review

Co-authored-by: Drashna Jaelre <drashna@live.com>

* Renamed users/muppetjones/README.md to lc

* Update keyboards/lily58/keymaps/muppetjones/config.h

Co-authored-by: Drashna Jaelre <drashna@live.com>

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-03 18:23:17 +01:00
QMK Bot
f48b1bce35 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 14:59:50 +00:00
QMK Bot
e93124f05c Merge remote-tracking branch 'origin/master' into develop 2022-08-03 14:59:13 +00:00
Ryan
5f6cf24294
Move keyboard USB IDs and strings to data driven: Q (#17883) 2022-08-03 15:58:29 +01:00
QMK Bot
0560cc0500 Merge remote-tracking branch 'origin/develop' into xap 2022-08-03 13:21:40 +00:00
QMK Bot
4c81d4e526 Merge remote-tracking branch 'origin/master' into develop 2022-08-03 13:20:50 +00:00