From 013b51a90428342f26d4f0909120c1ae7c2135f8 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 23 May 2024 11:55:38 -0700
Subject: [PATCH] Migrate `LOCKING_*_ENABLE` to Data-Driven: W, Part 1 (#23788)

Affects:

  - `waldo`
  - `walletburner/cajal`
  - `walletburner/neuron`
  - `wavtype/foundation`
  - `wavtype/p01_ultra`
  - `weirdo/geminate60`
  - `weirdo/kelowna/rgb64`
  - `weirdo/ls_60`
  - `weirdo/naiping/np64`
  - `weirdo/naiping/nphhkb`
  - `weirdo/naiping/npminila`
  - `weirdo/tiger910`
  - `wekey/polaris`
  - `westfoxtrot/aanzee`
  - `westfoxtrot/cyclops`
  - `westfoxtrot/cypher/rev1`
  - `westfoxtrot/cypher/rev5`
  - `westfoxtrot/prophet`
  - `westm/westm9`
  - `westm/westm68`
---
 keyboards/waldo/config.h                      | 39 -------------------
 keyboards/waldo/keyboard.json                 |  6 +++
 keyboards/walletburner/cajal/config.h         | 23 -----------
 keyboards/walletburner/cajal/keyboard.json    |  6 +++
 keyboards/walletburner/neuron/config.h        |  7 ----
 keyboards/walletburner/neuron/keyboard.json   |  6 +++
 keyboards/wavtype/foundation/config.h         | 25 ------------
 keyboards/wavtype/foundation/keyboard.json    |  6 +++
 keyboards/wavtype/p01_ultra/config.h          | 39 -------------------
 keyboards/wavtype/p01_ultra/keyboard.json     |  6 +++
 keyboards/weirdo/geminate60/config.h          | 25 ------------
 keyboards/weirdo/geminate60/keyboard.json     |  6 +++
 keyboards/weirdo/kelowna/rgb64/config.h       | 25 ------------
 keyboards/weirdo/kelowna/rgb64/keyboard.json  |  6 +++
 keyboards/weirdo/ls_60/config.h               | 25 ------------
 keyboards/weirdo/ls_60/keyboard.json          |  6 +++
 keyboards/weirdo/naiping/np64/config.h        | 25 ------------
 keyboards/weirdo/naiping/np64/keyboard.json   |  6 +++
 keyboards/weirdo/naiping/nphhkb/config.h      | 25 ------------
 keyboards/weirdo/naiping/nphhkb/keyboard.json |  6 +++
 keyboards/weirdo/naiping/npminila/config.h    | 25 ------------
 .../weirdo/naiping/npminila/keyboard.json     |  6 +++
 keyboards/weirdo/tiger910/config.h            | 23 -----------
 keyboards/weirdo/tiger910/keyboard.json       |  6 +++
 keyboards/wekey/polaris/config.h              | 39 -------------------
 keyboards/wekey/polaris/keyboard.json         |  6 +++
 keyboards/westfoxtrot/aanzee/config.h         |  5 ---
 keyboards/westfoxtrot/aanzee/keyboard.json    |  6 +++
 keyboards/westfoxtrot/cyclops/config.h        | 39 -------------------
 keyboards/westfoxtrot/cyclops/keyboard.json   |  6 +++
 keyboards/westfoxtrot/cypher/rev1/config.h    |  5 ---
 .../westfoxtrot/cypher/rev1/keyboard.json     |  6 +++
 keyboards/westfoxtrot/cypher/rev5/config.h    |  5 ---
 .../westfoxtrot/cypher/rev5/keyboard.json     |  6 +++
 keyboards/westfoxtrot/prophet/config.h        |  5 ---
 keyboards/westfoxtrot/prophet/keyboard.json   |  6 +++
 keyboards/westm/westm68/config.h              |  5 ---
 keyboards/westm/westm68/info.json             |  6 +++
 keyboards/westm/westm9/config.h               |  5 ---
 keyboards/westm/westm9/info.json              |  6 +++
 40 files changed, 120 insertions(+), 414 deletions(-)
 delete mode 100644 keyboards/waldo/config.h
 delete mode 100644 keyboards/walletburner/cajal/config.h
 delete mode 100644 keyboards/walletburner/neuron/config.h
 delete mode 100644 keyboards/wavtype/foundation/config.h
 delete mode 100644 keyboards/wavtype/p01_ultra/config.h
 delete mode 100644 keyboards/weirdo/geminate60/config.h
 delete mode 100644 keyboards/weirdo/kelowna/rgb64/config.h
 delete mode 100644 keyboards/weirdo/ls_60/config.h
 delete mode 100644 keyboards/weirdo/naiping/np64/config.h
 delete mode 100644 keyboards/weirdo/naiping/nphhkb/config.h
 delete mode 100644 keyboards/weirdo/naiping/npminila/config.h
 delete mode 100644 keyboards/weirdo/tiger910/config.h
 delete mode 100644 keyboards/wekey/polaris/config.h
 delete mode 100644 keyboards/westfoxtrot/cyclops/config.h

diff --git a/keyboards/waldo/config.h b/keyboards/waldo/config.h
deleted file mode 100644
index b9449c4714..0000000000
--- a/keyboards/waldo/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/waldo/keyboard.json b/keyboards/waldo/keyboard.json
index 204f4bf707..b3076d79cc 100644
--- a/keyboards/waldo/keyboard.json
+++ b/keyboards/waldo/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F7", "D5", "D3", "D2", "B3", "B2", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "B1"],
         "rows": ["F0", "F1", "F4", "F5", "F6"]
diff --git a/keyboards/walletburner/cajal/config.h b/keyboards/walletburner/cajal/config.h
deleted file mode 100644
index af1fe3ab43..0000000000
--- a/keyboards/walletburner/cajal/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/walletburner/cajal/keyboard.json b/keyboards/walletburner/cajal/keyboard.json
index 2419c6c7f4..e11c62ec87 100644
--- a/keyboards/walletburner/cajal/keyboard.json
+++ b/keyboards/walletburner/cajal/keyboard.json
@@ -18,6 +18,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F1", "F0", "E6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "B4", "F6"],
         "rows": ["D4", "D5", "C7", "C6"]
