logo

qmk_firmware

custom branch of QMK firmware git clone https://anongit.hacktivis.me/git/qmk_firmware.git
commit: 5469f30dfedb2537bf950bbc8e7fea95a42ac667
parent 924147dfe44ca812ed5e6ca17b2eb345dd72b2c3
Author: James Young <18669334+noroadsleft@users.noreply.github.com>
Date:   Fri, 17 May 2024 15:55:29 -0700

Migrate `LOCKING_*_ENABLE` to Data-Driven: 0-9 (#23716)

Affects:

  - `0_sixty`
  - `1upkeyboards/pi40`
  - `1upkeyboards/pi50`
  - `40percentclub/gherkin`
  - `4pplet/perk60_iso/rev_a`

Diffstat:

Dkeyboards/0_sixty/config.h38--------------------------------------
Mkeyboards/0_sixty/info.json6++++++
Mkeyboards/1upkeyboards/pi40/config.h5-----
Mkeyboards/1upkeyboards/pi40/info.json6++++++
Mkeyboards/1upkeyboards/pi50/config.h5-----
Mkeyboards/1upkeyboards/pi50/info.json6++++++
Dkeyboards/40percentclub/gherkin/config.h7-------
Mkeyboards/40percentclub/gherkin/info.json6++++++
Mkeyboards/4pplet/perk60_iso/rev_a/config.h5-----
Mkeyboards/4pplet/perk60_iso/rev_a/keyboard.json6++++++
10 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/keyboards/0_sixty/config.h b/keyboards/0_sixty/config.h @@ -1,38 +0,0 @@ -/* Copyright 2020 Vinam Arora <vinam@posteo.de> - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/0_sixty/info.json b/keyboards/0_sixty/info.json @@ -20,6 +20,12 @@ "build": { "lto": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/1upkeyboards/pi40/config.h b/keyboards/1upkeyboards/pi40/config.h @@ -9,8 +9,3 @@ #define I2C_DRIVER I2CD0 #define OLED_BRIGHTNESS 128 #define OLED_FONT_H "keyboards/1upkeyboards/pi40/lib/glcdfont.c" - -/* 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/1upkeyboards/pi40/info.json b/keyboards/1upkeyboards/pi40/info.json @@ -1,4 +1,10 @@ { + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "rgb_matrix": { "animations":{ "alphas_mods": true, diff --git a/keyboards/1upkeyboards/pi50/config.h b/keyboards/1upkeyboards/pi50/config.h @@ -8,8 +8,3 @@ #define I2C_DRIVER I2CD1 #define OLED_BRIGHTNESS 128 #define OLED_FONT_H "keyboards/1upkeyboards/pi50/lib/glcdfont.c" - -/* 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/1upkeyboards/pi50/info.json b/keyboards/1upkeyboards/pi50/info.json @@ -24,6 +24,12 @@ "rgb_matrix": true, "oled": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "rows": ["GP20", "GP15", "GP19", "GP14", "GP18", "GP13", "GP17", "GP12", "GP16", "GP21"], "cols": ["GP1", "GP2", "GP3", "GP4", "GP5", "GP6", "GP9"] diff --git a/keyboards/40percentclub/gherkin/config.h b/keyboards/40percentclub/gherkin/config.h @@ -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/40percentclub/gherkin/info.json b/keyboards/40percentclub/gherkin/info.json @@ -15,6 +15,12 @@ "nkro": true, "backlight": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "community_layouts": ["ortho_3x10"], "layouts": { "LAYOUT_ortho_3x10": { diff --git a/keyboards/4pplet/perk60_iso/rev_a/config.h b/keyboards/4pplet/perk60_iso/rev_a/config.h @@ -16,10 +16,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ -#define LOCKING_SUPPORT_ENABLE -/* Locking resynchronize hack */ -#define LOCKING_RESYNC_ENABLE - #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define IS31FL3733_PWM_FREQUENCY IS31FL3733_PWM_FREQUENCY_26K7_HZ diff --git a/keyboards/4pplet/perk60_iso/rev_a/keyboard.json b/keyboards/4pplet/perk60_iso/rev_a/keyboard.json @@ -49,6 +49,12 @@ "nkro": true, "rgb_matrix": true }, + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "matrix_pins": { "cols": ["A1", "B12", "B14", "A2", "A0", "A3", "A4"], "rows": ["C14", "C13", "B5", "B4", "B8", "A15", "B3", "B9", "A5", "A7"]