22b3cf4e9102aa6d746f9ac2b5ee5b529e884010
- Author
- Joel Challis <git@zvecr.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/dasky/reverb/info.json b/keyboards/dasky/reverb/keyboard.json
2rename from keyboards/dasky/reverb/info.json
3rename to keyboards/dasky/reverb/keyboard.json
4diff --git a/keyboards/dc01/arrow/info.json b/keyboards/dc01/arrow/keyboard.json
5rename from keyboards/dc01/arrow/info.json
6rename to keyboards/dc01/arrow/keyboard.json
7diff --git a/keyboards/dc01/left/info.json b/keyboards/dc01/left/keyboard.json
8rename from keyboards/dc01/left/info.json
9rename to keyboards/dc01/left/keyboard.json
10diff --git a/keyboards/dc01/numpad/info.json b/keyboards/dc01/numpad/keyboard.json
11rename from keyboards/dc01/numpad/info.json
12rename to keyboards/dc01/numpad/keyboard.json
13diff --git a/keyboards/dc01/right/info.json b/keyboards/dc01/right/keyboard.json
14rename from keyboards/dc01/right/info.json
15rename to keyboards/dc01/right/keyboard.json
16diff --git a/keyboards/dcpedit/redherring/info.json b/keyboards/dcpedit/redherring/keyboard.json
17rename from keyboards/dcpedit/redherring/info.json
18rename to keyboards/dcpedit/redherring/keyboard.json
19diff --git a/keyboards/deng/thirty/info.json b/keyboards/deng/thirty/keyboard.json
20rename from keyboards/deng/thirty/info.json
21rename to keyboards/deng/thirty/keyboard.json
22diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/keyboard.json
23rename from keyboards/dichotomy/info.json
24rename to keyboards/dichotomy/keyboard.json
25diff --git a/keyboards/dm9records/plaid/info.json b/keyboards/dm9records/plaid/keyboard.json
26rename from keyboards/dm9records/plaid/info.json
27rename to keyboards/dm9records/plaid/keyboard.json
28diff --git a/keyboards/dm9records/tartan/info.json b/keyboards/dm9records/tartan/keyboard.json
29rename from keyboards/dm9records/tartan/info.json
30rename to keyboards/dm9records/tartan/keyboard.json
31diff --git a/keyboards/doio/kb16/rev1/info.json b/keyboards/doio/kb16/rev1/keyboard.json
32rename from keyboards/doio/kb16/rev1/info.json
33rename to keyboards/doio/kb16/rev1/keyboard.json
34diff --git a/keyboards/doio/kb16/rev2/info.json b/keyboards/doio/kb16/rev2/keyboard.json
35rename from keyboards/doio/kb16/rev2/info.json
36rename to keyboards/doio/kb16/rev2/keyboard.json
37diff --git a/keyboards/doio/kb38/info.json b/keyboards/doio/kb38/keyboard.json
38rename from keyboards/doio/kb38/info.json
39rename to keyboards/doio/kb38/keyboard.json
40diff --git a/keyboards/dp60/info.json b/keyboards/dp60/keyboard.json
41rename from keyboards/dp60/info.json
42rename to keyboards/dp60/keyboard.json
43diff --git a/keyboards/draytronics/scarlet/config.h b/keyboards/draytronics/scarlet/config.h
44deleted file mode 100644
45index 4ae200c6a66625f1c9ab77dd7b9395b3cf9aa52b..0000000000000000000000000000000000000000
46--- a/keyboards/draytronics/scarlet/config.h
47+++ /dev/null
48@@ -1,37 +0,0 @@
49-/*Copyright 2020 Blake Drayson / Draytronics
50-
51-Contact info@draytronics.co.uk
52-
53-This program is free software: you can redistribute it and/or modify
54-it under the terms of the GNU General Public License as published by
55-the Free Software Foundation, either version 2 of the License, or
56-(at your option) any later version.
57-
58-This program is distributed in the hope that it will be useful,
59-but WITHOUT ANY WARRANTY; without even the implied warranty of
60-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
61-GNU General Public License for more details.
62-
63-You should have received a copy of the GNU General Public License
64-along with this program. If not, see <http://www.gnu.org/licenses/>.
65-*/
66-
67-#pragma once
68-
69-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
70-#define LOCKING_SUPPORT_ENABLE
71-/* Locking resynchronize hack */
72-#define LOCKING_RESYNC_ENABLE
73-
74-/*
75- * Feature disable options
76- * These options are also useful to firmware size reduction.
77- */
78-/* disable debug print */
79-//#define NO_DEBUG
80-/* disable print */
81-//#define NO_PRINT
82-/* disable action features */
83-//#define NO_ACTION_LAYER
84-//#define NO_ACTION_TAPPING
85-//#define NO_ACTION_ONESHOT
86diff --git a/keyboards/draytronics/scarlet/info.json b/keyboards/draytronics/scarlet/keyboard.json
87rename from keyboards/draytronics/scarlet/info.json
88rename to keyboards/draytronics/scarlet/keyboard.json
89index b70c7bfae65d31b338203d08ac4b3f031c8328e5..0eabd378da2e4da92655101f7ca787b3e03f9802 100644
90--- a/keyboards/draytronics/scarlet/info.json
91+++ b/keyboards/draytronics/scarlet/keyboard.json
92@@ -20,6 +20,12 @@
93 "mousekey": true,
94 "extrakey": true
95 },
96+ "qmk": {
97+ "locking": {
98+ "enabled": true,
99+ "resync": true
100+ }
101+ },
102 "community_layouts": ["numpad_5x4"],
103 "layouts": {
104 "LAYOUT_numpad_5x4": {
105diff --git a/keyboards/drop/alt/v2/info.json b/keyboards/drop/alt/v2/keyboard.json
106rename from keyboards/drop/alt/v2/info.json
107rename to keyboards/drop/alt/v2/keyboard.json
108diff --git a/keyboards/drop/cstm65/info.json b/keyboards/drop/cstm65/keyboard.json
109rename from keyboards/drop/cstm65/info.json
110rename to keyboards/drop/cstm65/keyboard.json
111diff --git a/keyboards/drop/cstm80/info.json b/keyboards/drop/cstm80/keyboard.json
112rename from keyboards/drop/cstm80/info.json
113rename to keyboards/drop/cstm80/keyboard.json
114diff --git a/keyboards/drop/ctrl/v2/info.json b/keyboards/drop/ctrl/v2/keyboard.json
115rename from keyboards/drop/ctrl/v2/info.json
116rename to keyboards/drop/ctrl/v2/keyboard.json
117diff --git a/keyboards/drop/sense75/info.json b/keyboards/drop/sense75/keyboard.json
118rename from keyboards/drop/sense75/info.json
119rename to keyboards/drop/sense75/keyboard.json
120diff --git a/keyboards/drop/shift/v2/info.json b/keyboards/drop/shift/v2/keyboard.json
121rename from keyboards/drop/shift/v2/info.json
122rename to keyboards/drop/shift/v2/keyboard.json
123diff --git a/keyboards/duck/eagle_viper/v2/info.json b/keyboards/duck/eagle_viper/v2/keyboard.json
124rename from keyboards/duck/eagle_viper/v2/info.json
125rename to keyboards/duck/eagle_viper/v2/keyboard.json
126diff --git a/keyboards/duck/jetfire/info.json b/keyboards/duck/jetfire/keyboard.json
127rename from keyboards/duck/jetfire/info.json
128rename to keyboards/duck/jetfire/keyboard.json
129diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/keyboard.json
130rename from keyboards/duck/lightsaver/info.json
131rename to keyboards/duck/lightsaver/keyboard.json
132diff --git a/keyboards/duck/octagon/v1/info.json b/keyboards/duck/octagon/v1/keyboard.json
133rename from keyboards/duck/octagon/v1/info.json
134rename to keyboards/duck/octagon/v1/keyboard.json
135diff --git a/keyboards/duck/octagon/v2/info.json b/keyboards/duck/octagon/v2/keyboard.json
136rename from keyboards/duck/octagon/v2/info.json
137rename to keyboards/duck/octagon/v2/keyboard.json
138diff --git a/keyboards/duck/orion/v3/info.json b/keyboards/duck/orion/v3/keyboard.json
139rename from keyboards/duck/orion/v3/info.json
140rename to keyboards/duck/orion/v3/keyboard.json
141diff --git a/keyboards/duck/tcv3/info.json b/keyboards/duck/tcv3/keyboard.json
142rename from keyboards/duck/tcv3/info.json
143rename to keyboards/duck/tcv3/keyboard.json
144diff --git a/keyboards/ducky/one2mini/1861st/info.json b/keyboards/ducky/one2mini/1861st/keyboard.json
145rename from keyboards/ducky/one2mini/1861st/info.json
146rename to keyboards/ducky/one2mini/1861st/keyboard.json
147diff --git a/keyboards/ducky/one2sf/1967st/info.json b/keyboards/ducky/one2sf/1967st/keyboard.json
148rename from keyboards/ducky/one2sf/1967st/info.json
149rename to keyboards/ducky/one2sf/1967st/keyboard.json
150diff --git a/keyboards/durgod/k310/base/info.json b/keyboards/durgod/k310/base/keyboard.json
151rename from keyboards/durgod/k310/base/info.json
152rename to keyboards/durgod/k310/base/keyboard.json
153diff --git a/keyboards/dztech/dz60rgb/v2_1/info.json b/keyboards/dztech/dz60rgb/v2_1/keyboard.json
154rename from keyboards/dztech/dz60rgb/v2_1/info.json
155rename to keyboards/dztech/dz60rgb/v2_1/keyboard.json
156diff --git a/keyboards/dztech/dz60rgb_ansi/v2_1/info.json b/keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
157rename from keyboards/dztech/dz60rgb_ansi/v2_1/info.json
158rename to keyboards/dztech/dz60rgb_ansi/v2_1/keyboard.json
159diff --git a/keyboards/dztech/dz60rgb_wkl/v2_1/info.json b/keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
160rename from keyboards/dztech/dz60rgb_wkl/v2_1/info.json
161rename to keyboards/dztech/dz60rgb_wkl/v2_1/keyboard.json
162diff --git a/keyboards/dztech/dz65rgb/v3/info.json b/keyboards/dztech/dz65rgb/v3/keyboard.json
163rename from keyboards/dztech/dz65rgb/v3/info.json
164rename to keyboards/dztech/dz65rgb/v3/keyboard.json
165diff --git a/keyboards/edi/hardlight/mk1/config.h b/keyboards/edi/hardlight/mk1/config.h
166deleted file mode 100644
167index 89b008296bcdde0422276bd9bab8063404f5d3a1..0000000000000000000000000000000000000000
168--- a/keyboards/edi/hardlight/mk1/config.h
169+++ /dev/null
170@@ -1,28 +0,0 @@
171-/*
172-©2021 Everywhere Defense Industries / Fate Everywhere <fate@7storm.org>
173-
174-This program is free software: you can redistribute it and/or modify
175-it under the terms of the GNU General Public License as published by
176-the Free Software Foundation, either version 3 of the License, or
177-(at your option) any later version.
178-
179-This program is distributed in the hope that it will be useful,
180-but WITHOUT ANY WARRANTY; without even the implied warranty of
181-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
182-GNU General Public License for more details.
183-
184-You should have received a copy of the GNU General Public License
185-along with this program. If not, see <http://www.gnu.org/licenses/>.
186-*/
187-
188-#pragma once
189-
190-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
191-#define LOCKING_SUPPORT_ENABLE
192-/* Locking resynchronize hack */
193-#define LOCKING_RESYNC_ENABLE
194-
195-/*
196- * Enable Audio Subsystem with two voices
197- */
198-// #define AUDIO_PIN C6
199diff --git a/keyboards/edi/hardlight/mk1/keyboard.json b/keyboards/edi/hardlight/mk1/keyboard.json
200index 7f33c2622783b84f4e660fe71210f7623305e92e..3cb07cb2f18d4f7a05328c8b52ddf3a0156f52c9 100644
201--- a/keyboards/edi/hardlight/mk1/keyboard.json
202+++ b/keyboards/edi/hardlight/mk1/keyboard.json
203@@ -16,6 +16,12 @@
204 "nkro": false,
205 "rgblight": true
206 },
207+ "qmk": {
208+ "locking": {
209+ "enabled": true,
210+ "resync": true
211+ }
212+ },
213 "matrix_pins": {
214 "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B5"],
215 "rows": ["B0", "B1", "B2", "B3", "D4", "D6", "D7", "B4"]
216diff --git a/keyboards/edi/hardlight/mk2/config.h b/keyboards/edi/hardlight/mk2/config.h
217index 52636c6484e47373c7f9a9f40869e861aa4f8c7c..bd604db684672fea2f86338949317e5d7081325f 100644
218--- a/keyboards/edi/hardlight/mk2/config.h
219+++ b/keyboards/edi/hardlight/mk2/config.h
220@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
221
222 #pragma once
223
224-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
225-#define LOCKING_SUPPORT_ENABLE
226-/* Locking resynchronize hack */
227-#define LOCKING_RESYNC_ENABLE
228-
229 #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 5
230
231 /* PWM RGB Underglow Defines */
232diff --git a/keyboards/edi/hardlight/mk2/info.json b/keyboards/edi/hardlight/mk2/keyboard.json
233rename from keyboards/edi/hardlight/mk2/info.json
234rename to keyboards/edi/hardlight/mk2/keyboard.json
235index cb337b71c898ba0bea7aa1d7cee2c13575762c8a..a1f47aabf5a82fcf6b2150a5945acc06b58e5b64 100644
236--- a/keyboards/edi/hardlight/mk2/info.json
237+++ b/keyboards/edi/hardlight/mk2/keyboard.json
238@@ -43,6 +43,12 @@
239 "velocikey": true,
240 "key_lock": true
241 },
242+ "qmk": {
243+ "locking": {
244+ "enabled": true,
245+ "resync": true
246+ }
247+ },
248 "community_layouts": ["ortho_4x16"],
249 "layouts": {
250 "LAYOUT_ortho_4x16": {
251diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/keyboard.json
252rename from keyboards/edinburgh41/info.json
253rename to keyboards/edinburgh41/keyboard.json
254diff --git a/keyboards/efreet/config.h b/keyboards/efreet/config.h
255deleted file mode 100644
256index 46a265902c41afd9a4912617bd424e988c9545cf..0000000000000000000000000000000000000000
257--- a/keyboards/efreet/config.h
258+++ /dev/null
259@@ -1,39 +0,0 @@
260-/*
261-Copyright 2019 Amber Holly
262-
263-This program is free software: you can redistribute it and/or modify
264-it under the terms of the GNU General Public License as published by
265-the Free Software Foundation, either version 2 of the License, or
266-(at your option) any later version.
267-
268-This program is distributed in the hope that it will be useful,
269-but WITHOUT ANY WARRANTY; without even the implied warranty of
270-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
271-GNU General Public License for more details.
272-
273-You should have received a copy of the GNU General Public License
274-along with this program. If not, see <http://www.gnu.org/licenses/>.
275-*/
276-
277-#pragma once
278-
279-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
280-#define LOCKING_SUPPORT_ENABLE
281-/* Locking resynchronize hack */
282-#define LOCKING_RESYNC_ENABLE
283-
284-/*
285- * Feature disable options
286- * These options are also useful to firmware size reduction.
287- */
288-
289-/* disable debug print */
290-//#define NO_DEBUG
291-
292-/* disable print */
293-//#define NO_PRINT
294-
295-/* disable action features */
296-//#define NO_ACTION_LAYER
297-//#define NO_ACTION_TAPPING
298-//#define NO_ACTION_ONESHOT
299diff --git a/keyboards/efreet/info.json b/keyboards/efreet/keyboard.json
300rename from keyboards/efreet/info.json
301rename to keyboards/efreet/keyboard.json
302index 4a53df1294e6a4bdbc6d2717303af35133a880ba..7dac78cc397ae86156763c845e6cb1f6c466b182 100644
303--- a/keyboards/efreet/info.json
304+++ b/keyboards/efreet/keyboard.json
305@@ -27,6 +27,12 @@
306 "nkro": true,
307 "backlight": true
308 },
309+ "qmk": {
310+ "locking": {
311+ "enabled": true,
312+ "resync": true
313+ }
314+ },
315 "community_layouts": ["ortho_4x12", "planck_mit"],
316 "layouts": {
317 "LAYOUT_planck_mit": {
318diff --git a/keyboards/elcantorhs/info.json b/keyboards/elcantorhs/keyboard.json
319rename from keyboards/elcantorhs/info.json
320rename to keyboards/elcantorhs/keyboard.json
321diff --git a/keyboards/emery65/info.json b/keyboards/emery65/keyboard.json
322rename from keyboards/emery65/info.json
323rename to keyboards/emery65/keyboard.json
324diff --git a/keyboards/ergodox_ez/shine/info.json b/keyboards/ergodox_ez/shine/keyboard.json
325rename from keyboards/ergodox_ez/shine/info.json
326rename to keyboards/ergodox_ez/shine/keyboard.json
327diff --git a/keyboards/ergodox_stm32/info.json b/keyboards/ergodox_stm32/keyboard.json
328rename from keyboards/ergodox_stm32/info.json
329rename to keyboards/ergodox_stm32/keyboard.json
330index 24e90ad7d716c18c8c3ed87ea18f4b1f95db2c1e..9315a3971f54d7e42e49376dbf39a42f26c7a605 100644
331--- a/keyboards/ergodox_stm32/info.json
332+++ b/keyboards/ergodox_stm32/keyboard.json
333@@ -15,7 +15,9 @@
334 "nkro": true,
335 "unicode": true
336 },
337-"layouts": {
338+ "processor": "STM32F103",
339+ "bootloader": "custom",
340+ "layouts": {
341 "LAYOUT_ergodox": {
342 "layout": [
343 {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5},
344diff --git a/keyboards/ergodox_stm32/rules.mk b/keyboards/ergodox_stm32/rules.mk
345index 21b474509d6400df8b7b725dad877f7cb2423d2b..a4e9df8c6a9a363ead8d7f623d360603c251fb7a 100644
346--- a/keyboards/ergodox_stm32/rules.mk
347+++ b/keyboards/ergodox_stm32/rules.mk
348@@ -1,11 +1,7 @@
349-# MCU name
350-MCU = STM32F103
351+# custom bootloader
352 MCU_LDSCRIPT = stm32f103_bootloader
353 BOARD = ST_NUCLEO64_F103RB
354
355-# Bootloader selection
356-BOOTLOADER = custom
357-
358 CUSTOM_MATRIX = yes
359
360 SRC += matrix.c
361diff --git a/keyboards/ericrlau/numdiscipline/rev1/config.h b/keyboards/ericrlau/numdiscipline/rev1/config.h
362deleted file mode 100644
363index 055e8afe380fbbfef2795781c965034846a94ba3..0000000000000000000000000000000000000000
364--- a/keyboards/ericrlau/numdiscipline/rev1/config.h
365+++ /dev/null
366@@ -1,39 +0,0 @@
367-/*
368-Copyright 2020 Eric Lau
369-
370-This program is free software: you can redistribute it and/or modify
371-it under the terms of the GNU General Public License as published by
372-the Free Software Foundation, either version 2 of the License, or
373-(at your option) any later version.
374-
375-This program is distributed in the hope that it will be useful,
376-but WITHOUT ANY WARRANTY; without even the implied warranty of
377-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
378-GNU General Public License for more details.
379-
380-You should have received a copy of the GNU General Public License
381-along with this program. If not, see <http://www.gnu.org/licenses/>.
382-*/
383-
384-#pragma once
385-
386-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
387-#define LOCKING_SUPPORT_ENABLE
388-/* Locking resynchronize hack */
389-#define LOCKING_RESYNC_ENABLE
390-
391-/*
392- * Feature disable options
393- * These options are also useful to firmware size reduction.
394- */
395-
396-/* disable debug print */
397-//#define NO_DEBUG
398-
399-/* disable print */
400-//#define NO_PRINT
401-
402-/* disable action features */
403-//#define NO_ACTION_LAYER
404-//#define NO_ACTION_TAPPING
405-//#define NO_ACTION_ONESHOT
406diff --git a/keyboards/ericrlau/numdiscipline/rev1/info.json b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
407rename from keyboards/ericrlau/numdiscipline/rev1/info.json
408rename to keyboards/ericrlau/numdiscipline/rev1/keyboard.json
409index 6fd9c377f688b9b5cadcb3b3a60d0a8ab69af3ba..5e9f39373248ca5520cd18ba72c95ba69eae8756 100644
410--- a/keyboards/ericrlau/numdiscipline/rev1/info.json
411+++ b/keyboards/ericrlau/numdiscipline/rev1/keyboard.json
412@@ -21,6 +21,12 @@
413 "mousekey": true,
414 "extrakey": true
415 },
416+ "qmk": {
417+ "locking": {
418+ "enabled": true,
419+ "resync": true
420+ }
421+ },
422 "layouts": {
423 "LAYOUT_all": {
424 "layout": [