030d503d35c01aad65ecfec171b08a963da9866e
- Author
- James Young <18669334+noroadsleft@users.noreply.github.com>
- Committer
- GitHub <noreply@github.com>
- Date
Message
Migrate `LOCKING_*_ENABLE` to Data-Driven: K, Part 3 (#23770) Affects: - `kindakeyboards/conone65` - `kinesis` - `kingly_keys/ave/ortho` - `kingly_keys/ave/staggered` - `kingly_keys/little_foot` - `kingly_keys/romac` - `kingly_keys/romac_plus` - `kingly_keys/ropro` - `kingly_keys/smd_milk` - `kingly_keys/soap` - `kira/kira75` - `kisakeyluxury/qtz` - `kiserdesigns/madeline` - `kiwikeebs/macro` - `kiwikeebs/macro_v2` - `kiwikey/borderland` - `kiwikey/kawii9` - `kiwikey/wanderland` - `kkatano/bakeneko60` - `kkatano/bakeneko65/rev2` - `kkatano/bakeneko65/rev3` - `kkatano/bakeneko80` - `kkatano/wallaby` - `kkatano/yurei` - `knops/mini` - `kona_classic` - `kopibeng/mnk60_stm32` - `kopibeng/mnk65` - `kopibeng/mnk65_stm32` - `kopibeng/mnk88` - `kopibeng/typ65` - `kopibeng/xt60` - `kopibeng/xt60_singa` - `kopibeng/xt65` - `kopibeng/xt8x` - `kprepublic/bm16s` - `kprepublic/bm40hsrgb/rev1` - `kprepublic/bm65hsrgb/rev1` - `kprepublic/bm68hsrgb/rev1` - `kprepublic/bm980hsrgb` - `kprepublic/cospad` - `ktec/daisy` - `kumaokobo/kudox/columner` - `kumaokobo/kudox/rev1` - `kumaokobo/kudox/rev2` - `kumaokobo/kudox/rev3` - `kumaokobo/kudox_full/rev1` - `kumaokobo/kudox_game/rev1` - `kumaokobo/kudox_game/rev2` - `kumaokobo/pico/65keys` - `kumaokobo/pico/70keys` - `kv/revt` - `kwub/bloop` - `ky01`
Diff
This diff is truncated to protect this page.
1diff --git a/keyboards/kindakeyboards/conone65/config.h b/keyboards/kindakeyboards/conone65/config.h
2deleted file mode 100644
3index d3147b115a3f65ad4aeb6b4c2dc32a24d0afe546..0000000000000000000000000000000000000000
4--- a/keyboards/kindakeyboards/conone65/config.h
5+++ /dev/null
6@@ -1,39 +0,0 @@
7-/*
8-Copyright 2021 Kindakeyboards
9-
10-This program is free software: you can redistribute it and/or modify
11-it under the terms of the GNU General Public License as published by
12-the Free Software Foundation, either version 2 of the License, or
13-(at your option) any later version.
14-
15-This program is distributed in the hope that it will be useful,
16-but WITHOUT ANY WARRANTY; without even the implied warranty of
17-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18-GNU General Public License for more details.
19-
20-You should have received a copy of the GNU General Public License
21-along with this program. If not, see <http://www.gnu.org/licenses/>.
22-*/
23-
24-#pragma once
25-
26-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
27-#define LOCKING_SUPPORT_ENABLE
28-/* Locking resynchronize hack */
29-#define LOCKING_RESYNC_ENABLE
30-
31-/*
32- * Feature disable options
33- * These options are also useful to firmware size reduction.
34- */
35-
36-/* disable debug print */
37-//#define NO_DEBUG
38-
39-/* disable print */
40-//#define NO_PRINT
41-
42-/* disable action features */
43-//#define NO_ACTION_LAYER
44-//#define NO_ACTION_TAPPING
45-//#define NO_ACTION_ONESHOT
46diff --git a/keyboards/kindakeyboards/conone65/keyboard.json b/keyboards/kindakeyboards/conone65/keyboard.json
47index 0c44723f62b9786b55e0275089e11cac25b61345..6786b6a3d5a108fb215af6fb21a74a55a1dc172f 100644
48--- a/keyboards/kindakeyboards/conone65/keyboard.json
49+++ b/keyboards/kindakeyboards/conone65/keyboard.json
50@@ -16,6 +16,12 @@
51 "mousekey": true,
52 "nkro": false
53 },
54+ "qmk": {
55+ "locking": {
56+ "enabled": true,
57+ "resync": true
58+ }
59+ },
60 "matrix_pins": {
61 "cols": ["B7", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0", "D0"],
62 "rows": ["D5", "D3", "E6", "D1", "D2"]
63diff --git a/keyboards/kinesis/config.h b/keyboards/kinesis/config.h
64index 52ea641d6ebfcfac98d93e1d1a83194d885ea5ca..e8381f8635ece16d3be7000b309c41c03dee7edc 100644
65--- a/keyboards/kinesis/config.h
66+++ b/keyboards/kinesis/config.h
67@@ -26,11 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
68 #define MOUSEKEY_WHEEL_DELTA 1
69 #define MOUSEKEY_WHEEL_TIME_TO_MAX 1
70
71-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
72-#define LOCKING_SUPPORT_ENABLE
73-/* Locking resynchronize hack */
74-#define LOCKING_RESYNC_ENABLE
75-
76 /*
77 * Feature disable options
78 * These options are also useful to firmware size reduction.
79diff --git a/keyboards/kinesis/info.json b/keyboards/kinesis/info.json
80index 4454639ab0f767ab476a53619bc306a033014a77..49025977bd3d8d2dd8fde36b5d19a7c384568be4 100644
81--- a/keyboards/kinesis/info.json
82+++ b/keyboards/kinesis/info.json
83@@ -1,4 +1,10 @@
84 {
85 "url": "",
86- "maintainer": "qmk"
87+ "maintainer": "qmk",
88+ "qmk": {
89+ "locking": {
90+ "enabled": true,
91+ "resync": true
92+ }
93+ }
94 }
95diff --git a/keyboards/kingly_keys/ave/config.h b/keyboards/kingly_keys/ave/config.h
96deleted file mode 100644
97index e43087b6978e5350d90c261c1a732ecb587a9073..0000000000000000000000000000000000000000
98--- a/keyboards/kingly_keys/ave/config.h
99+++ /dev/null
100@@ -1,23 +0,0 @@
101- /*
102- Copyright 2020 Garret Gartner
103-
104- This program is free software: you can redistribute it and/or modify
105- it under the terms of the GNU General Public License as published by
106- the Free Software Foundation, either version 2 of the License, or
107- (at your option) any later version.
108-
109- This program is distributed in the hope that it will be useful,
110- but WITHOUT ANY WARRANTY; without even the implied warranty of
111- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
112- GNU General Public License for more details.
113-
114- You should have received a copy of the GNU General Public License
115- along with this program. If not, see <http://www.gnu.org/licenses/>.
116- */
117-
118-#pragma once
119-
120-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
121-#define LOCKING_SUPPORT_ENABLE
122-/* Locking resynchronize hack */
123-#define LOCKING_RESYNC_ENABLE
124diff --git a/keyboards/kingly_keys/ave/ortho/keyboard.json b/keyboards/kingly_keys/ave/ortho/keyboard.json
125index 8c91b27615c17f6c6f4572def5f990a37c651036..d277e68e47fdfbdcf79d3886433caa367abc3375 100644
126--- a/keyboards/kingly_keys/ave/ortho/keyboard.json
127+++ b/keyboards/kingly_keys/ave/ortho/keyboard.json
128@@ -18,6 +18,12 @@
129 "nkro": false,
130 "rgblight": true
131 },
132+ "qmk": {
133+ "locking": {
134+ "enabled": true,
135+ "resync": true
136+ }
137+ },
138 "matrix_pins": {
139 "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
140 "rows": ["B3", "F4", "F7", "F6", "F5"]
141diff --git a/keyboards/kingly_keys/ave/staggered/keyboard.json b/keyboards/kingly_keys/ave/staggered/keyboard.json
142index 581e86c11b82bda74af85308889953bf5e0bef4c..3f5bf70ce8988d763ad330584e532468b20ab862 100644
143--- a/keyboards/kingly_keys/ave/staggered/keyboard.json
144+++ b/keyboards/kingly_keys/ave/staggered/keyboard.json
145@@ -18,6 +18,12 @@
146 "nkro": false,
147 "rgblight": true
148 },
149+ "qmk": {
150+ "locking": {
151+ "enabled": true,
152+ "resync": true
153+ }
154+ },
155 "matrix_pins": {
156 "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
157 "rows": ["B3", "F4", "F7", "F6", "F5"]
158diff --git a/keyboards/kingly_keys/little_foot/config.h b/keyboards/kingly_keys/little_foot/config.h
159deleted file mode 100644
160index a2c4815a2070aa08533018a5d469d73c47131ff4..0000000000000000000000000000000000000000
161--- a/keyboards/kingly_keys/little_foot/config.h
162+++ /dev/null
163@@ -1,23 +0,0 @@
164-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
165- *
166- * This program is free software: you can redistribute it and/or modify
167- * it under the terms of the GNU General Public License as published by
168- * the Free Software Foundation, either version 2 of the License, or
169- * (at your option) any later version.
170- *
171- * This program is distributed in the hope that it will be useful,
172- * but WITHOUT ANY WARRANTY; without even the implied warranty of
173- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
174- * GNU General Public License for more details.
175- *
176- * You should have received a copy of the GNU General Public License
177- * along with this program. If not, see <http://www.gnu.org/licenses/>.
178- */
179-
180-#pragma once
181-
182-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
183-#define LOCKING_SUPPORT_ENABLE
184-
185-/* Locking resynchronize hack */
186-#define LOCKING_RESYNC_ENABLE
187diff --git a/keyboards/kingly_keys/little_foot/keyboard.json b/keyboards/kingly_keys/little_foot/keyboard.json
188index 19e6a0f5478a3d89cd4b1317bd02cd2b9602efe7..a511d48905cd00c8694bf3b67da520ff920b7227 100644
189--- a/keyboards/kingly_keys/little_foot/keyboard.json
190+++ b/keyboards/kingly_keys/little_foot/keyboard.json
191@@ -39,6 +39,12 @@
192 "nkro": true,
193 "rgblight": true
194 },
195+ "qmk": {
196+ "locking": {
197+ "enabled": true,
198+ "resync": true
199+ }
200+ },
201 "matrix_pins": {
202 "cols": ["F5", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"],
203 "rows": ["F6", "B6", "B2", "B3", "B1"]
204diff --git a/keyboards/kingly_keys/romac/config.h b/keyboards/kingly_keys/romac/config.h
205deleted file mode 100644
206index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
207--- a/keyboards/kingly_keys/romac/config.h
208+++ /dev/null
209@@ -1,7 +0,0 @@
210-#pragma once
211-
212-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
213-#define LOCKING_SUPPORT_ENABLE
214-
215-/* Locking resynchronize hack */
216-#define LOCKING_RESYNC_ENABLE
217diff --git a/keyboards/kingly_keys/romac/keyboard.json b/keyboards/kingly_keys/romac/keyboard.json
218index 4c5e9298481db5d1f6360186a055c91adbf5d4af..9927bdc25ffb6c882869c8eb79d5713061c492c2 100644
219--- a/keyboards/kingly_keys/romac/keyboard.json
220+++ b/keyboards/kingly_keys/romac/keyboard.json
221@@ -16,6 +16,12 @@
222 "mousekey": true,
223 "nkro": true
224 },
225+ "qmk": {
226+ "locking": {
227+ "enabled": true,
228+ "resync": true
229+ }
230+ },
231 "matrix_pins": {
232 "cols": ["F7", "B1", "B3"],
233 "rows": ["D4", "C6", "D7", "E6"]
234diff --git a/keyboards/kingly_keys/romac_plus/config.h b/keyboards/kingly_keys/romac_plus/config.h
235deleted file mode 100644
236index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
237--- a/keyboards/kingly_keys/romac_plus/config.h
238+++ /dev/null
239@@ -1,7 +0,0 @@
240-#pragma once
241-
242-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
243-#define LOCKING_SUPPORT_ENABLE
244-
245-/* Locking resynchronize hack */
246-#define LOCKING_RESYNC_ENABLE
247diff --git a/keyboards/kingly_keys/romac_plus/keyboard.json b/keyboards/kingly_keys/romac_plus/keyboard.json
248index bc4ad616e183bafe7a643c16ecb7c6dc66900b7a..8b6c43333d9b8a0625787f05a92e3895dfb11fa2 100644
249--- a/keyboards/kingly_keys/romac_plus/keyboard.json
250+++ b/keyboards/kingly_keys/romac_plus/keyboard.json
251@@ -19,6 +19,12 @@
252 "oled": true,
253 "rgblight": true
254 },
255+ "qmk": {
256+ "locking": {
257+ "enabled": true,
258+ "resync": true
259+ }
260+ },
261 "matrix_pins": {
262 "cols": ["F6", "F5", "F4"],
263 "rows": ["C6", "D4", "D2", "D3"]
264diff --git a/keyboards/kingly_keys/ropro/config.h b/keyboards/kingly_keys/ropro/config.h
265deleted file mode 100644
266index a11ec4dfb288dcf758b5435a678123837378e7c7..0000000000000000000000000000000000000000
267--- a/keyboards/kingly_keys/ropro/config.h
268+++ /dev/null
269@@ -1,23 +0,0 @@
270-#pragma once
271-
272-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
273- *
274- * This program is free software: you can redistribute it and/or modify
275- * it under the terms of the GNU General Public License as published by
276- * the Free Software Foundation, either version 2 of the License, or
277- * (at your option) any later version.
278- *
279- * This program is distributed in the hope that it will be useful,
280- * but WITHOUT ANY WARRANTY; without even the implied warranty of
281- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
282- * GNU General Public License for more details.
283- *
284- * You should have received a copy of the GNU General Public License
285- * along with this program. If not, see <http://www.gnu.org/licenses/>.#pragma once
286- */
287-
288- /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
289-#define LOCKING_SUPPORT_ENABLE
290-
291- /* Locking resynchronize hack */
292-#define LOCKING_RESYNC_ENABLE
293diff --git a/keyboards/kingly_keys/ropro/keyboard.json b/keyboards/kingly_keys/ropro/keyboard.json
294index ed0bba5366f98f088e146f0a1163ec24ceb7c640..fb22d06a7d95e61af3138442a0e896bf08219bb0 100644
295--- a/keyboards/kingly_keys/ropro/keyboard.json
296+++ b/keyboards/kingly_keys/ropro/keyboard.json
297@@ -18,6 +18,12 @@
298 "nkro": true,
299 "rgblight": true
300 },
301+ "qmk": {
302+ "locking": {
303+ "enabled": true,
304+ "resync": true
305+ }
306+ },
307 "matrix_pins": {
308 "cols": ["F0", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B3", "B2", "B6", "D2", "C7"],
309 "rows": ["F4", "F5", "F6", "F7", "B1", "F1", null]
310diff --git a/keyboards/kingly_keys/smd_milk/config.h b/keyboards/kingly_keys/smd_milk/config.h
311deleted file mode 100644
312index 7bbb5b4e941b0550fa9d77b28549aee3ec7452c9..0000000000000000000000000000000000000000
313--- a/keyboards/kingly_keys/smd_milk/config.h
314+++ /dev/null
315@@ -1,22 +0,0 @@
316-/* Copyright 2019 Sebastian Williams
317- *
318- * This program is free software: you can redistribute it and/or modify
319- * it under the terms of the GNU General Public License as published by
320- * the Free Software Foundation, either version 2 of the License, or
321- * (at your option) any later version.
322- *
323- * This program is distributed in the hope that it will be useful,
324- * but WITHOUT ANY WARRANTY; without even the implied warranty of
325- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
326- * GNU General Public License for more details.
327- *
328- * You should have received a copy of the GNU General Public License
329- * along with this program. If not, see <http://www.gnu.org/licenses/>.
330- */
331-#pragma once
332-
333-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
334-#define LOCKING_SUPPORT_ENABLE
335-
336-/* Locking resynchronize hack */
337-#define LOCKING_RESYNC_ENABLE
338diff --git a/keyboards/kingly_keys/smd_milk/keyboard.json b/keyboards/kingly_keys/smd_milk/keyboard.json
339index e510ea80b41cb10c05ef4bb5c76d69273a9ac336..9f8a10a5bfc6481b547c26a1911e097b3ad95dff 100644
340--- a/keyboards/kingly_keys/smd_milk/keyboard.json
341+++ b/keyboards/kingly_keys/smd_milk/keyboard.json
342@@ -39,6 +39,12 @@
343 "nkro": true,
344 "rgblight": true
345 },
346+ "qmk": {
347+ "locking": {
348+ "enabled": true,
349+ "resync": true
350+ }
351+ },
352 "matrix_pins": {
353 "cols": ["D3"],
354 "rows": ["C5", "D2"]
355diff --git a/keyboards/kingly_keys/soap/config.h b/keyboards/kingly_keys/soap/config.h
356deleted file mode 100644
357index 847cfcd5be779a0ec9b37f20c6adf23dd9725336..0000000000000000000000000000000000000000
358--- a/keyboards/kingly_keys/soap/config.h
359+++ /dev/null
360@@ -1,21 +0,0 @@
361-/* Copyright 2019 Garret G. (TheRoyalSweatshirt)
362- *
363- * This program is free software: you can redistribute it and/or modify
364- * it under the terms of the GNU General Public License as published by
365- * the Free Software Foundation, either version 2 of the License, or
366- * (at your option) any later version.
367- *
368- * This program is distributed in the hope that it will be useful,
369- * but WITHOUT ANY WARRANTY; without even the implied warranty of
370- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
371- * GNU General Public License for more details.
372- *
373- * You should have received a copy of the GNU General Public License
374- * along with this program. If not, see <http://www.gnu.org/licenses/>.#pragma once
375- */
376-
377- /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
378-#define LOCKING_SUPPORT_ENABLE
379-
380- /* Locking resynchronize hack */
381-#define LOCKING_RESYNC_ENABLE
382diff --git a/keyboards/kingly_keys/soap/keyboard.json b/keyboards/kingly_keys/soap/keyboard.json
383index b4f8fb9e86b4cf916ec8aac2604318faafeb9f06..615014ffbfa2269c98e102e5ce51f230410932a2 100644
384--- a/keyboards/kingly_keys/soap/keyboard.json
385+++ b/keyboards/kingly_keys/soap/keyboard.json
386@@ -36,6 +36,12 @@
387 "nkro": true,
388 "rgblight": true
389 },
390+ "qmk": {
391+ "locking": {
392+ "enabled": true,
393+ "resync": true
394+ }
395+ },
396 "matrix_pins": {
397 "cols": ["F4", "F1", "F0", "D5"],
398 "rows": ["C7", "C6"]
399diff --git a/keyboards/kira/kira75/config.h b/keyboards/kira/kira75/config.h
400deleted file mode 100644
401index d876570c808ee13a971560fe2424afb24022f2eb..0000000000000000000000000000000000000000
402--- a/keyboards/kira/kira75/config.h
403+++ /dev/null
404@@ -1,39 +0,0 @@
405-/*
406-Copyright 2018 MechMerlin
407-
408-This program is free software: you can redistribute it and/or modify
409-it under the terms of the GNU General Public License as published by
410-the Free Software Foundation, either version 2 of the License, or
411-(at your option) any later version.
412-
413-This program is distributed in the hope that it will be useful,
414-but WITHOUT ANY WARRANTY; without even the implied warranty of
415-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
416-GNU General Public License for more details.
417-
418-You should have received a copy of the GNU General Public License
419-along with this program. If not, see <http://www.gnu.org/licenses/>.
420-*/
421-
422-#pragma once
423-
424-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
425-#define LOCKING_SUPPORT_ENABLE
426-/* Locking resynchronize hack */
427-#define LOCKING_RESYNC_ENABLE
428-
429-/*
430- * Feature disable options
431- * These options are also useful to firmware size reduction.
432- */
433-
434-/* disable debug print */
435-//#define NO_DEBUG
436-
437-/* disable print */
438-//#define NO_PRINT
439-
440-/* disable action features */
441-//#define NO_ACTION_LAYER
442-//#define NO_ACTION_TAPPING
443-//#define NO_ACTION_ONESHOT
444diff --git a/keyboards/kira/kira75/keyboard.json b/keyboards/kira/kira75/keyboard.json
445index c48f2bf49234a84fe3ecd944c334d1a99ce83c78..fb4c90a8b55fec481b4dbfa581de9686d075803c 100644
446--- a/keyboards/kira/kira75/keyboard.json
447+++ b/keyboards/kira/kira75/keyboard.json
448@@ -18,6 +18,12 @@
449 "nkro": false,
450 "rgblight": true
451 },
452+ "qmk": {
453+ "locking": {
454+ "enabled": true,
455+ "resync": true
456+ }
457+ },
458 "matrix_pins": {
459 "cols": ["F6", "F7", "C7", "C6", "B6", "B5", "B4", "F5", "F4", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
460 "rows": ["D0", "D1", "D2", "D3", "D5", "D4"]
461diff --git a/keyboards/kisakeyluxury/qtz/config.h b/keyboards/kisakeyluxury/qtz/config.h
462deleted file mode 100644
463index 7660e3d7e98e0d1fdc8c94b20a67abc20deb77a5..0000000000000000000000000000000000000000
464--- a/keyboards/kisakeyluxury/qtz/config.h
465+++ /dev/null
466@@ -1,23 +0,0 @@
467-/*
468-Copyright 2023 kisakeyluxury
469-
470-This program is free software: you can redistribute it and/or modify
471-it under the terms of the GNU General Public License as published by
472-the Free Software Foundation, either version 2 of the License, or
473-(at your option) any later version.
474-
475-This program is distributed in the hope that it will be useful,
476-but WITHOUT ANY WARRANTY; without even the implied warranty of
477-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
478-GNU General Public License for more details.
479-
480-You should have received a copy of the GNU General Public License
481-along with this program. If not, see <http://www.gnu.org/licenses/>.
482-*/
483-
484-#pragma once
485-
486-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
487-#define LOCKING_SUPPORT_ENABLE
488-/* Locking resynchronize hack */
489-#define LOCKING_RESYNC_ENABLE
490diff --git a/keyboards/kisakeyluxury/qtz/keyboard.json b/keyboards/kisakeyluxury/qtz/keyboard.json
491index 3225336890d2bf99d4a427af7e220d119d00ec05..d215f578959c99ad52b9134ed2096b8917d2384a 100644
492--- a/keyboards/kisakeyluxury/qtz/keyboard.json
493+++ b/keyboards/kisakeyluxury/qtz/keyboard.json
494@@ -13,6 +13,12 @@
495 "extrakey": true,
496 "nkro": true
497 },
498+ "qmk": {
499+ "locking": {
500+ "enabled": true,
501+ "resync": true
502+ }
503+ },
504 "matrix_pins": {
505 "cols": ["D0", "D1", "D2", "D3", "F7", "F6", "F5", "F4", "F1", "F0"],
506 "rows": ["D5", "D4", "D6", "C6"]
507diff --git a/keyboards/kiserdesigns/madeline/config.h b/keyboards/kiserdesigns/madeline/config.h
508index 8522d7cd431c11be3ac4de2905d5198fa5e1cc8e..027e62e3c63afcc81335972f11e4a496d9157859 100644
509--- a/keyboards/kiserdesigns/madeline/config.h
510+++ b/keyboards/kiserdesigns/madeline/config.h
511@@ -15,9 +15,6 @@
512 */
513 #pragma once
514
515-#define LOCKING_SUPPORT_ENABLE
516-#define LOCKING_RESYNC_ENABLE
517-
518 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
519 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
520 #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 1000U
521diff --git a/keyboards/kiserdesigns/madeline/keyboard.json b/keyboards/kiserdesigns/madeline/keyboard.json
522index 73d3f5ccff4a7e6ac3fdd14facc8b126dfe293f6..8a1a988a6f9d1bb5e46f65a05aba9d57cab014f5 100644
523--- a/keyboards/kiserdesigns/madeline/keyboard.json
524+++ b/keyboards/kiserdesigns/madeline/keyboard.json
525@@ -24,7 +24,11 @@
526 },
527 "processor": "RP2040",
528 "qmk": {
529- "tap_keycode_delay": 10
530+ "tap_keycode_delay": 10,
531+ "locking": {
532+ "enabled": true,
533+ "resync": true
534+ }
535 },
536 "url": "https://qmk.fm/keyboards",
537 "usb": {
538@@ -74,4 +78,4 @@
539 ]
540 }
541 }
542-}
543+}
544diff --git a/keyboards/kiwikeebs/macro/config.h b/keyboards/kiwikeebs/macro/config.h
545deleted file mode 100644
546index 2238a4171fd7b1e9a340e6d1447fc939560b1885..0000000000000000000000000000000000000000
547--- a/keyboards/kiwikeebs/macro/config.h
548+++ /dev/null
549@@ -1,39 +0,0 @@
550-/*
551-Copyright 2020 KiwiKeebs
552-
553-This program is free software: you can redistribute it and/or modify
554-it under the terms of the GNU General Public License as published by
555-the Free Software Foundation, either version 2 of the License, or
556-(at your option) any later version.
557-
558-This program is distributed in the hope that it will be useful,
559-but WITHOUT ANY WARRANTY; without even the implied warranty of
560-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
561-GNU General Public License for more details.
562-
563-You should have received a copy of the GNU General Public License
564-along with this program. If not, see <http://www.gnu.org/licenses/>.
565-*/
566-
567-#pragma once
568-
569-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
570-#define LOCKING_SUPPORT_ENABLE
571-/* Locking resynchronize hack */
572-#define LOCKING_RESYNC_ENABLE
573-
574-/*
575- * Feature disable options
576- * These options are also useful to firmware size reduction.
577- */
578-
579-/* disable debug print */
580-//#define NO_DEBUG
581-
582-/* disable print */
583-//#define NO_PRINT
584-
585-/* disable action features */
586-//#define NO_ACTION_LAYER
587-//#define NO_ACTION_TAPPING
588-//#define NO_ACTION_ONESHOT
589diff --git a/keyboards/kiwikeebs/macro/keyboard.json b/keyboards/kiwikeebs/macro/keyboard.json
590index d8bc9f392548ddc7d341269d4bea7eaeab5e1a01..faaebe88cf18384a3921d097de9c48e467e36736 100644
591--- a/keyboards/kiwikeebs/macro/keyboard.json
592+++ b/keyboards/kiwikeebs/macro/keyboard.json
593@@ -17,6 +17,12 @@
594 "mousekey": true,
595 "nkro": true
596 },
597+ "qmk": {
598+ "locking": {
599+ "enabled": true,
600+ "resync": true
601+ }
602+ },
603 "matrix_pins": {
604 "cols": ["F7", "B1", "B3", "B2"],
605 "rows": ["E6", "D7"]
606diff --git a/keyboards/kiwikeebs/macro_v2/config.h b/keyboards/kiwikeebs/macro_v2/config.h
607deleted file mode 100644
608index 2238a4171fd7b1e9a340e6d1447fc939560b1885..0000000000000000000000000000000000000000
609--- a/keyboards/kiwikeebs/macro_v2/config.h
610+++ /dev/null
611@@ -1,39 +0,0 @@
612-/*
613-Copyright 2020 KiwiKeebs
614-
615-This program is free software: you can redistribute it and/or modify
616-it under the terms of the GNU General Public License as published by
617-the Free Software Foundation, either version 2 of the License, or
618-(at your option) any later version.
619-
620-This program is distributed in the hope that it will be useful,
621-but WITHOUT ANY WARRANTY; without even the implied warranty of
622-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
623-GNU General Public License for more details.
624-
625-You should have received a copy of the GNU General Public License
626-along with this program. If not, see <http://www.gnu.org/licenses/>.
627-*/
628-
629-#pragma once
630-
631-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
632-#define LOCKING_SUPPORT_ENABLE
633-/* Locking resynchronize hack */
634-#define LOCKING_RESYNC_ENABLE
635-
636-/*
637- * Feature disable options
638- * These options are also useful to firmware size reduction.
639- */
640-
641-/* disable debug print */
642-//#define NO_DEBUG
643-
644-/* disable print */
645-//#define NO_PRINT
646-
647-/* disable action features */
648-//#define NO_ACTION_LAYER
649-//#define NO_ACTION_TAPPING
650-//#define NO_ACTION_ONESHOT
651diff --git a/keyboards/kiwikeebs/macro_v2/keyboard.json b/keyboards/kiwikeebs/macro_v2/keyboard.json
652index d9b693dd1ac053a062ae8588ebceb93926397e4f..38484579904066016e65e8fe31e14bc173df9f11 100644
653--- a/keyboards/kiwikeebs/macro_v2/keyboard.json
654+++ b/keyboards/kiwikeebs/macro_v2/keyboard.json
655@@ -17,6 +17,12 @@
656 "mousekey": true,
657 "nkro": true
658 },
659+ "qmk": {
660+ "locking": {
661+ "enabled": true,
662+ "resync": true
663+ }
664+ },
665 "matrix_pins": {
666 "cols": ["B6", "C6", "C7", "D4"],
667 "rows": ["B5", "B4"]
668diff --git a/keyboards/kiwikey/borderland/config.h b/keyboards/kiwikey/borderland/config.h
669deleted file mode 100644
670index bff2f881e877ce37e2fff12e8813c5ae9d015127..0000000000000000000000000000000000000000
671--- a/keyboards/kiwikey/borderland/config.h
672+++ /dev/null
673@@ -1,25 +0,0 @@
674-// Copyright 2021 KiwiKey (@KiwiKey)
675-// SPDX-License-Identifier: GPL-2.0-or-later
676-
677-#pragma once
678-
679-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
680-#define LOCKING_SUPPORT_ENABLE
681-/* Locking resynchronize hack */
682-#define LOCKING_RESYNC_ENABLE
683-
684-/*
685- * Feature disable options
686- * These options are also useful to firmware size reduction.
687- */
688-
689-/* disable debug print */
690-//#define NO_DEBUG
691-
692-/* disable print */
693-//#define NO_PRINT
694-
695-/* disable action features */
696-//#define NO_ACTION_LAYER
697-//#define NO_ACTION_TAPPING
698-//#define NO_ACTION_ONESHOT
699diff --git a/keyboards/kiwikey/borderland/keyboard.json b/keyboards/kiwikey/borderland/keyboard.json
700index 247c6b304d49e60aaa922e846dbd39a9b4223663..c4bf2eaba5ec918c8a71456b9d91f9bcf98f1209 100644
701--- a/keyboards/kiwikey/borderland/keyboard.json
702+++ b/keyboards/kiwikey/borderland/keyboard.json
703@@ -20,7 +20,11 @@
704 ]
705 },
706 "qmk": {
707- "tap_keycode_delay": 10
708+ "tap_keycode_delay": 10,
709+ "locking": {
710+ "enabled": true,
711+ "resync": true
712+ }
713 },
714 "rgblight": {
715 "saturation_steps": 8,
716diff --git a/keyboards/kiwikey/kawii9/config.h b/keyboards/kiwikey/kawii9/config.h
717deleted file mode 100644
718index bc1b5f6c88d16310c70b405d7305b6ebeaca9054..0000000000000000000000000000000000000000
719--- a/keyboards/kiwikey/kawii9/config.h
720+++ /dev/null
721@@ -1,39 +0,0 @@
722-/*
723-Copyright 2020 KiwiKey
724-
725-This program is free software: you can redistribute it and/or modify
726-it under the terms of the GNU General Public License as published by
727-the Free Software Foundation, either version 2 of the License, or
728-(at your option) any later version.
729-
730-This program is distributed in the hope that it will be useful,
731-but WITHOUT ANY WARRANTY; without even the implied warranty of
732-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
733-GNU General Public License for more details.
734-
735-You should have received a copy of the GNU General Public License
736-along with this program. If not, see <http://www.gnu.org/licenses/>.
737-*/
738-
739-#pragma once
740-
741-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
742-#define LOCKING_SUPPORT_ENABLE
743-/* Locking resynchronize hack */
744-#define LOCKING_RESYNC_ENABLE
745-
746-/*
747- * Feature disable options
748- * These options are also useful to firmware size reduction.
749- */
750-
751-/* disable debug print */
752-//#define NO_DEBUG
753-
754-/* disable print */
755-//#define NO_PRINT
756-
757-/* disable action features */
758-//#define NO_ACTION_LAYER
759-//#define NO_ACTION_TAPPING
760-//#define NO_ACTION_ONESHOT
761diff --git a/keyboards/kiwikey/kawii9/keyboard.json b/keyboards/kiwikey/kawii9/keyboard.json
762index 07b4cca097a1719e545e5f5b449c1f25966b9806..bb11911cdefb2f7e7be80408351f8ecc9bad40e4 100644
763--- a/keyboards/kiwikey/kawii9/keyboard.json
764+++ b/keyboards/kiwikey/kawii9/keyboard.json
765@@ -42,6 +42,12 @@
766 "extrakey": true,
767 "rgblight": true
768 },
769+ "qmk": {
770+ "locking": {
771+ "enabled": true,
772+ "resync": true
773+ }
774+ },
775 "layouts": {
776 "LAYOUT_ortho_3x3": {
777 "layout": [
778diff --git a/keyboards/kiwikey/wanderland/config.h b/keyboards/kiwikey/wanderland/config.h
779deleted file mode 100644
780index 1a4dea1b385f2bc4915837e71bc4902afacdef40..0000000000000000000000000000000000000000
781--- a/keyboards/kiwikey/wanderland/config.h
782+++ /dev/null
783@@ -1,39 +0,0 @@
784-/*
785-Copyright 2021 KiwiKey
786-
787-This program is free software: you can redistribute it and/or modify
788-it under the terms of the GNU General Public License as published by
789-the Free Software Foundation, either version 2 of the License, or
790-(at your option) any later version.
791-
792-This program is distributed in the hope that it will be useful,
793-but WITHOUT ANY WARRANTY; without even the implied warranty of
794-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
795-GNU General Public License for more details.
796-
797-You should have received a copy of the GNU General Public License
798-along with this program. If not, see <http://www.gnu.org/licenses/>.
799-*/
800-
801-#pragma once
802-
803-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
804-#define LOCKING_SUPPORT_ENABLE
805-/* Locking resynchronize hack */
806-#define LOCKING_RESYNC_ENABLE
807-
808-/*
809- * Feature disable options
810- * These options are also useful to firmware size reduction.
811- */
812-
813-/* disable debug print */
814-//#define NO_DEBUG
815-
816-/* disable print */
817-//#define NO_PRINT
818-
819-/* disable action features */
820-//#define NO_ACTION_LAYER
821-//#define NO_ACTION_TAPPING
822-//#define NO_ACTION_ONESHOT
823diff --git a/keyboards/kiwikey/wanderland/keyboard.json b/keyboards/kiwikey/wanderland/keyboard.json
824index b4d4d4f5166153c2ed9ecc0780b74630dc0764fb..3dd7c668ac08d9c130b232ca46a8c42093276724 100644
825--- a/keyboards/kiwikey/wanderland/keyboard.json
826+++ b/keyboards/kiwikey/wanderland/keyboard.json
827@@ -18,6 +18,12 @@
828 "nkro": false,
829 "rgblight": true
830 },
831+ "qmk": {
832+ "locking": {
833+ "enabled": true,
834+ "resync": true
835+ }
836+ },
837 "matrix_pins": {
838 "cols": ["F5", "F6", "B4", "D7", "D6", "D5", "D2", "D3", "B0", "F0", "B1", "B2", "B3"],
839 "rows": ["F4", "F1", "E6", "E2", "C7", "D4"]
840diff --git a/keyboards/kkatano/bakeneko60/config.h b/keyboards/kkatano/bakeneko60/config.h
841deleted file mode 100644
842index 6aac1d9a5ebf840aebe3c11b6bb3c777a9a60501..0000000000000000000000000000000000000000
843--- a/keyboards/kkatano/bakeneko60/config.h
844+++ /dev/null
845@@ -1,39 +0,0 @@
846-/*
847-Copyright 2020 Koichi Katano
848-
849-This program is free software: you can redistribute it and/or modify
850-it under the terms of the GNU General Public License as published by
851-the Free Software Foundation, either version 2 of the License, or
852-(at your option) any later version.
853-
854-This program is distributed in the hope that it will be useful,
855-but WITHOUT ANY WARRANTY; without even the implied warranty of
856-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
857-GNU General Public License for more details.
858-
859-You should have received a copy of the GNU General Public License
860-along with this program. If not, see <http://www.gnu.org/licenses/>.
861-*/
862-
863-#pragma once
864-
865-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
866-#define LOCKING_SUPPORT_ENABLE
867-/* Locking resynchronize hack */
868-#define LOCKING_RESYNC_ENABLE
869-
870-/*
871- * Feature disable options
872- * These options are also useful to firmware size reduction.
873- */
874-
875-/* disable debug print */
876-//#define NO_DEBUG
877-
878-/* disable print */
879-//#define NO_PRINT
880-
881-/* disable action features */
882-//#define NO_ACTION_LAYER
883-//#define NO_ACTION_TAPPING
884-//#define NO_ACTION_ONESHOT
885diff --git a/keyboards/kkatano/bakeneko60/keyboard.json b/keyboards/kkatano/bakeneko60/keyboard.json
886index a8d9e655a19f717318966bae08ad4a18f298ef1b..fee9b9d533d707d119d6a86bf3cb06b598d489bf 100644
887--- a/keyboards/kkatano/bakeneko60/keyboard.json
888+++ b/keyboards/kkatano/bakeneko60/keyboard.json
889@@ -16,6 +16,12 @@
890 "mousekey": true,
891 "nkro": false
892 },
893+ "qmk": {
894+ "locking": {
895+ "enabled": true,
896+ "resync": true
897+ }
898+ },
899 "matrix_pins": {
900 "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
901 "rows": ["E6", "B7", "F7", "F4", "F5"]
902diff --git a/keyboards/kkatano/bakeneko65/rev2/config.h b/keyboards/kkatano/bakeneko65/rev2/config.h
903deleted file mode 100644
904index 6aac1d9a5ebf840aebe3c11b6bb3c777a9a60501..0000000000000000000000000000000000000000
905--- a/keyboards/kkatano/bakeneko65/rev2/config.h
906+++ /dev/null
907@@ -1,39 +0,0 @@
908-/*
909-Copyright 2020 Koichi Katano
910-
911-This program is free software: you can redistribute it and/or modify
912-it under the terms of the GNU General Public License as published by
913-the Free Software Foundation, either version 2 of the License, or
914-(at your option) any later version.
915-
916-This program is distributed in the hope that it will be useful,
917-but WITHOUT ANY WARRANTY; without even the implied warranty of
918-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
919-GNU General Public License for more details.
920-
921-You should have received a copy of the GNU General Public License
922-along with this program. If not, see <http://www.gnu.org/licenses/>.
923-*/
924-
925-#pragma once
926-
927-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
928-#define LOCKING_SUPPORT_ENABLE
929-/* Locking resynchronize hack */
930-#define LOCKING_RESYNC_ENABLE
931-
932-/*
933- * Feature disable options
934- * These options are also useful to firmware size reduction.
935- */
936-
937-/* disable debug print */
938-//#define NO_DEBUG
939-
940-/* disable print */
941-//#define NO_PRINT
942-
943-/* disable action features */
944-//#define NO_ACTION_LAYER
945-//#define NO_ACTION_TAPPING
946-//#define NO_ACTION_ONESHOT
947diff --git a/keyboards/kkatano/bakeneko65/rev2/keyboard.json b/keyboards/kkatano/bakeneko65/rev2/keyboard.json
948index 92193e52dbbce185e820ef53d0ca99b3844d309b..93ac8a5e5004f70c254e81c1383c1ee91171a912 100644
949--- a/keyboards/kkatano/bakeneko65/rev2/keyboard.json
950+++ b/keyboards/kkatano/bakeneko65/rev2/keyboard.json
951@@ -16,6 +16,12 @@
952 "mousekey": true,
953 "nkro": false
954 },
955+ "qmk": {
956+ "locking": {
957+ "enabled": true,
958+ "resync": true
959+ }
960+ },
961 "matrix_pins": {
962 "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
963 "rows": ["E6", "B7", "F7", "F4", "F5"]
964diff --git a/keyboards/kkatano/bakeneko65/rev3/config.h b/keyboards/kkatano/bakeneko65/rev3/config.h
965deleted file mode 100644
966index 6aac1d9a5ebf840aebe3c11b6bb3c777a9a60501..0000000000000000000000000000000000000000
967--- a/keyboards/kkatano/bakeneko65/rev3/config.h
968+++ /dev/null
969@@ -1,39 +0,0 @@
970-/*
971-Copyright 2020 Koichi Katano
972-
973-This program is free software: you can redistribute it and/or modify
974-it under the terms of the GNU General Public License as published by
975-the Free Software Foundation, either version 2 of the License, or
976-(at your option) any later version.
977-
978-This program is distributed in the hope that it will be useful,
979-but WITHOUT ANY WARRANTY; without even the implied warranty of
980-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
981-GNU General Public License for more details.
982-
983-You should have received a copy of the GNU General Public License
984-along with this program. If not, see <http://www.gnu.org/licenses/>.
985-*/
986-
987-#pragma once
988-
989-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
990-#define LOCKING_SUPPORT_ENABLE
991-/* Locking resynchronize hack */
992-#define LOCKING_RESYNC_ENABLE
993-
994-/*
995- * Feature disable options
996- * These options are also useful to firmware size reduction.
997- */
998-
999-/* disable debug print */
1000-//#define NO_DEBUG
1001-
1002-/* disable print */
1003-//#define NO_PRINT
1004-
1005-/* disable action features */
1006-//#define NO_ACTION_LAYER
1007-//#define NO_ACTION_TAPPING
1008-//#define NO_ACTION_ONESHOT
1009diff --git a/keyboards/kkatano/bakeneko65/rev3/keyboard.json b/keyboards/kkatano/bakeneko65/rev3/keyboard.json
1010index d0717c1893d0937f737adc6cdb883df9d2ba21b0..3892da5d04e3447af7847d212877d4216d5d2855 100644
1011--- a/keyboards/kkatano/bakeneko65/rev3/keyboard.json
1012+++ b/keyboards/kkatano/bakeneko65/rev3/keyboard.json
1013@@ -16,6 +16,12 @@
1014 "mousekey": true,
1015 "nkro": false
1016 },
1017+ "qmk": {
1018+ "locking": {
1019+ "enabled": true,
1020+ "resync": true
1021+ }
1022+ },
1023 "matrix_pins": {
1024 "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
1025 "rows": ["E6", "B7", "F7", "F4", "F5"]
1026diff --git a/keyboards/kkatano/bakeneko80/config.h b/keyboards/kkatano/bakeneko80/config.h
1027deleted file mode 100644
1028index 6aac1d9a5ebf840aebe3c11b6bb3c777a9a60501..0000000000000000000000000000000000000000
1029--- a/keyboards/kkatano/bakeneko80/config.h
1030+++ /dev/null
1031@@ -1,39 +0,0 @@
1032-/*
1033-Copyright 2020 Koichi Katano
1034-
1035-This program is free software: you can redistribute it and/or modify
1036-it under the terms of the GNU General Public License as published by
1037-the Free Software Foundation, either version 2 of the License, or
1038-(at your option) any later version.
1039-
1040-This program is distributed in the hope that it will be useful,
1041-but WITHOUT ANY WARRANTY; without even the implied warranty of
1042-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1043-GNU General Public License for more details.
1044-
1045-You should have received a copy of the GNU General Public License
1046-along with this program. If not, see <http://www.gnu.org/licenses/>.
1047-*/
1048-
1049-#pragma once
1050-
1051-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1052-#define LOCKING_SUPPORT_ENABLE
1053-/* Locking resynchronize hack */
1054-#define LOCKING_RESYNC_ENABLE
1055-
1056-/*
1057- * Feature disable options
1058- * These options are also useful to firmware size reduction.
1059- */
1060-
1061-/* disable debug print */
1062-//#define NO_DEBUG
1063-
1064-/* disable print */
1065-//#define NO_PRINT
1066-
1067-/* disable action features */
1068-//#define NO_ACTION_LAYER
1069-//#define NO_ACTION_TAPPING
1070-//#define NO_ACTION_ONESHOT
1071diff --git a/keyboards/kkatano/bakeneko80/keyboard.json b/keyboards/kkatano/bakeneko80/keyboard.json
1072index ee005086c3b58255924393a83f28473528d3490c..06f7eeb4db540df136e6a4555e2d22f59098576a 100644
1073--- a/keyboards/kkatano/bakeneko80/keyboard.json
1074+++ b/keyboards/kkatano/bakeneko80/keyboard.json
1075@@ -16,6 +16,12 @@
1076 "mousekey": true,
1077 "nkro": false
1078 },
1079+ "qmk": {
1080+ "locking": {
1081+ "enabled": true,
1082+ "resync": true
1083+ }
1084+ },
1085 "matrix_pins": {
1086 "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
1087 "rows": ["E6", "B0", "B1", "B7", "D1", "D0"]
1088diff --git a/keyboards/kkatano/wallaby/config.h b/keyboards/kkatano/wallaby/config.h
1089deleted file mode 100644
1090index 6aac1d9a5ebf840aebe3c11b6bb3c777a9a60501..0000000000000000000000000000000000000000
1091--- a/keyboards/kkatano/wallaby/config.h
1092+++ /dev/null
1093@@ -1,39 +0,0 @@
1094-/*
1095-Copyright 2020 Koichi Katano
1096-
1097-This program is free software: you can redistribute it and/or modify
1098-it under the terms of the GNU General Public License as published by
1099-the Free Software Foundation, either version 2 of the License, or
1100-(at your option) any later version.
1101-
1102-This program is distributed in the hope that it will be useful,
1103-but WITHOUT ANY WARRANTY; without even the implied warranty of
1104-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1105-GNU General Public License for more details.
1106-
1107-You should have received a copy of the GNU General Public License
1108-along with this program. If not, see <http://www.gnu.org/licenses/>.
1109-*/
1110-
1111-#pragma once
1112-
1113-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1114-#define LOCKING_SUPPORT_ENABLE
1115-/* Locking resynchronize hack */
1116-#define LOCKING_RESYNC_ENABLE
1117-
1118-/*
1119- * Feature disable options
1120- * These options are also useful to firmware size reduction.
1121- */
1122-
1123-/* disable debug print */
1124-//#define NO_DEBUG
1125-
1126-/* disable print */
1127-//#define NO_PRINT
1128-
1129-/* disable action features */
1130-//#define NO_ACTION_LAYER
1131-//#define NO_ACTION_TAPPING
1132-//#define NO_ACTION_ONESHOT
1133diff --git a/keyboards/kkatano/wallaby/keyboard.json b/keyboards/kkatano/wallaby/keyboard.json
1134index e7c76c46a0a99c4ed8f8b08f9395f010bbdb2225..ee475a54bc0163bab84916053ebae0f07e40517a 100644
1135--- a/keyboards/kkatano/wallaby/keyboard.json
1136+++ b/keyboards/kkatano/wallaby/keyboard.json
1137@@ -16,6 +16,12 @@
1138 "mousekey": true,
1139 "nkro": false
1140 },
1141+ "qmk": {
1142+ "locking": {
1143+ "enabled": true,
1144+ "resync": true
1145+ }
1146+ },
1147 "matrix_pins": {
1148 "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
1149 "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
1150diff --git a/keyboards/kkatano/yurei/config.h b/keyboards/kkatano/yurei/config.h
1151deleted file mode 100644
1152index 6954b38182131ed0ce5844e813b28ee6a545731a..0000000000000000000000000000000000000000
1153--- a/keyboards/kkatano/yurei/config.h
1154+++ /dev/null
1155@@ -1,39 +0,0 @@
1156-/*
1157-Copyright 2019 Koichi Katano
1158-
1159-This program is free software: you can redistribute it and/or modify
1160-it under the terms of the GNU General Public License as published by
1161-the Free Software Foundation, either version 2 of the License, or
1162-(at your option) any later version.
1163-
1164-This program is distributed in the hope that it will be useful,
1165-but WITHOUT ANY WARRANTY; without even the implied warranty of
1166-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1167-GNU General Public License for more details.
1168-
1169-You should have received a copy of the GNU General Public License
1170-along with this program. If not, see <http://www.gnu.org/licenses/>.
1171-*/
1172-
1173-#pragma once
1174-
1175-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1176-#define LOCKING_SUPPORT_ENABLE
1177-/* Locking resynchronize hack */
1178-#define LOCKING_RESYNC_ENABLE
1179-
1180-/*
1181- * Feature disable options
1182- * These options are also useful to firmware size reduction.
1183- */
1184-
1185-/* disable debug print */
1186-//#define NO_DEBUG
1187-
1188-/* disable print */
1189-//#define NO_PRINT
1190-
1191-/* disable action features */
1192-//#define NO_ACTION_LAYER
1193-//#define NO_ACTION_TAPPING
1194-//#define NO_ACTION_ONESHOT
1195diff --git a/keyboards/kkatano/yurei/keyboard.json b/keyboards/kkatano/yurei/keyboard.json
1196index 324901484655cc7bcc37947f887f457ce76638c4..7bf08957872ed7763f99d0aa3cec121a1341eee3 100644
1197--- a/keyboards/kkatano/yurei/keyboard.json
1198+++ b/keyboards/kkatano/yurei/keyboard.json
1199@@ -16,6 +16,12 @@
1200 "mousekey": true,
1201 "nkro": false
1202 },
1203+ "qmk": {
1204+ "locking": {
1205+ "enabled": true,
1206+ "resync": true
1207+ }
1208+ },
1209 "matrix_pins": {
1210 "cols": ["D5", "C7", "C6", "D4", "D0", "E6", "F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D1", "D2", "D3"],
1211 "rows": ["B5", "B4", "B3", "B2", "B1", "B0"]
1212diff --git a/keyboards/knops/mini/config.h b/keyboards/knops/mini/config.h
1213deleted file mode 100644
1214index 8b274e7f0f831ba2896f24da6bb5a05755717f84..0000000000000000000000000000000000000000
1215--- a/keyboards/knops/mini/config.h
1216+++ /dev/null
1217@@ -1,39 +0,0 @@
1218-/*
1219-Copyright 2017 Pawnerd
1220-
1221-This program is free software: you can redistribute it and/or modify
1222-it under the terms of the GNU General Public License as published by
1223-the Free Software Foundation, either version 2 of the License, or
1224-(at your option) any later version.
1225-
1226-This program is distributed in the hope that it will be useful,
1227-but WITHOUT ANY WARRANTY; without even the implied warranty of
1228-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1229-GNU General Public License for more details.
1230-
1231-You should have received a copy of the GNU General Public License
1232-along with this program. If not, see <http://www.gnu.org/licenses/>.
1233-*/
1234-
1235-#pragma once
1236-
1237-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1238-#define LOCKING_SUPPORT_ENABLE
1239-/* Locking resynchronize hack */
1240-#define LOCKING_RESYNC_ENABLE
1241-
1242-/*
1243- * Feature disable options
1244- * These options are also useful to firmware size reduction.
1245- */
1246-
1247-/* disable debug print */
1248-//#define NO_DEBUG
1249-
1250-/* disable print */
1251-//#define NO_PRINT
1252-
1253-/* disable action features */
1254-//#define NO_ACTION_LAYER
1255-//#define NO_ACTION_TAPPING
1256-//#define NO_ACTION_ONESHOT
1257diff --git a/keyboards/knops/mini/keyboard.json b/keyboards/knops/mini/keyboard.json
1258index 721e3d7b36baa1a4470ba11661a20f4e78a7fd95..10b18faf8d705bf5add714e8439d32d364820018 100644
1259--- a/keyboards/knops/mini/keyboard.json
1260+++ b/keyboards/knops/mini/keyboard.json
1261@@ -16,6 +16,12 @@
1262 "mousekey": true,
1263 "nkro": false
1264 },
1265+ "qmk": {
1266+ "locking": {
1267+ "enabled": true,
1268+ "resync": true
1269+ }
1270+ },
1271 "matrix_pins": {
1272 "cols": ["F7", "F6", "F5", "F4", "F1", "F0"],
1273 "rows": ["D0"]
1274diff --git a/keyboards/kona_classic/config.h b/keyboards/kona_classic/config.h
1275deleted file mode 100644
1276index b9449c4714bf39561a177eb1ee1ba90b87dbc6fb..0000000000000000000000000000000000000000
1277--- a/keyboards/kona_classic/config.h
1278+++ /dev/null
1279@@ -1,39 +0,0 @@
1280-/*
1281-Copyright 2012 Jun Wako <wakojun@gmail.com>
1282-
1283-This program is free software: you can redistribute it and/or modify
1284-it under the terms of the GNU General Public License as published by
1285-the Free Software Foundation, either version 2 of the License, or
1286-(at your option) any later version.
1287-
1288-This program is distributed in the hope that it will be useful,
1289-but WITHOUT ANY WARRANTY; without even the implied warranty of
1290-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1291-GNU General Public License for more details.
1292-
1293-You should have received a copy of the GNU General Public License
1294-along with this program. If not, see <http://www.gnu.org/licenses/>.
1295-*/
1296-
1297-#pragma once
1298-
1299-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1300-#define LOCKING_SUPPORT_ENABLE
1301-/* Locking resynchronize hack */
1302-#define LOCKING_RESYNC_ENABLE
1303-
1304-/*
1305- * Feature disable options
1306- * These options are also useful to firmware size reduction.
1307- */
1308-
1309-/* disable debug print */
1310-//#define NO_DEBUG
1311-
1312-/* disable print */
1313-//#define NO_PRINT
1314-
1315-/* disable action features */
1316-//#define NO_ACTION_LAYER
1317-//#define NO_ACTION_TAPPING
1318-//#define NO_ACTION_ONESHOT