diff --git a/keyboards/walletburner/neuron/config.h b/keyboards/walletburner/neuron/config.h
deleted file mode 100644
index 5f36081323..0000000000
--- a/keyboards/walletburner/neuron/config.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/walletburner/neuron/keyboard.json b/keyboards/walletburner/neuron/keyboard.json
index 7637f5435a..1d9ce89387 100644
--- a/keyboards/walletburner/neuron/keyboard.json
+++ b/keyboards/walletburner/neuron/keyboard.json
@@ -37,6 +37,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F0", "F7", "F6", "F4", "F1", "E6", "D6", "D2", "B4", "D7", "B6", "D5"],
         "rows": ["D0", "D1", "D3", "F5"]
diff --git a/keyboards/wavtype/foundation/config.h b/keyboards/wavtype/foundation/config.h
deleted file mode 100644
index 4376386c3e..0000000000
--- a/keyboards/wavtype/foundation/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2022 wavtype (@wavtype)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wavtype/foundation/keyboard.json b/keyboards/wavtype/foundation/keyboard.json
index f13d226806..4b1dd1d348 100644
--- a/keyboards/wavtype/foundation/keyboard.json
+++ b/keyboards/wavtype/foundation/keyboard.json
@@ -38,6 +38,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F4", "F5", "F6", "F7", "D2", "D1", "D0", "D3", "D5", "D4", "B7", "D6", "D7", "B4", "B5", "B6", "C6", "C7"],
         "rows": ["B3", "B2", "B1", "F0", "F1"]
diff --git a/keyboards/wavtype/p01_ultra/config.h b/keyboards/wavtype/p01_ultra/config.h
deleted file mode 100644
index 3da58bc5d2..0000000000
--- a/keyboards/wavtype/p01_ultra/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 wavtype
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wavtype/p01_ultra/keyboard.json b/keyboards/wavtype/p01_ultra/keyboard.json
index 7bfc242468..c44f0bd3bd 100644
--- a/keyboards/wavtype/p01_ultra/keyboard.json
+++ b/keyboards/wavtype/p01_ultra/keyboard.json
@@ -37,6 +37,12 @@
         "nkro": false,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B3", "B2", "B1", "B0", "B7", "D0", "D1", "D2", "D3", "D5"],
         "rows": ["B4", "D7", "D6", "B5", "B6", "D4"]
