From c4e182b98e0b072dd97133b71b01f59f0eb07501 Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Thu, 23 May 2024 11:49:53 -0700 Subject: [PATCH] Migrate `LOCKING_*_ENABLE` to Data-Driven: P, Part 2 (#23780) Affects: - `preonic/rev1` - `preonic/rev2` - `preonic/rev3` - `preonic/rev3_drop` - `primekb/meridian/ktr1010` - `primekb/meridian/ws2812` - `primekb/meridian_rgb` - `primekb/prime_m` - `primekb/prime_o` - `primekb/prime_r` - `projectcain/relic` - `projectcain/vault45` - `projectd/65/projectd_65_ansi` - `projectd/75/ansi` - `projectkb/alice/rev1` - `projectkb/alice/rev2` - `projectkb/signature65` - `projectkb/signature87` - `prototypist/allison` - `prototypist/allison_numpad` - `prototypist/j01` - `psuieee/pluto12` - `pteron36` - `puck` - `punk75` --- keyboards/preonic/config.h | 5 --- keyboards/preonic/rev1/keyboard.json | 6 +++ keyboards/preonic/rev2/keyboard.json | 6 +++ keyboards/preonic/rev3/keyboard.json | 6 +++ keyboards/preonic/rev3_drop/keyboard.json | 6 +++ keyboards/primekb/meridian/config.h | 5 --- keyboards/primekb/meridian/info.json | 6 +++ keyboards/primekb/meridian/ktr1010/config.h | 5 --- keyboards/primekb/meridian/ws2812/config.h | 5 --- keyboards/primekb/meridian_rgb/config.h | 23 ----------- keyboards/primekb/meridian_rgb/keyboard.json | 6 +++ keyboards/primekb/prime_m/config.h | 24 ------------ keyboards/primekb/prime_m/keyboard.json | 6 +++ keyboards/primekb/prime_o/config.h | 23 ----------- keyboards/primekb/prime_o/keyboard.json | 6 +++ keyboards/primekb/prime_r/config.h | 24 ------------ keyboards/primekb/prime_r/keyboard.json | 6 +++ keyboards/projectcain/relic/config.h | 39 ------------------- keyboards/projectcain/relic/keyboard.json | 6 +++ keyboards/projectcain/vault45/config.h | 39 ------------------- keyboards/projectcain/vault45/keyboard.json | 6 +++ .../projectd/65/projectd_65_ansi/config.h | 5 --- .../65/projectd_65_ansi/keyboard.json | 6 ++- keyboards/projectd/75/ansi/config.h | 5 --- keyboards/projectd/75/ansi/keyboard.json | 6 ++- keyboards/projectkb/alice/rev1/config.h | 5 --- keyboards/projectkb/alice/rev1/keyboard.json | 6 +++ keyboards/projectkb/alice/rev2/config.h | 5 --- keyboards/projectkb/alice/rev2/keyboard.json | 6 +++ keyboards/projectkb/signature65/config.h | 23 ----------- keyboards/projectkb/signature65/keyboard.json | 6 +++ keyboards/projectkb/signature87/config.h | 23 ----------- keyboards/projectkb/signature87/keyboard.json | 6 +++ keyboards/prototypist/allison/config.h | 39 ------------------- keyboards/prototypist/allison/keyboard.json | 6 +++ keyboards/prototypist/allison_numpad/config.h | 39 ------------------- .../prototypist/allison_numpad/keyboard.json | 6 +++ keyboards/prototypist/j01/config.h | 22 ----------- keyboards/prototypist/j01/keyboard.json | 6 +++ keyboards/psuieee/pluto12/config.h | 9 ----- keyboards/psuieee/pluto12/keyboard.json | 6 +++ keyboards/pteron36/config.h | 39 ------------------- keyboards/pteron36/keyboard.json | 6 +++ keyboards/puck/config.h | 4 -- keyboards/puck/keyboard.json | 6 +++ keyboards/punk75/config.h | 5 --- keyboards/punk75/keyboard.json | 6 +++ 47 files changed, 142 insertions(+), 417 deletions(-) delete mode 100644 keyboards/primekb/meridian_rgb/config.h delete mode 100644 keyboards/primekb/prime_m/config.h delete mode 100644 keyboards/primekb/prime_o/config.h delete mode 100644 keyboards/primekb/prime_r/config.h delete mode 100644 keyboards/projectcain/relic/config.h delete mode 100644 keyboards/projectcain/vault45/config.h delete mode 100644 keyboards/projectkb/signature65/config.h delete mode 100644 keyboards/projectkb/signature87/config.h delete mode 100644 keyboards/prototypist/allison/config.h delete mode 100644 keyboards/prototypist/allison_numpad/config.h delete mode 100644 keyboards/prototypist/j01/config.h delete mode 100644 keyboards/psuieee/pluto12/config.h delete mode 100644 keyboards/pteron36/config.h delete mode 100644 keyboards/puck/config.h diff --git a/keyboards/preonic/config.h b/keyboards/preonic/config.h index 5301e26ab3..c47b9e7ed4 100644 --- a/keyboards/preonic/config.h +++ b/keyboards/preonic/config.h @@ -20,11 +20,6 @@ along with this program. If not, see . #define AUDIO_VOICES #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 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/preonic/rev1/keyboard.json b/keyboards/preonic/rev1/keyboard.json index aa43fe2c47..648dafe576 100644 --- a/keyboards/preonic/rev1/keyboard.json +++ b/keyboards/preonic/rev1/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev2/keyboard.json b/keyboards/preonic/rev2/keyboard.json index 3a6cab1e17..d24c3db42f 100644 --- a/keyboards/preonic/rev2/keyboard.json +++ b/keyboards/preonic/rev2/keyboard.json @@ -19,6 +19,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F1", "F0", "B0", "C7", "F4", "F5", "F6", "F7", "D4", "D6", "B4", "D7"], "rows": ["D2", "D5", "B5", "B6", "D3"] diff --git a/keyboards/preonic/rev3/keyboard.json b/keyboards/preonic/rev3/keyboard.json index 472229c0da..96cebf9ea0 100644 --- a/keyboards/preonic/rev3/keyboard.json +++ b/keyboards/preonic/rev3/keyboard.json @@ -40,6 +40,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "A7", "B0"], "rows": ["A10", "A9", "A8", "B15", "C13", "C14", "C15", "A2", "A3", "A6"] diff --git a/keyboards/preonic/rev3_drop/keyboard.json b/keyboards/preonic/rev3_drop/keyboard.json index f1cf1dfec1..22374fa5f7 100644 --- a/keyboards/preonic/rev3_drop/keyboard.json +++ b/keyboards/preonic/rev3_drop/keyboard.json @@ -18,6 +18,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 9, "animations": { diff --git a/keyboards/primekb/meridian/config.h b/keyboards/primekb/meridian/config.h index 8593536eec..c6cf02fc4c 100644 --- a/keyboards/primekb/meridian/config.h +++ b/keyboards/primekb/meridian/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 - -/* 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/primekb/meridian/info.json b/keyboards/primekb/meridian/info.json index 1e62489211..38358a3a7b 100644 --- a/keyboards/primekb/meridian/info.json +++ b/keyboards/primekb/meridian/info.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "B9", "B8", "B7", "B6", "B5", "B4", "B3", "A15"], "rows": ["A6", "A5", "A4", "A3", "A2"] diff --git a/keyboards/primekb/meridian/ktr1010/config.h b/keyboards/primekb/meridian/ktr1010/config.h index 3da9ff72c4..ba56ce4984 100644 --- a/keyboards/primekb/meridian/ktr1010/config.h +++ b/keyboards/primekb/meridian/ktr1010/config.h @@ -24,8 +24,3 @@ along with this program. If not, see . #define WS2812_T0L 975 #define WS2812_T1L 350 #define WS2812_RES_US 100 - -/* 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/primekb/meridian/ws2812/config.h b/keyboards/primekb/meridian/ws2812/config.h index 8593536eec..c6cf02fc4c 100644 --- a/keyboards/primekb/meridian/ws2812/config.h +++ b/keyboards/primekb/meridian/ws2812/config.h @@ -21,8 +21,3 @@ along with this program. If not, see . #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 #define WS2812_SPI_SCK_PIN B13 - -/* 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/primekb/meridian_rgb/config.h b/keyboards/primekb/meridian_rgb/config.h deleted file mode 100644 index 6685719914..0000000000 --- a/keyboards/primekb/meridian_rgb/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2022 Holten Campbell - -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/primekb/meridian_rgb/keyboard.json b/keyboards/primekb/meridian_rgb/keyboard.json index 49491b769a..145d4eeb8b 100644 --- a/keyboards/primekb/meridian_rgb/keyboard.json +++ b/keyboards/primekb/meridian_rgb/keyboard.json @@ -17,6 +17,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "F7", "D4", "B7", "B3", "D5", "D3", "D2", "D1", "D0"], "rows": ["E6", "F0", "F6", "D7", "D6"] diff --git a/keyboards/primekb/prime_m/config.h b/keyboards/primekb/prime_m/config.h deleted file mode 100644 index 053bc6236a..0000000000 --- a/keyboards/primekb/prime_m/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat -Copyright 2020 Holten Campbell - -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/primekb/prime_m/keyboard.json b/keyboards/primekb/prime_m/keyboard.json index b63b96bf70..eb06dcdb7e 100644 --- a/keyboards/primekb/prime_m/keyboard.json +++ b/keyboards/primekb/prime_m/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B3", "C7", "C6", "D2", "D1", "D0"], "rows": ["C5", "B5", "B2", "D5", "D3"] diff --git a/keyboards/primekb/prime_o/config.h b/keyboards/primekb/prime_o/config.h deleted file mode 100644 index 9c9e5754a9..0000000000 --- a/keyboards/primekb/prime_o/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat - -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/primekb/prime_o/keyboard.json b/keyboards/primekb/prime_o/keyboard.json index f3b427e148..04da8ab134 100644 --- a/keyboards/primekb/prime_o/keyboard.json +++ b/keyboards/primekb/prime_o/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B6", "B5", "C7", "C6", "D2", "D1", "D0", "C2"], "rows": ["D4", "D6", "B1", "C5", "B4", "B3", "C4", "B2", "B0", "D5"] diff --git a/keyboards/primekb/prime_r/config.h b/keyboards/primekb/prime_r/config.h deleted file mode 100644 index 2baa495f2c..0000000000 --- a/keyboards/primekb/prime_r/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2018 Andrew Heaston - -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/primekb/prime_r/keyboard.json b/keyboards/primekb/prime_r/keyboard.json index a45db2351a..b2a7ecec7a 100644 --- a/keyboards/primekb/prime_r/keyboard.json +++ b/keyboards/primekb/prime_r/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "C7", "C6", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D1", "D0", "B7", "B3", "B2"] diff --git a/keyboards/projectcain/relic/config.h b/keyboards/projectcain/relic/config.h deleted file mode 100644 index 199375c173..0000000000 --- a/keyboards/projectcain/relic/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 projectcain - -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/projectcain/relic/keyboard.json b/keyboards/projectcain/relic/keyboard.json index 9ebfbf72d4..f9df6770d1 100644 --- a/keyboards/projectcain/relic/keyboard.json +++ b/keyboards/projectcain/relic/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D3", "D5", "B0", "F0", "F1", "F4", "F5", "F6", "C7", "C6", "B4"], "rows": ["D7", "B2", "B6", "B5"] diff --git a/keyboards/projectcain/vault45/config.h b/keyboards/projectcain/vault45/config.h deleted file mode 100644 index 199375c173..0000000000 --- a/keyboards/projectcain/vault45/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 projectcain - -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/projectcain/vault45/keyboard.json b/keyboards/projectcain/vault45/keyboard.json index d09c8be764..2ab3e010e7 100644 --- a/keyboards/projectcain/vault45/keyboard.json +++ b/keyboards/projectcain/vault45/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B0", "D5", "D4", "D6", "D7", "B4", "D3", "F0", "F1", "F4", "F5", "F6", "F7"], "rows": ["C6", "B6", "B5", "C7"] diff --git a/keyboards/projectd/65/projectd_65_ansi/config.h b/keyboards/projectd/65/projectd_65_ansi/config.h index d7f9a52afe..c8da5c42a7 100644 --- a/keyboards/projectd/65/projectd_65_ansi/config.h +++ b/keyboards/projectd/65/projectd_65_ansi/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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/projectd/65/projectd_65_ansi/keyboard.json b/keyboards/projectd/65/projectd_65_ansi/keyboard.json index 9cfe8ffb5d..5d75389e2a 100644 --- a/keyboards/projectd/65/projectd_65_ansi/keyboard.json +++ b/keyboards/projectd/65/projectd_65_ansi/keyboard.json @@ -32,7 +32,11 @@ }, "processor": "WB32FQ95", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgb_matrix": { "animations": { diff --git a/keyboards/projectd/75/ansi/config.h b/keyboards/projectd/75/ansi/config.h index a42dd6c1ee..282e20a8e2 100644 --- a/keyboards/projectd/75/ansi/config.h +++ b/keyboards/projectd/75/ansi/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 - /* External spi flash */ #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14 diff --git a/keyboards/projectd/75/ansi/keyboard.json b/keyboards/projectd/75/ansi/keyboard.json index 2e57c35328..2296c63937 100644 --- a/keyboards/projectd/75/ansi/keyboard.json +++ b/keyboards/projectd/75/ansi/keyboard.json @@ -32,7 +32,11 @@ }, "processor": "WB32FQ95", "qmk": { - "tap_keycode_delay": 10 + "tap_keycode_delay": 10, + "locking": { + "enabled": true, + "resync": true + } }, "rgb_matrix": { "animations": { diff --git a/keyboards/projectkb/alice/rev1/config.h b/keyboards/projectkb/alice/rev1/config.h index 829976ebd6..66d3b75731 100644 --- a/keyboards/projectkb/alice/rev1/config.h +++ b/keyboards/projectkb/alice/rev1/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/projectkb/alice/rev1/keyboard.json b/keyboards/projectkb/alice/rev1/keyboard.json index 1e97746ee8..7e957d7ff4 100644 --- a/keyboards/projectkb/alice/rev1/keyboard.json +++ b/keyboards/projectkb/alice/rev1/keyboard.json @@ -9,6 +9,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 14, "animations": { diff --git a/keyboards/projectkb/alice/rev2/config.h b/keyboards/projectkb/alice/rev2/config.h index 6e250bb14e..3e786c1805 100644 --- a/keyboards/projectkb/alice/rev2/config.h +++ b/keyboards/projectkb/alice/rev2/config.h @@ -21,11 +21,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_CHANNEL 1 #define BACKLIGHT_PAL_MODE 1 -/* 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 WS2812_SPI_DRIVER SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 #define WS2812_SPI_SCK_PAL_MODE 0 diff --git a/keyboards/projectkb/alice/rev2/keyboard.json b/keyboards/projectkb/alice/rev2/keyboard.json index 0ed3b88ea2..639fc26877 100644 --- a/keyboards/projectkb/alice/rev2/keyboard.json +++ b/keyboards/projectkb/alice/rev2/keyboard.json @@ -9,6 +9,12 @@ "nkro": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgblight": { "led_count": 14, "animations": { diff --git a/keyboards/projectkb/signature65/config.h b/keyboards/projectkb/signature65/config.h deleted file mode 100644 index 4d31d4b095..0000000000 --- a/keyboards/projectkb/signature65/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/projectkb/signature65/keyboard.json b/keyboards/projectkb/signature65/keyboard.json index 7f865fbaaf..b72ff9926c 100644 --- a/keyboards/projectkb/signature65/keyboard.json +++ b/keyboards/projectkb/signature65/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B14", "A2", "B9", "B8", "B5", "B4", "B3", "A15", "B11", "B10", "B2", "A3", "B1", "B0", "A4", "A5"], "rows": ["A8", "A9", "B13", "A6", "A7"] diff --git a/keyboards/projectkb/signature87/config.h b/keyboards/projectkb/signature87/config.h deleted file mode 100644 index 4d31d4b095..0000000000 --- a/keyboards/projectkb/signature87/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/projectkb/signature87/keyboard.json b/keyboards/projectkb/signature87/keyboard.json index 2f8666aeb9..2b18bf4572 100644 --- a/keyboards/projectkb/signature87/keyboard.json +++ b/keyboards/projectkb/signature87/keyboard.json @@ -16,6 +16,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A15", "B3", "B4"], "rows": ["B13", "B12", "A8", "B15", "A10", "A9", "B9", "B8", "B1", "B0", "B10", "B2"] diff --git a/keyboards/prototypist/allison/config.h b/keyboards/prototypist/allison/config.h deleted file mode 100644 index 9765ad6b1a..0000000000 --- a/keyboards/prototypist/allison/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Yiancar - -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/prototypist/allison/keyboard.json b/keyboards/prototypist/allison/keyboard.json index 0261b204bb..ea80e853bf 100644 --- a/keyboards/prototypist/allison/keyboard.json +++ b/keyboards/prototypist/allison/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "F1", "F0"], "rows": ["D2", "D1", "D0", "B1", "B2", "D3"] diff --git a/keyboards/prototypist/allison_numpad/config.h b/keyboards/prototypist/allison_numpad/config.h deleted file mode 100644 index 9765ad6b1a..0000000000 --- a/keyboards/prototypist/allison_numpad/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2020 Yiancar - -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/prototypist/allison_numpad/keyboard.json b/keyboards/prototypist/allison_numpad/keyboard.json index 974573fc64..a995cd6bbf 100644 --- a/keyboards/prototypist/allison_numpad/keyboard.json +++ b/keyboards/prototypist/allison_numpad/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F5", "F1", "F0"], "rows": ["F4", "C7", "C6", "B6", "B5", "B4"] diff --git a/keyboards/prototypist/j01/config.h b/keyboards/prototypist/j01/config.h deleted file mode 100644 index 1d22c074e2..0000000000 --- a/keyboards/prototypist/j01/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2020 Shaun Mitchell (Flex) - * - * 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/prototypist/j01/keyboard.json b/keyboards/prototypist/j01/keyboard.json index d6e24dc9e5..68296e1b77 100644 --- a/keyboards/prototypist/j01/keyboard.json +++ b/keyboards/prototypist/j01/keyboard.json @@ -20,6 +20,12 @@ "mousekey": true, "nkro": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["B1", "F0", "F7", "F1", "F4", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], "rows": ["B3", "B2", "B0", "F6", "F5"] diff --git a/keyboards/psuieee/pluto12/config.h b/keyboards/psuieee/pluto12/config.h deleted file mode 100644 index cabf72507f..0000000000 --- a/keyboards/psuieee/pluto12/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021-22 Willem McGloughlin (wymcg) -// 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/psuieee/pluto12/keyboard.json b/keyboards/psuieee/pluto12/keyboard.json index 6dcb3d33ac..382d9fe030 100644 --- a/keyboards/psuieee/pluto12/keyboard.json +++ b/keyboards/psuieee/pluto12/keyboard.json @@ -17,6 +17,12 @@ "mousekey": true, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["D7", "E6", "B4", "B5"], "rows": ["D0", "D4", "C6"] diff --git a/keyboards/pteron36/config.h b/keyboards/pteron36/config.h deleted file mode 100644 index 72b4ea84e7..0000000000 --- a/keyboards/pteron36/config.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Harshit Goel - -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/pteron36/keyboard.json b/keyboards/pteron36/keyboard.json index f4bab52419..abd94d599a 100644 --- a/keyboards/pteron36/keyboard.json +++ b/keyboards/pteron36/keyboard.json @@ -19,6 +19,12 @@ "oled": true, "rgblight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2"], "rows": ["E6", "D7", "B4", "B5"] diff --git a/keyboards/puck/config.h b/keyboards/puck/config.h deleted file mode 100644 index 2f38776326..0000000000 --- a/keyboards/puck/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/puck/keyboard.json b/keyboards/puck/keyboard.json index 1ee73dc437..4ec04d72be 100644 --- a/keyboards/puck/keyboard.json +++ b/keyboards/puck/keyboard.json @@ -16,6 +16,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": false, + "resync": true + } + }, "matrix_pins": { "cols": ["B4", "D7", "D6"], "rows": ["D2", "D3", "C6", "C7"] diff --git a/keyboards/punk75/config.h b/keyboards/punk75/config.h index b314f6dae9..321865330c 100644 --- a/keyboards/punk75/config.h +++ b/keyboards/punk75/config.h @@ -18,8 +18,3 @@ along with this program. If not, see . #pragma once #define LED A0 - -/* 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/punk75/keyboard.json b/keyboards/punk75/keyboard.json index 5c1bd94a5e..dd084a147c 100644 --- a/keyboards/punk75/keyboard.json +++ b/keyboards/punk75/keyboard.json @@ -15,6 +15,12 @@ "mousekey": false, "nkro": false }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["C2", "C3", "C6", "C5", "C4", "A7", "A6", "A5", "A4", "B4", "A3", "B3", "A2", "B2", "A1"], "rows": ["D6", "D5", "C1", "C0", "D7"]