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/amjkeyboard/amj40/config.h | 6 ------ keyboards/amjkeyboard/amj40/info.json | 4 ++++ keyboards/amjkeyboard/amj60/config.h | 4 ---- keyboards/amjkeyboard/amj60/info.json | 5 +++++ keyboards/amjkeyboard/amj66/config.h | 3 --- keyboards/amjkeyboard/amj66/info.json | 4 ++++ keyboards/amjkeyboard/amj84/config.h | 3 --- keyboards/amjkeyboard/amj84/info.json | 4 ++++ keyboards/amjkeyboard/amjpad/config.h | 6 ------ keyboards/amjkeyboard/amjpad/info.json | 4 ++++ 10 files changed, 21 insertions(+), 22 deletions(-) (limited to 'keyboards/amjkeyboard') diff --git a/keyboards/amjkeyboard/amj40/config.h b/keyboards/amjkeyboard/amj40/config.h index 01e94f7651..bdefff8c4f 100755 --- a/keyboards/amjkeyboard/amj40/config.h +++ b/keyboards/amjkeyboard/amj40/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F4, F5, F6, F7} #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7} -#define BACKLIGHT_PIN B6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -33,10 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 4 - /* Underlight configuration */ diff --git a/keyboards/amjkeyboard/amj40/info.json b/keyboards/amjkeyboard/amj40/info.json index 79848d94dc..fe66c34b86 100644 --- a/keyboards/amjkeyboard/amj40/info.json +++ b/keyboards/amjkeyboard/amj40/info.json @@ -8,6 +8,10 @@ "pid": "0x6072", "device_version": "0.0.2" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/amjkeyboard/amj60/config.h b/keyboards/amjkeyboard/amj60/config.h index 825edef631..0a38f73032 100644 --- a/keyboards/amjkeyboard/amj60/config.h +++ b/keyboards/amjkeyboard/amj60/config.h @@ -34,10 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 4 -#define BACKLIGHT_BREATHING - #define RGB_DI_PIN E2 #ifdef RGB_DI_PIN # define RGBLED_NUM 8 diff --git a/keyboards/amjkeyboard/amj60/info.json b/keyboards/amjkeyboard/amj60/info.json index 750f7bec99..d624894691 100644 --- a/keyboards/amjkeyboard/amj60/info.json +++ b/keyboards/amjkeyboard/amj60/info.json @@ -8,6 +8,11 @@ "pid": "0x6066", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 4, + "breathing": true + }, "indicators": { "caps_lock": "B2", "on_state": 0 diff --git a/keyboards/amjkeyboard/amj66/config.h b/keyboards/amjkeyboard/amj66/config.h index 32508821b7..7271119876 100644 --- a/keyboards/amjkeyboard/amj66/config.h +++ b/keyboards/amjkeyboard/amj66/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN D4 -#define BACKLIGHT_BREATHING - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/amjkeyboard/amj66/info.json b/keyboards/amjkeyboard/amj66/info.json index f22677e20a..ed41d4d58c 100644 --- a/keyboards/amjkeyboard/amj66/info.json +++ b/keyboards/amjkeyboard/amj66/info.json @@ -8,6 +8,10 @@ "pid": "0xBD66", "device_version": "0.0.1" }, + "backlight": { + "pin": "D4", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["66_ansi", "66_iso"], diff --git a/keyboards/amjkeyboard/amj84/config.h b/keyboards/amjkeyboard/amj84/config.h index 8e92b9e599..7aef945e5b 100644 --- a/keyboards/amjkeyboard/amj84/config.h +++ b/keyboards/amjkeyboard/amj84/config.h @@ -20,9 +20,6 @@ /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B6 -#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/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json index 402dac7a42..20f8fd99b1 100644 --- a/keyboards/amjkeyboard/amj84/info.json +++ b/keyboards/amjkeyboard/amj84/info.json @@ -8,6 +8,10 @@ "pid": "0x6068", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/amjkeyboard/amjpad/config.h b/keyboards/amjkeyboard/amjpad/config.h index 46f38e6dbb..63e6e899fa 100644 --- a/keyboards/amjkeyboard/amjpad/config.h +++ b/keyboards/amjkeyboard/amjpad/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F7, F6, F5, F4, D5, D0 } #define MATRIX_COL_PINS { F1, F0, E6, C7 } -#define BACKLIGHT_PIN B6 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW @@ -33,10 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - */ -#define BACKLIGHT_LEVELS 4 - /* Underlight configuration */ diff --git a/keyboards/amjkeyboard/amjpad/info.json b/keyboards/amjkeyboard/amjpad/info.json index 60e80d0bdd..7a22d14639 100644 --- a/keyboards/amjkeyboard/amjpad/info.json +++ b/keyboards/amjkeyboard/amjpad/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "indicators": { "num_lock": "D6", "on_state": 0 -- cgit v1.2.3