Diff
1diff --git a/keyboards/uk78/config.h b/keyboards/uk78/config.h
2deleted file mode 100644
3index 822b37da7f7f83501606225d4e4ae08a5b8ba586..0000000000000000000000000000000000000000
4--- a/keyboards/uk78/config.h
5+++ /dev/null
6@@ -1,24 +0,0 @@
7-/*
8-Copyright 2017 Ruari Armstrong <ukkeyboards@gmail.com>
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-
29-/* Locking resynchronize hack */
30-#define LOCKING_RESYNC_ENABLE
31diff --git a/keyboards/uk78/keyboard.json b/keyboards/uk78/keyboard.json
32index 8b6b5e9feda2d1ddb152654e3a3e34e4bf2ac92d..673497ca9c095695f01efeea5828cf405c4e1161 100644
33--- a/keyboards/uk78/keyboard.json
34+++ b/keyboards/uk78/keyboard.json
35@@ -18,6 +18,12 @@
36 "nkro": true,
37 "rgblight": true
38 },
39+ "qmk": {
40+ "locking": {
41+ "enabled": true,
42+ "resync": true
43+ }
44+ },
45 "matrix_pins": {
46 "cols": ["A2", "A1", "F5", "F4", "E6", "E7", "E5", "E4", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "B5", "E0"],
47 "rows": ["F3", "F2", "F1", "F0", "A0"]
48diff --git a/keyboards/ungodly/nines/config.h b/keyboards/ungodly/nines/config.h
49deleted file mode 100644
50index ce4d927f09f64bed4414834b4f31411c111f9b5d..0000000000000000000000000000000000000000
51--- a/keyboards/ungodly/nines/config.h
52+++ /dev/null
53@@ -1,21 +0,0 @@
54-/* Copyright 2020 Ungodly Design <hello@ungodly.design>
55- *
56- * This program is free software: you can redistribute it and/or modify
57- * it under the terms of the GNU General Public License as published by
58- * the Free Software Foundation, either version 2 of the License, or
59- * (at your option) any later version.
60- *
61- * This program is distributed in the hope that it will be useful,
62- * but WITHOUT ANY WARRANTY; without even the implied warranty of
63- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
64- * GNU General Public License for more details.
65- *
66- * You should have received a copy of the GNU General Public License
67- * along with this program. If not, see <http://www.gnu.org/licenses/>.
68- */
69- #pragma once
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
75diff --git a/keyboards/ungodly/nines/keyboard.json b/keyboards/ungodly/nines/keyboard.json
76index 07496dd51501d50e1000bea16f86bb95bd5a567e..5e5418e14d45dab8ee27a82389a9bb45a46a2064 100644
77--- a/keyboards/ungodly/nines/keyboard.json
78+++ b/keyboards/ungodly/nines/keyboard.json
79@@ -25,6 +25,12 @@
80 "mousekey": true,
81 "nkro": true
82 },
83+ "qmk": {
84+ "locking": {
85+ "enabled": true,
86+ "resync": true
87+ }
88+ },
89 "matrix_pins": {
90 "direct": [
91 ["F4", "F5", "F6"],
92diff --git a/keyboards/unikeyboard/diverge3/config.h b/keyboards/unikeyboard/diverge3/config.h
93index b5ed9415d5fae96ad3695a53adbbb55bfc50e3b2..bdd2b7cbb29dc1fd631c09c6f00f0e4493ea2785 100644
94--- a/keyboards/unikeyboard/diverge3/config.h
95+++ b/keyboards/unikeyboard/diverge3/config.h
96@@ -21,11 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
97 #define SELECT_SOFT_SERIAL_SPEED 3
98 #endif
99
100-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
101-#define LOCKING_SUPPORT_ENABLE
102-/* Locking resynchronize hack */
103-#define LOCKING_RESYNC_ENABLE
104-
105 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
106 * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
107 */
108diff --git a/keyboards/unikeyboard/diverge3/keyboard.json b/keyboards/unikeyboard/diverge3/keyboard.json
109index a6dd684be6dd224d6c7cc1bda546eb2575aec17d..36f056187b848f41e2a0117f3d3a84dbbf296023 100644
110--- a/keyboards/unikeyboard/diverge3/keyboard.json
111+++ b/keyboards/unikeyboard/diverge3/keyboard.json
112@@ -17,6 +17,12 @@
113 "mousekey": true,
114 "nkro": false
115 },
116+ "qmk": {
117+ "locking": {
118+ "enabled": true,
119+ "resync": true
120+ }
121+ },
122 "matrix_pins": {
123 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
124 "rows": ["D4", "D7", "E6", "B4", "B5"]
125diff --git a/keyboards/unikeyboard/divergetm2/config.h b/keyboards/unikeyboard/divergetm2/config.h
126deleted file mode 100644
127index 78d133446e3e53de1da749ae2c8d3f0075986e96..0000000000000000000000000000000000000000
128--- a/keyboards/unikeyboard/divergetm2/config.h
129+++ /dev/null
130@@ -1,23 +0,0 @@
131-/* Copyright 2018 Christon DeWan (xton)
132- * Copyright 2017 IslandMan93
133- *
134- * This program is free software: you can redistribute it and/or modify
135- * it under the terms of the GNU General Public License as published by
136- * the Free Software Foundation, either version 2 of the License, or
137- * (at your option) any later version.
138- *
139- * This program is distributed in the hope that it will be useful,
140- * but WITHOUT ANY WARRANTY; without even the implied warranty of
141- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
142- * GNU General Public License for more details.
143- *
144- * You should have received a copy of the GNU General Public License
145- * along with this program. If not, see <http://www.gnu.org/licenses/>.
146- */
147-
148-#pragma once
149-
150-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
151-#define LOCKING_SUPPORT_ENABLE
152-/* Locking resynchronize hack */
153-#define LOCKING_RESYNC_ENABLE
154diff --git a/keyboards/unikeyboard/divergetm2/keyboard.json b/keyboards/unikeyboard/divergetm2/keyboard.json
155index 3c1420c39adcd1e6a0009675e47d164a40d90d63..b2db7a19db1ed75eeeb84751d2912842f90377ab 100644
156--- a/keyboards/unikeyboard/divergetm2/keyboard.json
157+++ b/keyboards/unikeyboard/divergetm2/keyboard.json
158@@ -16,6 +16,12 @@
159 "mousekey": true,
160 "nkro": false
161 },
162+ "qmk": {
163+ "locking": {
164+ "enabled": true,
165+ "resync": true
166+ }
167+ },
168 "matrix_pins": {
169 "cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
170 "rows": ["D7", "E6", "B4", "B5"]
171diff --git a/keyboards/unikeyboard/felix/config.h b/keyboards/unikeyboard/felix/config.h
172deleted file mode 100644
173index 7bc78f68d698af91ca00bae24cd8a9c49a31373d..0000000000000000000000000000000000000000
174--- a/keyboards/unikeyboard/felix/config.h
175+++ /dev/null
176@@ -1,22 +0,0 @@
177-#pragma once
178-
179-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
180-#define LOCKING_SUPPORT_ENABLE
181-/* Locking resynchronize hack */
182-#define LOCKING_RESYNC_ENABLE
183-
184-/*
185- * Feature disable options
186- * These options are also useful to firmware size reduction.
187- */
188-
189-/* disable debug print */
190-//#define NO_DEBUG
191-
192-/* disable print */
193-//#define NO_PRINT
194-
195-/* disable action features */
196-//#define NO_ACTION_LAYER
197-//#define NO_ACTION_TAPPING
198-//#define NO_ACTION_ONESHOT
199diff --git a/keyboards/unikeyboard/felix/keyboard.json b/keyboards/unikeyboard/felix/keyboard.json
200index 319340f5e62a7fb73818f8ca6e6f3cd380aa6e1e..b55138a15cecc09b4b2cd0a54c57b5c1e668e811 100644
201--- a/keyboards/unikeyboard/felix/keyboard.json
202+++ b/keyboards/unikeyboard/felix/keyboard.json
203@@ -17,6 +17,12 @@
204 "mousekey": true,
205 "nkro": true
206 },
207+ "qmk": {
208+ "locking": {
209+ "enabled": true,
210+ "resync": true
211+ }
212+ },
213 "matrix_pins": {
214 "cols": ["B5", "B4", "E6", "D7"],
215 "rows": ["B2", "B3", "B1", "F7", "F6"]
216diff --git a/keyboards/uranuma/config.h b/keyboards/uranuma/config.h
217deleted file mode 100644
218index 7bc78f68d698af91ca00bae24cd8a9c49a31373d..0000000000000000000000000000000000000000
219--- a/keyboards/uranuma/config.h
220+++ /dev/null
221@@ -1,22 +0,0 @@
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-/*
230- * Feature disable options
231- * These options are also useful to firmware size reduction.
232- */
233-
234-/* disable debug print */
235-//#define NO_DEBUG
236-
237-/* disable print */
238-//#define NO_PRINT
239-
240-/* disable action features */
241-//#define NO_ACTION_LAYER
242-//#define NO_ACTION_TAPPING
243-//#define NO_ACTION_ONESHOT
244diff --git a/keyboards/uranuma/keyboard.json b/keyboards/uranuma/keyboard.json
245index 8ac5b8063aec5c2bc2214e07a2d6bbb4cb9d4006..b24ce74d9ffb672c10e3adc3c8b825f84ecca740 100644
246--- a/keyboards/uranuma/keyboard.json
247+++ b/keyboards/uranuma/keyboard.json
248@@ -17,6 +17,12 @@
249 "mousekey": true,
250 "nkro": false
251 },
252+ "qmk": {
253+ "locking": {
254+ "enabled": true,
255+ "resync": true
256+ }
257+ },
258 "matrix_pins": {
259 "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D2", "D4"],
260 "rows": ["C6", "D7", "E6", "B4", "B5"]
261diff --git a/keyboards/utd80/config.h b/keyboards/utd80/config.h
262deleted file mode 100644
263index 4a4d65e62f8ac9f19d879fdfa0068490f736baa3..0000000000000000000000000000000000000000
264--- a/keyboards/utd80/config.h
265+++ /dev/null
266@@ -1,22 +0,0 @@
267-/* Copyright 2021 UTDKeyboard & Dominic Gan
268- *
269- * this program is free software: you can redistribute it and/or modify
270- * it under the terms of the gnu general public license as published by
271- * the free software foundation, either version 2 of the license, or
272- * (at your option) any later version.
273- *
274- * this program is distributed in the hope that it will be useful,
275- * but without any warranty; without even the implied warranty of
276- * merchantability or fitness for a particular purpose. see the
277- * gnu general public license for more details.
278- *
279- * you should have received a copy of the gnu general public license
280- * along with this program. if not, see <http://www.gnu.org/licenses/>.
281- */
282-#pragma once
283-
284-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
285-#define LOCKING_SUPPORT_ENABLE
286-
287-/* Locking resynchronize hack */
288-#define LOCKING_RESYNC_ENABLE
289diff --git a/keyboards/utd80/keyboard.json b/keyboards/utd80/keyboard.json
290index 6e4c966d40387116cc7b1cae14278bf12a7d405f..41bd35c66a47e6d4253ffdaf020ab1a6bc60bf03 100644
291--- a/keyboards/utd80/keyboard.json
292+++ b/keyboards/utd80/keyboard.json
293@@ -18,6 +18,12 @@
294 "nkro": true,
295 "rgblight": true
296 },
297+ "qmk": {
298+ "locking": {
299+ "enabled": true,
300+ "resync": true
301+ }
302+ },
303 "matrix_pins": {
304 "cols": ["B1", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "D3", "E6", "D7", "D6", "D4", "D2", "D1"],
305 "rows": ["B4", "D5", "D0", "B2", "B3", "B0"]
306diff --git a/keyboards/v60_type_r/config.h b/keyboards/v60_type_r/config.h
307index c8b7da2ae82f2c74f9780716633a05aa3243e0f6..6b92da0124626d658053b4f15a1cfbd6c748193c 100644
308--- a/keyboards/v60_type_r/config.h
309+++ b/keyboards/v60_type_r/config.h
310@@ -23,11 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
311 #define RGB_GREEN_PIN F5
312 #define RGB_BLUE_PIN F4
313
314-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
315-#define LOCKING_SUPPORT_ENABLE
316-/* Locking resynchronize hack */
317-#define LOCKING_RESYNC_ENABLE
318-
319 /*
320 * Feature disable options
321 * These options are also useful to firmware size reduction.
322diff --git a/keyboards/v60_type_r/keyboard.json b/keyboards/v60_type_r/keyboard.json
323index a9c01dc75018ebc9f1c02236a8efc59292159f4f..eba729220a88c9597e9ec8d2b9f5e269749c7687 100644
324--- a/keyboards/v60_type_r/keyboard.json
325+++ b/keyboards/v60_type_r/keyboard.json
326@@ -20,6 +20,12 @@
327 "mousekey": true,
328 "nkro": false
329 },
330+ "qmk": {
331+ "locking": {
332+ "enabled": true,
333+ "resync": true
334+ }
335+ },
336 "matrix_pins": {
337 "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"],
338 "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"]
339diff --git a/keyboards/vagrant_10/config.h b/keyboards/vagrant_10/config.h
340deleted file mode 100755
341index 195f3f617cd308bbfa20245f6c38814d5fe171eb..0000000000000000000000000000000000000000
342--- a/keyboards/vagrant_10/config.h
343+++ /dev/null
344@@ -1,32 +0,0 @@
345-
346-/**
347-MIT License
348-
349-Copyright (c) 2020 Shanduur & QMK Firmware
350-
351-Permission is hereby granted, free of charge, to any person obtaining a copy
352-of this software and associated documentation files (the "Software"), to deal
353-in the Software without restriction, including without limitation the rights
354-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
355-copies of the Software, and to permit persons to whom the Software is
356-furnished to do so, subject to the following conditions:
357-
358-The above copyright notice and this permission notice shall be included in all
359-copies or substantial portions of the Software.
360-
361-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
362-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
363-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
364-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
365-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
366-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
367-SOFTWARE.
368-*/
369-
370-#pragma once
371-
372-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
373-#define LOCKING_SUPPORT_ENABLE
374-
375-/* Locking resynchronize hack */
376-#define LOCKING_RESYNC_ENABLE
377diff --git a/keyboards/vagrant_10/keyboard.json b/keyboards/vagrant_10/keyboard.json
378index 7291dea3028d47a3356d058e2dddbb5096939ffd..26b68b6923412f4bdbbd91ae7aa5d828a2814516 100644
379--- a/keyboards/vagrant_10/keyboard.json
380+++ b/keyboards/vagrant_10/keyboard.json
381@@ -16,6 +16,12 @@
382 "mousekey": true,
383 "nkro": true
384 },
385+ "qmk": {
386+ "locking": {
387+ "enabled": true,
388+ "resync": true
389+ }
390+ },
391 "matrix_pins": {
392 "cols": ["F4", "F6", "F5"],
393 "rows": ["F7", "B1", "B3", "B2"]
394diff --git a/keyboards/viendi8l/config.h b/keyboards/viendi8l/config.h
395index a449301c2b29795d83f7f4844f1bbf33f66e1df3..0a22c61a09195f6e28c4a1188a02c6b34b834889 100644
396--- a/keyboards/viendi8l/config.h
397+++ b/keyboards/viendi8l/config.h
398@@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
399
400 #pragma once
401
402-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
403-#define LOCKING_SUPPORT_ENABLE
404-/* Locking resynchronize hack */
405-#define LOCKING_RESYNC_ENABLE
406-
407 #define I2C_DRIVER I2CD1
408 #define I2C_SCL_PIN B6
409 #define I2C_SDA_PIN B7
410diff --git a/keyboards/viendi8l/keyboard.json b/keyboards/viendi8l/keyboard.json
411index 4a7ac1b5acb6bb3d935216de8e54da6f0576f692..f6df59e08b6441f4c44d94d52331c4789db97203 100644
412--- a/keyboards/viendi8l/keyboard.json
413+++ b/keyboards/viendi8l/keyboard.json
414@@ -28,6 +28,12 @@
415 "nkro": false,
416 "rgblight": true
417 },
418+ "qmk": {
419+ "locking": {
420+ "enabled": true,
421+ "resync": true
422+ }
423+ },
424 "matrix_pins": {
425 "cols": ["C6", "C7", "C8", "C9", "A8", "B3", "B4", "A10", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1", "A2", "A3"],
426 "rows": ["C3", "C2", "C1", "C0", "B14", "A7"]
427diff --git a/keyboards/viktus/at101_bh/config.h b/keyboards/viktus/at101_bh/config.h
428deleted file mode 100644
429index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
430--- a/keyboards/viktus/at101_bh/config.h
431+++ /dev/null
432@@ -1,7 +0,0 @@
433-#pragma once
434-
435-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
436-#define LOCKING_SUPPORT_ENABLE
437-
438-/* Locking resynchronize hack */
439-#define LOCKING_RESYNC_ENABLE
440diff --git a/keyboards/viktus/at101_bh/keyboard.json b/keyboards/viktus/at101_bh/keyboard.json
441index b950aec2d02e1bb58b273a2f42ca820a8ad9be0a..a315288cac41b242793bb963caf83b971718d982 100644
442--- a/keyboards/viktus/at101_bh/keyboard.json
443+++ b/keyboards/viktus/at101_bh/keyboard.json
444@@ -17,6 +17,12 @@
445 "mousekey": true,
446 "nkro": true
447 },
448+ "qmk": {
449+ "locking": {
450+ "enabled": true,
451+ "resync": true
452+ }
453+ },
454 "matrix_pins": {
455 "cols": ["D1", "D0", "B7", "B3", "B2", "B1", "B0", "E6", "D2", "D3"],
456 "rows": ["F0", "F1", "F4", "D4", "F6", "F5", "F7", "B6", "B5", "D5", "C7", "C6"]
457diff --git a/keyboards/viktus/omnikey_bh/config.h b/keyboards/viktus/omnikey_bh/config.h
458deleted file mode 100644
459index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
460--- a/keyboards/viktus/omnikey_bh/config.h
461+++ /dev/null
462@@ -1,7 +0,0 @@
463-#pragma once
464-
465-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
466-#define LOCKING_SUPPORT_ENABLE
467-
468-/* Locking resynchronize hack */
469-#define LOCKING_RESYNC_ENABLE
470diff --git a/keyboards/viktus/omnikey_bh/keyboard.json b/keyboards/viktus/omnikey_bh/keyboard.json
471index a44b23d6552fabce52a58ad937eb70513567e7d2..3356bf1eb287e956cc4434f9aeef105539da3d94 100644
472--- a/keyboards/viktus/omnikey_bh/keyboard.json
473+++ b/keyboards/viktus/omnikey_bh/keyboard.json
474@@ -17,6 +17,12 @@
475 "mousekey": true,
476 "nkro": true
477 },
478+ "qmk": {
479+ "locking": {
480+ "enabled": true,
481+ "resync": true
482+ }
483+ },
484 "matrix_pins": {
485 "cols": ["C2", "C3", "C4", "C7", "C1", "C0", "E1", "E0", "D7", "F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1", "B2", "B3"],
486 "rows": ["B7", "D0", "D1", "D2", "D3", "D4"]
487diff --git a/keyboards/viktus/smolka/config.h b/keyboards/viktus/smolka/config.h
488deleted file mode 100644
489index bb14ae71b110fcc90940cffe07d52c59e098e21b..0000000000000000000000000000000000000000
490--- a/keyboards/viktus/smolka/config.h
491+++ /dev/null
492@@ -1,39 +0,0 @@
493-/*
494-Copyright 2021 jrfhoutx
495-
496-This program is free software: you can redistribute it and/or modify
497-it under the terms of the GNU General Public License as published by
498-the Free Software Foundation, either version 2 of the License, or
499-(at your option) any later version.
500-
501-This program is distributed in the hope that it will be useful,
502-but WITHOUT ANY WARRANTY; without even the implied warranty of
503-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
504-GNU General Public License for more details.
505-
506-You should have received a copy of the GNU General Public License
507-along with this program. If not, see <http://www.gnu.org/licenses/>.
508-*/
509-
510-#pragma once
511-
512-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
513-#define LOCKING_SUPPORT_ENABLE
514-/* Locking resynchronize hack */
515-#define LOCKING_RESYNC_ENABLE
516-
517-/*
518- * Feature disable options
519- * These options are also useful to firmware size reduction.
520- */
521-
522-/* disable debug print */
523-//#define NO_DEBUG
524-
525-/* disable print */
526-//#define NO_PRINT
527-
528-/* disable action features */
529-//#define NO_ACTION_LAYER
530-//#define NO_ACTION_TAPPING
531-//#define NO_ACTION_ONESHOT
532diff --git a/keyboards/viktus/smolka/keyboard.json b/keyboards/viktus/smolka/keyboard.json
533index ade26b37351802839995314209b1e347362ac8c2..e2cd55a4052cb90fe21ccd6f217d99e78942eccd 100644
534--- a/keyboards/viktus/smolka/keyboard.json
535+++ b/keyboards/viktus/smolka/keyboard.json
536@@ -17,6 +17,12 @@
537 "mousekey": true,
538 "nkro": true
539 },
540+ "qmk": {
541+ "locking": {
542+ "enabled": true,
543+ "resync": true
544+ }
545+ },
546 "matrix_pins": {
547 "cols": ["D6", "D7", "B4", "B5", "B6", "D4", "B1", "B2"],
548 "rows": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6"]
549diff --git a/keyboards/viktus/sp111/config.h b/keyboards/viktus/sp111/config.h
550index de6983490262efff5241d1dec5135322cbfcde27..cbd6dbc4d947633eaa89ad2171c6693e54e96710 100644
551--- a/keyboards/viktus/sp111/config.h
552+++ b/keyboards/viktus/sp111/config.h
553@@ -20,11 +20,6 @@
554 #define MATRIX_ROWS 6*2
555 #define MATRIX_COLS 11
556
557-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
558-#define LOCKING_SUPPORT_ENABLE
559-/* Locking resynchronize hack */
560-#define LOCKING_RESYNC_ENABLE
561-
562 /*
563 * Feature disable options
564 * These options are also useful to firmware size reduction.
565diff --git a/keyboards/viktus/sp111/keyboard.json b/keyboards/viktus/sp111/keyboard.json
566index a309c14afe3576da2b9cbb042b8ea5fd296686a5..8cf65a5522ada463f2b8bf424682b41ef709c446 100644
567--- a/keyboards/viktus/sp111/keyboard.json
568+++ b/keyboards/viktus/sp111/keyboard.json
569@@ -17,6 +17,12 @@
570 "mousekey": true,
571 "nkro": true
572 },
573+ "qmk": {
574+ "locking": {
575+ "enabled": true,
576+ "resync": true
577+ }
578+ },
579 "processor": "atmega32u4",
580 "bootloader": "atmel-dfu",
581 "layouts": {
582diff --git a/keyboards/viktus/styrka/config.h b/keyboards/viktus/styrka/config.h
583deleted file mode 100644
584index c0e0f2bef8bba4b2202a43865cf8d8915407606e..0000000000000000000000000000000000000000
585--- a/keyboards/viktus/styrka/config.h
586+++ /dev/null
587@@ -1,39 +0,0 @@
588-/*
589-Copyright 2020 jrfhoutx
590-
591-This program is free software: you can redistribute it and/or modify
592-it under the terms of the GNU General Public License as published by
593-the Free Software Foundation, either version 2 of the License, or
594-(at your option) any later version.
595-
596-This program is distributed in the hope that it will be useful,
597-but WITHOUT ANY WARRANTY; without even the implied warranty of
598-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
599-GNU General Public License for more details.
600-
601-You should have received a copy of the GNU General Public License
602-along with this program. If not, see <http://www.gnu.org/licenses/>.
603-*/
604-
605-#pragma once
606-
607-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
608-#define LOCKING_SUPPORT_ENABLE
609-/* Locking resynchronize hack */
610-#define LOCKING_RESYNC_ENABLE
611-
612-/*
613- * Feature disable options
614- * These options are also useful to firmware size reduction.
615- */
616-
617-/* disable debug print */
618-//#define NO_DEBUG
619-
620-/* disable print */
621-//#define NO_PRINT
622-
623-/* disable action features */
624-//#define NO_ACTION_LAYER
625-//#define NO_ACTION_TAPPING
626-//#define NO_ACTION_ONESHOT
627diff --git a/keyboards/viktus/styrka/keyboard.json b/keyboards/viktus/styrka/keyboard.json
628index e5a642e471e1f468cfc50e40c091e4ad0315a1fc..98d46bc81a0c83d544bfc13c9e152076eda503be 100644
629--- a/keyboards/viktus/styrka/keyboard.json
630+++ b/keyboards/viktus/styrka/keyboard.json
631@@ -16,6 +16,12 @@
632 "mousekey": false,
633 "nkro": true
634 },
635+ "qmk": {
636+ "locking": {
637+ "enabled": true,
638+ "resync": true
639+ }
640+ },
641 "matrix_pins": {
642 "cols": ["A0", "A1", "A2", "A3", "A4", "B14", "B15", "A8", "A9"],
643 "rows": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "B13", "B12"]
644diff --git a/keyboards/viktus/z150_bh/config.h b/keyboards/viktus/z150_bh/config.h
645deleted file mode 100644
646index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
647--- a/keyboards/viktus/z150_bh/config.h
648+++ /dev/null
649@@ -1,7 +0,0 @@
650-#pragma once
651-
652-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
653-#define LOCKING_SUPPORT_ENABLE
654-
655-/* Locking resynchronize hack */
656-#define LOCKING_RESYNC_ENABLE
657diff --git a/keyboards/viktus/z150_bh/keyboard.json b/keyboards/viktus/z150_bh/keyboard.json
658index 5875b6d1712e09cf4b76ea431959a117e2c1daaf..27754da5438a4a44e32248f5f92e89d11ff5b739 100644
659--- a/keyboards/viktus/z150_bh/keyboard.json
660+++ b/keyboards/viktus/z150_bh/keyboard.json
661@@ -17,6 +17,12 @@
662 "mousekey": true,
663 "nkro": true
664 },
665+ "qmk": {
666+ "locking": {
667+ "enabled": true,
668+ "resync": true
669+ }
670+ },
671 "matrix_pins": {
672 "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D7", "E0", "C7", "C6", "C5", "C4", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"],
673 "rows": ["C3", "C2", "C1", "C0", "E1"]
674diff --git a/keyboards/vitamins_included/rev1/config.h b/keyboards/vitamins_included/rev1/config.h
675index 027686726dfd39ac7e9849ea69f023c7c1c447a4..6faac18ae1d54c931dd257198e509f127acbc0ce 100644
676--- a/keyboards/vitamins_included/rev1/config.h
677+++ b/keyboards/vitamins_included/rev1/config.h
678@@ -23,11 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
679
680 #define EE_HANDS
681
682-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
683-#define LOCKING_SUPPORT_ENABLE
684-/* Locking resynchronize hack */
685-#define LOCKING_RESYNC_ENABLE
686-
687 /* Audio settings */
688 #ifdef AUDIO_ENABLE
689 #define AUDIO_PIN C6 // Define this to enable the buzzer
690diff --git a/keyboards/vitamins_included/rev1/keyboard.json b/keyboards/vitamins_included/rev1/keyboard.json
691index de21929c39bde13c29bffda5f1522cc8346cffb9..dc55407b6af003c523c6bfea50c9e67a2149f21b 100644
692--- a/keyboards/vitamins_included/rev1/keyboard.json
693+++ b/keyboards/vitamins_included/rev1/keyboard.json
694@@ -7,6 +7,12 @@
695 "rows": ["F5", "F6", "C7", "F7"]
696 },
697 "diode_direction": "COL2ROW",
698+ "qmk": {
699+ "locking": {
700+ "enabled": true,
701+ "resync": true
702+ }
703+ },
704 "split": {
705 "enabled": true,
706 "soft_serial_pin": "D0"