From 314f6c1ddba09851b33e4f3b4bd43bdbc55f9628 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 26 Feb 2023 08:37:57 +1100 Subject: Move backlight config to data driven (#19910) --- keyboards/sentraq/number_pad/config.h | 2 -- keyboards/sentraq/number_pad/info.json | 3 +++ keyboards/sentraq/s60_x/default/config.h | 5 ----- keyboards/sentraq/s60_x/default/info.json | 4 ++++ keyboards/sentraq/s60_x/rgb/config.h | 5 ----- keyboards/sentraq/s60_x/rgb/info.json | 4 ++++ keyboards/sentraq/s65_plus/config.h | 2 -- keyboards/sentraq/s65_plus/info.json | 3 +++ keyboards/sentraq/s65_x/config.h | 4 ---- keyboards/sentraq/s65_x/info.json | 5 +++++ 10 files changed, 19 insertions(+), 18 deletions(-) (limited to 'keyboards/sentraq') diff --git a/keyboards/sentraq/number_pad/config.h b/keyboards/sentraq/number_pad/config.h index 8e5be4d533..0d96be0baf 100644 --- a/keyboards/sentraq/number_pad/config.h +++ b/keyboards/sentraq/number_pad/config.h @@ -34,8 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN B0 #ifdef RGB_DI_PIN #define RGBLED_NUM 13 diff --git a/keyboards/sentraq/number_pad/info.json b/keyboards/sentraq/number_pad/info.json index d39336e2e4..5b7af3fb0f 100644 --- a/keyboards/sentraq/number_pad/info.json +++ b/keyboards/sentraq/number_pad/info.json @@ -7,6 +7,9 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "url": "https://sentraq.com/collections/kits/products/number-pad-rgb-kit", diff --git a/keyboards/sentraq/s60_x/default/config.h b/keyboards/sentraq/s60_x/default/config.h index 3f073551d1..01ce1f2e65 100644 --- a/keyboards/sentraq/s60_x/default/config.h +++ b/keyboards/sentraq/s60_x/default/config.h @@ -5,11 +5,6 @@ #define MATRIX_ROW_PINS { B7, B3, B2, B1, B0 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F1 } -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/sentraq/s60_x/default/info.json b/keyboards/sentraq/s60_x/default/info.json index 2e98820a02..ae5728a679 100644 --- a/keyboards/sentraq/s60_x/default/info.json +++ b/keyboards/sentraq/s60_x/default/info.json @@ -1,5 +1,9 @@ { "keyboard_name": "S60-X", + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/sentraq/s60_x/rgb/config.h b/keyboards/sentraq/s60_x/rgb/config.h index 178b6c3027..2332b484e1 100644 --- a/keyboards/sentraq/s60_x/rgb/config.h +++ b/keyboards/sentraq/s60_x/rgb/config.h @@ -5,11 +5,6 @@ #define MATRIX_ROW_PINS { B5, B4, D7, D6, D4 } #define MATRIX_COL_PINS { D0, D1, D2, D3, D5, B6, C6, C7, F1, F0, E6, B3, B2, B1, B0 } -#define BACKLIGHT_PIN B7 -#ifdef BACKLIGHT_PIN -#define BACKLIGHT_BREATHING -#endif - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/sentraq/s60_x/rgb/info.json b/keyboards/sentraq/s60_x/rgb/info.json index b29f71288b..6420a8069a 100644 --- a/keyboards/sentraq/s60_x/rgb/info.json +++ b/keyboards/sentraq/s60_x/rgb/info.json @@ -1,5 +1,9 @@ { "keyboard_name": "S60-X-RGB", + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/sentraq/s65_plus/config.h b/keyboards/sentraq/s65_plus/config.h index 648c758462..3b8323074f 100644 --- a/keyboards/sentraq/s65_plus/config.h +++ b/keyboards/sentraq/s65_plus/config.h @@ -5,8 +5,6 @@ #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 } -#define BACKLIGHT_PIN B7 - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/sentraq/s65_plus/info.json b/keyboards/sentraq/s65_plus/info.json index 0e9f0fce75..3d9f6d1f21 100644 --- a/keyboards/sentraq/s65_plus/info.json +++ b/keyboards/sentraq/s65_plus/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "indicators": { "caps_lock": "B7", "on_state": 0 diff --git a/keyboards/sentraq/s65_x/config.h b/keyboards/sentraq/s65_x/config.h index cc31fdfd19..e8d1cb933d 100644 --- a/keyboards/sentraq/s65_x/config.h +++ b/keyboards/sentraq/s65_x/config.h @@ -5,10 +5,6 @@ #define MATRIX_ROW_PINS { C7, C6, B6, B5, B4 } #define MATRIX_COL_PINS { F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 } -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 -#define BACKLIGHT_CAPS_LOCK - #define RGB_DI_PIN D3 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/sentraq/s65_x/info.json b/keyboards/sentraq/s65_x/info.json index 6b77754a65..a37852080c 100644 --- a/keyboards/sentraq/s65_x/info.json +++ b/keyboards/sentraq/s65_x/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "as_caps_lock": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi", "65_iso"], -- cgit v1.2.3