QMK Bot
815d4cd322
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 15:34:20 +00:00
QMK Bot
db90919c7a
Merge remote-tracking branch 'origin/master' into develop
2022-09-02 15:33:43 +00:00
Drashna Jaelre
90418b371f
[Keymap] Fix bootmagic compilation issue with Drashna keymaps ( #18223 )
2022-09-02 08:32:38 -07:00
QMK Bot
fb2d62082c
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 03:55:44 +00:00
QMK Bot
4ad659f226
Merge remote-tracking branch 'origin/master' into develop
2022-09-02 03:55:05 +00:00
27671d8a43
[Keyboard] Add Lunakey Pico ( #18202 )
...
Co-authored-by: Joel Challis <git@zvecr.com >
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
2022-09-01 20:54:33 -07:00
QMK Bot
d440e9063c
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 03:49:31 +00:00
QMK Bot
fbfb04b253
Merge remote-tracking branch 'origin/master' into develop
2022-09-02 03:48:58 +00:00
QMK Bot
f684e181da
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 03:48:34 +00:00
8c793c1a43
[Keyboard] Add Shoc Keyboard ( #18143 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
2022-09-01 20:48:24 -07:00
Joy Lee and Joy
b5a52b4cff
Prevent USB peripheral fault when restarting USB on WB32 MCUs ( #18058 )
...
Co-authored-by: Joy <chang.li@westberrytech.com >
2022-09-01 20:48:02 -07:00
QMK Bot
1a8cf559f3
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 03:44:23 +00:00
QMK Bot
6b6cbf6038
Merge remote-tracking branch 'origin/master' into develop
2022-09-02 03:43:52 +00:00
QMK Bot
5a9e3a71f0
Merge remote-tracking branch 'origin/develop' into xap
2022-09-02 03:43:50 +00:00
Joel Challis
26814ca060
Install correct package on Fedora ( #18243 )
2022-09-01 20:43:19 -07:00
Drashna Jaelre
423826a34a
Better handle EEPROM reset keycode ( #18244 )
2022-09-01 20:43:06 -07:00
QMK Bot
64722d8dfa
Merge remote-tracking branch 'origin/develop' into xap
2022-09-01 23:33:53 +00:00
QMK Bot
98ed5b6cfa
Merge remote-tracking branch 'origin/master' into develop
2022-09-01 23:33:21 +00:00
101d7b5337
[Keyboard] Add Ingrained Keyboard ( #15928 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com >
Co-authored-by: Ryan <fauxpark@gmail.com >
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com >
Co-authored-by: Juan Puerto <jpuerto@psc.edu >
Co-authored-by: jpuerto-psc <68066250+jpuerto-psc@users.noreply.github.com >
2022-09-01 16:32:47 -07:00
QMK Bot
40009f5c9a
Merge remote-tracking branch 'origin/develop' into xap
2022-09-01 22:40:04 +00:00
QMK Bot
bc4ab8a433
Merge remote-tracking branch 'origin/master' into develop
2022-09-01 22:39:30 +00:00
Joel Challis
7adef85fa4
Remove non promicro pins from converters ( #18239 )
2022-09-01 15:38:52 -07:00
QMK Bot
21c4f3d103
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 23:40:11 +00:00
Joshua Diamond
e4bf832368
Add unicode mode change callbacks ( #18235 )
2022-08-31 16:39:16 -07:00
QMK Bot
894e2ab781
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 20:06:45 +00:00
QMK Bot
b9effc94db
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 20:06:14 +00:00
3araht
1ccd0c19da
Add giabalanai keyboard ( #10125 )
...
by 3araht
2022-08-31 21:05:43 +01:00
QMK Bot
bd3cecb5b6
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 19:31:49 +00:00
QMK Bot
55c0c920e9
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 19:30:30 +00:00
Ryan Neff
d4c935d8fa
Added personal Iris Rev6a layout and Milk 2% layout ( #17600 )
...
by JellyTitan
2022-08-31 20:29:26 +01:00
QMK Bot
738c4dd9cc
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 17:20:47 +00:00
QMK Bot
64749d3adc
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 17:20:16 +00:00
Benjamin Collet
6104b66014
Add bepo variant to massdrop/thekey keymaps ( #18129 )
...
by mrBen
2022-08-31 18:19:42 +01:00
QMK Bot
82f936af21
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 17:19:16 +00:00
QMK Bot
5af7982af1
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 17:18:46 +00:00
3araht
786b5d310d
Bandominedoni encoder fix ( #18229 )
...
by 3araht
2022-08-31 18:17:54 +01:00
QMK Bot
b6a6928afc
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 16:45:34 +00:00
QMK Bot
8e6f8ec37f
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 16:44:57 +00:00
Drashna Jaelre
0faedb11cc
[Keyboard] Updates to Work Louder keyboards ( #18232 )
...
by Drashna
2022-08-31 17:44:00 +01:00
QMK Bot
fd31d0c6c6
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 16:42:31 +00:00
QMK Bot
196b71ad53
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 16:41:59 +00:00
JX
de0d342b82
[Keyboard] add tg67 ( #18225 )
2022-08-31 09:41:14 -07:00
QMK Bot
aefcce8947
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 16:37:23 +00:00
Ryan
50c4ca3426
Ensure all keyboards have a bootloader set ( #18234 )
2022-08-31 17:36:41 +01:00
QMK Bot
b1f814a2b9
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 14:17:56 +00:00
Ryan
bb6f028833
Move bootloader.mk to platforms ( #18228 )
2022-08-31 07:17:24 -07:00
QMK Bot
6e2c02f3db
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 07:17:11 +00:00
Marek Kraus and Drashna Jaelre
0237ff0c62
[Core] Rework PS/2 driver selection ( #17892 )
...
* [Core] Rework PS/2 driver selection
Enabling and selecting PS/2 driver was using old approach,
so it was reworked to current approach, inspired by Serial
and WS2812 driver selections.
* [Keyboard] Update keyboards using PS/2 to use new PS/2 driver selection
* [Docs] Update PS/2 documentation to use new PS/2 driver selection
* Fix indentation
* [Core] Add PS2 to data driver
* Fix oversight in property name
Co-authored-by: Drashna Jaelre <drashna@live.com >
* Add PS/2 pins to data driven mappings
Co-authored-by: Drashna Jaelre <drashna@live.com >
2022-08-31 09:16:07 +02:00
QMK Bot
c87899aa27
Merge remote-tracking branch 'origin/develop' into xap
2022-08-31 05:21:13 +00:00
QMK Bot
ba7030d216
Merge remote-tracking branch 'origin/master' into develop
2022-08-31 05:20:33 +00:00
QMK Bot