From f37f27f02a55f750c21f671e712e3f704ba57885 Mon Sep 17 00:00:00 2001
From: James Young <18669334+noroadsleft@users.noreply.github.com>
Date: Thu, 23 May 2024 11:49:30 -0700
Subject: [PATCH] Migrate `LOCKING_*_ENABLE` to Data-Driven: O (#23778)
Affects:
- `oddball`
- `oddforge/vea`
- `ok60`
- `om60`
- `omkbd/ergodash/mini`
- `omkbd/ergodash/rev1`
- `omkbd/runner3680/3x6`
- `omkbd/runner3680/3x7`
- `omkbd/runner3680/3x8`
- `omkbd/runner3680/4x6`
- `omkbd/runner3680/4x7`
- `omkbd/runner3680/4x8`
- `omkbd/runner3680/5x6`
- `omkbd/runner3680/5x6_5x8`
- `omkbd/runner3680/5x7`
- `omkbd/runner3680/5x8`
- `omnikeyish`
- `orange75`
- `org60`
- `ortho5by12`
- `orthocode`
---
keyboards/oddball/config.h | 5 ----
keyboards/oddball/info.json | 6 +++++
keyboards/oddforge/vea/config.h | 3 ---
keyboards/oddforge/vea/keyboard.json | 6 +++++
keyboards/ok60/config.h | 24 -------------------
keyboards/ok60/keyboard.json | 6 +++++
keyboards/om60/config.h | 5 ----
keyboards/om60/keyboard.json | 6 ++++-
keyboards/omkbd/ergodash/mini/config.h | 5 ----
keyboards/omkbd/ergodash/mini/keyboard.json | 6 +++++
keyboards/omkbd/ergodash/rev1/config.h | 5 ----
keyboards/omkbd/ergodash/rev1/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/3x6/config.h | 5 ----
keyboards/omkbd/runner3680/3x6/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/3x7/config.h | 5 ----
keyboards/omkbd/runner3680/3x7/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/3x8/config.h | 5 ----
keyboards/omkbd/runner3680/3x8/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/4x6/config.h | 5 ----
keyboards/omkbd/runner3680/4x6/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/4x7/config.h | 5 ----
keyboards/omkbd/runner3680/4x7/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/4x8/config.h | 5 ----
keyboards/omkbd/runner3680/4x8/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/5x6/config.h | 5 ----
keyboards/omkbd/runner3680/5x6/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/5x6_5x8/config.h | 5 ----
.../omkbd/runner3680/5x6_5x8/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/5x7/config.h | 5 ----
keyboards/omkbd/runner3680/5x7/keyboard.json | 6 +++++
keyboards/omkbd/runner3680/5x8/config.h | 5 ----
keyboards/omkbd/runner3680/5x8/keyboard.json | 6 +++++
keyboards/omnikeyish/config.h | 6 -----
keyboards/omnikeyish/keyboard.json | 6 +++++
keyboards/orange75/config.h | 7 ------
keyboards/orange75/keyboard.json | 6 +++++
keyboards/org60/config.h | 23 ------------------
keyboards/org60/keyboard.json | 6 +++++
keyboards/ortho5by12/config.h | 20 ----------------
keyboards/ortho5by12/keyboard.json | 6 +++++
keyboards/orthocode/config.h | 22 -----------------
keyboards/orthocode/keyboard.json | 6 ++++-
42 files changed, 124 insertions(+), 177 deletions(-)
delete mode 100644 keyboards/ok60/config.h
delete mode 100644 keyboards/orange75/config.h
delete mode 100644 keyboards/org60/config.h
delete mode 100644 keyboards/ortho5by12/config.h
delete mode 100644 keyboards/orthocode/config.h
diff --git a/keyboards/oddball/config.h b/keyboards/oddball/config.h
index 71c4ecd4dbb..73d4cbe862a 100644
--- a/keyboards/oddball/config.h
+++ b/keyboards/oddball/config.h
@@ -21,11 +21,6 @@
#define SPLIT_USB_DETECT
#define MASTER_RIGHT
-/* 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
-
/* optical sensor settings */
#define SCROLL_DIVIDER 12
#define CPI_1 2000
diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json
index fdbb8b2b1db..3e6ffb0a90f 100644
--- a/keyboards/oddball/info.json
+++ b/keyboards/oddball/info.json
@@ -15,6 +15,12 @@
"nkro": false,
"pointing_device": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"split": {
"enabled": true
},
diff --git a/keyboards/oddforge/vea/config.h b/keyboards/oddforge/vea/config.h
index 316f8392c0d..c31783065cb 100644
--- a/keyboards/oddforge/vea/config.h
+++ b/keyboards/oddforge/vea/config.h
@@ -21,7 +21,4 @@ along with this program. If not, see .
#define MATRIX_ROWS 8
#define MATRIX_COLS 15
-#define LOCKING_SUPPORT_ENABLE
-#define LOCKING_RESYNC_ENABLE
-
#define RGBLIGHT_EFFECT_KNIGHT_OFFSET 9
diff --git a/keyboards/oddforge/vea/keyboard.json b/keyboards/oddforge/vea/keyboard.json
index 6a6780ea53c..a93f843aa06 100644
--- a/keyboards/oddforge/vea/keyboard.json
+++ b/keyboards/oddforge/vea/keyboard.json
@@ -15,6 +15,12 @@
"mousekey": false,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"backlight": {
"pin": "D4"
},
diff --git a/keyboards/ok60/config.h b/keyboards/ok60/config.h
deleted file mode 100644
index 74f7ff51815..00000000000
--- a/keyboards/ok60/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-Copyright 2018 Edward Browncross
-
-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 .
-*/
-
-#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/ok60/keyboard.json b/keyboards/ok60/keyboard.json
index f6459907bea..5cf55b666d6 100644
--- a/keyboards/ok60/keyboard.json
+++ b/keyboards/ok60/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D0", "D1", "D2", "D3", "D5", "B6", "C6", "C7", "F1", "F0", "E6", "B3", "B2", "B1", "B0"],
"rows": ["B5", "B4", "D7", "D6", "D4"]
diff --git a/keyboards/om60/config.h b/keyboards/om60/config.h
index e5c8d9426ab..1a6dfd12813 100644
--- a/keyboards/om60/config.h
+++ b/keyboards/om60/config.h
@@ -29,11 +29,6 @@ along with this program. If not, see .
#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 }
#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, E6 }
-/* 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
-
#ifndef IOS_DEVICE_ENABLE
#define RGBLIGHT_LIMIT_VAL 90
#define RGBLIGHT_VAL_STEP 17
diff --git a/keyboards/om60/keyboard.json b/keyboards/om60/keyboard.json
index 22386db039a..08eb898b014 100644
--- a/keyboards/om60/keyboard.json
+++ b/keyboards/om60/keyboard.json
@@ -22,7 +22,11 @@
]
},
"qmk": {
- "tap_keycode_delay": 10
+ "tap_keycode_delay": 10,
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"rgblight": {
"hue_steps": 10,
diff --git a/keyboards/omkbd/ergodash/mini/config.h b/keyboards/omkbd/ergodash/mini/config.h
index 26543ebb9df..12b408ff562 100644
--- a/keyboards/omkbd/ergodash/mini/config.h
+++ b/keyboards/omkbd/ergodash/mini/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see .
#define AUDIO_PIN C6
-/* 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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/ergodash/mini/keyboard.json b/keyboards/omkbd/ergodash/mini/keyboard.json
index 04233261779..6286b73b90d 100644
--- a/keyboards/omkbd/ergodash/mini/keyboard.json
+++ b/keyboards/omkbd/ergodash/mini/keyboard.json
@@ -14,6 +14,12 @@
"mousekey": false,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D7", "E6", "B4", "B5"]
diff --git a/keyboards/omkbd/ergodash/rev1/config.h b/keyboards/omkbd/ergodash/rev1/config.h
index 26543ebb9df..12b408ff562 100644
--- a/keyboards/omkbd/ergodash/rev1/config.h
+++ b/keyboards/omkbd/ergodash/rev1/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see .
#define AUDIO_PIN C6
-/* 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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/ergodash/rev1/keyboard.json b/keyboards/omkbd/ergodash/rev1/keyboard.json
index 07405e22f72..fb4a1c22549 100644
--- a/keyboards/omkbd/ergodash/rev1/keyboard.json
+++ b/keyboards/omkbd/ergodash/rev1/keyboard.json
@@ -14,6 +14,12 @@
"mousekey": false,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"],
"rows": ["D4", "D7", "E6", "B4", "B5"]
diff --git a/keyboards/omkbd/runner3680/3x6/config.h b/keyboards/omkbd/runner3680/3x6/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/3x6/config.h
+++ b/keyboards/omkbd/runner3680/3x6/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/3x6/keyboard.json b/keyboards/omkbd/runner3680/3x6/keyboard.json
index f2a169d2288..3e1ab5ba824 100644
--- a/keyboards/omkbd/runner3680/3x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x6/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7"]
diff --git a/keyboards/omkbd/runner3680/3x7/config.h b/keyboards/omkbd/runner3680/3x7/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/3x7/config.h
+++ b/keyboards/omkbd/runner3680/3x7/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/3x7/keyboard.json b/keyboards/omkbd/runner3680/3x7/keyboard.json
index e4b36983e73..496be949256 100644
--- a/keyboards/omkbd/runner3680/3x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x7/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7"]
diff --git a/keyboards/omkbd/runner3680/3x8/config.h b/keyboards/omkbd/runner3680/3x8/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/3x8/config.h
+++ b/keyboards/omkbd/runner3680/3x8/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/3x8/keyboard.json b/keyboards/omkbd/runner3680/3x8/keyboard.json
index e001332796c..80719fd0e47 100644
--- a/keyboards/omkbd/runner3680/3x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/3x8/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7"]
diff --git a/keyboards/omkbd/runner3680/4x6/config.h b/keyboards/omkbd/runner3680/4x6/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/4x6/config.h
+++ b/keyboards/omkbd/runner3680/4x6/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/4x6/keyboard.json b/keyboards/omkbd/runner3680/4x6/keyboard.json
index 6568a9e845e..f9d3146a785 100644
--- a/keyboards/omkbd/runner3680/4x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x6/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/omkbd/runner3680/4x7/config.h b/keyboards/omkbd/runner3680/4x7/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/4x7/config.h
+++ b/keyboards/omkbd/runner3680/4x7/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/4x7/keyboard.json b/keyboards/omkbd/runner3680/4x7/keyboard.json
index 88f3bdd18de..120e254e5cc 100644
--- a/keyboards/omkbd/runner3680/4x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x7/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/omkbd/runner3680/4x8/config.h b/keyboards/omkbd/runner3680/4x8/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/4x8/config.h
+++ b/keyboards/omkbd/runner3680/4x8/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/4x8/keyboard.json b/keyboards/omkbd/runner3680/4x8/keyboard.json
index 1ee1d482c92..e0b91088da0 100644
--- a/keyboards/omkbd/runner3680/4x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/4x8/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6"]
diff --git a/keyboards/omkbd/runner3680/5x6/config.h b/keyboards/omkbd/runner3680/5x6/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/5x6/config.h
+++ b/keyboards/omkbd/runner3680/5x6/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/5x6/keyboard.json b/keyboards/omkbd/runner3680/5x6/keyboard.json
index 28fddf18738..c06bff537fb 100644
--- a/keyboards/omkbd/runner3680/5x6/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x6/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/config.h b/keyboards/omkbd/runner3680/5x6_5x8/config.h
index 8cf1e8238d3..b6f3f5ff865 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x6_5x8/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
index 8a7b34597e1..4c359b27ebd 100644
--- a/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x6_5x8/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x5658",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"rgb_matrix": {
"driver": "ws2812",
"split_count": [30, 40]
diff --git a/keyboards/omkbd/runner3680/5x7/config.h b/keyboards/omkbd/runner3680/5x7/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/5x7/config.h
+++ b/keyboards/omkbd/runner3680/5x7/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/5x7/keyboard.json b/keyboards/omkbd/runner3680/5x7/keyboard.json
index 10a833a839e..55936eb9d36 100644
--- a/keyboards/omkbd/runner3680/5x7/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x7/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
diff --git a/keyboards/omkbd/runner3680/5x8/config.h b/keyboards/omkbd/runner3680/5x8/config.h
index c0a755e251b..2b0210d2be2 100644
--- a/keyboards/omkbd/runner3680/5x8/config.h
+++ b/keyboards/omkbd/runner3680/5x8/config.h
@@ -16,11 +16,6 @@
#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 SELECT_SOFT_SERIAL_SPEED 1
/*Sets the protocol speed when using serial communication*/
//Speeds:
diff --git a/keyboards/omkbd/runner3680/5x8/keyboard.json b/keyboards/omkbd/runner3680/5x8/keyboard.json
index 8b2ca0142ce..9e96e69bbb8 100644
--- a/keyboards/omkbd/runner3680/5x8/keyboard.json
+++ b/keyboards/omkbd/runner3680/5x8/keyboard.json
@@ -8,6 +8,12 @@
"pid": "0x0000",
"device_version": "0.0.5"
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"],
"rows": ["D4", "C6", "D7", "E6", "B4"]
diff --git a/keyboards/omnikeyish/config.h b/keyboards/omnikeyish/config.h
index c4edb8427c6..ad307854e03 100644
--- a/keyboards/omnikeyish/config.h
+++ b/keyboards/omnikeyish/config.h
@@ -14,12 +14,6 @@
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL
-/* 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 DYNAMIC_MACRO_COUNT 12
#define DYNAMIC_MACRO_SIZE 48
#define DYNAMIC_MACRO_EEPROM_STORAGE
diff --git a/keyboards/omnikeyish/keyboard.json b/keyboards/omnikeyish/keyboard.json
index cd61f2954bb..82363b10bfa 100644
--- a/keyboards/omnikeyish/keyboard.json
+++ b/keyboards/omnikeyish/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": false,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"indicators": {
"caps_lock": "E1",
"num_lock": "E0",
diff --git a/keyboards/orange75/config.h b/keyboards/orange75/config.h
deleted file mode 100644
index 5f360813239..00000000000
--- a/keyboards/orange75/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/orange75/keyboard.json b/keyboards/orange75/keyboard.json
index 4208cc0f586..a0ef8196513 100644
--- a/keyboards/orange75/keyboard.json
+++ b/keyboards/orange75/keyboard.json
@@ -17,6 +17,12 @@
"mousekey": true,
"nkro": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "B7", "B3"],
"rows": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B4", "D7", "D4", "D5", "D6"]
diff --git a/keyboards/org60/config.h b/keyboards/org60/config.h
deleted file mode 100644
index 4e596948184..00000000000
--- a/keyboards/org60/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright 2012 Jun Wako
-
-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 .
-*/
-
-#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/org60/keyboard.json b/keyboards/org60/keyboard.json
index d4994346af2..2586d16b083 100644
--- a/keyboards/org60/keyboard.json
+++ b/keyboards/org60/keyboard.json
@@ -18,6 +18,12 @@
"nkro": true,
"rgblight": true
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B7", "B5", "B4", "D7", "D6", "B3"],
"rows": ["D0", "D1", "D2", "D3", "D5"]
diff --git a/keyboards/ortho5by12/config.h b/keyboards/ortho5by12/config.h
deleted file mode 100644
index 2e979809874..00000000000
--- a/keyboards/ortho5by12/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright 2019 Takuya Urakawa (dm9records.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 .
-*/
-
-#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/ortho5by12/keyboard.json b/keyboards/ortho5by12/keyboard.json
index c45788ba2fe..49ce4944175 100644
--- a/keyboards/ortho5by12/keyboard.json
+++ b/keyboards/ortho5by12/keyboard.json
@@ -16,6 +16,12 @@
"mousekey": false,
"nkro": false
},
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["C2", "D0", "D1", "D4", "C3", "C1"],
"rows": ["B5", "B1", "B2", "B3", "B4", "C0", "D5", "D6", "D7", "B0"]
diff --git a/keyboards/orthocode/config.h b/keyboards/orthocode/config.h
deleted file mode 100644
index 3cc80db3764..00000000000
--- a/keyboards/orthocode/config.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*Copyright 2020 Jrodna
-
-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 .
-*/
-
-#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/orthocode/keyboard.json b/keyboards/orthocode/keyboard.json
index 69f3374b27f..11c720c6b1d 100644
--- a/keyboards/orthocode/keyboard.json
+++ b/keyboards/orthocode/keyboard.json
@@ -31,7 +31,11 @@
]
},
"qmk": {
- "tap_keycode_delay": 10
+ "tap_keycode_delay": 10,
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
},
"rgblight": {
"saturation_steps": 8,