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/lfkeyboards/lfk65_hs/config.h | 1 - keyboards/lfkeyboards/lfk65_hs/info.json | 3 +++ keyboards/lfkeyboards/lfk78/config.h | 1 - keyboards/lfkeyboards/lfk78/revb/info.json | 4 ++++ keyboards/lfkeyboards/lfk78/revc/info.json | 4 ++++ keyboards/lfkeyboards/lfk78/revj/info.json | 4 ++++ keyboards/lfkeyboards/lfk78/rules.mk | 1 - keyboards/lfkeyboards/lfk87/config.h | 1 - keyboards/lfkeyboards/lfk87/info.json | 4 ++++ keyboards/lfkeyboards/lfk87/rules.mk | 1 - keyboards/lfkeyboards/mini1800/config.h | 1 - keyboards/lfkeyboards/mini1800/info.json | 4 ++++ keyboards/lfkeyboards/mini1800/mini1800.c | 1 - keyboards/lfkeyboards/mini1800/reva/rules.mk | 1 - keyboards/lfkeyboards/mini1800/revc/rules.mk | 1 - keyboards/lfkeyboards/smk65/revb/config.h | 1 - keyboards/lfkeyboards/smk65/revb/info.json | 3 +++ 17 files changed, 26 insertions(+), 10 deletions(-) (limited to 'keyboards/lfkeyboards') diff --git a/keyboards/lfkeyboards/lfk65_hs/config.h b/keyboards/lfkeyboards/lfk65_hs/config.h index 9bec564065..a4b4d931c4 100644 --- a/keyboards/lfkeyboards/lfk65_hs/config.h +++ b/keyboards/lfkeyboards/lfk65_hs/config.h @@ -6,7 +6,6 @@ #define MATRIX_COL_PINS {E6, F4, B7, D5, D3, D2, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4} #define RGBLED_NUM 20 // Number of LEDs -#define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/lfk65_hs/info.json b/keyboards/lfkeyboards/lfk65_hs/info.json index 8973c3fafa..a2aea08829 100644 --- a/keyboards/lfkeyboards/lfk65_hs/info.json +++ b/keyboards/lfkeyboards/lfk65_hs/info.json @@ -8,6 +8,9 @@ "pid": "0x6064", "device_version": "0.0.1" }, + "backlight": { + "levels": 8 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/config.h b/keyboards/lfkeyboards/lfk78/config.h index 4b047f6c1c..3e88fe3d37 100644 --- a/keyboards/lfkeyboards/lfk78/config.h +++ b/keyboards/lfkeyboards/lfk78/config.h @@ -21,7 +21,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP { 8, 16, 40, 55, 70, 128, 200, 255 } #define TAPPING_TERM 200 diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json index 8ff16c7e54..026ec0d0c5 100644 --- a/keyboards/lfkeyboards/lfk78/revb/info.json +++ b/keyboards/lfkeyboards/lfk78/revb/info.json @@ -8,6 +8,10 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 8 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/revc/info.json b/keyboards/lfkeyboards/lfk78/revc/info.json index 48233f60cd..8867f107e8 100644 --- a/keyboards/lfkeyboards/lfk78/revc/info.json +++ b/keyboards/lfkeyboards/lfk78/revc/info.json @@ -8,6 +8,10 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 8 + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/revj/info.json b/keyboards/lfkeyboards/lfk78/revj/info.json index 0d1c355184..320e5f89ec 100644 --- a/keyboards/lfkeyboards/lfk78/revj/info.json +++ b/keyboards/lfkeyboards/lfk78/revj/info.json @@ -8,6 +8,10 @@ "pid": "0x3738", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 8 + }, "processor": "at90usb646", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/lfkeyboards/lfk78/rules.mk b/keyboards/lfkeyboards/lfk78/rules.mk index 1db50d1423..6c0b7f6d8d 100644 --- a/keyboards/lfkeyboards/lfk78/rules.mk +++ b/keyboards/lfkeyboards/lfk78/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = yes # Enable WS2812 RGB underlight. RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lfkeyboards, not qmk base diff --git a/keyboards/lfkeyboards/lfk87/config.h b/keyboards/lfkeyboards/lfk87/config.h index 51feeb7f6e..3120a184e6 100644 --- a/keyboards/lfkeyboards/lfk87/config.h +++ b/keyboards/lfkeyboards/lfk87/config.h @@ -40,7 +40,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_LEVELS 10 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN F4 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/lfk87/info.json b/keyboards/lfkeyboards/lfk87/info.json index 833eb3261d..9ba48f7b29 100644 --- a/keyboards/lfkeyboards/lfk87/info.json +++ b/keyboards/lfkeyboards/lfk87/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 10 + }, "community_layouts": ["tkl_ansi", "tkl_iso"], "layouts": { "LAYOUT_tkl_ansi": { diff --git a/keyboards/lfkeyboards/lfk87/rules.mk b/keyboards/lfkeyboards/lfk87/rules.mk index 32c2a94f2b..9a0fd53343 100644 --- a/keyboards/lfkeyboards/lfk87/rules.mk +++ b/keyboards/lfkeyboards/lfk87/rules.mk @@ -22,7 +22,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = custom AUDIO_ENABLE = yes # Audio output RGBLIGHT_ENABLE = yes # Enable RGB underlight RGBLIGHT_CUSTOM_DRIVER = yes # RGB code is implemented in lefkeyboards, not WS2812 diff --git a/keyboards/lfkeyboards/mini1800/config.h b/keyboards/lfkeyboards/mini1800/config.h index e2e2366044..2d648c4e4d 100644 --- a/keyboards/lfkeyboards/mini1800/config.h +++ b/keyboards/lfkeyboards/mini1800/config.h @@ -28,7 +28,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_LEVELS 10 #define BACKLIGHT_PWM_MAP {2, 4, 8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN F4 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json index 703184dc99..6b66ed9774 100644 --- a/keyboards/lfkeyboards/mini1800/info.json +++ b/keyboards/lfkeyboards/mini1800/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "driver": "custom", + "levels": 10 + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/lfkeyboards/mini1800/mini1800.c b/keyboards/lfkeyboards/mini1800/mini1800.c index fb92137be8..f435f55677 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.c +++ b/keyboards/lfkeyboards/mini1800/mini1800.c @@ -9,7 +9,6 @@ #include "lighting.h" #include "debug.h" -#define BACKLIGHT_BREATHING #include "quantum.h" uint16_t click_hz = CLICK_HZ; diff --git a/keyboards/lfkeyboards/mini1800/reva/rules.mk b/keyboards/lfkeyboards/mini1800/reva/rules.mk index bb938f99b3..edd26e498d 100644 --- a/keyboards/lfkeyboards/mini1800/reva/rules.mk +++ b/keyboards/lfkeyboards/mini1800/reva/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = yes # Audio output # RGB code is implemented in lfkeyboards, not WS2812 RGBLIGHT_CUSTOM_DRIVER = yes -BACKLIGHT_DRIVER = custom SLEEP_LED_ENABLE = yes ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled diff --git a/keyboards/lfkeyboards/mini1800/revc/rules.mk b/keyboards/lfkeyboards/mini1800/revc/rules.mk index bb938f99b3..edd26e498d 100644 --- a/keyboards/lfkeyboards/mini1800/revc/rules.mk +++ b/keyboards/lfkeyboards/mini1800/revc/rules.mk @@ -13,7 +13,6 @@ AUDIO_ENABLE = yes # Audio output # RGB code is implemented in lfkeyboards, not WS2812 RGBLIGHT_CUSTOM_DRIVER = yes -BACKLIGHT_DRIVER = custom SLEEP_LED_ENABLE = yes ISSI_ENABLE = yes # If the I2C pullup resistors aren't install this must be disabled diff --git a/keyboards/lfkeyboards/smk65/revb/config.h b/keyboards/lfkeyboards/smk65/revb/config.h index 06334113ef..b746d90232 100644 --- a/keyboards/lfkeyboards/smk65/revb/config.h +++ b/keyboards/lfkeyboards/smk65/revb/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . #define AUDIO_VOICES #define AUDIO_PIN C6 -#define BACKLIGHT_LEVELS 8 #define BACKLIGHT_PWM_MAP {8, 16, 40, 55, 70, 128, 200, 255} #define RGB_DI_PIN C7 // Have to set it to something to get the ws2812 code to compile diff --git a/keyboards/lfkeyboards/smk65/revb/info.json b/keyboards/lfkeyboards/smk65/revb/info.json index bf42e51ded..25cbf0f77a 100644 --- a/keyboards/lfkeyboards/smk65/revb/info.json +++ b/keyboards/lfkeyboards/smk65/revb/info.json @@ -2,6 +2,9 @@ "usb": { "pid": "0x565B" }, + "backlight": { + "levels": 8 + }, "processor": "at90usb646", "bootloader": "atmel-dfu" } -- cgit v1.2.3