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/xiudi/xd004/info.json | 4 ++++ keyboards/xiudi/xd004/v1/config.h | 5 ----- keyboards/xiudi/xd60/rev2/config.h | 4 ---- keyboards/xiudi/xd60/rev2/info.json | 2 ++ keyboards/xiudi/xd60/rev3/config.h | 4 ---- keyboards/xiudi/xd60/rev3/info.json | 2 ++ keyboards/xiudi/xd68/config.h | 4 ---- keyboards/xiudi/xd68/info.json | 3 +++ keyboards/xiudi/xd75/config.h | 3 --- keyboards/xiudi/xd75/info.json | 2 ++ keyboards/xiudi/xd84/config.h | 3 --- keyboards/xiudi/xd84/info.json | 2 ++ keyboards/xiudi/xd84pro/config.h | 3 --- keyboards/xiudi/xd84pro/info.json | 2 ++ keyboards/xiudi/xd87/config.h | 2 -- keyboards/xiudi/xd87/info.json | 1 + keyboards/xiudi/xd96/config.h | 3 --- keyboards/xiudi/xd96/info.json | 4 ++++ 18 files changed, 22 insertions(+), 31 deletions(-) (limited to 'keyboards/xiudi') diff --git a/keyboards/xiudi/xd004/info.json b/keyboards/xiudi/xd004/info.json index 175b7873f3..a404780eea 100644 --- a/keyboards/xiudi/xd004/info.json +++ b/keyboards/xiudi/xd004/info.json @@ -7,6 +7,10 @@ "pid": "0x0404", "device_version": "0.0.1" }, + "backlight": { + "pin": "D5", + "levels": 6 + }, "processor": "atmega16u2", "bootloader": "atmel-dfu", "matrix_pins": { diff --git a/keyboards/xiudi/xd004/v1/config.h b/keyboards/xiudi/xd004/v1/config.h index 0b4e44336c..1e747adeaf 100644 --- a/keyboards/xiudi/xd004/v1/config.h +++ b/keyboards/xiudi/xd004/v1/config.h @@ -23,11 +23,6 @@ where some things are disabled to save space as well. #pragma once -/* Backlight Setup */ -// Looks like each backlight LED is connected to a single output, D5 is the one furtherst away from USB port -#define BACKLIGHT_PIN D5 -#define BACKLIGHT_LEVELS 6 - /* RGB Underglow This will not be used, as RGBLIGHT_ENABLE is set to 'no' in rules.mk We do not have enough space in the flash for this at the moment, maybe diff --git a/keyboards/xiudi/xd60/rev2/config.h b/keyboards/xiudi/xd60/rev2/config.h index 8641113690..43a56c9a92 100644 --- a/keyboards/xiudi/xd60/rev2/config.h +++ b/keyboards/xiudi/xd60/rev2/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } -/* Backlight Setup */ -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/xiudi/xd60/rev2/info.json b/keyboards/xiudi/xd60/rev2/info.json index 6d6d288d0c..1951e52dfe 100644 --- a/keyboards/xiudi/xd60/rev2/info.json +++ b/keyboards/xiudi/xd60/rev2/info.json @@ -4,6 +4,8 @@ "pid": "0x6060" }, "backlight": { + "pin": "F5", + "levels": 6, "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/xiudi/xd60/rev3/config.h b/keyboards/xiudi/xd60/rev3/config.h index 05acd6cba2..617d77b1de 100644 --- a/keyboards/xiudi/xd60/rev3/config.h +++ b/keyboards/xiudi/xd60/rev3/config.h @@ -31,10 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3 } -/* Backlight Setup */ -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/xiudi/xd60/rev3/info.json b/keyboards/xiudi/xd60/rev3/info.json index 85e6a5d3f4..1b03e6c6e3 100644 --- a/keyboards/xiudi/xd60/rev3/info.json +++ b/keyboards/xiudi/xd60/rev3/info.json @@ -4,6 +4,8 @@ "pid": "0x6363" }, "backlight": { + "pin": "F5", + "levels": 6, "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/xiudi/xd68/config.h b/keyboards/xiudi/xd68/config.h index d1e69102e1..93181b668b 100644 --- a/keyboards/xiudi/xd68/config.h +++ b/keyboards/xiudi/xd68/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/xiudi/xd68/info.json b/keyboards/xiudi/xd68/info.json index 5163e03127..8b1169474c 100644 --- a/keyboards/xiudi/xd68/info.json +++ b/keyboards/xiudi/xd68/info.json @@ -9,6 +9,9 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F5", + "levels": 6, + "breathing": true, "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd75/config.h b/keyboards/xiudi/xd75/config.h index b44c70e2c1..e4a2e0139e 100644 --- a/keyboards/xiudi/xd75/config.h +++ b/keyboards/xiudi/xd75/config.h @@ -34,9 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 6 - #define RGB_DI_PIN F6 #ifdef RGB_DI_PIN # define RGBLED_NUM 6 diff --git a/keyboards/xiudi/xd75/info.json b/keyboards/xiudi/xd75/info.json index 0c45316080..54b1dc718b 100644 --- a/keyboards/xiudi/xd75/info.json +++ b/keyboards/xiudi/xd75/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F5", + "levels": 6, "on_state": 0 }, "processor": "atmega32u4", diff --git a/keyboards/xiudi/xd84/config.h b/keyboards/xiudi/xd84/config.h index 6d1024d748..5908cc6d24 100644 --- a/keyboards/xiudi/xd84/config.h +++ b/keyboards/xiudi/xd84/config.h @@ -37,9 +37,6 @@ /* COL2ROW, ROW2COL */ //#define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 10 - #define RGB_DI_PIN C7 #define RGBLED_NUM 7 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/xiudi/xd84/info.json b/keyboards/xiudi/xd84/info.json index a4d40e4fcd..60fed56bce 100644 --- a/keyboards/xiudi/xd84/info.json +++ b/keyboards/xiudi/xd84/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "B5", + "levels": 10, "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd84pro/config.h b/keyboards/xiudi/xd84pro/config.h index f9b059ef56..7390a6cd0a 100644 --- a/keyboards/xiudi/xd84pro/config.h +++ b/keyboards/xiudi/xd84pro/config.h @@ -42,9 +42,6 @@ #define RGBLIGHT_EFFECT_TWINKLE #endif -#define BACKLIGHT_PIN F5 -#define BACKLIGHT_LEVELS 10 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/xiudi/xd84pro/info.json b/keyboards/xiudi/xd84pro/info.json index 87f1549c57..88968b933f 100644 --- a/keyboards/xiudi/xd84pro/info.json +++ b/keyboards/xiudi/xd84pro/info.json @@ -9,6 +9,8 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "F5", + "levels": 10, "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd87/config.h b/keyboards/xiudi/xd87/config.h index 80abf8b7ee..42a49372ce 100644 --- a/keyboards/xiudi/xd87/config.h +++ b/keyboards/xiudi/xd87/config.h @@ -36,8 +36,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D0 - #define RGB_DI_PIN B7 #ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/xiudi/xd87/info.json b/keyboards/xiudi/xd87/info.json index 6503d55bba..52d010ada5 100644 --- a/keyboards/xiudi/xd87/info.json +++ b/keyboards/xiudi/xd87/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "backlight": { + "pin": "D0", "on_state": 0 }, "indicators": { diff --git a/keyboards/xiudi/xd96/config.h b/keyboards/xiudi/xd96/config.h index 8e6c6601e7..5950630920 100644 --- a/keyboards/xiudi/xd96/config.h +++ b/keyboards/xiudi/xd96/config.h @@ -37,9 +37,6 @@ /* COL2ROW, ROW2COL */ //#define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_LEVELS 10 - #define RGB_DI_PIN C7 #define RGBLED_NUM 16 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/xiudi/xd96/info.json b/keyboards/xiudi/xd96/info.json index c8a62379b2..7d60236491 100644 --- a/keyboards/xiudi/xd96/info.json +++ b/keyboards/xiudi/xd96/info.json @@ -8,6 +8,10 @@ "pid": "0x9696", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "levels": 10 + }, "indicators": { "caps_lock": "B6", "num_lock": "C6", -- cgit v1.2.3