912124f71cfcd9276fec13b27dea0029e49b1483

Author
James Young <18669334+noroadsleft@users.noreply.github.com>
Committer
GitHub <noreply@github.com>
Date

Message

Migrate `LOCKING_*_ENABLE` to Data-Driven: T (#23785)

Affects:

  - `takashicompany/center_enter`
  - `takashicompany/endzone34`
  - `takashicompany/qoolee`
  - `takashicompany/radialex`
  - `takashiski/namecard2x4/rev1`
  - `takashiski/namecard2x4/rev2`
  - `takashiski/otaku_split/rev0`
  - `takashiski/otaku_split/rev1`
  - `taleguers/taleguers75`
  - `tanuki`
  - `team0110/p1800fl`
  - `technika`
  - `tenki`
  - `tetris`
  - `tg4x`
  - `the_royal/liminal`
  - `the_royal/schwann`
  - `thevankeyboards/bananasplit`
  - `thevankeyboards/caravan`
  - `thevankeyboards/jetvan`
  - `thevankeyboards/minivan`
  - `thevankeyboards/roadkit`
  - `tkc/california`
  - `tkc/m0lly`
  - `tkc/tkc1800`
  - `tkc/tkl_ab87`
  - `tkw/stoutgat/v2`
  - `tmo50`
  - `toad`
  - `toffee_studio/blueberry`
  - `tokyokeyboard/alix40`
  - `tokyokeyboard/tokyo60`
  - `tominabox1/adalyn`
  - `tominabox1/le_chiffre`
  - `tominabox1/qaz`
  - `tr60w`
  - `treasure/type9`
  - `tszaboo/ortho4exent`

Diff

This diff is truncated to protect this page.

   1diff --git a/keyboards/takashicompany/center_enter/config.h b/keyboards/takashicompany/center_enter/config.h
   2deleted file mode 100644
   3index 7b4e38bd96430dca5b7f1056c79f9e804b606f55..0000000000000000000000000000000000000000
   4--- a/keyboards/takashicompany/center_enter/config.h
   5+++ /dev/null
   6@@ -1,39 +0,0 @@
   7-/*
   8-Copyright 2021 takashicompany
   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/takashicompany/center_enter/keyboard.json b/keyboards/takashicompany/center_enter/keyboard.json
  47index 41a3e45093176628696c39aea7f60ac8f7f9e441..b8188bd7182a78013d864e31172abaeb0c3fb70d 100644
  48--- a/keyboards/takashicompany/center_enter/keyboard.json
  49+++ b/keyboards/takashicompany/center_enter/keyboard.json
  50@@ -38,6 +38,12 @@
  51         "nkro": false,
  52         "rgblight": true
  53     },
  54+    "qmk": {
  55+        "locking": {
  56+            "enabled": true,
  57+            "resync": true
  58+        }
  59+    },
  60     "matrix_pins": {
  61         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D7", "B2", "B6", "D0", "D4", "C6"],
  62         "rows": ["E6", "B4", "B5"]
  63diff --git a/keyboards/takashicompany/endzone34/config.h b/keyboards/takashicompany/endzone34/config.h
  64deleted file mode 100644
  65index 7b4e38bd96430dca5b7f1056c79f9e804b606f55..0000000000000000000000000000000000000000
  66--- a/keyboards/takashicompany/endzone34/config.h
  67+++ /dev/null
  68@@ -1,39 +0,0 @@
  69-/*
  70-Copyright 2021 takashicompany
  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-/* Locking resynchronize hack */
  91-#define LOCKING_RESYNC_ENABLE
  92-
  93-/*
  94- * Feature disable options
  95- *  These options are also useful to firmware size reduction.
  96- */
  97-
  98-/* disable debug print */
  99-//#define NO_DEBUG
 100-
 101-/* disable print */
 102-//#define NO_PRINT
 103-
 104-/* disable action features */
 105-//#define NO_ACTION_LAYER
 106-//#define NO_ACTION_TAPPING
 107-//#define NO_ACTION_ONESHOT
 108diff --git a/keyboards/takashicompany/endzone34/keyboard.json b/keyboards/takashicompany/endzone34/keyboard.json
 109index 382d2f06724f3fe99482d7b1be1c8112fc8a5673..3549d2c0893a6e3810a083c2b96dcf790f26be41 100644
 110--- a/keyboards/takashicompany/endzone34/keyboard.json
 111+++ b/keyboards/takashicompany/endzone34/keyboard.json
 112@@ -39,6 +39,12 @@
 113         "oled": true,
 114         "rgblight": true
 115     },
 116+    "qmk": {
 117+        "locking": {
 118+            "enabled": true,
 119+            "resync": true
 120+        }
 121+    },
 122     "matrix_pins": {
 123         "cols": ["F4", "F5", "F6", "F7", "B1", "D4", "C6", "D7", "E6", "B4"],
 124         "rows": ["B3", "B2", "B6", "B5"]
 125diff --git a/keyboards/takashicompany/qoolee/config.h b/keyboards/takashicompany/qoolee/config.h
 126deleted file mode 100644
 127index 7b4e38bd96430dca5b7f1056c79f9e804b606f55..0000000000000000000000000000000000000000
 128--- a/keyboards/takashicompany/qoolee/config.h
 129+++ /dev/null
 130@@ -1,39 +0,0 @@
 131-/*
 132-Copyright 2021 takashicompany
 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
 154-
 155-/*
 156- * Feature disable options
 157- *  These options are also useful to firmware size reduction.
 158- */
 159-
 160-/* disable debug print */
 161-//#define NO_DEBUG
 162-
 163-/* disable print */
 164-//#define NO_PRINT
 165-
 166-/* disable action features */
 167-//#define NO_ACTION_LAYER
 168-//#define NO_ACTION_TAPPING
 169-//#define NO_ACTION_ONESHOT
 170diff --git a/keyboards/takashicompany/qoolee/keyboard.json b/keyboards/takashicompany/qoolee/keyboard.json
 171index 52e6d61b8032ff23e07b5a77e56e88e5f622202e..bce233529368b303e9cf69287c4befee41a31982 100644
 172--- a/keyboards/takashicompany/qoolee/keyboard.json
 173+++ b/keyboards/takashicompany/qoolee/keyboard.json
 174@@ -38,6 +38,12 @@
 175         "nkro": false,
 176         "rgblight": true
 177     },
 178+    "qmk": {
 179+        "locking": {
 180+            "enabled": true,
 181+            "resync": true
 182+        }
 183+    },
 184     "matrix_pins": {
 185         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D0", "D4", "C6", "D7"],
 186         "rows": ["E6", "B4", "B5"]
 187diff --git a/keyboards/takashicompany/radialex/config.h b/keyboards/takashicompany/radialex/config.h
 188deleted file mode 100644
 189index 7b4e38bd96430dca5b7f1056c79f9e804b606f55..0000000000000000000000000000000000000000
 190--- a/keyboards/takashicompany/radialex/config.h
 191+++ /dev/null
 192@@ -1,39 +0,0 @@
 193-/*
 194-Copyright 2021 takashicompany
 195-
 196-This program is free software: you can redistribute it and/or modify
 197-it under the terms of the GNU General Public License as published by
 198-the Free Software Foundation, either version 2 of the License, or
 199-(at your option) any later version.
 200-
 201-This program is distributed in the hope that it will be useful,
 202-but WITHOUT ANY WARRANTY; without even the implied warranty of
 203-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 204-GNU General Public License for more details.
 205-
 206-You should have received a copy of the GNU General Public License
 207-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 208-*/
 209-
 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-/* Locking resynchronize hack */
 215-#define LOCKING_RESYNC_ENABLE
 216-
 217-/*
 218- * Feature disable options
 219- *  These options are also useful to firmware size reduction.
 220- */
 221-
 222-/* disable debug print */
 223-//#define NO_DEBUG
 224-
 225-/* disable print */
 226-//#define NO_PRINT
 227-
 228-/* disable action features */
 229-//#define NO_ACTION_LAYER
 230-//#define NO_ACTION_TAPPING
 231-//#define NO_ACTION_ONESHOT
 232diff --git a/keyboards/takashicompany/radialex/keyboard.json b/keyboards/takashicompany/radialex/keyboard.json
 233index 3cc94cdd9139621362f20b8efd60e00268afc017..34ef3d2f1fcc08d7ae98435831359d600089eb78 100644
 234--- a/keyboards/takashicompany/radialex/keyboard.json
 235+++ b/keyboards/takashicompany/radialex/keyboard.json
 236@@ -38,6 +38,12 @@
 237         "nkro": false,
 238         "rgblight": true
 239     },
 240+    "qmk": {
 241+        "locking": {
 242+            "enabled": true,
 243+            "resync": true
 244+        }
 245+    },
 246     "matrix_pins": {
 247         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
 248         "rows": ["B6", "D4", "C6", "D7", "E6", "B4", "B5"]
 249diff --git a/keyboards/takashiski/namecard2x4/rev1/config.h b/keyboards/takashiski/namecard2x4/rev1/config.h
 250deleted file mode 100644
 251index 8ecec41e2a902cdd0e400ed68dae0877ad23dbf4..0000000000000000000000000000000000000000
 252--- a/keyboards/takashiski/namecard2x4/rev1/config.h
 253+++ /dev/null
 254@@ -1,39 +0,0 @@
 255-/*
 256-Copyright 2018 takashiski
 257-
 258-This program is free software: you can redistribute it and/or modify
 259-it under the terms of the GNU General Public License as published by
 260-the Free Software Foundation, either version 2 of the License, or
 261-(at your option) any later version.
 262-
 263-This program is distributed in the hope that it will be useful,
 264-but WITHOUT ANY WARRANTY; without even the implied warranty of
 265-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 266-GNU General Public License for more details.
 267-
 268-You should have received a copy of the GNU General Public License
 269-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 270-*/
 271-
 272-#pragma once
 273-
 274-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 275-#define LOCKING_SUPPORT_ENABLE
 276-/* Locking resynchronize hack */
 277-#define LOCKING_RESYNC_ENABLE
 278-
 279-/*
 280- * Feature disable options
 281- *  These options are also useful to firmware size reduction.
 282- */
 283-
 284-/* disable debug print */
 285-//#define NO_DEBUG
 286-
 287-/* disable print */
 288-//#define NO_PRINT
 289-
 290-/* disable action features */
 291-//#define NO_ACTION_LAYER
 292-//#define NO_ACTION_TAPPING
 293-//#define NO_ACTION_ONESHOT
 294diff --git a/keyboards/takashiski/namecard2x4/rev1/keyboard.json b/keyboards/takashiski/namecard2x4/rev1/keyboard.json
 295index aaab760be3bbe86d8d546fb67c560887123bd6fd..5eed4727a52bfdb28ba9a3fd6a670703ea74b185 100644
 296--- a/keyboards/takashiski/namecard2x4/rev1/keyboard.json
 297+++ b/keyboards/takashiski/namecard2x4/rev1/keyboard.json
 298@@ -1,4 +1,10 @@
 299 {
 300+    "qmk": {
 301+        "locking": {
 302+            "enabled": true,
 303+            "resync": true
 304+        }
 305+    },
 306     "rgblight": {
 307         "hue_steps": 10,
 308         "saturation_steps": 10,
 309diff --git a/keyboards/takashiski/namecard2x4/rev2/config.h b/keyboards/takashiski/namecard2x4/rev2/config.h
 310deleted file mode 100644
 311index 8ecec41e2a902cdd0e400ed68dae0877ad23dbf4..0000000000000000000000000000000000000000
 312--- a/keyboards/takashiski/namecard2x4/rev2/config.h
 313+++ /dev/null
 314@@ -1,39 +0,0 @@
 315-/*
 316-Copyright 2018 takashiski
 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-
 332-#pragma once
 333-
 334-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 335-#define LOCKING_SUPPORT_ENABLE
 336-/* Locking resynchronize hack */
 337-#define LOCKING_RESYNC_ENABLE
 338-
 339-/*
 340- * Feature disable options
 341- *  These options are also useful to firmware size reduction.
 342- */
 343-
 344-/* disable debug print */
 345-//#define NO_DEBUG
 346-
 347-/* disable print */
 348-//#define NO_PRINT
 349-
 350-/* disable action features */
 351-//#define NO_ACTION_LAYER
 352-//#define NO_ACTION_TAPPING
 353-//#define NO_ACTION_ONESHOT
 354diff --git a/keyboards/takashiski/namecard2x4/rev2/keyboard.json b/keyboards/takashiski/namecard2x4/rev2/keyboard.json
 355index edef6a31b4186671a743bc4735f97e164c01f4bb..a66da76c44559ed0477db1e900d0ddc08218a2b7 100644
 356--- a/keyboards/takashiski/namecard2x4/rev2/keyboard.json
 357+++ b/keyboards/takashiski/namecard2x4/rev2/keyboard.json
 358@@ -1,4 +1,10 @@
 359 {
 360+    "qmk": {
 361+        "locking": {
 362+            "enabled": true,
 363+            "resync": true
 364+        }
 365+    },
 366     "rgblight": {
 367         "hue_steps": 10,
 368         "saturation_steps": 10,
 369diff --git a/keyboards/takashiski/otaku_split/rev0/config.h b/keyboards/takashiski/otaku_split/rev0/config.h
 370deleted file mode 100644
 371index b43d9c74c8026ad73f471f94c8dd474598cd0a55..0000000000000000000000000000000000000000
 372--- a/keyboards/takashiski/otaku_split/rev0/config.h
 373+++ /dev/null
 374@@ -1,39 +0,0 @@
 375-/*
 376-Copyright 2019 takashiski
 377-
 378-This program is free software: you can redistribute it and/or modify
 379-it under the terms of the GNU General Public License as published by
 380-the Free Software Foundation, either version 2 of the License, or
 381-(at your option) any later version.
 382-
 383-This program is distributed in the hope that it will be useful,
 384-but WITHOUT ANY WARRANTY; without even the implied warranty of
 385-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 386-GNU General Public License for more details.
 387-
 388-You should have received a copy of the GNU General Public License
 389-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 390-*/
 391-
 392-#pragma once
 393-
 394-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 395-#define LOCKING_SUPPORT_ENABLE
 396-/* Locking resynchronize hack */
 397-#define LOCKING_RESYNC_ENABLE
 398-
 399-/*
 400- * Feature disable options
 401- *  These options are also useful to firmware size reduction.
 402- */
 403-
 404-/* disable debug print */
 405-//#define NO_DEBUG
 406-
 407-/* disable print */
 408-//#define NO_PRINT
 409-
 410-/* disable action features */
 411-//#define NO_ACTION_LAYER
 412-//#define NO_ACTION_TAPPING
 413-//#define NO_ACTION_ONESHOT
 414diff --git a/keyboards/takashiski/otaku_split/rev0/keyboard.json b/keyboards/takashiski/otaku_split/rev0/keyboard.json
 415index db577c226061d4e02ce69efdd2776807490049c6..e8e3b35d623308936f2cd49b49727a9b3d4e8b69 100644
 416--- a/keyboards/takashiski/otaku_split/rev0/keyboard.json
 417+++ b/keyboards/takashiski/otaku_split/rev0/keyboard.json
 418@@ -16,6 +16,12 @@
 419         "mousekey": true,
 420         "nkro": false
 421     },
 422+    "qmk": {
 423+        "locking": {
 424+            "enabled": true,
 425+            "resync": true
 426+        }
 427+    },
 428     "matrix_pins": {
 429         "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
 430         "rows": ["B5", "B4", "E6", "D7", "C6"]
 431diff --git a/keyboards/takashiski/otaku_split/rev1/config.h b/keyboards/takashiski/otaku_split/rev1/config.h
 432index 6a81e8ddcb9e219f6d4ba73e0cfa05c8c1b69c4b..8bede1c4213e66dd448bffb9e904d56a171556c4 100644
 433--- a/keyboards/takashiski/otaku_split/rev1/config.h
 434+++ b/keyboards/takashiski/otaku_split/rev1/config.h
 435@@ -19,11 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 436 
 437 #define SPLIT_HAND_PIN D2 //fix pin. HIGH is left, LOW is right
 438 
 439-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 440-#define LOCKING_SUPPORT_ENABLE
 441-/* Locking resynchronize hack */
 442-#define LOCKING_RESYNC_ENABLE
 443-
 444 /*
 445  * Feature disable options
 446  *  These options are also useful to firmware size reduction.
 447diff --git a/keyboards/takashiski/otaku_split/rev1/keyboard.json b/keyboards/takashiski/otaku_split/rev1/keyboard.json
 448index 0c83593eea629651c75913e8398c8408e158d44d..039838144fb2ec8abb8f88567ee789b0ca813285 100644
 449--- a/keyboards/takashiski/otaku_split/rev1/keyboard.json
 450+++ b/keyboards/takashiski/otaku_split/rev1/keyboard.json
 451@@ -16,6 +16,12 @@
 452         "mousekey": true,
 453         "nkro": false
 454     },
 455+    "qmk": {
 456+        "locking": {
 457+            "enabled": true,
 458+            "resync": true
 459+        }
 460+    },
 461     "matrix_pins": {
 462         "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
 463         "rows": ["C6", "D7", "E6", "B4", "B5"]
 464diff --git a/keyboards/taleguers/taleguers75/config.h b/keyboards/taleguers/taleguers75/config.h
 465deleted file mode 100644
 466index 6b1277af2ce76b1d4574280a47e2196be0cb6b12..0000000000000000000000000000000000000000
 467--- a/keyboards/taleguers/taleguers75/config.h
 468+++ /dev/null
 469@@ -1,23 +0,0 @@
 470-/* Copyright 2020 Borja Lopez Jimenez
 471- *
 472- * This program is free software: you can redistribute it and/or modify
 473- * it under the terms of the GNU General Public License as published by
 474- * the Free Software Foundation, either version 2 of the License, or
 475- * (at your option) any later version.
 476- *
 477- * This program is distributed in the hope that it will be useful,
 478- * but WITHOUT ANY WARRANTY; without even the implied warranty of
 479- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 480- * GNU General Public License for more details.
 481- *
 482- * You should have received a copy of the GNU General Public License
 483- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 484- */
 485-
 486-#pragma once
 487-
 488-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 489-#define LOCKING_SUPPORT_ENABLE
 490-
 491-/* Locking resynchronize hack */
 492-#define LOCKING_RESYNC_ENABLE
 493diff --git a/keyboards/taleguers/taleguers75/keyboard.json b/keyboards/taleguers/taleguers75/keyboard.json
 494index 5526c0b0a87b3c32b3d061cee8f8afdd40feaf32..8c3a1565e21684f176c3e78fb09fbd022a338de6 100644
 495--- a/keyboards/taleguers/taleguers75/keyboard.json
 496+++ b/keyboards/taleguers/taleguers75/keyboard.json
 497@@ -18,6 +18,12 @@
 498         "nkro": true,
 499         "rgblight": true
 500     },
 501+    "qmk": {
 502+        "locking": {
 503+            "enabled": true,
 504+            "resync": true
 505+        }
 506+    },
 507     "matrix_pins": {
 508         "cols": ["B3", "B2", "B1", "E6", "B7", "C7", "C6", "D4", "D6", "D7", "B4", "D0", "D1", "F7"],
 509         "rows": ["B0", "F6", "F5", "F4", "F1", "F0"]
 510diff --git a/keyboards/tanuki/config.h b/keyboards/tanuki/config.h
 511deleted file mode 100644
 512index 4b007cf387ee6a288bd263126612efecfecc4011..0000000000000000000000000000000000000000
 513--- a/keyboards/tanuki/config.h
 514+++ /dev/null
 515@@ -1,39 +0,0 @@
 516-/*
 517-Copyright 2015 Jun Wako <wakojun@gmail.com>
 518-
 519-This program is free software: you can redistribute it and/or modify
 520-it under the terms of the GNU General Public License as published by
 521-the Free Software Foundation, either version 2 of the License, or
 522-(at your option) any later version.
 523-
 524-This program is distributed in the hope that it will be useful,
 525-but WITHOUT ANY WARRANTY; without even the implied warranty of
 526-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 527-GNU General Public License for more details.
 528-
 529-You should have received a copy of the GNU General Public License
 530-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 531-*/
 532-
 533-#pragma once
 534-
 535-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 536-#define LOCKING_SUPPORT_ENABLE
 537-/* Locking resynchronize hack */
 538-#define LOCKING_RESYNC_ENABLE
 539-
 540-/*
 541- * Feature disable options
 542- *  These options are also useful to firmware size reduction.
 543- */
 544-
 545-/* disable debug print */
 546-//#define NO_DEBUG
 547-
 548-/* disable print */
 549-//#define NO_PRINT
 550-
 551-/* disable action features */
 552-//#define NO_ACTION_LAYER
 553-//#define NO_ACTION_TAPPING
 554-//#define NO_ACTION_ONESHOT
 555diff --git a/keyboards/tanuki/keyboard.json b/keyboards/tanuki/keyboard.json
 556index cebcc4404e462ddf55f7b640ea7d40afeb2674c5..0c4045e320cd29a10c1ff24d8f57feacf6157f22 100644
 557--- a/keyboards/tanuki/keyboard.json
 558+++ b/keyboards/tanuki/keyboard.json
 559@@ -37,6 +37,12 @@
 560     "nkro": true,
 561     "rgblight": true
 562   },
 563+  "qmk": {
 564+    "locking": {
 565+      "enabled": true,
 566+      "resync": true
 567+    }
 568+  },
 569   "matrix_pins": {
 570     "cols": ["B3", "B2", "B6", "B5", "B4", "E6", "D7", "C6", "F4", "F5", "F6"],
 571     "rows": ["F7", "B1", "D4", "D0"]
 572diff --git a/keyboards/team0110/p1800fl/config.h b/keyboards/team0110/p1800fl/config.h
 573deleted file mode 100644
 574index effb62971cdabe034de35404f68ec255167080aa..0000000000000000000000000000000000000000
 575--- a/keyboards/team0110/p1800fl/config.h
 576+++ /dev/null
 577@@ -1,23 +0,0 @@
 578-/*
 579-Copyright 2020 marhalloweenvt
 580-
 581-This program is free software: you can redistribute it and/or modify
 582-it under the terms of the GNU General Public License as published by
 583-the Free Software Foundation, either version 2 of the License, or
 584-(at your option) any later version.
 585-
 586-This program is distributed in the hope that it will be useful,
 587-but WITHOUT ANY WARRANTY; without even the implied warranty of
 588-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 589-GNU General Public License for more details.
 590-
 591-You should have received a copy of the GNU General Public License
 592-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 593-*/
 594-
 595-#pragma once
 596-
 597-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 598-#define LOCKING_SUPPORT_ENABLE
 599-/* Locking resynchronize hack */
 600-#define LOCKING_RESYNC_ENABLE
 601diff --git a/keyboards/team0110/p1800fl/keyboard.json b/keyboards/team0110/p1800fl/keyboard.json
 602index d5a34de04948ed334ddea813d3a1bc226f52ca56..a56864cd36af29c9ec011353bd3a3c3981774431 100644
 603--- a/keyboards/team0110/p1800fl/keyboard.json
 604+++ b/keyboards/team0110/p1800fl/keyboard.json
 605@@ -18,6 +18,12 @@
 606         "nkro": true,
 607         "rgblight": true
 608     },
 609+    "qmk": {
 610+        "locking": {
 611+            "enabled": true,
 612+            "resync": true
 613+        }
 614+    },
 615     "matrix_pins": {
 616         "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2"],
 617         "rows": ["B6", "B5", "B4", "D7", "D6", "D4"]
 618diff --git a/keyboards/technika/config.h b/keyboards/technika/config.h
 619deleted file mode 100644
 620index f608132b5afd4d79846a79d3c1670eb89a3978ea..0000000000000000000000000000000000000000
 621--- a/keyboards/technika/config.h
 622+++ /dev/null
 623@@ -1,39 +0,0 @@
 624-/*
 625-Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
 626-
 627-This program is free software: you can redistribute it and/or modify
 628-it under the terms of the GNU General Public License as published by
 629-the Free Software Foundation, either version 2 of the License, or
 630-(at your option) any later version.
 631-
 632-This program is distributed in the hope that it will be useful,
 633-but WITHOUT ANY WARRANTY; without even the implied warranty of
 634-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 635-GNU General Public License for more details.
 636-
 637-You should have received a copy of the GNU General Public License
 638-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 639-*/
 640-
 641-#pragma once
 642-
 643-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 644-#define LOCKING_SUPPORT_ENABLE
 645-/* Locking resynchronize hack */
 646-#define LOCKING_RESYNC_ENABLE
 647-
 648-/*
 649- * Feature disable options
 650- *  These options are also useful to firmware size reduction.
 651- */
 652-
 653-/* disable debug print */
 654-//#define NO_DEBUG
 655-
 656-/* disable print */
 657-//#define NO_PRINT
 658-
 659-/* disable action features */
 660-//#define NO_ACTION_LAYER
 661-//#define NO_ACTION_TAPPING
 662-//#define NO_ACTION_ONESHOT
 663diff --git a/keyboards/technika/keyboard.json b/keyboards/technika/keyboard.json
 664index 303983dfb41c24cec59a92fa613ce21f0f419312..a6f3c2bd01a1b8a51e88e08424239718260b7303 100644
 665--- a/keyboards/technika/keyboard.json
 666+++ b/keyboards/technika/keyboard.json
 667@@ -17,6 +17,12 @@
 668         "nkro": true,
 669         "rgblight": true
 670     },
 671+    "qmk": {
 672+        "locking": {
 673+            "enabled": true,
 674+            "resync": true
 675+        }
 676+    },
 677     "matrix_pins": {
 678         "cols": ["A10", "A9", "A8", "B14", "B12", "B2", "B1", "B0", "A7", "A6", "A3", "B9", "B8", "B7"],
 679         "rows": ["B11", "B10", "A5", "A4"]
 680diff --git a/keyboards/tenki/config.h b/keyboards/tenki/config.h
 681deleted file mode 100644
 682index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
 683--- a/keyboards/tenki/config.h
 684+++ /dev/null
 685@@ -1,7 +0,0 @@
 686-#pragma once
 687-
 688-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 689-#define LOCKING_SUPPORT_ENABLE
 690-
 691-/* Locking resynchronize hack */
 692-#define LOCKING_RESYNC_ENABLE
 693diff --git a/keyboards/tenki/keyboard.json b/keyboards/tenki/keyboard.json
 694index 7c05c98ef7db45dcbbe0f5297ceab58c5fbc45c0..628e2068bae69cf3cba766b22e403f7b63104fd8 100644
 695--- a/keyboards/tenki/keyboard.json
 696+++ b/keyboards/tenki/keyboard.json
 697@@ -39,6 +39,12 @@
 698         "nkro": true,
 699         "rgblight": true
 700     },
 701+    "qmk": {
 702+        "locking": {
 703+            "enabled": true,
 704+            "resync": true
 705+        }
 706+    },
 707     "matrix_pins": {
 708         "cols": ["F4", "F5", "D4", "D0"],
 709         "rows": ["B1", "B4", "F6", "B6", "B2"]
 710diff --git a/keyboards/tetris/config.h b/keyboards/tetris/config.h
 711index bc2273d5478145fb23157b7a3b912ceb4807d45c..ac304699bf7c4523e5029172390b8fbb18a309a8 100755
 712--- a/keyboards/tetris/config.h
 713+++ b/keyboards/tetris/config.h
 714@@ -1,11 +1,5 @@
 715 #pragma once
 716 
 717-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 718-#define LOCKING_SUPPORT_ENABLE
 719-
 720-/* Locking resynchronize hack */
 721-#define LOCKING_RESYNC_ENABLE
 722-
 723 #ifdef AUDIO_ENABLE
 724   #define AUDIO_PIN B5
 725   #define STARTUP_SONG SONG(ONE_UP_SOUND)
 726diff --git a/keyboards/tetris/keyboard.json b/keyboards/tetris/keyboard.json
 727index 01df052ba60e40fd06bdbc50d87df74d8ea8489d..57cfd42c70d4ad753269c49fc832cb48ec4cd6da 100644
 728--- a/keyboards/tetris/keyboard.json
 729+++ b/keyboards/tetris/keyboard.json
 730@@ -43,6 +43,12 @@
 731     "nkro": true,
 732     "rgblight": true
 733   },
 734+  "qmk": {
 735+    "locking": {
 736+      "enabled": true,
 737+      "resync": true
 738+    }
 739+  },
 740   "matrix_pins": {
 741     "cols": ["D7", "B4", "B6", "C6", "C7", "F6", "F7", "D4", "D2", "D3", "D5", "D6"],
 742     "rows": ["B3", "B2", "B1", "B0", "E6"]
 743diff --git a/keyboards/tg4x/config.h b/keyboards/tg4x/config.h
 744deleted file mode 100644
 745index b5b661bef2ab428761d172350f0bd4622cdc4718..0000000000000000000000000000000000000000
 746--- a/keyboards/tg4x/config.h
 747+++ /dev/null
 748@@ -1,39 +0,0 @@
 749-/*
 750-Copyright 2019 MechMerlin
 751-
 752-This program is free software: you can redistribute it and/or modify
 753-it under the terms of the GNU General Public License as published by
 754-the Free Software Foundation, either version 2 of the License, or
 755-(at your option) any later version.
 756-
 757-This program is distributed in the hope that it will be useful,
 758-but WITHOUT ANY WARRANTY; without even the implied warranty of
 759-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 760-GNU General Public License for more details.
 761-
 762-You should have received a copy of the GNU General Public License
 763-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 764-*/
 765-
 766-#pragma once
 767-
 768-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 769-#define LOCKING_SUPPORT_ENABLE
 770-/* Locking resynchronize hack */
 771-#define LOCKING_RESYNC_ENABLE
 772-
 773-/*
 774- * Feature disable options
 775- *  These options are also useful to firmware size reduction.
 776- */
 777-
 778-/* disable debug print */
 779-//#define NO_DEBUG
 780-
 781-/* disable print */
 782-//#define NO_PRINT
 783-
 784-/* disable action features */
 785-//#define NO_ACTION_LAYER
 786-//#define NO_ACTION_TAPPING
 787-//#define NO_ACTION_ONESHOT
 788diff --git a/keyboards/tg4x/keyboard.json b/keyboards/tg4x/keyboard.json
 789index d108774dfd3db0a42805e9cf3fff33bba136efab..ae4cd53a2895aa1565dfaf1c028e993ec1edc662 100644
 790--- a/keyboards/tg4x/keyboard.json
 791+++ b/keyboards/tg4x/keyboard.json
 792@@ -41,6 +41,12 @@
 793         "nkro": false,
 794         "rgblight": true
 795     },
 796+    "qmk": {
 797+        "locking": {
 798+            "enabled": true,
 799+            "resync": true
 800+        }
 801+    },
 802     "matrix_pins": {
 803         "cols": ["D3", "B3", "B1", "F7", "F6", "F5", "F4"],
 804         "rows": ["B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1"]
 805diff --git a/keyboards/the_royal/liminal/config.h b/keyboards/the_royal/liminal/config.h
 806deleted file mode 100644
 807index fa9a83d08ec462f2e7c2a96a952b444eeb07b91f..0000000000000000000000000000000000000000
 808--- a/keyboards/the_royal/liminal/config.h
 809+++ /dev/null
 810@@ -1,6 +0,0 @@
 811-#pragma once
 812-
 813-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 814-#define LOCKING_SUPPORT_ENABLE
 815-/* Locking resynchronize hack */
 816-#define LOCKING_RESYNC_ENABLE
 817diff --git a/keyboards/the_royal/liminal/keyboard.json b/keyboards/the_royal/liminal/keyboard.json
 818index c0fa5524ad00ccbbbbd061dc9639e3d37c2e95b2..0a5bd361e7c8580372edb78d5b8e0ba033005329 100644
 819--- a/keyboards/the_royal/liminal/keyboard.json
 820+++ b/keyboards/the_royal/liminal/keyboard.json
 821@@ -26,6 +26,12 @@
 822     "nkro": false,
 823     "rgblight": true
 824   },
 825+  "qmk": {
 826+    "locking": {
 827+      "enabled": true,
 828+      "resync": true
 829+    }
 830+  },
 831   "matrix_pins": {
 832     "cols": ["D6", "C4", "D3", "D2", "D1", "D0", "C2", "B0", "B1", "B2", "B3", "B4", "D5", "C5"],
 833     "rows": ["C6", "B6", "B7", "C7"]
 834diff --git a/keyboards/the_royal/schwann/config.h b/keyboards/the_royal/schwann/config.h
 835deleted file mode 100644
 836index fa9a83d08ec462f2e7c2a96a952b444eeb07b91f..0000000000000000000000000000000000000000
 837--- a/keyboards/the_royal/schwann/config.h
 838+++ /dev/null
 839@@ -1,6 +0,0 @@
 840-#pragma once
 841-
 842-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 843-#define LOCKING_SUPPORT_ENABLE
 844-/* Locking resynchronize hack */
 845-#define LOCKING_RESYNC_ENABLE
 846diff --git a/keyboards/the_royal/schwann/keyboard.json b/keyboards/the_royal/schwann/keyboard.json
 847index dcb32312f952968156b7f06404966ba16e534131..800d45b83aff324b4506322fdec89df1cc7317e1 100644
 848--- a/keyboards/the_royal/schwann/keyboard.json
 849+++ b/keyboards/the_royal/schwann/keyboard.json
 850@@ -38,6 +38,12 @@
 851     "nkro": false,
 852     "rgblight": true
 853   },
 854+  "qmk": {
 855+    "locking": {
 856+      "enabled": true,
 857+      "resync": true
 858+    }
 859+  },
 860   "matrix_pins": {
 861     "cols": ["F4", "F5", "D5", "D3", "D2", "C6", "B6", "B5", "B4", "D7", "D6", "D1"],
 862     "rows": ["F0", "F1", "F6", "C7"]
 863diff --git a/keyboards/thevankeyboards/bananasplit/config.h b/keyboards/thevankeyboards/bananasplit/config.h
 864deleted file mode 100644
 865index c2949ab3a7a457131242c952ab8a5b96003aee24..0000000000000000000000000000000000000000
 866--- a/keyboards/thevankeyboards/bananasplit/config.h
 867+++ /dev/null
 868@@ -1,24 +0,0 @@
 869-/*
 870-Copyright 2012 Jun Wako <wakojun@gmail.com>
 871-
 872-This program is free software: you can redistribute it and/or modify
 873-it under the terms of the GNU General Public License as published by
 874-the Free Software Foundation, either version 2 of the License, or
 875-(at your option) any later version.
 876-
 877-This program is distributed in the hope that it will be useful,
 878-but WITHOUT ANY WARRANTY; without even the implied warranty of
 879-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 880-GNU General Public License for more details.
 881-
 882-You should have received a copy of the GNU General Public License
 883-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 884-*/
 885-
 886-#pragma once
 887-
 888-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 889-#define LOCKING_SUPPORT_ENABLE
 890-/* Locking resynchronize hack */
 891-#define LOCKING_RESYNC_ENABLE
 892-
 893diff --git a/keyboards/thevankeyboards/bananasplit/keyboard.json b/keyboards/thevankeyboards/bananasplit/keyboard.json
 894index 3b1d5c846dc9e2c6117dbe697c53878cf2002ab2..1fb7fc505440839e62092549233b023e1715ca95 100644
 895--- a/keyboards/thevankeyboards/bananasplit/keyboard.json
 896+++ b/keyboards/thevankeyboards/bananasplit/keyboard.json
 897@@ -17,6 +17,12 @@
 898         "mousekey": true,
 899         "nkro": true
 900     },
 901+    "qmk": {
 902+        "locking": {
 903+            "enabled": true,
 904+            "resync": true
 905+        }
 906+    },
 907     "matrix_pins": {
 908         "cols": ["F5", "B1", "F0", "F1", "F4", "B3", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"],
 909         "rows": ["B0", "B2", "B4", "B5", "B6"]
 910diff --git a/keyboards/thevankeyboards/caravan/config.h b/keyboards/thevankeyboards/caravan/config.h
 911deleted file mode 100644
 912index 5070f051560f5a649e49673c2dffb1d975efd21b..0000000000000000000000000000000000000000
 913--- a/keyboards/thevankeyboards/caravan/config.h
 914+++ /dev/null
 915@@ -1,23 +0,0 @@
 916-/*
 917-Copyright 2012 Jun Wako <wakojun@gmail.com>
 918-
 919-This program is free software: you can redistribute it and/or modify
 920-it under the terms of the GNU General Public License as published by
 921-the Free Software Foundation, either version 2 of the License, or
 922-(at your option) any later version.
 923-
 924-This program is distributed in the hope that it will be useful,
 925-but WITHOUT ANY WARRANTY; without even the implied warranty of
 926-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 927-GNU General Public License for more details.
 928-
 929-You should have received a copy of the GNU General Public License
 930-along with this program.  If not, see <http://www.gnu.org/licenses/>.
 931-*/
 932-
 933-#pragma once
 934-
 935-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 936-#define LOCKING_SUPPORT_ENABLE
 937-/* Locking resynchronize hack */
 938-#define LOCKING_RESYNC_ENABLE
 939diff --git a/keyboards/thevankeyboards/caravan/keyboard.json b/keyboards/thevankeyboards/caravan/keyboard.json
 940index 595c7c9fc9c6f3a73c34d9dadedc85793d970598..a5c00abf4e9bf7c0a535f70e19839d2b2d2c71a0 100644
 941--- a/keyboards/thevankeyboards/caravan/keyboard.json
 942+++ b/keyboards/thevankeyboards/caravan/keyboard.json
 943@@ -16,6 +16,12 @@
 944         "mousekey": false,
 945         "nkro": true
 946     },
 947+    "qmk": {
 948+        "locking": {
 949+            "enabled": true,
 950+            "resync": true
 951+        }
 952+    },
 953     "matrix_pins": {
 954         "cols": ["F1", "F4", "F5", "B4", "B5", "B6", "B7", "D2", "D3", "D5", "D4", "D6"],
 955         "rows": ["B0", "B1", "B2", "B3"]
 956diff --git a/keyboards/thevankeyboards/jetvan/config.h b/keyboards/thevankeyboards/jetvan/config.h
 957deleted file mode 100644
 958index 950d17c81376858b39c9b0524cfc8a53a4980a10..0000000000000000000000000000000000000000
 959--- a/keyboards/thevankeyboards/jetvan/config.h
 960+++ /dev/null
 961@@ -1,41 +0,0 @@
 962-/*
 963-Copyright 2020 <terry@terrymathews.net>
 964-
 965-This program is free software: you can redistribute it and/or modify
 966-it under the terms of the GNU General Public License as published by
 967-the Free Software Foundation, either version 2 of the License, or
 968-(at your option) any later version.
 969-
 970-This program is distributed in the hope that it will be useful,
 971-but WITHOUT ANY WARRANTY; without even the implied warranty of
 972-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 973-GNU General Public License for more details.
 974-
 975-You should have received a copy of the GNU General Public License
 976-along with this program. If not, see <http://www.gnu.org/licenses/>.
 977-*/
 978-
 979-#pragma once
 980-
 981-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 982-#define LOCKING_SUPPORT_ENABLE
 983-/* Locking resynchronize hack */
 984-#define LOCKING_RESYNC_ENABLE
 985-
 986-/* Define less important options */
 987-
 988-/*
 989- * Feature disable options
 990- * These options are also useful to firmware size reduction.
 991- */
 992-
 993-/* disable debug print */
 994-//#define NO_DEBUG
 995-
 996-/* disable print */
 997-//#define NO_PRINT
 998-
 999-/* disable action features */
1000-//#define NO_ACTION_LAYER
1001-//#define NO_ACTION_TAPPING
1002-//#define NO_ACTION_ONESHOT
1003diff --git a/keyboards/thevankeyboards/jetvan/keyboard.json b/keyboards/thevankeyboards/jetvan/keyboard.json
1004index 5e1535a8ad1395b65f6ef8520d53b4caab313979..a5a9b96ac8b6b5e356cca3faf8fc73fe1d71fa18 100644
1005--- a/keyboards/thevankeyboards/jetvan/keyboard.json
1006+++ b/keyboards/thevankeyboards/jetvan/keyboard.json
1007@@ -35,6 +35,12 @@
1008         "nkro": true,
1009         "rgblight": true
1010     },
1011+    "qmk": {
1012+        "locking": {
1013+            "enabled": true,
1014+            "resync": true
1015+        }
1016+    },
1017     "matrix_pins": {
1018         "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"],
1019         "rows": ["D7", "B5", "F7", "D4"]
1020diff --git a/keyboards/thevankeyboards/minivan/config.h b/keyboards/thevankeyboards/minivan/config.h
1021deleted file mode 100644
1022index 5070f051560f5a649e49673c2dffb1d975efd21b..0000000000000000000000000000000000000000
1023--- a/keyboards/thevankeyboards/minivan/config.h
1024+++ /dev/null
1025@@ -1,23 +0,0 @@
1026-/*
1027-Copyright 2012 Jun Wako <wakojun@gmail.com>
1028-
1029-This program is free software: you can redistribute it and/or modify
1030-it under the terms of the GNU General Public License as published by
1031-the Free Software Foundation, either version 2 of the License, or
1032-(at your option) any later version.
1033-
1034-This program is distributed in the hope that it will be useful,
1035-but WITHOUT ANY WARRANTY; without even the implied warranty of
1036-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1037-GNU General Public License for more details.
1038-
1039-You should have received a copy of the GNU General Public License
1040-along with this program.  If not, see <http://www.gnu.org/licenses/>.
1041-*/
1042-
1043-#pragma once
1044-
1045-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1046-#define LOCKING_SUPPORT_ENABLE
1047-/* Locking resynchronize hack */
1048-#define LOCKING_RESYNC_ENABLE
1049diff --git a/keyboards/thevankeyboards/minivan/keyboard.json b/keyboards/thevankeyboards/minivan/keyboard.json
1050index 11684b6cf8067470152cf49a185d63445b8daef1..53b3e0d89c49fc842d062c4f67867f87d89345eb 100644
1051--- a/keyboards/thevankeyboards/minivan/keyboard.json
1052+++ b/keyboards/thevankeyboards/minivan/keyboard.json
1053@@ -24,6 +24,12 @@
1054     "nkro": true,
1055     "rgblight": true
1056   },
1057+  "qmk": {
1058+    "locking": {
1059+      "enabled": true,
1060+      "resync": true
1061+    }
1062+  },
1063   "matrix_pins": {
1064     "cols": ["D2", "D3", "D5", "D6", "B4", "B6", "F6", "F5", "F4", "F1", "F0", "B3"],
1065     "rows": ["D7", "B5", "F7", "D4"]
1066diff --git a/keyboards/thevankeyboards/roadkit/config.h b/keyboards/thevankeyboards/roadkit/config.h
1067deleted file mode 100644
1068index b9449c4714bf39561a177eb1ee1ba90b87dbc6fb..0000000000000000000000000000000000000000
1069--- a/keyboards/thevankeyboards/roadkit/config.h
1070+++ /dev/null
1071@@ -1,39 +0,0 @@
1072-/*
1073-Copyright 2012 Jun Wako <wakojun@gmail.com>
1074-
1075-This program is free software: you can redistribute it and/or modify
1076-it under the terms of the GNU General Public License as published by
1077-the Free Software Foundation, either version 2 of the License, or
1078-(at your option) any later version.
1079-
1080-This program is distributed in the hope that it will be useful,
1081-but WITHOUT ANY WARRANTY; without even the implied warranty of
1082-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1083-GNU General Public License for more details.
1084-
1085-You should have received a copy of the GNU General Public License
1086-along with this program.  If not, see <http://www.gnu.org/licenses/>.
1087-*/
1088-
1089-#pragma once
1090-
1091-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1092-#define LOCKING_SUPPORT_ENABLE
1093-/* Locking resynchronize hack */
1094-#define LOCKING_RESYNC_ENABLE
1095-
1096-/*
1097- * Feature disable options
1098- *  These options are also useful to firmware size reduction.
1099- */
1100-
1101-/* disable debug print */
1102-//#define NO_DEBUG
1103-
1104-/* disable print */
1105-//#define NO_PRINT
1106-
1107-/* disable action features */
1108-//#define NO_ACTION_LAYER
1109-//#define NO_ACTION_TAPPING
1110-//#define NO_ACTION_ONESHOT
1111diff --git a/keyboards/thevankeyboards/roadkit/keyboard.json b/keyboards/thevankeyboards/roadkit/keyboard.json
1112index 3b8a5b2159151ee9a9bc79136bd566190b9722cb..e3c282bffe7e3061a8c9a9e9cca85925b16b47e6 100644
1113--- a/keyboards/thevankeyboards/roadkit/keyboard.json
1114+++ b/keyboards/thevankeyboards/roadkit/keyboard.json
1115@@ -16,6 +16,12 @@
1116     "mousekey": true,
1117     "nkro": true
1118   },
1119+  "qmk": {
1120+    "locking": {
1121+      "enabled": true,
1122+      "resync": true
1123+    }
1124+  },
1125   "matrix_pins": {
1126     "cols": ["F1", "F4", "D6", "D4"],
1127     "rows": ["F0", "F5", "D7", "B4"]
1128diff --git a/keyboards/tkc/california/config.h b/keyboards/tkc/california/config.h
1129deleted file mode 100644
1130index 827133aed36599651c4990f6624e27a2d1fb0a44..0000000000000000000000000000000000000000
1131--- a/keyboards/tkc/california/config.h
1132+++ /dev/null
1133@@ -1,39 +0,0 @@
1134-/*
1135-Copyright 2021 Terry Mathews
1136-
1137-This program is free software: you can redistribute it and/or modify
1138-it under the terms of the GNU General Public License as published by
1139-the Free Software Foundation, either version 2 of the License, or
1140-(at your option) any later version.
1141-
1142-This program is distributed in the hope that it will be useful,
1143-but WITHOUT ANY WARRANTY; without even the implied warranty of
1144-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1145-GNU General Public License for more details.
1146-
1147-You should have received a copy of the GNU General Public License
1148-along with this program.  If not, see <http://www.gnu.org/licenses/>.
1149-*/
1150-
1151-#pragma once
1152-
1153-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1154-#define LOCKING_SUPPORT_ENABLE
1155-/* Locking resynchronize hack */
1156-#define LOCKING_RESYNC_ENABLE
1157-
1158-/*
1159- * Feature disable options
1160- *  These options are also useful to firmware size reduction.
1161- */
1162-
1163-/* disable debug print */
1164-//#define NO_DEBUG
1165-
1166-/* disable print */
1167-//#define NO_PRINT
1168-
1169-/* disable action features */
1170-//#define NO_ACTION_LAYER
1171-//#define NO_ACTION_TAPPING
1172-//#define NO_ACTION_ONESHOT
1173diff --git a/keyboards/tkc/california/keyboard.json b/keyboards/tkc/california/keyboard.json
1174index 1d52466bbab07441aaa7f8e3252bca8b5857993c..465544bc03e78d1e8b4c10484077546aad992d60 100644
1175--- a/keyboards/tkc/california/keyboard.json
1176+++ b/keyboards/tkc/california/keyboard.json
1177@@ -17,6 +17,12 @@
1178         "mousekey": true,
1179         "nkro": true
1180     },
1181+    "qmk": {
1182+        "locking": {
1183+            "enabled": true,
1184+            "resync": true
1185+        }
1186+    },
1187     "matrix_pins": {
1188         "cols": ["B5", "B4", "D7", "D6", "F7", "F6", "F5", "D5", "D1", "F4"],
1189         "rows": ["C7", "C6", "B6", "D4", "D3", "D0", "E6", "B0", "B1", "B2", "D2", "B3"]
1190diff --git a/keyboards/tkc/m0lly/config.h b/keyboards/tkc/m0lly/config.h
1191deleted file mode 100644
1192index b9449c4714bf39561a177eb1ee1ba90b87dbc6fb..0000000000000000000000000000000000000000
1193--- a/keyboards/tkc/m0lly/config.h
1194+++ /dev/null
1195@@ -1,39 +0,0 @@
1196-/*
1197-Copyright 2012 Jun Wako <wakojun@gmail.com>
1198-
1199-This program is free software: you can redistribute it and/or modify
1200-it under the terms of the GNU General Public License as published by
1201-the Free Software Foundation, either version 2 of the License, or
1202-(at your option) any later version.
1203-
1204-This program is distributed in the hope that it will be useful,
1205-but WITHOUT ANY WARRANTY; without even the implied warranty of
1206-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1207-GNU General Public License for more details.
1208-
1209-You should have received a copy of the GNU General Public License
1210-along with this program.  If not, see <http://www.gnu.org/licenses/>.
1211-*/
1212-
1213-#pragma once
1214-
1215-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1216-#define LOCKING_SUPPORT_ENABLE
1217-/* Locking resynchronize hack */
1218-#define LOCKING_RESYNC_ENABLE
1219-
1220-/*
1221- * Feature disable options
1222- *  These options are also useful to firmware size reduction.
1223- */
1224-
1225-/* disable debug print */
1226-//#define NO_DEBUG
1227-
1228-/* disable print */
1229-//#define NO_PRINT
1230-
1231-/* disable action features */
1232-//#define NO_ACTION_LAYER
1233-//#define NO_ACTION_TAPPING
1234-//#define NO_ACTION_ONESHOT
1235diff --git a/keyboards/tkc/m0lly/keyboard.json b/keyboards/tkc/m0lly/keyboard.json
1236index e37b9e7bb2aeeb85afc1351168e6c9181803de43..ae76f1e6d9b878c1ea0a2db081f17eded5ea4507 100644
1237--- a/keyboards/tkc/m0lly/keyboard.json
1238+++ b/keyboards/tkc/m0lly/keyboard.json
1239@@ -19,6 +19,12 @@
1240         "oled": true,
1241         "rgblight": true
1242     },
1243+    "qmk": {
1244+        "locking": {
1245+            "enabled": true,
1246+            "resync": true
1247+        }
1248+    },
1249     "matrix_pins": {
1250         "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"],
1251         "rows": ["F2", "F1", "F0", "E1", "E0"]
1252diff --git a/keyboards/tkc/tkc1800/config.h b/keyboards/tkc/tkc1800/config.h
1253deleted file mode 100644
1254index b9449c4714bf39561a177eb1ee1ba90b87dbc6fb..0000000000000000000000000000000000000000
1255--- a/keyboards/tkc/tkc1800/config.h
1256+++ /dev/null
1257@@ -1,39 +0,0 @@
1258-/*
1259-Copyright 2012 Jun Wako <wakojun@gmail.com>
1260-
1261-This program is free software: you can redistribute it and/or modify
1262-it under the terms of the GNU General Public License as published by
1263-the Free Software Foundation, either version 2 of the License, or
1264-(at your option) any later version.
1265-
1266-This program is distributed in the hope that it will be useful,
1267-but WITHOUT ANY WARRANTY; without even the implied warranty of
1268-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1269-GNU General Public License for more details.
1270-
1271-You should have received a copy of the GNU General Public License
1272-along with this program.  If not, see <http://www.gnu.org/licenses/>.
1273-*/
1274-
1275-#pragma once
1276-
1277-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1278-#define LOCKING_SUPPORT_ENABLE
1279-/* Locking resynchronize hack */
1280-#define LOCKING_RESYNC_ENABLE
1281-
1282-/*
1283- * Feature disable options
1284- *  These options are also useful to firmware size reduction.
1285- */
1286-
1287-/* disable debug print */
1288-//#define NO_DEBUG
1289-
1290-/* disable print */
1291-//#define NO_PRINT
1292-
1293-/* disable action features */
1294-//#define NO_ACTION_LAYER
1295-//#define NO_ACTION_TAPPING
1296-//#define NO_ACTION_ONESHOT
1297diff --git a/keyboards/tkc/tkc1800/keyboard.json b/keyboards/tkc/tkc1800/keyboard.json
1298index bdc6aa13a75dcdf29cada322b6766a5e35944d9c..2965c61d83a430e082618f357634a0e77d1a1a3d 100644
1299--- a/keyboards/tkc/tkc1800/keyboard.json
1300+++ b/keyboards/tkc/tkc1800/keyboard.json
1301@@ -19,6 +19,12 @@
1302     "oled": true,
1303     "rgblight": true
1304   },
1305+  "qmk": {
1306+    "locking": {
1307+      "enabled": true,
1308+      "resync": true
1309+    }
1310+  },
1311   "matrix_pins": {
1312     "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "F5", "F6", "F7"],
1313     "rows": ["F4", "F3", "F2", "F1", "F0", "E1", "E0"]