diff --git a/keyboards/weirdo/geminate60/config.h b/keyboards/weirdo/geminate60/config.h
deleted file mode 100644
index 5e0e8b40a9..0000000000
--- a/keyboards/weirdo/geminate60/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2020 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-
diff --git a/keyboards/weirdo/geminate60/keyboard.json b/keyboards/weirdo/geminate60/keyboard.json
index 4240d3a075..828630725a 100644
--- a/keyboards/weirdo/geminate60/keyboard.json
+++ b/keyboards/weirdo/geminate60/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
         "rows": ["A9", "A10", "B10", "B11", "B15"]
diff --git a/keyboards/weirdo/kelowna/rgb64/config.h b/keyboards/weirdo/kelowna/rgb64/config.h
deleted file mode 100644
index 5c0ed9cf61..0000000000
--- a/keyboards/weirdo/kelowna/rgb64/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2021 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-
diff --git a/keyboards/weirdo/kelowna/rgb64/keyboard.json b/keyboards/weirdo/kelowna/rgb64/keyboard.json
index 6e86f8cc47..4822f979fe 100644
--- a/keyboards/weirdo/kelowna/rgb64/keyboard.json
+++ b/keyboards/weirdo/kelowna/rgb64/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A3", "A4", "A5", "A7", "B0", "B1", "B10", "B15", "A8", "A9", "A10", "B7", "B6", "B5", "B4"],
         "rows": ["B12", "B13", "B14", "C11", "A1"]
diff --git a/keyboards/weirdo/ls_60/config.h b/keyboards/weirdo/ls_60/config.h
deleted file mode 100644
index 5c0ed9cf61..0000000000
--- a/keyboards/weirdo/ls_60/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2021 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-
diff --git a/keyboards/weirdo/ls_60/keyboard.json b/keyboards/weirdo/ls_60/keyboard.json
index eeaf5a23a5..7ab1f2f6cb 100644
--- a/keyboards/weirdo/ls_60/keyboard.json
+++ b/keyboards/weirdo/ls_60/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A8", "B14", "B13", "B12", "B1", "B0", "A7", "A1", "A15", "B3", "B4", "B5", "B6", "B7", "B8"],
         "rows": ["A9", "A10", "B10", "B11", "B15"]
diff --git a/keyboards/weirdo/naiping/np64/config.h b/keyboards/weirdo/naiping/np64/config.h
deleted file mode 100644
index 2c7e4c037b..0000000000
--- a/keyboards/weirdo/naiping/np64/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2021 Weirdo
-  *
-  * This program is free software: you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-  * the Free Software Foundation, either version 2 of the License, or
-  * (at your option) any later version.
-  *
-  * This program is distributed in the hope that it will be useful,
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  * GNU General Public License for more details.
-  *
-  * You should have received a copy of the GNU General Public License
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-
diff --git a/keyboards/weirdo/naiping/np64/keyboard.json b/keyboards/weirdo/naiping/np64/keyboard.json
index ddbbfecc3c..f620fb1169 100644
--- a/keyboards/weirdo/naiping/np64/keyboard.json
+++ b/keyboards/weirdo/naiping/np64/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1"],
         "rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/weirdo/naiping/nphhkb/config.h b/keyboards/weirdo/naiping/nphhkb/config.h
deleted file mode 100644
index 5c0ed9cf61..0000000000
--- a/keyboards/weirdo/naiping/nphhkb/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2021 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-
diff --git a/keyboards/weirdo/naiping/nphhkb/keyboard.json b/keyboards/weirdo/naiping/nphhkb/keyboard.json
index 13fe77f476..e89854f02e 100644
--- a/keyboards/weirdo/naiping/nphhkb/keyboard.json
+++ b/keyboards/weirdo/naiping/nphhkb/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A4", "C15", "C14", "A5", "A6", "A15", "B1", "B10", "B12", "B13", "B14", "B15", "B6", "A8", "B5"],
         "rows": ["B7", "B8", "B9", "C13", "B4"]
