8f6b019dcc
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 10:22:48 -07:00
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
d2accb48e7
RESET -> QK_BOOT keyboard readme ( #18110 )
2022-08-20 11:34:17 +01:00
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
3bf36e8b04
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 04:17:48 +00:00
e7107691ab
[Keymap] Add joe_scotto keymap for CRKBD ( #18103 )
2022-08-19 21:17:09 -07:00
68079cba61
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 03:52:33 +00:00
f08e08cec2
[Keyboard] Fix compilation issues for keycapsss kimiko ( #18112 )
2022-08-20 13:51:57 +10:00
a69303bb78
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 02:59:05 +00:00
c9120ea8e9
[Keymap] Add Miryoku keymap for Hillside family ( #18087 )
2022-08-19 19:58:24 -07:00
880ea06760
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 01:55:33 +00:00
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
61689ae609
Merge remote-tracking branch 'upstream/master' into develop
2022-08-20 10:55:40 +10:00
201f1a8f47
Move keyboard USB IDs and strings to data driven, pass 2: S-Y ( #18093 )
2022-08-20 01:48:38 +01:00
f4dcce7e59
Move keyboard USB IDs and strings to data driven, pass 2: M-O ( #18090 )
2022-08-20 01:45:28 +01:00
201a914beb
Move keyboard USB IDs and strings to data driven, pass 2: P-R ( #18091 )
2022-08-20 01:42:49 +01:00
835c971f78
Move keyboard USB IDs and strings to data driven, pass 2: J-L ( #18080 )
2022-08-20 10:39:35 +10:00
eceed6c50b
Merge remote-tracking branch 'origin/master' into develop
2022-08-20 00:32:18 +00:00
48792b030b
Move keyboard USB IDs and strings to data driven, pass 2: handwired ( #18079 )
2022-08-20 10:31:48 +10:00
f1ac92ac63
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 23:50:09 +00:00
39f0fb7bea
[Keyboard] Update Work Louder keyboards ( #18109 )
2022-08-19 16:49:37 -07:00
4a8bed844d
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 22:15:34 +00:00
f1786cbd7b
Fix duplicate keys in info.json files ( #18107 )
2022-08-19 23:14:38 +01:00
c0c875d675
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 19:48:31 +00:00
8e8c0e2d57
Cyberstar Custom ( #18076 )
...
* Create Cyberstar Custom
Co-authored-by: yiancar <yiancar@gmail.com>
2022-08-19 20:47:45 +01:00
1eac095c0c
Use the correct bootloader definition. ( #18102 )
2022-08-19 05:20:44 +01:00
5ee482b110
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 01:19:23 +00:00
e6a1afb8f1
[Docs] Fix typo in data driven config docs ( #18095 )
2022-08-18 18:18:51 -07:00
2ed2c88a08
Merge remote-tracking branch 'origin/master' into develop
2022-08-19 01:17:50 +00:00
286dd6abe6
[Docs] Update list of "ARM-based ProMicro replacements" ( #18083 )
2022-08-18 18:17:20 -07:00
3c745caf61
Remove legacy bootmagic cli parsing ( #18099 )
2022-08-19 01:56:48 +01:00
9550cc464c
Fix new-keyboard default for RP2040 bootloader ( #18100 )
2022-08-19 01:48:33 +01:00
0fcebdcdf1
Swap F4x1 default board files away from blackpill ( #17522 )
2022-08-19 00:52:50 +01:00
227e552f5c
Add support keyboard Feker IK75 ( #17611 )
2022-08-18 01:23:34 +01:00
a645301c82
Add Bonsai C4 converter ( #17711 )
2022-08-18 01:01:54 +01:00
29f47f4cf3
Merge remote-tracking branch 'origin/master' into develop
2022-08-17 22:51:34 +00:00
9607b46756
Fixup mokey/ibis80 keymaps ( #18088 )
2022-08-17 23:51:04 +01:00
f9abecda3f
Merge remote-tracking branch 'origin/master' into develop
2022-08-17 14:11:59 +00:00
45845ea07f
Replace CG_SWAP in junonum ( #18086 )
...
Co-authored-by: Minh-tri Nguyen <mtngx@PigeonMac.local>
2022-08-17 15:11:00 +01:00
47e98e3a68
Merge remote-tracking branch 'origin/master' into develop
2022-08-17 07:28:11 +00:00
0df97fc968
[Keymap] Add personal keymap for kprepublic BM40HSRGB ( #18021 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Fae <faenkhauser@gmail.com>
2022-08-17 00:27:31 -07:00
6b78d07e64
[Keyboard] add 'soda/cherish' ( #18057 )
...
Co-authored-by: Drashna Jaelre <drashna@live.com>
2022-08-17 00:26:35 -07:00
39337373f5
Merge remote-tracking branch 'origin/master' into develop
2022-08-17 02:38:02 +00:00
e5f1d8859e
[Keyboard] Add ibis80 ( #18051 )
...
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-16 19:37:57 -07:00
2ade237e77
Merge remote-tracking branch 'origin/master' into develop
2022-08-17 02:37:40 +00:00
5a1a0e71de
[Keymap] toshi0383 keymaps update ( #18073 )
2022-08-16 19:37:29 -07:00
cfab3e2d6e
Merge remote-tracking branch 'origin/master' into develop
2022-08-17 02:37:10 +00:00
a1f0208797
[Docs] Use layer number as example for COMBO_ONLY_FROM_LAYER ( #18072 )
...
Co-authored-by: Ryan <fauxpark@gmail.com>
2022-08-16 19:37:06 -07:00
8230b4c49d
[Keymap] jotix's community/ortho4x12 change ( #18069 )
2022-08-16 19:36:30 -07:00
77150d00ac
Merge remote-tracking branch 'origin/master' into develop
2022-08-16 18:42:23 +00:00
Drashna Jael're
Sergey Vlasov
Joel Challis
Erovia
QMK Bot
Joe Scotto
Davide Masserut
AliceH66
fauxpark
yiancar
Nick Brassel
Simon Hengel
~ aka goonf!sh
HorrorTroll
David Hoelscher
jack
Juno Nguyen
CoffeeIsLife
ZhaoYou
Runheme
Toshihiro Suzuki
Albert Y
jotix