0a84bf8b574b0efdf4ea729b3204ea32ffceef6e

Message

Migrate `LOCKING_*_ENABLE` to Data-Driven: F (#23757)

Affects:

  - `fallacy`
  - `ffkeebs/puca`
  - `fjlabs/7vhotswap`
  - `fjlabs/ad65`
  - `fjlabs/avalon`
  - `fjlabs/bks65`
  - `fjlabs/bks65solder`
  - `fjlabs/bolsa65`
  - `fjlabs/kf87`
  - `fjlabs/kyuu`
  - `fjlabs/ldk65`
  - `fjlabs/midway60`
  - `fjlabs/mk61rgbansi`
  - `fjlabs/peaker`
  - `fjlabs/polaris`
  - `fjlabs/ready100`
  - `fjlabs/sinanju`
  - `fjlabs/sinanjuwk`
  - `fjlabs/solanis`
  - `fjlabs/swordfish`
  - `fjlabs/tf60ansi`
  - `fjlabs/tf60v2`
  - `fjlabs/tf65rgbv2`
  - `flehrad/downbubble`
  - `flehrad/numbrero`
  - `flehrad/snagpad`
  - `flehrad/tradestation`
  - `fleuron`
  - `fluorite`
  - `flx/lodestone`
  - `flxlb/zplit`
  - `foostan/cornelius`
  - `forever65`
  - `fortitude60/rev1`
  - `foxlab/key65/hotswap`
  - `foxlab/key65/universal`
  - `foxlab/leaf60/hotswap`
  - `foxlab/leaf60/universal`
  - `foxlab/time80`
  - `fr4/southpaw75`
  - `fractal`
  - `fungo/rev1`
  - `funky40`

Diff

This diff is truncated to protect this page.

   1diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
   2index 14df31805dda61e2b3b9cd8b4a217a245dc8b364..ed6561e6aab9d40bfe7100fb190a0b8b61882258 100755
   3--- a/keyboards/fallacy/config.h
   4+++ b/keyboards/fallacy/config.h
   5@@ -20,11 +20,3 @@
   6  */
   7 #define IS31FL3731_I2C_ADDRESS_1 IS31FL3731_I2C_ADDRESS_GND
   8 #define IS31FL3731_LED_COUNT 3
   9-
  10-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
  11- */
  12-#define LOCKING_SUPPORT_ENABLE
  13-
  14-/* Locking resynchronize hack
  15- */
  16-#define LOCKING_RESYNC_ENABLE
  17diff --git a/keyboards/fallacy/keyboard.json b/keyboards/fallacy/keyboard.json
  18index fbeca239d9f3b537fcd16b4f6dd97fd13d5ed5f6..b1050f435418faa05298aaf0a80dc165097d713c 100644
  19--- a/keyboards/fallacy/keyboard.json
  20+++ b/keyboards/fallacy/keyboard.json
  21@@ -40,6 +40,12 @@
  22         "nkro": true,
  23         "rgblight": true
  24     },
  25+    "qmk": {
  26+        "locking": {
  27+            "enabled": true,
  28+            "resync": true
  29+        }
  30+    },
  31     "community_layouts": ["alice", "alice_split_bs"],
  32     "layout_aliases": {
  33         "LAYOUT_all": "LAYOUT_alice_split_bs",
  34diff --git a/keyboards/ffkeebs/puca/config.h b/keyboards/ffkeebs/puca/config.h
  35deleted file mode 100644
  36index ced239c83344efbdf0cd94f7b599ccce219ca6a4..0000000000000000000000000000000000000000
  37--- a/keyboards/ffkeebs/puca/config.h
  38+++ /dev/null
  39@@ -1,23 +0,0 @@
  40-/*
  41-Copyright 2021 Sleepdealer
  42-
  43-This program is free software: you can redistribute it and/or modify
  44-it under the terms of the GNU General Public License as published by
  45-the Free Software Foundation, either version 2 of the License, or
  46-(at your option) any later version.
  47-
  48-This program is distributed in the hope that it will be useful,
  49-but WITHOUT ANY WARRANTY; without even the implied warranty of
  50-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  51-GNU General Public License for more details.
  52-
  53-You should have received a copy of the GNU General Public License
  54-along with this program.  If not, see <http://www.gnu.org/licenses/>.
  55-*/
  56-
  57-#pragma once
  58-
  59-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
  60-#define LOCKING_SUPPORT_ENABLE
  61-/* Locking resynchronize hack */
  62-#define LOCKING_RESYNC_ENABLE
  63diff --git a/keyboards/ffkeebs/puca/keyboard.json b/keyboards/ffkeebs/puca/keyboard.json
  64index 04f444869d70d765ee9a9730ac3ef7597a3f959b..2abd0cfc3699e89ab1a0dacc388df89c97ed1c45 100644
  65--- a/keyboards/ffkeebs/puca/keyboard.json
  66+++ b/keyboards/ffkeebs/puca/keyboard.json
  67@@ -22,6 +22,12 @@
  68         "oled": true,
  69         "rgblight": true
  70     },
  71+    "qmk": {
  72+        "locking": {
  73+            "enabled": true,
  74+            "resync": true
  75+        }
  76+    },
  77     "matrix_pins": {
  78         "cols": ["F7", "B1", "B3", "B2", "B6"],
  79         "rows": ["B4", "E6", "D7", "B5", "C6", "F6"]
  80diff --git a/keyboards/fjlabs/7vhotswap/config.h b/keyboards/fjlabs/7vhotswap/config.h
  81deleted file mode 100644
  82index 2b28e8a484dc2bfa12c96787aa68b4120fbf1b70..0000000000000000000000000000000000000000
  83--- a/keyboards/fjlabs/7vhotswap/config.h
  84+++ /dev/null
  85@@ -1,41 +0,0 @@
  86-/*
  87-Copyright 2021 <me@fjlaboratories.com>
  88-
  89-This program is free software: you can redistribute it and/or modify
  90-it under the terms of the GNU General Public License as published by
  91-the Free Software Foundation, either version 2 of the License, or
  92-(at your option) any later version.
  93-
  94-This program is distributed in the hope that it will be useful,
  95-but WITHOUT ANY WARRANTY; without even the implied warranty of
  96-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  97-GNU General Public License for more details.
  98-
  99-You should have received a copy of the GNU General Public License
 100-along with this program. If not, see <http://www.gnu.org/licenses/>.
 101-*/
 102-
 103-#pragma once
 104-
 105-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 106-#define LOCKING_SUPPORT_ENABLE
 107-/* Locking resynchronize hack */
 108-#define LOCKING_RESYNC_ENABLE 
 109-
 110-/* Define less important options */
 111-
 112-/*
 113- * Feature disable options
 114- * These options are also useful to firmware size reduction.
 115- */
 116-
 117-/* disable debug print */
 118-//#define NO_DEBUG
 119-
 120-/* disable print */
 121-//#define NO_PRINT
 122-
 123-/* disable action features */
 124-//#define NO_ACTION_LAYER
 125-//#define NO_ACTION_TAPPING
 126-//#define NO_ACTION_ONESHOT
 127diff --git a/keyboards/fjlabs/7vhotswap/keyboard.json b/keyboards/fjlabs/7vhotswap/keyboard.json
 128index 220cf28831ffe0a148e980c7d75eb61bfcc3d534..03d8fe03b7d62e9b8a1079963c34b00c6854eb60 100644
 129--- a/keyboards/fjlabs/7vhotswap/keyboard.json
 130+++ b/keyboards/fjlabs/7vhotswap/keyboard.json
 131@@ -41,6 +41,12 @@
 132         "nkro": true,
 133         "rgblight": true
 134     },
 135+    "qmk": {
 136+        "locking": {
 137+            "enabled": true,
 138+            "resync": true
 139+        }
 140+    },
 141     "layouts": {
 142         "LAYOUT_75_all": {
 143             "layout": [
 144diff --git a/keyboards/fjlabs/ad65/config.h b/keyboards/fjlabs/ad65/config.h
 145deleted file mode 100644
 146index 084c49212ca69047306f0d561107c8583386cf78..0000000000000000000000000000000000000000
 147--- a/keyboards/fjlabs/ad65/config.h
 148+++ /dev/null
 149@@ -1,41 +0,0 @@
 150-/*
 151-Copyright 2021 <felix@fjlaboratories.com>
 152-
 153-This program is free software: you can redistribute it and/or modify
 154-it under the terms of the GNU General Public License as published by
 155-the Free Software Foundation, either version 2 of the License, or
 156-(at your option) any later version.
 157-
 158-This program is distributed in the hope that it will be useful,
 159-but WITHOUT ANY WARRANTY; without even the implied warranty of
 160-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 161-GNU General Public License for more details.
 162-
 163-You should have received a copy of the GNU General Public License
 164-along with this program. If not, see <http://www.gnu.org/licenses/>.
 165-*/
 166-
 167-#pragma once
 168-
 169-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 170-#define LOCKING_SUPPORT_ENABLE
 171-/* Locking resynchronize hack */
 172-#define LOCKING_RESYNC_ENABLE
 173-
 174-/* Define less important options */
 175-
 176-/*
 177- * Feature disable options
 178- * These options are also useful to firmware size reduction.
 179- */
 180-
 181-/* disable debug print */
 182-//#define NO_DEBUG
 183-
 184-/* disable print */
 185-//#define NO_PRINT
 186-
 187-/* disable action features */
 188-//#define NO_ACTION_LAYER
 189-//#define NO_ACTION_TAPPING
 190-//#define NO_ACTION_ONESHOT
 191diff --git a/keyboards/fjlabs/ad65/keyboard.json b/keyboards/fjlabs/ad65/keyboard.json
 192index 19adad79325ecc703527f001ad7f8ac27a3424f6..853bc32f55d3c852698488fdcae47f1e201dc5fb 100644
 193--- a/keyboards/fjlabs/ad65/keyboard.json
 194+++ b/keyboards/fjlabs/ad65/keyboard.json
 195@@ -25,6 +25,12 @@
 196         "command": true,
 197         "nkro": true
 198     },
 199+    "qmk": {
 200+        "locking": {
 201+            "enabled": true,
 202+            "resync": true
 203+        }
 204+    },
 205     "community_layouts": [
 206         "65_ansi_blocker",
 207         "65_ansi_blocker_split_bs",
 208diff --git a/keyboards/fjlabs/avalon/config.h b/keyboards/fjlabs/avalon/config.h
 209deleted file mode 100644
 210index 46df2a0d6af4440985ff746a17cf371afcc3a44a..0000000000000000000000000000000000000000
 211--- a/keyboards/fjlabs/avalon/config.h
 212+++ /dev/null
 213@@ -1,23 +0,0 @@
 214-/*
 215-Copyright 2022 <hello@fjlaboratories.com>
 216-
 217-This program is free software: you can redistribute it and/or modify
 218-it under the terms of the GNU General Public License as published by
 219-the Free Software Foundation, either version 2 of the License, or
 220-(at your option) any later version.
 221-
 222-This program is distributed in the hope that it will be useful,
 223-but WITHOUT ANY WARRANTY; without even the implied warranty of
 224-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 225-GNU General Public License for more details.
 226-
 227-You should have received a copy of the GNU General Public License
 228-along with this program. If not, see <http://www.gnu.org/licenses/>.
 229-*/
 230-
 231-#pragma once
 232-
 233-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 234-#define LOCKING_SUPPORT_ENABLE
 235-/* Locking resynchronize hack */
 236-#define LOCKING_RESYNC_ENABLE
 237diff --git a/keyboards/fjlabs/avalon/keyboard.json b/keyboards/fjlabs/avalon/keyboard.json
 238index 2407c3ec26ba9cfb619a32188f5d123230bde6e4..077286729cfff091a5db4724c625b5de9c6d8707 100644
 239--- a/keyboards/fjlabs/avalon/keyboard.json
 240+++ b/keyboards/fjlabs/avalon/keyboard.json
 241@@ -49,6 +49,12 @@
 242         "nkro": true,
 243         "rgblight": true
 244     },
 245+    "qmk": {
 246+        "locking": {
 247+            "enabled": true,
 248+            "resync": true
 249+        }
 250+    },
 251     "layouts": {
 252         "LAYOUT_all": {
 253             "layout": [
 254diff --git a/keyboards/fjlabs/bks65/config.h b/keyboards/fjlabs/bks65/config.h
 255deleted file mode 100644
 256index 990e5335c311d3dd7e05924e391e42ebd88387ae..0000000000000000000000000000000000000000
 257--- a/keyboards/fjlabs/bks65/config.h
 258+++ /dev/null
 259@@ -1,41 +0,0 @@
 260-/*
 261-Copyright 2020 <me@homedrop.org>
 262-
 263-This program is free software: you can redistribute it and/or modify
 264-it under the terms of the GNU General Public License as published by
 265-the Free Software Foundation, either version 2 of the License, or
 266-(at your option) any later version.
 267-
 268-This program is distributed in the hope that it will be useful,
 269-but WITHOUT ANY WARRANTY; without even the implied warranty of
 270-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 271-GNU General Public License for more details.
 272-
 273-You should have received a copy of the GNU General Public License
 274-along with this program. If not, see <http://www.gnu.org/licenses/>.
 275-*/
 276-
 277-#pragma once
 278-
 279-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 280-#define LOCKING_SUPPORT_ENABLE
 281-/* Locking resynchronize hack */
 282-#define LOCKING_RESYNC_ENABLE
 283-
 284-/* Define less important options */
 285-
 286-/*
 287- * Feature disable options
 288- * These options are also useful to firmware size reduction.
 289- */
 290-
 291-/* disable debug print */
 292-//#define NO_DEBUG
 293-
 294-/* disable print */
 295-//#define NO_PRINT
 296-
 297-/* disable action features */
 298-//#define NO_ACTION_LAYER
 299-//#define NO_ACTION_TAPPING
 300-//#define NO_ACTION_ONESHOT
 301diff --git a/keyboards/fjlabs/bks65/keyboard.json b/keyboards/fjlabs/bks65/keyboard.json
 302index 5be09bfe0d08c74e0f081471fef0a68f9d3dff8a..7b1a8db86e5f7e4c676f8387b64d22756b48d2ca 100644
 303--- a/keyboards/fjlabs/bks65/keyboard.json
 304+++ b/keyboards/fjlabs/bks65/keyboard.json
 305@@ -44,6 +44,12 @@
 306         "nkro": true,
 307         "rgblight": true
 308     },
 309+    "qmk": {
 310+        "locking": {
 311+            "enabled": true,
 312+            "resync": true
 313+        }
 314+    },
 315     "community_layouts": ["65_ansi"],
 316     "layouts": {
 317         "LAYOUT_65_ansi": {
 318diff --git a/keyboards/fjlabs/bks65solder/config.h b/keyboards/fjlabs/bks65solder/config.h
 319deleted file mode 100644
 320index 990e5335c311d3dd7e05924e391e42ebd88387ae..0000000000000000000000000000000000000000
 321--- a/keyboards/fjlabs/bks65solder/config.h
 322+++ /dev/null
 323@@ -1,41 +0,0 @@
 324-/*
 325-Copyright 2020 <me@homedrop.org>
 326-
 327-This program is free software: you can redistribute it and/or modify
 328-it under the terms of the GNU General Public License as published by
 329-the Free Software Foundation, either version 2 of the License, or
 330-(at your option) any later version.
 331-
 332-This program is distributed in the hope that it will be useful,
 333-but WITHOUT ANY WARRANTY; without even the implied warranty of
 334-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 335-GNU General Public License for more details.
 336-
 337-You should have received a copy of the GNU General Public License
 338-along with this program. If not, see <http://www.gnu.org/licenses/>.
 339-*/
 340-
 341-#pragma once
 342-
 343-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 344-#define LOCKING_SUPPORT_ENABLE
 345-/* Locking resynchronize hack */
 346-#define LOCKING_RESYNC_ENABLE
 347-
 348-/* Define less important options */
 349-
 350-/*
 351- * Feature disable options
 352- * These options are also useful to firmware size reduction.
 353- */
 354-
 355-/* disable debug print */
 356-//#define NO_DEBUG
 357-
 358-/* disable print */
 359-//#define NO_PRINT
 360-
 361-/* disable action features */
 362-//#define NO_ACTION_LAYER
 363-//#define NO_ACTION_TAPPING
 364-//#define NO_ACTION_ONESHOT
 365diff --git a/keyboards/fjlabs/bks65solder/keyboard.json b/keyboards/fjlabs/bks65solder/keyboard.json
 366index 609dc4cdbc01954b3540dc28db9250ac58e9278f..59599bb5490044a97d8a7ce400a9f4cc5480fdbd 100644
 367--- a/keyboards/fjlabs/bks65solder/keyboard.json
 368+++ b/keyboards/fjlabs/bks65solder/keyboard.json
 369@@ -41,6 +41,12 @@
 370         "nkro": true,
 371         "rgblight": true
 372     },
 373+    "qmk": {
 374+        "locking": {
 375+            "enabled": true,
 376+            "resync": true
 377+        }
 378+    },
 379     "community_layouts": ["65_ansi"],
 380     "layouts": {
 381         "LAYOUT_all": {
 382diff --git a/keyboards/fjlabs/bolsa65/config.h b/keyboards/fjlabs/bolsa65/config.h
 383deleted file mode 100644
 384index 990e5335c311d3dd7e05924e391e42ebd88387ae..0000000000000000000000000000000000000000
 385--- a/keyboards/fjlabs/bolsa65/config.h
 386+++ /dev/null
 387@@ -1,41 +0,0 @@
 388-/*
 389-Copyright 2020 <me@homedrop.org>
 390-
 391-This program is free software: you can redistribute it and/or modify
 392-it under the terms of the GNU General Public License as published by
 393-the Free Software Foundation, either version 2 of the License, or
 394-(at your option) any later version.
 395-
 396-This program is distributed in the hope that it will be useful,
 397-but WITHOUT ANY WARRANTY; without even the implied warranty of
 398-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 399-GNU General Public License for more details.
 400-
 401-You should have received a copy of the GNU General Public License
 402-along with this program. If not, see <http://www.gnu.org/licenses/>.
 403-*/
 404-
 405-#pragma once
 406-
 407-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 408-#define LOCKING_SUPPORT_ENABLE
 409-/* Locking resynchronize hack */
 410-#define LOCKING_RESYNC_ENABLE
 411-
 412-/* Define less important options */
 413-
 414-/*
 415- * Feature disable options
 416- * These options are also useful to firmware size reduction.
 417- */
 418-
 419-/* disable debug print */
 420-//#define NO_DEBUG
 421-
 422-/* disable print */
 423-//#define NO_PRINT
 424-
 425-/* disable action features */
 426-//#define NO_ACTION_LAYER
 427-//#define NO_ACTION_TAPPING
 428-//#define NO_ACTION_ONESHOT
 429diff --git a/keyboards/fjlabs/bolsa65/keyboard.json b/keyboards/fjlabs/bolsa65/keyboard.json
 430index 9deb09fef29559ab230feba951807790a4cfd967..dfa47e90bb537b7dcc60d9d42ca0af943ed6d41f 100644
 431--- a/keyboards/fjlabs/bolsa65/keyboard.json
 432+++ b/keyboards/fjlabs/bolsa65/keyboard.json
 433@@ -22,6 +22,12 @@
 434         "command": true,
 435         "nkro": true
 436     },
 437+    "qmk": {
 438+        "locking": {
 439+            "enabled": true,
 440+            "resync": true
 441+        }
 442+    },
 443     "community_layouts": ["65_ansi_blocker"],
 444     "layouts": {
 445         "LAYOUT_65_ansi_blocker": {
 446diff --git a/keyboards/fjlabs/kf87/config.h b/keyboards/fjlabs/kf87/config.h
 447deleted file mode 100644
 448index 9f4595856496221c4f2e15454735d67ffb54e518..0000000000000000000000000000000000000000
 449--- a/keyboards/fjlabs/kf87/config.h
 450+++ /dev/null
 451@@ -1,41 +0,0 @@
 452-/*
 453-Copyright 2020 <me@fjlaboratories.com>
 454-
 455-This program is free software: you can redistribute it and/or modify
 456-it under the terms of the GNU General Public License as published by
 457-the Free Software Foundation, either version 2 of the License, or
 458-(at your option) any later version.
 459-
 460-This program is distributed in the hope that it will be useful,
 461-but WITHOUT ANY WARRANTY; without even the implied warranty of
 462-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 463-GNU General Public License for more details.
 464-
 465-You should have received a copy of the GNU General Public License
 466-along with this program. If not, see <http://www.gnu.org/licenses/>.
 467-*/
 468-
 469-#pragma once
 470-
 471-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 472-#define LOCKING_SUPPORT_ENABLE
 473-/* Locking resynchronize hack */
 474-#define LOCKING_RESYNC_ENABLE
 475-
 476-/* Define less important options */
 477-
 478-/*
 479- * Feature disable options
 480- * These options are also useful to firmware size reduction.
 481- */
 482-
 483-/* disable debug print */
 484-//#define NO_DEBUG
 485-
 486-/* disable print */
 487-//#define NO_PRINT
 488-
 489-/* disable action features */
 490-//#define NO_ACTION_LAYER
 491-//#define NO_ACTION_TAPPING
 492-//#define NO_ACTION_ONESHOT
 493diff --git a/keyboards/fjlabs/kf87/keyboard.json b/keyboards/fjlabs/kf87/keyboard.json
 494index e4f48acc8ecb2d7ef6e4473c769fb65e3dfb0a0d..f0742b671e7d066792bace4b86f32e098fae7980 100644
 495--- a/keyboards/fjlabs/kf87/keyboard.json
 496+++ b/keyboards/fjlabs/kf87/keyboard.json
 497@@ -46,6 +46,12 @@
 498         "nkro": true,
 499         "rgblight": true
 500     },
 501+    "qmk": {
 502+        "locking": {
 503+            "enabled": true,
 504+            "resync": true
 505+        }
 506+    },
 507     "layouts": {
 508         "LAYOUT_tkl_all": {
 509             "layout": [
 510diff --git a/keyboards/fjlabs/kyuu/config.h b/keyboards/fjlabs/kyuu/config.h
 511deleted file mode 100644
 512index 084c49212ca69047306f0d561107c8583386cf78..0000000000000000000000000000000000000000
 513--- a/keyboards/fjlabs/kyuu/config.h
 514+++ /dev/null
 515@@ -1,41 +0,0 @@
 516-/*
 517-Copyright 2021 <felix@fjlaboratories.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-/* Define less important options */
 541-
 542-/*
 543- * Feature disable options
 544- * These options are also useful to firmware size reduction.
 545- */
 546-
 547-/* disable debug print */
 548-//#define NO_DEBUG
 549-
 550-/* disable print */
 551-//#define NO_PRINT
 552-
 553-/* disable action features */
 554-//#define NO_ACTION_LAYER
 555-//#define NO_ACTION_TAPPING
 556-//#define NO_ACTION_ONESHOT
 557diff --git a/keyboards/fjlabs/kyuu/keyboard.json b/keyboards/fjlabs/kyuu/keyboard.json
 558index a16e2835cf2e6480eff09db7ca68829efdba2ec0..a2c9732ad3ec6639dcd8ed660e40c558e33684b8 100644
 559--- a/keyboards/fjlabs/kyuu/keyboard.json
 560+++ b/keyboards/fjlabs/kyuu/keyboard.json
 561@@ -45,6 +45,12 @@
 562         "nkro": true,
 563         "rgblight": true
 564     },
 565+    "qmk": {
 566+        "locking": {
 567+            "enabled": true,
 568+            "resync": true
 569+        }
 570+    },
 571     "layouts": {
 572         "LAYOUT_65_ansi_blocker_badge": {
 573             "layout": [
 574diff --git a/keyboards/fjlabs/ldk65/config.h b/keyboards/fjlabs/ldk65/config.h
 575deleted file mode 100644
 576index 990e5335c311d3dd7e05924e391e42ebd88387ae..0000000000000000000000000000000000000000
 577--- a/keyboards/fjlabs/ldk65/config.h
 578+++ /dev/null
 579@@ -1,41 +0,0 @@
 580-/*
 581-Copyright 2020 <me@homedrop.org>
 582-
 583-This program is free software: you can redistribute it and/or modify
 584-it under the terms of the GNU General Public License as published by
 585-the Free Software Foundation, either version 2 of the License, or
 586-(at your option) any later version.
 587-
 588-This program is distributed in the hope that it will be useful,
 589-but WITHOUT ANY WARRANTY; without even the implied warranty of
 590-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 591-GNU General Public License for more details.
 592-
 593-You should have received a copy of the GNU General Public License
 594-along with this program. If not, see <http://www.gnu.org/licenses/>.
 595-*/
 596-
 597-#pragma once
 598-
 599-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 600-#define LOCKING_SUPPORT_ENABLE
 601-/* Locking resynchronize hack */
 602-#define LOCKING_RESYNC_ENABLE
 603-
 604-/* Define less important options */
 605-
 606-/*
 607- * Feature disable options
 608- * These options are also useful to firmware size reduction.
 609- */
 610-
 611-/* disable debug print */
 612-//#define NO_DEBUG
 613-
 614-/* disable print */
 615-//#define NO_PRINT
 616-
 617-/* disable action features */
 618-//#define NO_ACTION_LAYER
 619-//#define NO_ACTION_TAPPING
 620-//#define NO_ACTION_ONESHOT
 621diff --git a/keyboards/fjlabs/ldk65/keyboard.json b/keyboards/fjlabs/ldk65/keyboard.json
 622index a9d997c67e054da4a558e05e8968d54ed53dff46..c9b0946b9a2ee387c20bf7697aafc31dccfa6001 100644
 623--- a/keyboards/fjlabs/ldk65/keyboard.json
 624+++ b/keyboards/fjlabs/ldk65/keyboard.json
 625@@ -25,6 +25,12 @@
 626         "command": true,
 627         "nkro": true
 628     },
 629+    "qmk": {
 630+        "locking": {
 631+            "enabled": true,
 632+            "resync": true
 633+        }
 634+    },
 635     "community_layouts": ["65_ansi"],
 636     "layouts": {
 637         "LAYOUT_65_ansi": {
 638diff --git a/keyboards/fjlabs/midway60/config.h b/keyboards/fjlabs/midway60/config.h
 639deleted file mode 100644
 640index 9f4595856496221c4f2e15454735d67ffb54e518..0000000000000000000000000000000000000000
 641--- a/keyboards/fjlabs/midway60/config.h
 642+++ /dev/null
 643@@ -1,41 +0,0 @@
 644-/*
 645-Copyright 2020 <me@fjlaboratories.com>
 646-
 647-This program is free software: you can redistribute it and/or modify
 648-it under the terms of the GNU General Public License as published by
 649-the Free Software Foundation, either version 2 of the License, or
 650-(at your option) any later version.
 651-
 652-This program is distributed in the hope that it will be useful,
 653-but WITHOUT ANY WARRANTY; without even the implied warranty of
 654-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 655-GNU General Public License for more details.
 656-
 657-You should have received a copy of the GNU General Public License
 658-along with this program. If not, see <http://www.gnu.org/licenses/>.
 659-*/
 660-
 661-#pragma once
 662-
 663-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 664-#define LOCKING_SUPPORT_ENABLE
 665-/* Locking resynchronize hack */
 666-#define LOCKING_RESYNC_ENABLE
 667-
 668-/* Define less important options */
 669-
 670-/*
 671- * Feature disable options
 672- * These options are also useful to firmware size reduction.
 673- */
 674-
 675-/* disable debug print */
 676-//#define NO_DEBUG
 677-
 678-/* disable print */
 679-//#define NO_PRINT
 680-
 681-/* disable action features */
 682-//#define NO_ACTION_LAYER
 683-//#define NO_ACTION_TAPPING
 684-//#define NO_ACTION_ONESHOT
 685diff --git a/keyboards/fjlabs/midway60/keyboard.json b/keyboards/fjlabs/midway60/keyboard.json
 686index 0f5b1e13bca16ac71c31347071d031cb0a41315a..d05975699b64f5396e8c2ef5d38b5b67c3aafda5 100644
 687--- a/keyboards/fjlabs/midway60/keyboard.json
 688+++ b/keyboards/fjlabs/midway60/keyboard.json
 689@@ -25,6 +25,12 @@
 690         "command": true,
 691         "nkro": true
 692     },
 693+    "qmk": {
 694+        "locking": {
 695+            "enabled": true,
 696+            "resync": true
 697+        }
 698+    },
 699     "community_layouts": [
 700         "60_ansi",
 701         "60_ansi_split_bs_rshift",
 702diff --git a/keyboards/fjlabs/mk61rgbansi/config.h b/keyboards/fjlabs/mk61rgbansi/config.h
 703deleted file mode 100644
 704index b352868d2d440fda54700802029366c12f330ea7..0000000000000000000000000000000000000000
 705--- a/keyboards/fjlabs/mk61rgbansi/config.h
 706+++ /dev/null
 707@@ -1,41 +0,0 @@
 708-/*
 709-Copyright 2021 <me@fjlaboratories.com>
 710-
 711-This program is free software: you can redistribute it and/or modify
 712-it under the terms of the GNU General Public License as published by
 713-the Free Software Foundation, either version 2 of the License, or
 714-(at your option) any later version.
 715-
 716-This program is distributed in the hope that it will be useful,
 717-but WITHOUT ANY WARRANTY; without even the implied warranty of
 718-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 719-GNU General Public License for more details.
 720-
 721-You should have received a copy of the GNU General Public License
 722-along with this program. If not, see <http://www.gnu.org/licenses/>.
 723-*/
 724-
 725-#pragma once
 726-
 727-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 728-#define LOCKING_SUPPORT_ENABLE
 729-/* Locking resynchronize hack */
 730-#define LOCKING_RESYNC_ENABLE
 731-
 732-/* Define less important options */
 733-
 734-/*
 735- * Feature disable options
 736- * These options are also useful to firmware size reduction.
 737- */
 738-
 739-/* disable debug print */
 740-//#define NO_DEBUG
 741-
 742-/* disable print */
 743-//#define NO_PRINT
 744-
 745-/* disable action features */
 746-//#define NO_ACTION_LAYER
 747-//#define NO_ACTION_TAPPING
 748-//#define NO_ACTION_ONESHOT
 749diff --git a/keyboards/fjlabs/mk61rgbansi/keyboard.json b/keyboards/fjlabs/mk61rgbansi/keyboard.json
 750index de26f98ebe69db20850e88c2dc4c19f72305389e..649a881a8dabdc696f0b73fde150b892c5d1de62 100644
 751--- a/keyboards/fjlabs/mk61rgbansi/keyboard.json
 752+++ b/keyboards/fjlabs/mk61rgbansi/keyboard.json
 753@@ -46,6 +46,12 @@
 754         "nkro": true,
 755         "rgblight": true
 756     },
 757+    "qmk": {
 758+        "locking": {
 759+            "enabled": true,
 760+            "resync": true
 761+        }
 762+    },
 763     "community_layouts": ["60_ansi"],
 764     "layouts": {
 765         "LAYOUT_60_ansi": {
 766diff --git a/keyboards/fjlabs/peaker/config.h b/keyboards/fjlabs/peaker/config.h
 767deleted file mode 100644
 768index 13c17d597d1f1a8dd1ff0c189d808a3a893308ee..0000000000000000000000000000000000000000
 769--- a/keyboards/fjlabs/peaker/config.h
 770+++ /dev/null
 771@@ -1,41 +0,0 @@
 772-/*
 773-Copyright 2022 <felix@fjlaboratories.com>
 774-
 775-This program is free software: you can redistribute it and/or modify
 776-it under the terms of the GNU General Public License as published by
 777-the Free Software Foundation, either version 2 of the License, or
 778-(at your option) any later version.
 779-
 780-This program is distributed in the hope that it will be useful,
 781-but WITHOUT ANY WARRANTY; without even the implied warranty of
 782-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 783-GNU General Public License for more details.
 784-
 785-You should have received a copy of the GNU General Public License
 786-along with this program. If not, see <http://www.gnu.org/licenses/>.
 787-*/
 788-
 789-#pragma once
 790-
 791-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 792-#define LOCKING_SUPPORT_ENABLE
 793-/* Locking resynchronize hack */
 794-#define LOCKING_RESYNC_ENABLE
 795-
 796-/* Define less important options */
 797-
 798-/*
 799- * Feature disable options
 800- * These options are also useful to firmware size reduction.
 801- */
 802-
 803-/* disable debug print */
 804-//#define NO_DEBUG
 805-
 806-/* disable print */
 807-//#define NO_PRINT
 808-
 809-/* disable action features */
 810-//#define NO_ACTION_LAYER
 811-//#define NO_ACTION_TAPPING
 812-//#define NO_ACTION_ONESHOT
 813diff --git a/keyboards/fjlabs/peaker/keyboard.json b/keyboards/fjlabs/peaker/keyboard.json
 814index 73f4f754c31710ec3b9c5e197a6b68c390a49a6f..4c07b3485687a7ef9737f72ccbc11b4ae491d393 100644
 815--- a/keyboards/fjlabs/peaker/keyboard.json
 816+++ b/keyboards/fjlabs/peaker/keyboard.json
 817@@ -22,6 +22,12 @@
 818         "command": true,
 819         "nkro": true
 820     },
 821+    "qmk": {
 822+        "locking": {
 823+            "enabled": true,
 824+            "resync": true
 825+        }
 826+    },
 827     "layouts": {
 828         "LAYOUT_tkl_all": {
 829             "layout": [
 830diff --git a/keyboards/fjlabs/polaris/config.h b/keyboards/fjlabs/polaris/config.h
 831deleted file mode 100644
 832index 9f4595856496221c4f2e15454735d67ffb54e518..0000000000000000000000000000000000000000
 833--- a/keyboards/fjlabs/polaris/config.h
 834+++ /dev/null
 835@@ -1,41 +0,0 @@
 836-/*
 837-Copyright 2020 <me@fjlaboratories.com>
 838-
 839-This program is free software: you can redistribute it and/or modify
 840-it under the terms of the GNU General Public License as published by
 841-the Free Software Foundation, either version 2 of the License, or
 842-(at your option) any later version.
 843-
 844-This program is distributed in the hope that it will be useful,
 845-but WITHOUT ANY WARRANTY; without even the implied warranty of
 846-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 847-GNU General Public License for more details.
 848-
 849-You should have received a copy of the GNU General Public License
 850-along with this program. If not, see <http://www.gnu.org/licenses/>.
 851-*/
 852-
 853-#pragma once
 854-
 855-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 856-#define LOCKING_SUPPORT_ENABLE
 857-/* Locking resynchronize hack */
 858-#define LOCKING_RESYNC_ENABLE
 859-
 860-/* Define less important options */
 861-
 862-/*
 863- * Feature disable options
 864- * These options are also useful to firmware size reduction.
 865- */
 866-
 867-/* disable debug print */
 868-//#define NO_DEBUG
 869-
 870-/* disable print */
 871-//#define NO_PRINT
 872-
 873-/* disable action features */
 874-//#define NO_ACTION_LAYER
 875-//#define NO_ACTION_TAPPING
 876-//#define NO_ACTION_ONESHOT
 877diff --git a/keyboards/fjlabs/polaris/keyboard.json b/keyboards/fjlabs/polaris/keyboard.json
 878index c4f3caf28795e51268b0bdb50cea3661983480c6..674cf8484bc50a93046e5b8bee666c4fa107cb8c 100644
 879--- a/keyboards/fjlabs/polaris/keyboard.json
 880+++ b/keyboards/fjlabs/polaris/keyboard.json
 881@@ -25,6 +25,12 @@
 882         "command": true,
 883         "nkro": true
 884     },
 885+    "qmk": {
 886+        "locking": {
 887+            "enabled": true,
 888+            "resync": true
 889+        }
 890+    },
 891     "community_layouts": [
 892         "60_ansi",
 893         "60_ansi_split_bs_rshift",
 894diff --git a/keyboards/fjlabs/ready100/config.h b/keyboards/fjlabs/ready100/config.h
 895deleted file mode 100644
 896index b352868d2d440fda54700802029366c12f330ea7..0000000000000000000000000000000000000000
 897--- a/keyboards/fjlabs/ready100/config.h
 898+++ /dev/null
 899@@ -1,41 +0,0 @@
 900-/*
 901-Copyright 2021 <me@fjlaboratories.com>
 902-
 903-This program is free software: you can redistribute it and/or modify
 904-it under the terms of the GNU General Public License as published by
 905-the Free Software Foundation, either version 2 of the License, or
 906-(at your option) any later version.
 907-
 908-This program is distributed in the hope that it will be useful,
 909-but WITHOUT ANY WARRANTY; without even the implied warranty of
 910-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 911-GNU General Public License for more details.
 912-
 913-You should have received a copy of the GNU General Public License
 914-along with this program. If not, see <http://www.gnu.org/licenses/>.
 915-*/
 916-
 917-#pragma once
 918-
 919-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 920-#define LOCKING_SUPPORT_ENABLE
 921-/* Locking resynchronize hack */
 922-#define LOCKING_RESYNC_ENABLE
 923-
 924-/* Define less important options */
 925-
 926-/*
 927- * Feature disable options
 928- * These options are also useful to firmware size reduction.
 929- */
 930-
 931-/* disable debug print */
 932-//#define NO_DEBUG
 933-
 934-/* disable print */
 935-//#define NO_PRINT
 936-
 937-/* disable action features */
 938-//#define NO_ACTION_LAYER
 939-//#define NO_ACTION_TAPPING
 940-//#define NO_ACTION_ONESHOT
 941diff --git a/keyboards/fjlabs/ready100/keyboard.json b/keyboards/fjlabs/ready100/keyboard.json
 942index b5940b9c527a2df375aa7f9ec411ec758944cf78..8b79b2b927ac76053fa83cf5f45a3191816f48fd 100644
 943--- a/keyboards/fjlabs/ready100/keyboard.json
 944+++ b/keyboards/fjlabs/ready100/keyboard.json
 945@@ -42,6 +42,12 @@
 946         "nkro": true,
 947         "rgblight": true
 948     },
 949+    "qmk": {
 950+        "locking": {
 951+            "enabled": true,
 952+            "resync": true
 953+        }
 954+    },
 955     "layout_aliases": {
 956         "LAYOUT_64key": "LAYOUT_64_ansi"
 957     },
 958diff --git a/keyboards/fjlabs/sinanju/config.h b/keyboards/fjlabs/sinanju/config.h
 959deleted file mode 100644
 960index 13c17d597d1f1a8dd1ff0c189d808a3a893308ee..0000000000000000000000000000000000000000
 961--- a/keyboards/fjlabs/sinanju/config.h
 962+++ /dev/null
 963@@ -1,41 +0,0 @@
 964-/*
 965-Copyright 2022 <felix@fjlaboratories.com>
 966-
 967-This program is free software: you can redistribute it and/or modify
 968-it under the terms of the GNU General Public License as published by
 969-the Free Software Foundation, either version 2 of the License, or
 970-(at your option) any later version.
 971-
 972-This program is distributed in the hope that it will be useful,
 973-but WITHOUT ANY WARRANTY; without even the implied warranty of
 974-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 975-GNU General Public License for more details.
 976-
 977-You should have received a copy of the GNU General Public License
 978-along with this program. If not, see <http://www.gnu.org/licenses/>.
 979-*/
 980-
 981-#pragma once
 982-
 983-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 984-#define LOCKING_SUPPORT_ENABLE
 985-/* Locking resynchronize hack */
 986-#define LOCKING_RESYNC_ENABLE
 987-
 988-/* Define less important options */
 989-
 990-/*
 991- * Feature disable options
 992- * These options are also useful to firmware size reduction.
 993- */
 994-
 995-/* disable debug print */
 996-//#define NO_DEBUG
 997-
 998-/* disable print */
 999-//#define NO_PRINT
1000-
1001-/* disable action features */
1002-//#define NO_ACTION_LAYER
1003-//#define NO_ACTION_TAPPING
1004-//#define NO_ACTION_ONESHOT
1005diff --git a/keyboards/fjlabs/sinanju/keyboard.json b/keyboards/fjlabs/sinanju/keyboard.json
1006index ef9cf0e872b6af826cdc25c91717dfef0866b6fb..0ade74b77bdebd188cabe51117d73fbe896397ae 100644
1007--- a/keyboards/fjlabs/sinanju/keyboard.json
1008+++ b/keyboards/fjlabs/sinanju/keyboard.json
1009@@ -25,6 +25,12 @@
1010         "command": true,
1011         "nkro": true
1012     },
1013+    "qmk": {
1014+        "locking": {
1015+            "enabled": true,
1016+            "resync": true
1017+        }
1018+    },
1019     "layouts": {
1020         "LAYOUT_60_ansi_wkl": {
1021             "layout": [
1022diff --git a/keyboards/fjlabs/sinanjuwk/config.h b/keyboards/fjlabs/sinanjuwk/config.h
1023deleted file mode 100644
1024index 13c17d597d1f1a8dd1ff0c189d808a3a893308ee..0000000000000000000000000000000000000000
1025--- a/keyboards/fjlabs/sinanjuwk/config.h
1026+++ /dev/null
1027@@ -1,41 +0,0 @@
1028-/*
1029-Copyright 2022 <felix@fjlaboratories.com>
1030-
1031-This program is free software: you can redistribute it and/or modify
1032-it under the terms of the GNU General Public License as published by
1033-the Free Software Foundation, either version 2 of the License, or
1034-(at your option) any later version.
1035-
1036-This program is distributed in the hope that it will be useful,
1037-but WITHOUT ANY WARRANTY; without even the implied warranty of
1038-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1039-GNU General Public License for more details.
1040-
1041-You should have received a copy of the GNU General Public License
1042-along with this program. If not, see <http://www.gnu.org/licenses/>.
1043-*/
1044-
1045-#pragma once
1046-
1047-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1048-#define LOCKING_SUPPORT_ENABLE
1049-/* Locking resynchronize hack */
1050-#define LOCKING_RESYNC_ENABLE
1051-
1052-/* Define less important options */
1053-
1054-/*
1055- * Feature disable options
1056- * These options are also useful to firmware size reduction.
1057- */
1058-
1059-/* disable debug print */
1060-//#define NO_DEBUG
1061-
1062-/* disable print */
1063-//#define NO_PRINT
1064-
1065-/* disable action features */
1066-//#define NO_ACTION_LAYER
1067-//#define NO_ACTION_TAPPING
1068-//#define NO_ACTION_ONESHOT
1069diff --git a/keyboards/fjlabs/sinanjuwk/keyboard.json b/keyboards/fjlabs/sinanjuwk/keyboard.json
1070index e825ae335e79525ebfe5a67912895ac1e8a5c4eb..cb1565c6829723f65844c222a499a2355cc791a0 100644
1071--- a/keyboards/fjlabs/sinanjuwk/keyboard.json
1072+++ b/keyboards/fjlabs/sinanjuwk/keyboard.json
1073@@ -25,6 +25,12 @@
1074         "command": true,
1075         "nkro": true
1076     },
1077+    "qmk": {
1078+        "locking": {
1079+            "enabled": true,
1080+            "resync": true
1081+        }
1082+    },
1083     "layout_aliases": {
1084         "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
1085     },
1086diff --git a/keyboards/fjlabs/solanis/config.h b/keyboards/fjlabs/solanis/config.h
1087deleted file mode 100644
1088index 68becd07670b557db2b46cb219b9c9a190aeade3..0000000000000000000000000000000000000000
1089--- a/keyboards/fjlabs/solanis/config.h
1090+++ /dev/null
1091@@ -1,41 +0,0 @@
1092-/*
1093-Copyright 2022 <felix@fjlaboratories.com>
1094-
1095-This program is free software: you can redistribute it and/or modify
1096-it under the terms of the GNU General Public License as published by
1097-the Free Software Foundation, either version 2 of the License, or
1098-(at your option) any later version.
1099-
1100-This program is distributed in the hope that it will be useful,
1101-but WITHOUT ANY WARRANTY; without even the implied warranty of
1102-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1103-GNU General Public License for more details.
1104-
1105-You should have received a copy of the GNU General Public License
1106-along with this program. If not, see <http://www.gnu.org/licenses/>.
1107-*/
1108-
1109-#pragma once
1110-
1111-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1112-#define LOCKING_SUPPORT_ENABLE
1113-/* Locking resynchronize hack */
1114-#define LOCKING_RESYNC_ENABLE
1115-
1116-/* Define less important options */
1117-
1118-/*
1119- * Feature disable options
1120- * These options are also useful to firmware size reduction.
1121- */
1122-
1123-/* disable debug print */
1124-//#define NO_DEBUG
1125-
1126-/* disable print */
1127-//#define NO_PRINT
1128-
1129-/* disable action features */
1130-//#define NO_ACTION_LAYER
1131-//#define NO_ACTION_TAPPING
1132-//#define NO_ACTION_ONESHOT
1133diff --git a/keyboards/fjlabs/solanis/keyboard.json b/keyboards/fjlabs/solanis/keyboard.json
1134index 12103d105861bfbab15be5da2f49dbbdc52b91c4..39cf7a1e69ba8a3ae08155eb63ce00cfe3ec41d5 100644
1135--- a/keyboards/fjlabs/solanis/keyboard.json
1136+++ b/keyboards/fjlabs/solanis/keyboard.json
1137@@ -42,6 +42,12 @@
1138         "nkro": true,
1139         "rgblight": true
1140     },
1141+    "qmk": {
1142+        "locking": {
1143+            "enabled": true,
1144+            "resync": true
1145+        }
1146+    },
1147     "community_layouts": [
1148         "tkl_ansi",
1149         "tkl_ansi_split_bs_rshift",
1150diff --git a/keyboards/fjlabs/swordfish/config.h b/keyboards/fjlabs/swordfish/config.h
1151deleted file mode 100644
1152index ea4c7011e141534f7906023e8fe2d728374ee64e..0000000000000000000000000000000000000000
1153--- a/keyboards/fjlabs/swordfish/config.h
1154+++ /dev/null
1155@@ -1,41 +0,0 @@
1156-/*
1157-Copyright 2022 <me@fjlaboratories.com>
1158-
1159-This program is free software: you can redistribute it and/or modify
1160-it under the terms of the GNU General Public License as published by
1161-the Free Software Foundation, either version 2 of the License, or
1162-(at your option) any later version.
1163-
1164-This program is distributed in the hope that it will be useful,
1165-but WITHOUT ANY WARRANTY; without even the implied warranty of
1166-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1167-GNU General Public License for more details.
1168-
1169-You should have received a copy of the GNU General Public License
1170-along with this program. If not, see <http://www.gnu.org/licenses/>.
1171-*/
1172-
1173-#pragma once
1174-
1175-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1176-#define LOCKING_SUPPORT_ENABLE
1177-/* Locking resynchronize hack */
1178-#define LOCKING_RESYNC_ENABLE 
1179-
1180-/* Define less important options */
1181-
1182-/*
1183- * Feature disable options
1184- * These options are also useful to firmware size reduction.
1185- */
1186-
1187-/* disable debug print */
1188-//#define NO_DEBUG
1189-
1190-/* disable print */
1191-//#define NO_PRINT
1192-
1193-/* disable action features */
1194-//#define NO_ACTION_LAYER
1195-//#define NO_ACTION_TAPPING
1196-//#define NO_ACTION_ONESHOT
1197diff --git a/keyboards/fjlabs/swordfish/keyboard.json b/keyboards/fjlabs/swordfish/keyboard.json
1198index 331bae459c0e22981df845c7f3513d1b0ceb4726..cc21269832e9b44ca51000f494234522354b9856 100644
1199--- a/keyboards/fjlabs/swordfish/keyboard.json
1200+++ b/keyboards/fjlabs/swordfish/keyboard.json
1201@@ -41,6 +41,12 @@
1202         "nkro": true,
1203         "rgblight": true
1204     },
1205+    "qmk": {
1206+        "locking": {
1207+            "enabled": true,
1208+            "resync": true
1209+        }
1210+    },
1211     "layouts": {
1212         "LAYOUT_2u_bs": {
1213             "layout": [
1214diff --git a/keyboards/fjlabs/tf60ansi/config.h b/keyboards/fjlabs/tf60ansi/config.h
1215deleted file mode 100644
1216index b352868d2d440fda54700802029366c12f330ea7..0000000000000000000000000000000000000000
1217--- a/keyboards/fjlabs/tf60ansi/config.h
1218+++ /dev/null
1219@@ -1,41 +0,0 @@
1220-/*
1221-Copyright 2021 <me@fjlaboratories.com>
1222-
1223-This program is free software: you can redistribute it and/or modify
1224-it under the terms of the GNU General Public License as published by
1225-the Free Software Foundation, either version 2 of the License, or
1226-(at your option) any later version.
1227-
1228-This program is distributed in the hope that it will be useful,
1229-but WITHOUT ANY WARRANTY; without even the implied warranty of
1230-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1231-GNU General Public License for more details.
1232-
1233-You should have received a copy of the GNU General Public License
1234-along with this program. If not, see <http://www.gnu.org/licenses/>.
1235-*/
1236-
1237-#pragma once
1238-
1239-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1240-#define LOCKING_SUPPORT_ENABLE
1241-/* Locking resynchronize hack */
1242-#define LOCKING_RESYNC_ENABLE
1243-
1244-/* Define less important options */
1245-
1246-/*
1247- * Feature disable options
1248- * These options are also useful to firmware size reduction.
1249- */
1250-
1251-/* disable debug print */
1252-//#define NO_DEBUG
1253-
1254-/* disable print */
1255-//#define NO_PRINT
1256-
1257-/* disable action features */
1258-//#define NO_ACTION_LAYER
1259-//#define NO_ACTION_TAPPING
1260-//#define NO_ACTION_ONESHOT
1261diff --git a/keyboards/fjlabs/tf60ansi/keyboard.json b/keyboards/fjlabs/tf60ansi/keyboard.json
1262index 69ff0690a1857a91798efdb5559493be13b8be6c..16ee46e833e02edcff1fd5dd27471abe11d6e77e 100644
1263--- a/keyboards/fjlabs/tf60ansi/keyboard.json
1264+++ b/keyboards/fjlabs/tf60ansi/keyboard.json
1265@@ -46,6 +46,12 @@
1266         "nkro": true,
1267         "rgblight": true
1268     },
1269+    "qmk": {
1270+        "locking": {
1271+            "enabled": true,
1272+            "resync": true
1273+        }
1274+    },
1275     "community_layouts": ["60_ansi"],
1276     "layouts": {
1277         "LAYOUT_60_ansi": {
1278diff --git a/keyboards/fjlabs/tf60v2/config.h b/keyboards/fjlabs/tf60v2/config.h
1279deleted file mode 100644
1280index b352868d2d440fda54700802029366c12f330ea7..0000000000000000000000000000000000000000
1281--- a/keyboards/fjlabs/tf60v2/config.h
1282+++ /dev/null
1283@@ -1,41 +0,0 @@
1284-/*
1285-Copyright 2021 <me@fjlaboratories.com>
1286-
1287-This program is free software: you can redistribute it and/or modify
1288-it under the terms of the GNU General Public License as published by
1289-the Free Software Foundation, either version 2 of the License, or
1290-(at your option) any later version.
1291-
1292-This program is distributed in the hope that it will be useful,
1293-but WITHOUT ANY WARRANTY; without even the implied warranty of
1294-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1295-GNU General Public License for more details.
1296-
1297-You should have received a copy of the GNU General Public License
1298-along with this program. If not, see <http://www.gnu.org/licenses/>.
1299-*/
1300-
1301-#pragma once
1302-
1303-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1304-#define LOCKING_SUPPORT_ENABLE
1305-/* Locking resynchronize hack */
1306-#define LOCKING_RESYNC_ENABLE
1307-
1308-/* Define less important options */
1309-
1310-/*
1311- * Feature disable options
1312- * These options are also useful to firmware size reduction.
1313- */
1314-
1315-/* disable debug print */
1316-//#define NO_DEBUG
1317-
1318-/* disable print */
1319-//#define NO_PRINT
1320-
1321-/* disable action features */
1322-//#define NO_ACTION_LAYER
1323-//#define NO_ACTION_TAPPING
1324-//#define NO_ACTION_ONESHOT
1325diff --git a/keyboards/fjlabs/tf60v2/keyboard.json b/keyboards/fjlabs/tf60v2/keyboard.json
1326index 337a06843f18544fb1644c4e2521dd00ab6db224..b38cde89aadb2f9dd9613e3c1dd12557f377aa53 100644
1327--- a/keyboards/fjlabs/tf60v2/keyboard.json
1328+++ b/keyboards/fjlabs/tf60v2/keyboard.json
1329@@ -46,6 +46,12 @@
1330         "nkro": true,
1331         "rgblight": true
1332     },
1333+    "qmk": {
1334+        "locking": {
1335+            "enabled": true,
1336+            "resync": true
1337+        }
1338+    },
1339     "community_layouts": ["60_ansi_arrow"],
1340     "layouts": {
1341         "LAYOUT_60_ansi_arrow": {
1342diff --git a/keyboards/fjlabs/tf65rgbv2/config.h b/keyboards/fjlabs/tf65rgbv2/config.h
1343deleted file mode 100644
1344index b352868d2d440fda54700802029366c12f330ea7..0000000000000000000000000000000000000000
1345--- a/keyboards/fjlabs/tf65rgbv2/config.h
1346+++ /dev/null
1347@@ -1,41 +0,0 @@
1348-/*
1349-Copyright 2021 <me@fjlaboratories.com>
1350-
1351-This program is free software: you can redistribute it and/or modify
1352-it under the terms of the GNU General Public License as published by
1353-the Free Software Foundation, either version 2 of the License, or
1354-(at your option) any later version.
1355-
1356-This program is distributed in the hope that it will be useful,
1357-but WITHOUT ANY WARRANTY; without even the implied warranty of
1358-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1359-GNU General Public License for more details.
1360-
1361-You should have received a copy of the GNU General Public License
1362-along with this program. If not, see <http://www.gnu.org/licenses/>.
1363-*/
1364-
1365-#pragma once
1366-
1367-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1368-#define LOCKING_SUPPORT_ENABLE
1369-/* Locking resynchronize hack */
1370-#define LOCKING_RESYNC_ENABLE
1371-
1372-/* Define less important options */
1373-
1374-/*
1375- * Feature disable options
1376- * These options are also useful to firmware size reduction.
1377- */
1378-
1379-/* disable debug print */
1380-//#define NO_DEBUG
1381-
1382-/* disable print */
1383-//#define NO_PRINT
1384-
1385-/* disable action features */
1386-//#define NO_ACTION_LAYER
1387-//#define NO_ACTION_TAPPING
1388-//#define NO_ACTION_ONESHOT
1389diff --git a/keyboards/fjlabs/tf65rgbv2/keyboard.json b/keyboards/fjlabs/tf65rgbv2/keyboard.json
1390index dd567c63b859d3fa372e3e29b903153f64b0c91a..7bcc4f60b97c717be5f9d0ad4c1b56871e085f11 100644
1391--- a/keyboards/fjlabs/tf65rgbv2/keyboard.json
1392+++ b/keyboards/fjlabs/tf65rgbv2/keyboard.json
1393@@ -46,6 +46,12 @@
1394         "nkro": true,
1395         "rgblight": true
1396     },
1397+    "qmk": {
1398+        "locking": {
1399+            "enabled": true,
1400+            "resync": true
1401+        }
1402+    },
1403     "community_layouts": ["65_ansi"],
1404     "layouts": {
1405         "LAYOUT_65_ansi": {
1406diff --git a/keyboards/flehrad/downbubble/config.h b/keyboards/flehrad/downbubble/config.h
1407deleted file mode 100644
1408index 64455593edf4e6f852cca71de84d66498b3657d8..0000000000000000000000000000000000000000
1409--- a/keyboards/flehrad/downbubble/config.h
1410+++ /dev/null
1411@@ -1,39 +0,0 @@
1412-/*
1413-Copyright 2018 Don Chiou
1414-
1415-This program is free software: you can redistribute it and/or modify
1416-it under the terms of the GNU General Public License as published by
1417-the Free Software Foundation, either version 2 of the License, or
1418-(at your option) any later version.
1419-
1420-This program is distributed in the hope that it will be useful,
1421-but WITHOUT ANY WARRANTY; without even the implied warranty of
1422-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1423-GNU General Public License for more details.
1424-
1425-You should have received a copy of the GNU General Public License
1426-along with this program.  If not, see <http://www.gnu.org/licenses/>.
1427-*/
1428-
1429-#pragma once
1430-
1431-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1432-#define LOCKING_SUPPORT_ENABLE
1433-/* Locking resynchronize hack */
1434-#define LOCKING_RESYNC_ENABLE
1435-
1436-/*
1437- * Feature disable options
1438- *  These options are also useful to firmware size reduction.
1439- */
1440-
1441-/* disable debug print */
1442-//#define NO_DEBUG
1443-
1444-/* disable print */
1445-//#define NO_PRINT
1446-
1447-/* disable action features */
1448-//#define NO_ACTION_LAYER
1449-//#define NO_ACTION_TAPPING
1450-//#define NO_ACTION_ONESHOT
1451diff --git a/keyboards/flehrad/downbubble/keyboard.json b/keyboards/flehrad/downbubble/keyboard.json
1452index 94f29b89f2b700c3d717b0a2391b23538c89414f..f4f2222fa84688a7c59ab034fc4efe87426e7be2 100644
1453--- a/keyboards/flehrad/downbubble/keyboard.json
1454+++ b/keyboards/flehrad/downbubble/keyboard.json
1455@@ -15,6 +15,12 @@
1456     "mousekey": true,
1457     "nkro": false
1458   },
1459+  "qmk": {
1460+    "locking": {
1461+      "enabled": true,
1462+      "resync": true
1463+    }
1464+  },
1465   "matrix_pins": {
1466     "cols": ["F7", "C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "D6", "D5", "D4", "D3", "D2", "D1", "D0", "B7"],
1467     "rows": ["F1", "F2", "F3", "F4", "F5", "F6"]
1468diff --git a/keyboards/flehrad/numbrero/config.h b/keyboards/flehrad/numbrero/config.h
1469deleted file mode 100644
1470index 5f360813239bad2c21db930bcae016798f148177..0000000000000000000000000000000000000000
1471--- a/keyboards/flehrad/numbrero/config.h
1472+++ /dev/null
1473@@ -1,7 +0,0 @@
1474-#pragma once
1475-
1476-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
1477-#define LOCKING_SUPPORT_ENABLE
1478-
1479-/* Locking resynchronize hack */
1480-#define LOCKING_RESYNC_ENABLE
1481diff --git a/keyboards/flehrad/numbrero/keyboard.json b/keyboards/flehrad/numbrero/keyboard.json
1482index 035aaa85b9ca14e04a74e1faf034ade7db4c0634..f72b06ca7c7fc470919956a61befdffb2cec7883 100644
1483--- a/keyboards/flehrad/numbrero/keyboard.json
1484+++ b/keyboards/flehrad/numbrero/keyboard.json
1485@@ -16,6 +16,12 @@
1486     "mousekey": true,
1487     "nkro": true
1488   },
1489+  "qmk": {
1490+    "locking": {
1491+      "enabled": true,
1492+      "resync": true
1493+    }
1494+  },
1495   "matrix_pins": {
1496     "cols": ["D1", "D0", "D4", "F5", "F4"],
1497     "rows": ["F6", "B5", "B4", "E6", "F7"]