QMK Bot
0b27f39455
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 17:23:40 +00:00
Drashna Jael're
8f6b019dcc
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 10:22:48 -07:00
QMK Bot
b5436f182a
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 14:59:50 +00:00
Sergey Vlasov
7ee55b1754
Fix PID value for the Keyboardio Atreus 2 bootloader ( #18116 )
...
Copy the correct PID from `util/udev/50-qmk.rules`.
2022-08-20 15:59:17 +01:00
Joel Challis
d2accb48e7
RESET -> QK_BOOT keyboard readme ( #18110 )
2022-08-20 11:34:17 +01:00
QMK Bot
1a68d5dee7
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 05:40:23 +00:00
Erovia
5e2ffe7d8f
CLI: Teaching the CLI to flash binaries ( #16584 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Sergey Vlasov <sigprof@gmail.com>
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
2022-08-20 15:39:19 +10:00
QMK Bot
94702f6f67
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 04:18:28 +00:00
QMK Bot
3bf36e8b04
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 04:17:48 +00:00
Joe Scotto
e7107691ab
[Keymap] Add joe_scotto keymap for CRKBD ( #18103 )
2022-08-19 21:17:09 -07:00
QMK Bot
a9aacc0310
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 03:53:04 +00:00
QMK Bot
68079cba61
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 03:52:33 +00:00
Drashna Jaelre
f08e08cec2
[Keyboard] Fix compilation issues for keycapsss kimiko ( #18112 )
2022-08-20 13:51:57 +10:00
QMK Bot
7740c3754d
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 02:59:44 +00:00
QMK Bot
a69303bb78
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 02:59:05 +00:00
Davide Masserut
c9120ea8e9
[Keymap] Add Miryoku keymap for Hillside family ( #18087 )
2022-08-19 19:58:24 -07:00
QMK Bot
bb33765db5
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 01:56:14 +00:00
QMK Bot
880ea06760
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 01:55:33 +00:00
AliceH66
85831fc188
[Keyboard] Add aliceh66 pianoforte ( #18081 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-19 18:55:01 -07:00
QMK Bot
454891e583
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 00:56:45 +00:00
fauxpark
61689ae609
Merge remote-tracking branch 'upstream/master' into develop
2022-08-20 10:55:40 +10:00
Ryan
201f1a8f47
Move keyboard USB IDs and strings to data driven, pass 2: S-Y ( #18093 )
2022-08-20 01:48:38 +01:00
Ryan
f4dcce7e59
Move keyboard USB IDs and strings to data driven, pass 2: M-O ( #18090 )
2022-08-20 01:45:28 +01:00
Ryan
201a914beb
Move keyboard USB IDs and strings to data driven, pass 2: P-R ( #18091 )
2022-08-20 01:42:49 +01:00
Ryan
835c971f78
Move keyboard USB IDs and strings to data driven, pass 2: J-L ( #18080 )
2022-08-20 10:39:35 +10:00
QMK Bot
ca69c7ce3b
Merge remote-tracking branch 'origin/develop' into xap
2022-08-20 00:32:54 +00:00
QMK Bot
eceed6c50b
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 00:32:18 +00:00
Ryan
48792b030b
Move keyboard USB IDs and strings to data driven, pass 2: handwired ( #18079 )
2022-08-20 10:31:48 +10:00
QMK Bot
2a45e4f83b
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 23:50:43 +00:00
QMK Bot
f1ac92ac63
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 23:50:09 +00:00
Drashna Jaelre
39f0fb7bea
[Keyboard] Update Work Louder keyboards ( #18109 )
2022-08-19 16:49:37 -07:00
QMK Bot
c0fedaf7f3
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 22:16:13 +00:00
QMK Bot
4a8bed844d
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 22:15:34 +00:00
Joel Challis
f1786cbd7b
Fix duplicate keys in info.json files ( #18107 )
2022-08-19 23:14:38 +01:00
QMK Bot
c194357e93
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 19:49:19 +00:00
QMK Bot
c0c875d675
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 19:48:31 +00:00
yiancar
8e8c0e2d57
Cyberstar Custom ( #18076 )
...
* Create Cyberstar Custom
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-19 20:47:45 +01:00
QMK Bot
5449d9fd7d
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 04:21:15 +00:00
Nick Brassel
1eac095c0c
Use the correct bootloader definition. ( #18102 )
2022-08-19 05:20:44 +01:00
QMK Bot
afae4c87c6
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 01:19:54 +00:00
QMK Bot
5ee482b110
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 01:19:23 +00:00
Simon Hengel
e6a1afb8f1
[Docs] Fix typo in data driven config docs ( #18095 )
2022-08-18 18:18:51 -07:00
QMK Bot
6a63feee6a
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 01:18:30 +00:00
QMK Bot
2ed2c88a08
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 01:17:50 +00:00
~ aka goonf!sh
286dd6abe6
[Docs] Update list of "ARM-based ProMicro replacements" ( #18083 )
2022-08-18 18:17:20 -07:00
QMK Bot
d0a9ceb8b2
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 00:57:25 +00:00
Joel Challis
3c745caf61
Remove legacy bootmagic cli parsing ( #18099 )
2022-08-19 01:56:48 +01:00
QMK Bot
646099927d
Merge remote-tracking branch 'origin/develop' into xap
2022-08-19 00:49:34 +00:00
Joel Challis
9550cc464c
Fix new-keyboard default for RP2040 bootloader ( #18100 )
2022-08-19 01:48:33 +01:00
QMK Bot
9040983049
Merge remote-tracking branch 'origin/develop' into xap
2022-08-18 23:53:33 +00:00
