From 495e83b30f86a2ce4511f84f2e9cefb8e7f99136 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Wed, 22 May 2024 03:13:39 -0700 Subject: [PATCH] Migrate `LOCKING_*_ENABLE` to Data-Driven: M, Part 2 (#23773) Affects: - `mkh_studio/bully` - `mlego/m48/rev1` - `mlego/m60/rev1` - `mlego/m60_split/rev1` - `mlego/m60_split/rev2` - `mntre` - `mode/m65ha_alpha` - `mode/m65hi_alpha` - `mode/m65s` - `mode/m80v1/m80h` - `mode/m80v1/m80s` - `mode/m80v2/m80v2h` - `mode/m80v2/m80v2s` - `molecule` - `momoka_ergo` - `monarch` - `monsgeek/m1` - `monsgeek/m3` - `monsgeek/m5` - `monsgeek/m6` - `monstargear/xo87/rgb` - `monstargear/xo87/solderable` - `montsinger/rebound/rev1` - `montsinger/rebound/rev2` - `montsinger/rebound/rev3` - `montsinger/rebound/rev4` - `montsinger/rewind` - `moon` - `morizon` - `mountainblocks/mb17` - `mt/blocked65` - `mt/mt64rgb` - `mt/mt980` - `mtbkeys/mtb60/hotswap` - `mtbkeys/mtb60/solder` - `murcielago/rev1` - `mxss` - `mysticworks/wyvern` --- keyboards/mkh_studio/bully/config.h | 9 ----- keyboards/mkh_studio/bully/keyboard.json | 6 +++ keyboards/mlego/m48/config.h | 21 ---------- keyboards/mlego/m48/rev1/keyboard.json | 6 +++ keyboards/mlego/m60/config.h | 21 ---------- keyboards/mlego/m60/rev1/keyboard.json | 6 +++ keyboards/mlego/m60_split/config.h | 21 ---------- keyboards/mlego/m60_split/rev1/keyboard.json | 6 +++ keyboards/mlego/m60_split/rev2/keyboard.json | 6 +++ keyboards/mntre/config.h | 5 --- keyboards/mntre/keyboard.json | 6 +++ keyboards/mode/m65ha_alpha/config.h | 5 --- keyboards/mode/m65ha_alpha/keyboard.json | 6 +++ keyboards/mode/m65hi_alpha/config.h | 5 --- keyboards/mode/m65hi_alpha/keyboard.json | 6 +++ keyboards/mode/m65s/config.h | 5 --- keyboards/mode/m65s/keyboard.json | 6 ++- keyboards/mode/m80v1/config.h | 39 ------------------- keyboards/mode/m80v1/m80h/keyboard.json | 6 +++ keyboards/mode/m80v1/m80s/keyboard.json | 6 +++ keyboards/mode/m80v2/config.h | 23 ----------- keyboards/mode/m80v2/m80v2h/keyboard.json | 6 +++ keyboards/mode/m80v2/m80v2s/keyboard.json | 6 +++ keyboards/molecule/config.h | 5 --- keyboards/molecule/keyboard.json | 6 +++ keyboards/momoka_ergo/config.h | 5 --- keyboards/momoka_ergo/keyboard.json | 6 +++ keyboards/monarch/config.h | 5 --- keyboards/monarch/keyboard.json | 6 +++ keyboards/monsgeek/m1/config.h | 5 --- keyboards/monsgeek/m1/keyboard.json | 6 +++ keyboards/monsgeek/m3/config.h | 5 --- keyboards/monsgeek/m3/keyboard.json | 6 +++ keyboards/monsgeek/m5/config.h | 5 --- keyboards/monsgeek/m5/keyboard.json | 6 +++ keyboards/monsgeek/m6/config.h | 5 --- keyboards/monsgeek/m6/keyboard.json | 6 +++ keyboards/monstargear/xo87/rgb/config.h | 20 ---------- keyboards/monstargear/xo87/rgb/keyboard.json | 6 +++ .../monstargear/xo87/solderable/config.h | 3 -- .../monstargear/xo87/solderable/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev1/config.h | 20 ---------- .../montsinger/rebound/rev1/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev2/config.h | 20 ---------- .../montsinger/rebound/rev2/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev3/config.h | 20 ---------- .../montsinger/rebound/rev3/keyboard.json | 6 +++ keyboards/montsinger/rebound/rev4/config.h | 20 ---------- .../montsinger/rebound/rev4/keyboard.json | 6 +++ keyboards/montsinger/rewind/config.h | 20 ---------- keyboards/montsinger/rewind/keyboard.json | 6 +++ keyboards/moon/config.h | 5 --- keyboards/moon/keyboard.json | 6 +++ keyboards/morizon/config.h | 23 ----------- keyboards/morizon/keyboard.json | 6 +++ keyboards/mountainblocks/mb17/config.h | 23 ----------- keyboards/mountainblocks/mb17/keyboard.json | 6 +++ keyboards/mt/blocked65/config.h | 23 ----------- keyboards/mt/blocked65/keyboard.json | 6 +++ keyboards/mt/mt64rgb/config.h | 5 --- keyboards/mt/mt64rgb/keyboard.json | 6 +++ keyboards/mt/mt980/config.h | 7 ---- keyboards/mt/mt980/keyboard.json | 6 +++ keyboards/mtbkeys/mtb60/hotswap/config.h | 24 ------------ keyboards/mtbkeys/mtb60/hotswap/keyboard.json | 6 +++ keyboards/mtbkeys/mtb60/solder/config.h | 24 ------------ keyboards/mtbkeys/mtb60/solder/keyboard.json | 6 +++ keyboards/murcielago/rev1/config.h | 5 --- keyboards/murcielago/rev1/keyboard.json | 6 +++ keyboards/mxss/config.h | 23 ----------- keyboards/mxss/keyboard.json | 6 +++ keyboards/mysticworks/wyvern/config.h | 22 ----------- keyboards/mysticworks/wyvern/keyboard.json | 6 +++ 73 files changed, 227 insertions(+), 497 deletions(-) delete mode 100644 keyboards/mkh_studio/bully/config.h delete mode 100644 keyboards/mlego/m48/config.h delete mode 100644 keyboards/mlego/m60/config.h delete mode 100644 keyboards/mlego/m60_split/config.h delete mode 100644 keyboards/mode/m80v1/config.h delete mode 100644 keyboards/mode/m80v2/config.h delete mode 100644 keyboards/monstargear/xo87/rgb/config.h delete mode 100644 keyboards/montsinger/rebound/rev1/config.h delete mode 100644 keyboards/montsinger/rebound/rev2/config.h delete mode 100644 keyboards/montsinger/rebound/rev3/config.h delete mode 100644 keyboards/montsinger/rebound/rev4/config.h delete mode 100644 keyboards/montsinger/rewind/config.h delete mode 100644 keyboards/morizon/config.h delete mode 100644 keyboards/mountainblocks/mb17/config.h delete mode 100644 keyboards/mt/blocked65/config.h delete mode 100644 keyboards/mt/mt980/config.h delete mode 100644 keyboards/mtbkeys/mtb60/hotswap/config.h delete mode 100644 keyboards/mtbkeys/mtb60/solder/config.h delete mode 100644 keyboards/mxss/config.h delete mode 100644 keyboards/mysticworks/wyvern/config.h diff --git a/keyboards/mkh_studio/bully/config.h b/keyboards/mkh_studio/bully/config.h deleted file mode 100644 index 53958accae1..00000000000 --- a/keyboards/mkh_studio/bully/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2022 zhol -// 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 diff --git a/keyboards/mkh_studio/bully/keyboard.json b/keyboards/mkh_studio/bully/keyboard.json index ddd50665f6e..5102ffa632f 100644 --- a/keyboards/mkh_studio/bully/keyboard.json +++ b/keyboards/mkh_studio/bully/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mlego/m48/config.h b/keyboards/mlego/m48/config.h deleted file mode 100644 index 70e1beb43e7..00000000000 --- a/keyboards/mlego/m48/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021-2022 alin m elena - * - * 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/mlego/m48/rev1/keyboard.json b/keyboards/mlego/m48/rev1/keyboard.json index c8259424f3e..efd38882951 100644 --- a/keyboards/mlego/m48/rev1/keyboard.json +++ b/keyboards/mlego/m48/rev1/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], "rows": ["A6", "A7", "B0", "B10"] diff --git a/keyboards/mlego/m60/config.h b/keyboards/mlego/m60/config.h deleted file mode 100644 index 70e1beb43e7..00000000000 --- a/keyboards/mlego/m60/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021-2022 alin m elena - * - * 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/mlego/m60/rev1/keyboard.json b/keyboards/mlego/m60/rev1/keyboard.json index 989474db830..126338b0c8e 100644 --- a/keyboards/mlego/m60/rev1/keyboard.json +++ b/keyboards/mlego/m60/rev1/keyboard.json @@ -13,6 +13,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A15", "B3", "B4", "B5", "B7", "B6", "A1", "A2", "A3", "A4", "A5"], "rows": ["A6", "A7", "B0", "B1", "B10"] diff --git a/keyboards/mlego/m60_split/config.h b/keyboards/mlego/m60_split/config.h deleted file mode 100644 index 70e1beb43e7..00000000000 --- a/keyboards/mlego/m60_split/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021-2022 alin m elena - * - * 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/mlego/m60_split/rev1/keyboard.json b/keyboards/mlego/m60_split/rev1/keyboard.json index 9be9708081e..d0c6275dc9a 100644 --- a/keyboards/mlego/m60_split/rev1/keyboard.json +++ b/keyboards/mlego/m60_split/rev1/keyboard.json @@ -11,6 +11,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mlego/m60_split/rev2/keyboard.json b/keyboards/mlego/m60_split/rev2/keyboard.json index 5185a2e6456..48d962f9cc0 100644 --- a/keyboards/mlego/m60_split/rev2/keyboard.json +++ b/keyboards/mlego/m60_split/rev2/keyboard.json @@ -11,6 +11,12 @@ "rgblight": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "A10", "A15", "B3", "B4", "B5"], "rows": ["B0", "A6", "A7", "B1", "A5"] diff --git a/keyboards/mntre/config.h b/keyboards/mntre/config.h index c12ca236724..1887ae7b3dd 100644 --- a/keyboards/mntre/config.h +++ b/keyboards/mntre/config.h @@ -5,11 +5,6 @@ #define BACKLIGHT_RESOLUTION 0x400 -/* 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. diff --git a/keyboards/mntre/keyboard.json b/keyboards/mntre/keyboard.json index 4e14dd19f53..26dc66dc48d 100644 --- a/keyboards/mntre/keyboard.json +++ b/keyboards/mntre/keyboard.json @@ -18,6 +18,12 @@ "nkro": false, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D5", "F7", "E6", "C7", "B3", "B2", "B1", "B0", "F0", "F1", "F4", "F5", "F6", "C6"], "rows": ["B6", "B5", "B4", "D7", "D6", "D4"] diff --git a/keyboards/mode/m65ha_alpha/config.h b/keyboards/mode/m65ha_alpha/config.h index 52f0c6784df..9f49dcabf7d 100644 --- a/keyboards/mode/m65ha_alpha/config.h +++ b/keyboards/mode/m65ha_alpha/config.h @@ -17,11 +17,6 @@ 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 - #define EEPROM_I2C_24LC256 //#define I2C1_CLOCK_SPEED 400000 //#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 diff --git a/keyboards/mode/m65ha_alpha/keyboard.json b/keyboards/mode/m65ha_alpha/keyboard.json index 8297f3b2bd6..cc5271b5c2c 100644 --- a/keyboards/mode/m65ha_alpha/keyboard.json +++ b/keyboards/mode/m65ha_alpha/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] diff --git a/keyboards/mode/m65hi_alpha/config.h b/keyboards/mode/m65hi_alpha/config.h index 52f0c6784df..9f49dcabf7d 100644 --- a/keyboards/mode/m65hi_alpha/config.h +++ b/keyboards/mode/m65hi_alpha/config.h @@ -17,11 +17,6 @@ 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 - #define EEPROM_I2C_24LC256 //#define I2C1_CLOCK_SPEED 400000 //#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 diff --git a/keyboards/mode/m65hi_alpha/keyboard.json b/keyboards/mode/m65hi_alpha/keyboard.json index ff6c75f55be..c0c843d4de4 100644 --- a/keyboards/mode/m65hi_alpha/keyboard.json +++ b/keyboards/mode/m65hi_alpha/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B10", "B12", "C8", "C4", "C5", "B0", "C10", "B13", "B14", "B15", "A15", "C6", "C7", "A8", "C9"], "rows": ["A7", "A10", "D2", "C12", "B1", "C11"] diff --git a/keyboards/mode/m65s/config.h b/keyboards/mode/m65s/config.h index 80d31d8d756..f41925995b5 100644 --- a/keyboards/mode/m65s/config.h +++ b/keyboards/mode/m65s/config.h @@ -17,11 +17,6 @@ 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 - #define EEPROM_I2C_24LC128 //#define I2C1_CLOCK_SPEED 400000 //#define I2C1_DUTY_CYCLE FAST_DUTY_CYCLE_2 diff --git a/keyboards/mode/m65s/keyboard.json b/keyboards/mode/m65s/keyboard.json index 8ed817a1801..ae8df282ad9 100644 --- a/keyboards/mode/m65s/keyboard.json +++ b/keyboards/mode/m65s/keyboard.json @@ -9,7 +9,11 @@ "device_version": "0.0.1" }, "qmk": { - "tap_keycode_delay": 50 + "tap_keycode_delay": 50, + "locking": { + "enabled": true, + "resync": true + } }, "features": { "bootmagic": true, diff --git a/keyboards/mode/m80v1/config.h b/keyboards/mode/m80v1/config.h deleted file mode 100644 index 72ad3079054..00000000000 --- a/keyboards/mode/m80v1/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Alvaro "Gondolindrim" Volpato - -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 - -/* - * 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/mode/m80v1/m80h/keyboard.json b/keyboards/mode/m80v1/m80h/keyboard.json index 8d743dcb62f..dcebcb6d494 100644 --- a/keyboards/mode/m80v1/m80h/keyboard.json +++ b/keyboards/mode/m80v1/m80h/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] diff --git a/keyboards/mode/m80v1/m80s/keyboard.json b/keyboards/mode/m80v1/m80s/keyboard.json index f4585389344..27622de022b 100644 --- a/keyboards/mode/m80v1/m80s/keyboard.json +++ b/keyboards/mode/m80v1/m80s/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B8", "B7", "B6", "B5", "B4", "A2", "A1", "A0", "F1", "F0", "C15", "C14", "C13", "A7", "A6", "A5"], "rows": ["A10", "A15", "B3", "B9", "A3", "A4"] diff --git a/keyboards/mode/m80v2/config.h b/keyboards/mode/m80v2/config.h deleted file mode 100644 index d553d5d8942..00000000000 --- a/keyboards/mode/m80v2/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - Copyright 2020 Álvaro "Gondolindrim" Volpato - -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/mode/m80v2/m80v2h/keyboard.json b/keyboards/mode/m80v2/m80v2h/keyboard.json index e8bd7f2912b..1844e0775cd 100644 --- a/keyboards/mode/m80v2/m80v2h/keyboard.json +++ b/keyboards/mode/m80v2/m80v2h/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] diff --git a/keyboards/mode/m80v2/m80v2s/keyboard.json b/keyboards/mode/m80v2/m80v2s/keyboard.json index 8f5ecc9ac2e..8ab060668c9 100644 --- a/keyboards/mode/m80v2/m80v2s/keyboard.json +++ b/keyboards/mode/m80v2/m80v2s/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B10", "A8", "A10", "B15", "A15", "B5", "B8", "C13"], "rows": ["B12", "B13", "B14", "B3", "B4", "B9"] diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h index 1755979bbc8..3de5dc14cc4 100755 --- a/keyboards/molecule/config.h +++ b/keyboards/molecule/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . /* OLED */ #define OLED_TIMEOUT 0 -/* 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. diff --git a/keyboards/molecule/keyboard.json b/keyboards/molecule/keyboard.json index f3bd818122c..94c721f7524 100755 --- a/keyboards/molecule/keyboard.json +++ b/keyboards/molecule/keyboard.json @@ -14,6 +14,12 @@ "extrakey": true, "pointing_device": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], "rows": ["F4", "F5", "F6", "B6"] diff --git a/keyboards/momoka_ergo/config.h b/keyboards/momoka_ergo/config.h index 54d60e9963f..dbd81b12135 100644 --- a/keyboards/momoka_ergo/config.h +++ b/keyboards/momoka_ergo/config.h @@ -19,10 +19,5 @@ along with this program. If not, see . #define SELECT_SOFT_SERIAL_SPEED 5 -/* 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 SPLIT_USB_DETECT #define EE_HANDS diff --git a/keyboards/momoka_ergo/keyboard.json b/keyboards/momoka_ergo/keyboard.json index da21c509b92..68fe1b308f5 100644 --- a/keyboards/momoka_ergo/keyboard.json +++ b/keyboards/momoka_ergo/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7"] diff --git a/keyboards/monarch/config.h b/keyboards/monarch/config.h index 30181978df9..aa89dc3eacf 100644 --- a/keyboards/monarch/config.h +++ b/keyboards/monarch/config.h @@ -23,11 +23,6 @@ along with this program. If not, see . #define SLEEP_LED_GPT_DRIVER GPTD1 -/* 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. diff --git a/keyboards/monarch/keyboard.json b/keyboards/monarch/keyboard.json index f5dee1f9f60..c42db64a26f 100644 --- a/keyboards/monarch/keyboard.json +++ b/keyboards/monarch/keyboard.json @@ -19,6 +19,12 @@ "nkro": true, "sleep_led": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B10", "B2", "B1", "B0", "A5", "A7", "A4", "A3", "B6"], "rows": ["A15", "B3", "B11", "A2", "A1", "B9"] diff --git a/keyboards/monsgeek/m1/config.h b/keyboards/monsgeek/m1/config.h index 4aa60123309..4b6f30ded3f 100644 --- a/keyboards/monsgeek/m1/config.h +++ b/keyboards/monsgeek/m1/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 ENCODER_DEFAULT_POS 0x3 /* SPI Config for spi flash*/ diff --git a/keyboards/monsgeek/m1/keyboard.json b/keyboards/monsgeek/m1/keyboard.json index 5d5d030214c..1551b2a1137 100644 --- a/keyboards/monsgeek/m1/keyboard.json +++ b/keyboards/monsgeek/m1/keyboard.json @@ -21,6 +21,12 @@ "encoder": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/monsgeek/m3/config.h b/keyboards/monsgeek/m3/config.h index ba77115d40f..c179436ca75 100644 --- a/keyboards/monsgeek/m3/config.h +++ b/keyboards/monsgeek/m3/config.h @@ -20,11 +20,6 @@ #define LED_MAC_OS_PIN C10 #define LED_WIN_LOCK_PIN C11 -/* 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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/monsgeek/m3/keyboard.json b/keyboards/monsgeek/m3/keyboard.json index 09ce11c4476..cb7c3abf212 100644 --- a/keyboards/monsgeek/m3/keyboard.json +++ b/keyboards/monsgeek/m3/keyboard.json @@ -26,6 +26,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "dynamic_keymap": { "layer_count": 6 }, diff --git a/keyboards/monsgeek/m5/config.h b/keyboards/monsgeek/m5/config.h index d18d1fdacdc..f7cedc4d41e 100644 --- a/keyboards/monsgeek/m5/config.h +++ b/keyboards/monsgeek/m5/config.h @@ -19,11 +19,6 @@ /* LED Indicators */ #define LED_WIN_LOCK_PIN C11 -/* 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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/monsgeek/m5/keyboard.json b/keyboards/monsgeek/m5/keyboard.json index 77d474d5db2..b9ef0099bc3 100644 --- a/keyboards/monsgeek/m5/keyboard.json +++ b/keyboards/monsgeek/m5/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2","B10","B11","B12","B13","B14"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/monsgeek/m6/config.h b/keyboards/monsgeek/m6/config.h index 3586c2cb466..d5131a1bb2a 100644 --- a/keyboards/monsgeek/m6/config.h +++ b/keyboards/monsgeek/m6/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 - /* SPI Config for spi flash*/ #define SPI_DRIVER SPIDQ #define SPI_SCK_PIN B3 diff --git a/keyboards/monsgeek/m6/keyboard.json b/keyboards/monsgeek/m6/keyboard.json index 7931d0d1224..12d7def4c77 100644 --- a/keyboards/monsgeek/m6/keyboard.json +++ b/keyboards/monsgeek/m6/keyboard.json @@ -20,6 +20,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["C6", "C7", "C8", "C9", "A8"] diff --git a/keyboards/monstargear/xo87/rgb/config.h b/keyboards/monstargear/xo87/rgb/config.h deleted file mode 100644 index e32abb6630c..00000000000 --- a/keyboards/monstargear/xo87/rgb/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 datafx - * - * 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 - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/monstargear/xo87/rgb/keyboard.json b/keyboards/monstargear/xo87/rgb/keyboard.json index cedc1868450..5571b919907 100644 --- a/keyboards/monstargear/xo87/rgb/keyboard.json +++ b/keyboards/monstargear/xo87/rgb/keyboard.json @@ -73,6 +73,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] diff --git a/keyboards/monstargear/xo87/solderable/config.h b/keyboards/monstargear/xo87/solderable/config.h index 088e09dc81a..68da1addfa7 100644 --- a/keyboards/monstargear/xo87/solderable/config.h +++ b/keyboards/monstargear/xo87/solderable/config.h @@ -23,6 +23,3 @@ #define KEYLED_COLS 16 #define KEYLED_ROW_PINS { E5,B4,B5,F0,C6,D5 } #define KEYLED_COL_PINS { C4,C2,C0,E0,D4,E4,B6,B2,F4,A0,F2,A4,F1,A7,D3,A3 } - -#define LOCKING_SUPPORT_ENABLE -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/monstargear/xo87/solderable/keyboard.json b/keyboards/monstargear/xo87/solderable/keyboard.json index f8436f4bacd..a230649b49c 100644 --- a/keyboards/monstargear/xo87/solderable/keyboard.json +++ b/keyboards/monstargear/xo87/solderable/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C5", "C3", "C1", "E1", "D6", "D2", "B7", "B3", "F6", "F7", "F3", "A5", "A1", "E2", "C7", "A6"], "rows": ["E6", "E7", "E3", "B0", "B1", "A2"] diff --git a/keyboards/montsinger/rebound/rev1/config.h b/keyboards/montsinger/rebound/rev1/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev1/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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/montsinger/rebound/rev1/keyboard.json b/keyboards/montsinger/rebound/rev1/keyboard.json index 66ed41a6740..b03f0250688 100644 --- a/keyboards/montsinger/rebound/rev1/keyboard.json +++ b/keyboards/montsinger/rebound/rev1/keyboard.json @@ -15,6 +15,12 @@ "console": true, "command": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6"] diff --git a/keyboards/montsinger/rebound/rev2/config.h b/keyboards/montsinger/rebound/rev2/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev2/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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/montsinger/rebound/rev2/keyboard.json b/keyboards/montsinger/rebound/rev2/keyboard.json index a3a99247ab3..3bee7fc3efd 100644 --- a/keyboards/montsinger/rebound/rev2/keyboard.json +++ b/keyboards/montsinger/rebound/rev2/keyboard.json @@ -16,6 +16,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D4", "C6", "D7", "E6", "B4", "B3", "B1", "F7", "F6", "F5", "F4"], "rows": ["D1", "B5", "B2", "B6", "B0"] diff --git a/keyboards/montsinger/rebound/rev3/config.h b/keyboards/montsinger/rebound/rev3/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev3/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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/montsinger/rebound/rev3/keyboard.json b/keyboards/montsinger/rebound/rev3/keyboard.json index 630761b4013..a0d3fc6db84 100644 --- a/keyboards/montsinger/rebound/rev3/keyboard.json +++ b/keyboards/montsinger/rebound/rev3/keyboard.json @@ -16,6 +16,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"], "rows": ["F4", "F5", "D1", "D0", "B0"] diff --git a/keyboards/montsinger/rebound/rev4/config.h b/keyboards/montsinger/rebound/rev4/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rebound/rev4/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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/montsinger/rebound/rev4/keyboard.json b/keyboards/montsinger/rebound/rev4/keyboard.json index ad17ca423ea..7497bdc80d0 100644 --- a/keyboards/montsinger/rebound/rev4/keyboard.json +++ b/keyboards/montsinger/rebound/rev4/keyboard.json @@ -16,6 +16,12 @@ "command": true, "encoder": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5", "B2", "B3", "B1"], "rows": ["D1", "D0", "D4", "C6", "F7", "F6", "F5", "F4"] diff --git a/keyboards/montsinger/rewind/config.h b/keyboards/montsinger/rewind/config.h deleted file mode 100644 index 274c715a937..00000000000 --- a/keyboards/montsinger/rewind/config.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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/montsinger/rewind/keyboard.json b/keyboards/montsinger/rewind/keyboard.json index b8a70296633..ddb6ab64968 100644 --- a/keyboards/montsinger/rewind/keyboard.json +++ b/keyboards/montsinger/rewind/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "E6", "D7", "C6", "D4", "D0", "D1"], "rows": ["B5", "B4", "D2", "D3", "B2"] diff --git a/keyboards/moon/config.h b/keyboards/moon/config.h index dda16185227..ca4c770a3bc 100644 --- a/keyboards/moon/config.h +++ b/keyboards/moon/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . /* key matrix size */ #define MATRIX_ROWS 8 #define MATRIX_COLS 11 - -/* 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/moon/keyboard.json b/keyboards/moon/keyboard.json index 4c66cb51a9b..76d2c08f7e2 100644 --- a/keyboards/moon/keyboard.json +++ b/keyboards/moon/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "backlight": { "pin": "C6" }, diff --git a/keyboards/morizon/config.h b/keyboards/morizon/config.h deleted file mode 100644 index 5b0945d4d4b..00000000000 --- a/keyboards/morizon/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Steven Karrmann - -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/morizon/keyboard.json b/keyboards/morizon/keyboard.json index 440047c6902..73097dd113a 100644 --- a/keyboards/morizon/keyboard.json +++ b/keyboards/morizon/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] diff --git a/keyboards/mountainblocks/mb17/config.h b/keyboards/mountainblocks/mb17/config.h deleted file mode 100644 index 2aca1d46b3b..00000000000 --- a/keyboards/mountainblocks/mb17/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2020 mechmerlin - -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/mountainblocks/mb17/keyboard.json b/keyboards/mountainblocks/mb17/keyboard.json index dca8ca8ee97..9e9bb984066 100644 --- a/keyboards/mountainblocks/mb17/keyboard.json +++ b/keyboards/mountainblocks/mb17/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F7", "E6", "D7", "C6"], "rows": ["F4", "B1", "B3", "B2", "B6"] diff --git a/keyboards/mt/blocked65/config.h b/keyboards/mt/blocked65/config.h deleted file mode 100644 index 28be4f1a5b4..00000000000 --- a/keyboards/mt/blocked65/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2019 Evy Dekkers - -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/mt/blocked65/keyboard.json b/keyboards/mt/blocked65/keyboard.json index 14e5942228d..9a0ce520430 100644 --- a/keyboards/mt/blocked65/keyboard.json +++ b/keyboards/mt/blocked65/keyboard.json @@ -35,6 +35,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/mt/mt64rgb/config.h b/keyboards/mt/mt64rgb/config.h index 50c9ca5f64b..f69c778b8b6 100644 --- a/keyboards/mt/mt64rgb/config.h +++ b/keyboards/mt/mt64rgb/config.h @@ -18,8 +18,3 @@ #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define RGB_MATRIX_LED_COUNT 64 - -/* 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/mt/mt64rgb/keyboard.json b/keyboards/mt/mt64rgb/keyboard.json index 5dbcf309697..0858e85ecae 100644 --- a/keyboards/mt/mt64rgb/keyboard.json +++ b/keyboards/mt/mt64rgb/keyboard.json @@ -77,6 +77,12 @@ "rgblight": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "B1", "B2", "B3", "B7"], "rows": ["D7", "D6", "D5", "D3", "D2"] diff --git a/keyboards/mt/mt980/config.h b/keyboards/mt/mt980/config.h deleted file mode 100644 index 5f360813239..00000000000 --- a/keyboards/mt/mt980/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/mt/mt980/keyboard.json b/keyboards/mt/mt980/keyboard.json index 6ecc9f86108..2fa17224cb4 100644 --- a/keyboards/mt/mt980/keyboard.json +++ b/keyboards/mt/mt980/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B7", "B3", "B2", "B1", "B0", "E6", "F0", "F1", "F4", "F5", "F6", "F7"] diff --git a/keyboards/mtbkeys/mtb60/hotswap/config.h b/keyboards/mtbkeys/mtb60/hotswap/config.h deleted file mode 100644 index 19881718ef2..00000000000 --- a/keyboards/mtbkeys/mtb60/hotswap/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 MTBKeys - -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/mtbkeys/mtb60/hotswap/keyboard.json b/keyboards/mtbkeys/mtb60/hotswap/keyboard.json index 8d39de83230..cca7bb726ac 100644 --- a/keyboards/mtbkeys/mtb60/hotswap/keyboard.json +++ b/keyboards/mtbkeys/mtb60/hotswap/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "B7", "B6", "F7", "C6", "C7", "F6", "F4", "F1", "F0", "F5", "E6"], "rows": ["D6", "D7", "B4", "B5", "D5"] diff --git a/keyboards/mtbkeys/mtb60/solder/config.h b/keyboards/mtbkeys/mtb60/solder/config.h deleted file mode 100644 index 19881718ef2..00000000000 --- a/keyboards/mtbkeys/mtb60/solder/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2021 MTBKeys - -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/mtbkeys/mtb60/solder/keyboard.json b/keyboards/mtbkeys/mtb60/solder/keyboard.json index 1770e3a997a..1059f1fd76e 100644 --- a/keyboards/mtbkeys/mtb60/solder/keyboard.json +++ b/keyboards/mtbkeys/mtb60/solder/keyboard.json @@ -41,6 +41,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "F0", "F5", "F6", "F7", "D5", "D3", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["D0", "D1", "F4", "F1", "D2"] diff --git a/keyboards/murcielago/rev1/config.h b/keyboards/murcielago/rev1/config.h index 156f708632b..17f316d6af8 100644 --- a/keyboards/murcielago/rev1/config.h +++ b/keyboards/murcielago/rev1/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define EE_HANDS #define SPLIT_USB_DETECT -/* 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. diff --git a/keyboards/murcielago/rev1/keyboard.json b/keyboards/murcielago/rev1/keyboard.json index 2dd650666a2..39c2d4fc3d5 100644 --- a/keyboards/murcielago/rev1/keyboard.json +++ b/keyboards/murcielago/rev1/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "D7", "D6", "D4"], "rows": ["B4", "D5", "B3", "B2", "B1", "B0"] diff --git a/keyboards/mxss/config.h b/keyboards/mxss/config.h deleted file mode 100644 index 704da3911aa..00000000000 --- a/keyboards/mxss/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat / MxBlue - -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/mxss/keyboard.json b/keyboards/mxss/keyboard.json index 08461574579..defa0ae6b7e 100644 --- a/keyboards/mxss/keyboard.json +++ b/keyboards/mxss/keyboard.json @@ -17,6 +17,12 @@ "nkro": false, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "saturation_steps": 8, "brightness_steps": 8, diff --git a/keyboards/mysticworks/wyvern/config.h b/keyboards/mysticworks/wyvern/config.h deleted file mode 100644 index d025a3d4de6..00000000000 --- a/keyboards/mysticworks/wyvern/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Albert Dong - * - * 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/mysticworks/wyvern/keyboard.json b/keyboards/mysticworks/wyvern/keyboard.json index ddc240dd8f3..77f2aa19bd4 100644 --- a/keyboards/mysticworks/wyvern/keyboard.json +++ b/keyboards/mysticworks/wyvern/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["E6", "B0", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["D0", "D1", "D5", "D3", "F7", "F6", "F5", "F4", "F1", "F0"]