Diff
1diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h
2index 71c4ecd4dbbbec239c516656210c144bb370c836..73d4cbe862a09a6a21d20b927ab3c0ab4da6111c 100644
3--- a/keyboards/oddball/config.h
4+++ b/keyboards/oddball/config.h
5@@ -21,11 +21,6 @@
6 #define SPLIT_USB_DETECT
7 #define MASTER_RIGHT
8
9-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
10-#define LOCKING_SUPPORT_ENABLE
11-/* Locking resynchronize hack */
12-#define LOCKING_RESYNC_ENABLE
13-
14 /* optical sensor settings */
15 #define SCROLL_DIVIDER 12
16 #define CPI_1 2000
17diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
18index fdbb8b2b1db43bcb2f38daf4a9df4e8fc76f9524..3e6ffb0a90fcb2f6ede720c0a32d7c960d6e6203 100644
19--- a/keyboards/oddball/info.json
20+++ b/keyboards/oddball/info.json
21@@ -15,6 +15,12 @@
22 "nkro": false,
23 "pointing_device": true
24 },
25+ "qmk": {
26+ "locking": {
27+ "enabled": true,
28+ "resync": true
29+ }
30+ },
31 "split": {
32 "enabled": true
33 },
34diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
35index 316f8392c0db91b850a0f79b5999ae18e8d188d0..c31783065cb6eb12feba349f0b5db8ae72f8945d 100644
36--- a/keyboards/oddforge/vea/config.h
37+++ b/keyboards/oddforge/vea/config.h
38@@ -21,7 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
39 #define MATRIX_ROWS 8
40 #define MATRIX_COLS 15
41
42-#define LOCKING_SUPPORT_ENABLE
43-#define LOCKING_RESYNC_ENABLE
44-
45 #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
46diff --git a/keyboards/oddforge/vea/keyboard.json b/keyboards/oddforge/vea/keyboard.json
47index 6a6780ea53c783d4e2c33fbdc462a2bd16d19bdb..a93f843aa069e30d302f54b3ba529a082af1a81d 100644
48--- a/keyboards/oddforge/vea/keyboard.json
49+++ b/keyboards/oddforge/vea/keyboard.json
50@@ -15,6 +15,12 @@
51 "mousekey": false,
52 "rgblight": true
53 },
54+ "qmk": {
55+ "locking": {
56+ "enabled": true,
57+ "resync": true
58+ }
59+ },
60 "backlight": {
61 "pin": "D4"
62 },
63diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
64deleted file mode 100644
65index 74f7ff51815d25864b854619d503adcf6609975c..0000000000000000000000000000000000000000
66--- a/keyboards/ok60/config.h
67+++ /dev/null
68@@ -1,24 +0,0 @@
69-/*
70-Copyright 2018 Edward Browncross
71-
72-This program is free software: you can redistribute it and/or modify
73-it under the terms of the GNU General Public License as published by
74-the Free Software Foundation, either version 2 of the License, or
75-(at your option) any later version.
76-
77-This program is distributed in the hope that it will be useful,
78-but WITHOUT ANY WARRANTY; without even the implied warranty of
79-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
80-GNU General Public License for more details.
81-
82-You should have received a copy of the GNU General Public License
83-along with this program. If not, see <http://www.gnu.org/licenses/>.
84-*/
85-
86-#pragma once
87-
88-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
89-#define LOCKING_SUPPORT_ENABLE
90-
91-/* Locking resynchronize hack */
92-#define LOCKING_RESYNC_ENABLE
93diff --git a/keyboards/ok60/keyboard.json b/keyboards/ok60/keyboard.json
94index f6459907bea2254a159451aa9cef00908b893492..5cf55b666d6c2aecfe7807546b2d361b28be8732 100644
95--- a/keyboards/ok60/keyboard.json
96+++ b/keyboards/ok60/keyboard.json
97@@ -18,6 +18,12 @@
98 "nkro": true,
99 "rgblight": true
100 },
101+ "qmk": {
102+ "locking": {
103+ "enabled": true,
104+ "resync": true
105+ }
106+ },
107 "matrix_pins": {
108 "cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
109 "rows": ["B5", "B4", "D7", "D6", "D4"]
110diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h
111index e5c8d9426ab29554054df109ce7c0aed6de1f20b..1a6dfd12813a027542088e1213005fa1b820e0cf 100644
112--- a/keyboards/om60/config.h
113+++ b/keyboards/om60/config.h
114@@ -29,11 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
115 #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
116 #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 }
117
118-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
119-#define LOCKING_SUPPORT_ENABLE
120-/* Locking resynchronize hack */
121-#define LOCKING_RESYNC_ENABLE
122-
123 #ifndef IOS_DEVICE_ENABLE
124 #define RGBLIGHT_LIMIT_VAL 90
125 #define RGBLIGHT_VAL_STEP 17
126diff --git a/keyboards/om60/keyboard.json b/keyboards/om60/keyboard.json
127index 22386db039aec8802a58c2261d86c4fee96b1f8e..08eb898b014a191f59421628de973fef2d39abe1 100644
128--- a/keyboards/om60/keyboard.json
129+++ b/keyboards/om60/keyboard.json
130@@ -22,7 +22,11 @@
131 ]
132 },
133 "qmk": {
134- "tap_keycode_delay": 10
135+ "tap_keycode_delay": 10,
136+ "locking": {
137+ "enabled": true,
138+ "resync": true
139+ }
140 },
141 "rgblight": {
142 "hue_steps": 10,
143diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
144index 26543ebb9df18daf6b943367f9839785ee973110..12b408ff562aaa233d8c56e223b8d7adc3e11037 100644
145--- a/keyboards/omkbd/ergodash/mini/config.h
146+++ b/keyboards/omkbd/ergodash/mini/config.h
147@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
148
149 #define AUDIO_PIN C6
150
151-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
152-#define LOCKING_SUPPORT_ENABLE
153-/* Locking resynchronize hack */
154-#define LOCKING_RESYNC_ENABLE
155-
156 #define SELECT_SOFT_SERIAL_SPEED 1
157 /*Sets the protocol speed when using serial communication*/
158 //Speeds:
159diff --git a/keyboards/omkbd/ergodash/mini/keyboard.json b/keyboards/omkbd/ergodash/mini/keyboard.json
160index 042332617794965e791cf1009f205f332ae83c78..6286b73b90dc63dfe09d27770bc2c8b6306e8b13 100644
161--- a/keyboards/omkbd/ergodash/mini/keyboard.json
162+++ b/keyboards/omkbd/ergodash/mini/keyboard.json
163@@ -14,6 +14,12 @@
164 "mousekey": false,
165 "nkro": false
166 },
167+ "qmk": {
168+ "locking": {
169+ "enabled": true,
170+ "resync": true
171+ }
172+ },
173 "matrix_pins": {
174 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
175 "rows": ["D7", "E6", "B4", "B5"]
176diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
177index 26543ebb9df18daf6b943367f9839785ee973110..12b408ff562aaa233d8c56e223b8d7adc3e11037 100644
178--- a/keyboards/omkbd/ergodash/rev1/config.h
179+++ b/keyboards/omkbd/ergodash/rev1/config.h
180@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
181
182 #define AUDIO_PIN C6
183
184-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
185-#define LOCKING_SUPPORT_ENABLE
186-/* Locking resynchronize hack */
187-#define LOCKING_RESYNC_ENABLE
188-
189 #define SELECT_SOFT_SERIAL_SPEED 1
190 /*Sets the protocol speed when using serial communication*/
191 //Speeds:
192diff --git a/keyboards/omkbd/ergodash/rev1/keyboard.json b/keyboards/omkbd/ergodash/rev1/keyboard.json
193index 07405e22f7288342bbcc9d4cae6e8ab343803b56..fb4a1c22549ac8e9509ac4049db96a4675a2a496 100644
194--- a/keyboards/omkbd/ergodash/rev1/keyboard.json
195+++ b/keyboards/omkbd/ergodash/rev1/keyboard.json
196@@ -14,6 +14,12 @@
197 "mousekey": false,
198 "nkro": false
199 },
200+ "qmk": {
201+ "locking": {
202+ "enabled": true,
203+ "resync": true
204+ }
205+ },
206 "matrix_pins": {
207 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
208 "rows": ["D4", "D7", "E6", "B4", "B5"]
209diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
210index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
211--- a/keyboards/omkbd/runner3680/3x6/config.h
212+++ b/keyboards/omkbd/runner3680/3x6/config.h
213@@ -16,11 +16,6 @@
214
215 #pragma once
216
217-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
218-#define LOCKING_SUPPORT_ENABLE
219-/* Locking resynchronize hack */
220-#define LOCKING_RESYNC_ENABLE
221-
222 #define SELECT_SOFT_SERIAL_SPEED 1
223 /*Sets the protocol speed when using serial communication*/
224 //Speeds:
225diff --git a/keyboards/omkbd/runner3680/3x6/keyboard.json b/keyboards/omkbd/runner3680/3x6/keyboard.json
226index f2a169d22887f0829eb067004ad6e184081a2fdf..3e1ab5ba824c5e22d2a4d4e693857385994d249b 100644
227--- a/keyboards/omkbd/runner3680/3x6/keyboard.json
228+++ b/keyboards/omkbd/runner3680/3x6/keyboard.json
229@@ -8,6 +8,12 @@
230 "pid": "0x0000",
231 "device_version": "0.0.5"
232 },
233+ "qmk": {
234+ "locking": {
235+ "enabled": true,
236+ "resync": true
237+ }
238+ },
239 "matrix_pins": {
240 "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
241 "rows": ["D4", "C6", "D7"]
242diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
243index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
244--- a/keyboards/omkbd/runner3680/3x7/config.h
245+++ b/keyboards/omkbd/runner3680/3x7/config.h
246@@ -16,11 +16,6 @@
247
248 #pragma once
249
250-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
251-#define LOCKING_SUPPORT_ENABLE
252-/* Locking resynchronize hack */
253-#define LOCKING_RESYNC_ENABLE
254-
255 #define SELECT_SOFT_SERIAL_SPEED 1
256 /*Sets the protocol speed when using serial communication*/
257 //Speeds:
258diff --git a/keyboards/omkbd/runner3680/3x7/keyboard.json b/keyboards/omkbd/runner3680/3x7/keyboard.json
259index e4b36983e7317e14b4d02602b13711591817d082..496be949256f6bd4cd1d342f32b5933af35d3305 100644
260--- a/keyboards/omkbd/runner3680/3x7/keyboard.json
261+++ b/keyboards/omkbd/runner3680/3x7/keyboard.json
262@@ -8,6 +8,12 @@
263 "pid": "0x0000",
264 "device_version": "0.0.5"
265 },
266+ "qmk": {
267+ "locking": {
268+ "enabled": true,
269+ "resync": true
270+ }
271+ },
272 "matrix_pins": {
273 "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
274 "rows": ["D4", "C6", "D7"]
275diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
276index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
277--- a/keyboards/omkbd/runner3680/3x8/config.h
278+++ b/keyboards/omkbd/runner3680/3x8/config.h
279@@ -16,11 +16,6 @@
280
281 #pragma once
282
283-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
284-#define LOCKING_SUPPORT_ENABLE
285-/* Locking resynchronize hack */
286-#define LOCKING_RESYNC_ENABLE
287-
288 #define SELECT_SOFT_SERIAL_SPEED 1
289 /*Sets the protocol speed when using serial communication*/
290 //Speeds:
291diff --git a/keyboards/omkbd/runner3680/3x8/keyboard.json b/keyboards/omkbd/runner3680/3x8/keyboard.json
292index e001332796c9ca269576566868fc26aceac29fee..80719fd0e4731603260fda11c2cb0eba33d8be3d 100644
293--- a/keyboards/omkbd/runner3680/3x8/keyboard.json
294+++ b/keyboards/omkbd/runner3680/3x8/keyboard.json
295@@ -8,6 +8,12 @@
296 "pid": "0x0000",
297 "device_version": "0.0.5"
298 },
299+ "qmk": {
300+ "locking": {
301+ "enabled": true,
302+ "resync": true
303+ }
304+ },
305 "matrix_pins": {
306 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
307 "rows": ["D4", "C6", "D7"]
308diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
309index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
310--- a/keyboards/omkbd/runner3680/4x6/config.h
311+++ b/keyboards/omkbd/runner3680/4x6/config.h
312@@ -16,11 +16,6 @@
313
314 #pragma once
315
316-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
317-#define LOCKING_SUPPORT_ENABLE
318-/* Locking resynchronize hack */
319-#define LOCKING_RESYNC_ENABLE
320-
321 #define SELECT_SOFT_SERIAL_SPEED 1
322 /*Sets the protocol speed when using serial communication*/
323 //Speeds:
324diff --git a/keyboards/omkbd/runner3680/4x6/keyboard.json b/keyboards/omkbd/runner3680/4x6/keyboard.json
325index 6568a9e845e97b30d5239edc83289dd4fdd28164..f9d3146a7852e8506f6828e3a9c270396dbaf811 100644
326--- a/keyboards/omkbd/runner3680/4x6/keyboard.json
327+++ b/keyboards/omkbd/runner3680/4x6/keyboard.json
328@@ -8,6 +8,12 @@
329 "pid": "0x0000",
330 "device_version": "0.0.5"
331 },
332+ "qmk": {
333+ "locking": {
334+ "enabled": true,
335+ "resync": true
336+ }
337+ },
338 "matrix_pins": {
339 "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
340 "rows": ["D4", "C6", "D7", "E6"]
341diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
342index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
343--- a/keyboards/omkbd/runner3680/4x7/config.h
344+++ b/keyboards/omkbd/runner3680/4x7/config.h
345@@ -16,11 +16,6 @@
346
347 #pragma once
348
349-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
350-#define LOCKING_SUPPORT_ENABLE
351-/* Locking resynchronize hack */
352-#define LOCKING_RESYNC_ENABLE
353-
354 #define SELECT_SOFT_SERIAL_SPEED 1
355 /*Sets the protocol speed when using serial communication*/
356 //Speeds:
357diff --git a/keyboards/omkbd/runner3680/4x7/keyboard.json b/keyboards/omkbd/runner3680/4x7/keyboard.json
358index 88f3bdd18de4497db57f8a3c342d9562089b5b29..120e254e5cc50ab679f4b523292141ff4efcdbc3 100644
359--- a/keyboards/omkbd/runner3680/4x7/keyboard.json
360+++ b/keyboards/omkbd/runner3680/4x7/keyboard.json
361@@ -8,6 +8,12 @@
362 "pid": "0x0000",
363 "device_version": "0.0.5"
364 },
365+ "qmk": {
366+ "locking": {
367+ "enabled": true,
368+ "resync": true
369+ }
370+ },
371 "matrix_pins": {
372 "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
373 "rows": ["D4", "C6", "D7", "E6"]
374diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
375index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
376--- a/keyboards/omkbd/runner3680/4x8/config.h
377+++ b/keyboards/omkbd/runner3680/4x8/config.h
378@@ -16,11 +16,6 @@
379
380 #pragma once
381
382-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
383-#define LOCKING_SUPPORT_ENABLE
384-/* Locking resynchronize hack */
385-#define LOCKING_RESYNC_ENABLE
386-
387 #define SELECT_SOFT_SERIAL_SPEED 1
388 /*Sets the protocol speed when using serial communication*/
389 //Speeds:
390diff --git a/keyboards/omkbd/runner3680/4x8/keyboard.json b/keyboards/omkbd/runner3680/4x8/keyboard.json
391index 1ee1d482c92b1b1e54f54ac29acd921d08a9667f..e0b91088da0cd44144210b98acc4fcec936a715c 100644
392--- a/keyboards/omkbd/runner3680/4x8/keyboard.json
393+++ b/keyboards/omkbd/runner3680/4x8/keyboard.json
394@@ -8,6 +8,12 @@
395 "pid": "0x0000",
396 "device_version": "0.0.5"
397 },
398+ "qmk": {
399+ "locking": {
400+ "enabled": true,
401+ "resync": true
402+ }
403+ },
404 "matrix_pins": {
405 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
406 "rows": ["D4", "C6", "D7", "E6"]
407diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
408index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
409--- a/keyboards/omkbd/runner3680/5x6/config.h
410+++ b/keyboards/omkbd/runner3680/5x6/config.h
411@@ -16,11 +16,6 @@
412
413 #pragma once
414
415-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
416-#define LOCKING_SUPPORT_ENABLE
417-/* Locking resynchronize hack */
418-#define LOCKING_RESYNC_ENABLE
419-
420 #define SELECT_SOFT_SERIAL_SPEED 1
421 /*Sets the protocol speed when using serial communication*/
422 //Speeds:
423diff --git a/keyboards/omkbd/runner3680/5x6/keyboard.json b/keyboards/omkbd/runner3680/5x6/keyboard.json
424index 28fddf187383175460ff15735b81e92a4497d77a..c06bff537fbd8eeb26609f8acbf9174ca78f4e66 100644
425--- a/keyboards/omkbd/runner3680/5x6/keyboard.json
426+++ b/keyboards/omkbd/runner3680/5x6/keyboard.json
427@@ -8,6 +8,12 @@
428 "pid": "0x0000",
429 "device_version": "0.0.5"
430 },
431+ "qmk": {
432+ "locking": {
433+ "enabled": true,
434+ "resync": true
435+ }
436+ },
437 "matrix_pins": {
438 "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
439 "rows": ["D4", "C6", "D7", "E6", "B4"]
440diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
441index 8cf1e8238d3fe85127e8e4e9d2cb116484903950..b6f3f5ff86557b33a4e78bf76a0e1060ee2528bf 100644
442--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
443+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
444@@ -16,11 +16,6 @@
445
446 #pragma once
447
448-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
449-#define LOCKING_SUPPORT_ENABLE
450-/* Locking resynchronize hack */
451-#define LOCKING_RESYNC_ENABLE
452-
453 #define SELECT_SOFT_SERIAL_SPEED 1
454 /*Sets the protocol speed when using serial communication*/
455 //Speeds:
456diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
457index 8a7b34597e1e892b461c4285f4670ca34ded234f..4c359b27ebd51c7d530a2f3f2b946d7408737636 100644
458--- a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
459+++ b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
460@@ -8,6 +8,12 @@
461 "pid": "0x5658",
462 "device_version": "0.0.5"
463 },
464+ "qmk": {
465+ "locking": {
466+ "enabled": true,
467+ "resync": true
468+ }
469+ },
470 "rgb_matrix": {
471 "driver": "ws2812",
472 "split_count": [30, 40]
473diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
474index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
475--- a/keyboards/omkbd/runner3680/5x7/config.h
476+++ b/keyboards/omkbd/runner3680/5x7/config.h
477@@ -16,11 +16,6 @@
478
479 #pragma once
480
481-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
482-#define LOCKING_SUPPORT_ENABLE
483-/* Locking resynchronize hack */
484-#define LOCKING_RESYNC_ENABLE
485-
486 #define SELECT_SOFT_SERIAL_SPEED 1
487 /*Sets the protocol speed when using serial communication*/
488 //Speeds:
489diff --git a/keyboards/omkbd/runner3680/5x7/keyboard.json b/keyboards/omkbd/runner3680/5x7/keyboard.json
490index 10a833a839e904a88cf464885dd5e8b060854944..55936eb9d3624a2e36a4c6ce923d3a3649564653 100644
491--- a/keyboards/omkbd/runner3680/5x7/keyboard.json
492+++ b/keyboards/omkbd/runner3680/5x7/keyboard.json
493@@ -8,6 +8,12 @@
494 "pid": "0x0000",
495 "device_version": "0.0.5"
496 },
497+ "qmk": {
498+ "locking": {
499+ "enabled": true,
500+ "resync": true
501+ }
502+ },
503 "matrix_pins": {
504 "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
505 "rows": ["D4", "C6", "D7", "E6", "B4"]
506diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
507index c0a755e251b5e85a732ca5c4e51f6749a19ddf79..2b0210d2be2541249078ef7b8c42dd28a57fa52a 100644
508--- a/keyboards/omkbd/runner3680/5x8/config.h
509+++ b/keyboards/omkbd/runner3680/5x8/config.h
510@@ -16,11 +16,6 @@
511
512 #pragma once
513
514-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
515-#define LOCKING_SUPPORT_ENABLE
516-/* Locking resynchronize hack */
517-#define LOCKING_RESYNC_ENABLE
518-
519 #define SELECT_SOFT_SERIAL_SPEED 1
520 /*Sets the protocol speed when using serial communication*/
521 //Speeds:
522diff --git a/keyboards/omkbd/runner3680/5x8/keyboard.json b/keyboards/omkbd/runner3680/5x8/keyboard.json
523index 8b2ca0142ce4630aa0e3e1808d87b87b9bc2ab0f..9e96e69bbb81bd387b81630286f9fa2d579a547b 100644
524--- a/keyboards/omkbd/runner3680/5x8/keyboard.json
525+++ b/keyboards/omkbd/runner3680/5x8/keyboard.json
526@@ -8,6 +8,12 @@
527 "pid": "0x0000",
528 "device_version": "0.0.5"
529 },
530+ "qmk": {
531+ "locking": {
532+ "enabled": true,
533+ "resync": true
534+ }
535+ },
536 "matrix_pins": {
537 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
538 "rows": ["D4", "C6", "D7", "E6", "B4"]
539diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h
540index c4edb8427c64eaaf6e2dc2d3a249c5656e001830..ad307854e0348ed1be6635299fe4524e8da4c808 100644
541--- a/keyboards/omnikeyish/config.h
542+++ b/keyboards/omnikeyish/config.h
543@@ -14,12 +14,6 @@
544 /* COL2ROW or ROW2COL */
545 #define DIODE_DIRECTION ROW2COL
546
547-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
548-#define LOCKING_SUPPORT_ENABLE
549-
550-/* Locking resynchronize hack */
551-#define LOCKING_RESYNC_ENABLE
552-
553 #define DYNAMIC_MACRO_COUNT 12
554 #define DYNAMIC_MACRO_SIZE 48
555 #define DYNAMIC_MACRO_EEPROM_STORAGE
556diff --git a/keyboards/omnikeyish/keyboard.json b/keyboards/omnikeyish/keyboard.json
557index cd61f2954bbb1111cb345153ce618006dedeafd1..82363b10bfad9efa38c05e648c41780be7acfb7b 100644
558--- a/keyboards/omnikeyish/keyboard.json
559+++ b/keyboards/omnikeyish/keyboard.json
560@@ -17,6 +17,12 @@
561 "mousekey": false,
562 "nkro": true
563 },
564+ "qmk": {
565+ "locking": {
566+ "enabled": true,
567+ "resync": true
568+ }
569+ },
570 "indicators": {
571 "caps_lock": "E1",
572 "num_lock": "E0",
573diff --git a/keyboards/orange75/config.h b/keyboards/orange75/config.h
574deleted file mode 100644
575index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
576--- a/keyboards/orange75/config.h
577+++ /dev/null
578@@ -1,7 +0,0 @@
579-#pragma once
580-
581-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
582-#define LOCKING_SUPPORT_ENABLE
583-
584-/* Locking resynchronize hack */
585-#define LOCKING_RESYNC_ENABLE
586diff --git a/keyboards/orange75/keyboard.json b/keyboards/orange75/keyboard.json
587index 4208cc0f586ec3812126151a59ad8268e652da4a..a0ef8196513460aa5726558b2dc717639b715b76 100644
588--- a/keyboards/orange75/keyboard.json
589+++ b/keyboards/orange75/keyboard.json
590@@ -17,6 +17,12 @@
591 "mousekey": true,
592 "nkro": true
593 },
594+ "qmk": {
595+ "locking": {
596+ "enabled": true,
597+ "resync": true
598+ }
599+ },
600 "matrix_pins": {
601 "cols": ["D3", "D2", "D1", "D0", "B7", "B3"],
602 "rows": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B4", "D7", "D4", "D5", "D6"]
603diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
604deleted file mode 100644
605index 4e5969481849cc0390367c2f005305398c2c60d1..0000000000000000000000000000000000000000
606--- a/keyboards/org60/config.h
607+++ /dev/null
608@@ -1,23 +0,0 @@
609-/*
610-Copyright 2012 Jun Wako <wakojun@gmail.com>
611-
612-This program is free software: you can redistribute it and/or modify
613-it under the terms of the GNU General Public License as published by
614-the Free Software Foundation, either version 2 of the License, or
615-(at your option) any later version.
616-
617-This program is distributed in the hope that it will be useful,
618-but WITHOUT ANY WARRANTY; without even the implied warranty of
619-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
620-GNU General Public License for more details.
621-
622-You should have received a copy of the GNU General Public License
623-along with this program. If not, see <http://www.gnu.org/licenses/>.
624-*/
625-
626-#pragma once
627-
628-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
629-#define LOCKING_SUPPORT_ENABLE
630-/* Locking resynchronize hack */
631-#define LOCKING_RESYNC_ENABLE
632diff --git a/keyboards/org60/keyboard.json b/keyboards/org60/keyboard.json
633index d4994346af2aa040f12215890c09f9049e963334..2586d16b083a280926925402c7bd32dc4dd47796 100644
634--- a/keyboards/org60/keyboard.json
635+++ b/keyboards/org60/keyboard.json
636@@ -18,6 +18,12 @@
637 "nkro": true,
638 "rgblight": true
639 },
640+ "qmk": {
641+ "locking": {
642+ "enabled": true,
643+ "resync": true
644+ }
645+ },
646 "matrix_pins": {
647 "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
648 "rows": ["D0", "D1", "D2", "D3", "D5"]
649diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h
650deleted file mode 100644
651index 2e979809874d6381e1c5a25ea2fb2f87619d3c7f..0000000000000000000000000000000000000000
652--- a/keyboards/ortho5by12/config.h
653+++ /dev/null
654@@ -1,20 +0,0 @@
655-/*
656-Copyright 2019 Takuya Urakawa (dm9records.com)
657-This program is free software: you can redistribute it and/or modify
658-it under the terms of the GNU General Public License as published by
659-the Free Software Foundation, either version 2 of the License, or
660-(at your option) any later version.
661-This program is distributed in the hope that it will be useful,
662-but WITHOUT ANY WARRANTY; without even the implied warranty of
663-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
664-GNU General Public License for more details.
665-You should have received a copy of the GNU General Public License
666-along with this program. If not, see <http://www.gnu.org/licenses/>.
667-*/
668-
669-#pragma once
670-
671-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
672-#define LOCKING_SUPPORT_ENABLE
673-/* Locking resynchronize hack */
674-#define LOCKING_RESYNC_ENABLE
675diff --git a/keyboards/ortho5by12/keyboard.json b/keyboards/ortho5by12/keyboard.json
676index c45788ba2fe7749a5e69aad59915caf31dabf7c5..49ce494417509b87d0a123f8be4bf8c011ed24d4 100644
677--- a/keyboards/ortho5by12/keyboard.json
678+++ b/keyboards/ortho5by12/keyboard.json
679@@ -16,6 +16,12 @@
680 "mousekey": false,
681 "nkro": false
682 },
683+ "qmk": {
684+ "locking": {
685+ "enabled": true,
686+ "resync": true
687+ }
688+ },
689 "matrix_pins": {
690 "cols": ["C2", "D0", "D1", "D4", "C3", "C1"],
691 "rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"]
692diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
693deleted file mode 100644
694index 3cc80db37646e8160fed400b08a4323087be2e61..0000000000000000000000000000000000000000
695--- a/keyboards/orthocode/config.h
696+++ /dev/null
697@@ -1,22 +0,0 @@
698-/*Copyright 2020 Jrodna
699-
700-This program is free software: you can redistribute it and/or modify
701-it under the terms of the GNU General Public License as published by
702-the Free Software Foundation, either version 2 of the License, or
703-(at your option) any later version.
704-
705-This program is distributed in the hope that it will be useful,
706-but WITHOUT ANY WARRANTY; without even the implied warranty of
707-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
708-GNU General Public License for more details.
709-
710-You should have received a copy of the GNU General Public License
711-along with this program. If not, see <http://www.gnu.org/licenses/>.
712-*/
713-
714-#pragma once
715-
716-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
717-#define LOCKING_SUPPORT_ENABLE
718-/* Locking resynchronize hack */
719-#define LOCKING_RESYNC_ENABLE
720diff --git a/keyboards/orthocode/keyboard.json b/keyboards/orthocode/keyboard.json
721index 69f3374b27fa20d154c13e2c0468180b9922524a..11c720c6b1d34d3ac2cef445477612ff6a2a35bf 100644
722--- a/keyboards/orthocode/keyboard.json
723+++ b/keyboards/orthocode/keyboard.json
724@@ -31,7 +31,11 @@
725 ]
726 },
727 "qmk": {
728- "tap_keycode_delay": 10
729+ "tap_keycode_delay": 10,
730+ "locking": {
731+ "enabled": true,
732+ "resync": true
733+ }
734 },
735 "rgblight": {
736 "saturation_steps": 8,