diff --git a/keyboards/weirdo/naiping/npminila/config.h b/keyboards/weirdo/naiping/npminila/config.h
deleted file mode 100644
index 5c0ed9cf61..0000000000
--- a/keyboards/weirdo/naiping/npminila/config.h
+++ /dev/null
@@ -1,25 +0,0 @@
- /* Copyright 2021 Weirdo
-  * 
-  * This program is free software: you can redistribute it and/or modify 
-  * it under the terms of the GNU General Public License as published by 
-  * the Free Software Foundation, either version 2 of the License, or 
-  * (at your option) any later version. 
-  * 
-  * This program is distributed in the hope that it will be useful, 
-  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
-  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-  * GNU General Public License for more details. 
-  * 
-  * You should have received a copy of the GNU General Public License 
-  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-  */ 
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-
-
diff --git a/keyboards/weirdo/naiping/npminila/keyboard.json b/keyboards/weirdo/naiping/npminila/keyboard.json
index 37c297a3fc..b4048a52cf 100644
--- a/keyboards/weirdo/naiping/npminila/keyboard.json
+++ b/keyboards/weirdo/naiping/npminila/keyboard.json
@@ -23,6 +23,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["F6", "B0", "F1", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2"],
         "rows": ["E6", "B7", "F7", "F4", "F5"]
diff --git a/keyboards/weirdo/tiger910/config.h b/keyboards/weirdo/tiger910/config.h
deleted file mode 100644
index e484ffe49e..0000000000
--- a/keyboards/weirdo/tiger910/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2021 Weirdo
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/weirdo/tiger910/keyboard.json b/keyboards/weirdo/tiger910/keyboard.json
index 90f4208b8d..ca24561ebd 100644
--- a/keyboards/weirdo/tiger910/keyboard.json
+++ b/keyboards/weirdo/tiger910/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": false,
         "sleep_led": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B5", "B6", "B7", "C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "D2", "D3", "D4"],
         "rows": ["B0", "B1", "B2", "B3", "B4"]
diff --git a/keyboards/wekey/polaris/config.h b/keyboards/wekey/polaris/config.h
deleted file mode 100644
index c86ead57bd..0000000000
--- a/keyboards/wekey/polaris/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2021 @wekey
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/wekey/polaris/keyboard.json b/keyboards/wekey/polaris/keyboard.json
index 356e3f951e..29d79b6a0b 100644
--- a/keyboards/wekey/polaris/keyboard.json
+++ b/keyboards/wekey/polaris/keyboard.json
@@ -19,6 +19,12 @@
         "mousekey": true,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["E6", "B4", "B5", "B6", "D0", "D1", "D2", "D3"],
         "rows": ["F4", "F1", "F0", "B7", "F7", "D5", "C6", "C7", "F5", "F6"]
diff --git a/keyboards/westfoxtrot/aanzee/config.h b/keyboards/westfoxtrot/aanzee/config.h
index cd1f84bc1f..5c058cddf1 100644
--- a/keyboards/westfoxtrot/aanzee/config.h
+++ b/keyboards/westfoxtrot/aanzee/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
diff --git a/keyboards/westfoxtrot/aanzee/keyboard.json b/keyboards/westfoxtrot/aanzee/keyboard.json
index 898fe9e62b..3a15014c4e 100644
--- a/keyboards/westfoxtrot/aanzee/keyboard.json
+++ b/keyboards/westfoxtrot/aanzee/keyboard.json
@@ -18,6 +18,12 @@
     "nkro": true,
     "rgblight": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D2", "D1", "D0", "D3", "D5", "C7", "C6", "B6", "B5", "F0", "F1", "F4", "F5", "F6", "F7", "B0"],
     "rows": ["B4", "D7", "D6", "D4", "B3"]
diff --git a/keyboards/westfoxtrot/cyclops/config.h b/keyboards/westfoxtrot/cyclops/config.h
deleted file mode 100644
index d1de752f79..0000000000
--- a/keyboards/westfoxtrot/cyclops/config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2018 westfoxtrot
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
diff --git a/keyboards/westfoxtrot/cyclops/keyboard.json b/keyboards/westfoxtrot/cyclops/keyboard.json
index 7bfcd859b0..a74926511d 100644
--- a/keyboards/westfoxtrot/cyclops/keyboard.json
+++ b/keyboards/westfoxtrot/cyclops/keyboard.json
@@ -16,6 +16,12 @@
         "mousekey": false,
         "nkro": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D3", "D2", "D5", "D6", "B6", "B1", "B2", "B3", "C6", "C7", "F7", "F6", "F4", "F5", "F1"],
         "rows": ["D1", "D0", "D7", "B4", "F0"]
diff --git a/keyboards/westfoxtrot/cypher/rev1/config.h b/keyboards/westfoxtrot/cypher/rev1/config.h
index cd1f84bc1f..5c058cddf1 100644
--- a/keyboards/westfoxtrot/cypher/rev1/config.h
+++ b/keyboards/westfoxtrot/cypher/rev1/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
diff --git a/keyboards/westfoxtrot/cypher/rev1/keyboard.json b/keyboards/westfoxtrot/cypher/rev1/keyboard.json
index 46c0dd298e..09294d169c 100644
--- a/keyboards/westfoxtrot/cypher/rev1/keyboard.json
+++ b/keyboards/westfoxtrot/cypher/rev1/keyboard.json
@@ -15,6 +15,12 @@
     "mousekey": false,
     "nkro": true
   },
+  "qmk": {
+    "locking": {
+      "enabled": true,
+      "resync": true
+    }
+  },
   "matrix_pins": {
     "cols": ["D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E6", "F0"],
     "rows": ["B0", "B1", "B2", "B3", "B4", "F6", "B6", "B7", "C6", "C7"]
diff --git a/keyboards/westfoxtrot/cypher/rev5/config.h b/keyboards/westfoxtrot/cypher/rev5/config.h
index cd1f84bc1f..5c058cddf1 100644
--- a/keyboards/westfoxtrot/cypher/rev5/config.h
+++ b/keyboards/westfoxtrot/cypher/rev5/config.h
@@ -17,11 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
  * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
diff --git a/keyboards/westfoxtrot/cypher/rev5/keyboard.json b/keyboards/westfoxtrot/cypher/rev5/keyboard.json
index 74938c4563..fbb487534d 100644
--- a/keyboards/westfoxtrot/cypher/rev5/keyboard.json
+++ b/keyboards/westfoxtrot/cypher/rev5/keyboard.json
@@ -16,6 +16,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["D6", "D7", "B4", "B5", "B6", "B7", "B3", "B2", "B1", "F0"],
         "rows": ["B0", "F1", "F5", "F6", "F7", "D1", "F4", "D4", "C6", "C7"]
diff --git a/keyboards/westfoxtrot/prophet/config.h b/keyboards/westfoxtrot/prophet/config.h
index d7d992f50e..95fb682e17 100644
--- a/keyboards/westfoxtrot/prophet/config.h
+++ b/keyboards/westfoxtrot/prophet/config.h
@@ -1,8 +1,3 @@
 #pragma once
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
 #define SLEEP_LED_GPT_DRIVER GPTD1
diff --git a/keyboards/westfoxtrot/prophet/keyboard.json b/keyboards/westfoxtrot/prophet/keyboard.json
index 1d6067a4e2..049f5cd7fc 100644
--- a/keyboards/westfoxtrot/prophet/keyboard.json
+++ b/keyboards/westfoxtrot/prophet/keyboard.json
@@ -17,6 +17,12 @@
         "nkro": true,
         "sleep_led": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["A6", "A7", "B0", "A9", "A8", "A14", "A15", "B3", "B4", "B5", "B8", "B7", "B6", "B9"],
         "rows": ["C13", "B2", "B1", "A4", "A3"]
diff --git a/keyboards/westm/westm68/config.h b/keyboards/westm/westm68/config.h
index 9a425a91a8..83153c1241 100644
--- a/keyboards/westm/westm68/config.h
+++ b/keyboards/westm/westm68/config.h
@@ -19,8 +19,3 @@
 
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/westm/westm68/info.json b/keyboards/westm/westm68/info.json
index 85dd61bf86..d863273ced 100644
--- a/keyboards/westm/westm68/info.json
+++ b/keyboards/westm/westm68/info.json
@@ -16,6 +16,12 @@
         "nkro": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B14", "B13", "B12", "B11", "B10", "B2", "B1", "B8", "B7", "B6", "B5", "B4", "B3", "A15", "A14"],
         "rows": ["A13", "B9", "F1", "A10", "A9"]
diff --git a/keyboards/westm/westm9/config.h b/keyboards/westm/westm9/config.h
index 9a425a91a8..83153c1241 100644
--- a/keyboards/westm/westm9/config.h
+++ b/keyboards/westm/westm9/config.h
@@ -19,8 +19,3 @@
 
 /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */
 #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index 43f12b17ad..85b93b47a7 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -15,6 +15,12 @@
         "oled": true,
         "rgblight": true
     },
+    "qmk": {
+        "locking": {
+            "enabled": true,
+            "resync": true
+        }
+    },
     "matrix_pins": {
         "cols": ["B8", "B5", "B4"],
         "rows": ["A14", "A15", "B3"]