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/handwired/aek64/config.h | 4 ---- keyboards/handwired/aek64/info.json | 5 +++++ keyboards/handwired/arrow_pad/config.h | 2 -- keyboards/handwired/arrow_pad/info.json | 3 +++ keyboards/handwired/bdn9_ble/config.h | 3 --- keyboards/handwired/bdn9_ble/info.json | 4 ++++ keyboards/handwired/chiron/config.h | 4 ---- keyboards/handwired/chiron/info.json | 4 ++++ keyboards/handwired/co60/rev1/config.h | 5 ----- keyboards/handwired/co60/rev1/info.json | 4 ++++ keyboards/handwired/co60/rev6/config.h | 6 ------ keyboards/handwired/co60/rev6/info.json | 4 ++++ keyboards/handwired/co60/rev7/config.h | 6 ------ keyboards/handwired/co60/rev7/info.json | 4 ++++ keyboards/handwired/hacked_motospeed/config.h | 2 -- keyboards/handwired/hacked_motospeed/info.json | 3 +++ keyboards/handwired/hnah108/config.h | 4 ---- keyboards/handwired/hnah108/info.json | 5 +++++ keyboards/handwired/jot50/config.h | 4 ---- keyboards/handwired/jot50/info.json | 4 ++++ keyboards/handwired/nozbe_macro/config.h | 2 -- keyboards/handwired/nozbe_macro/info.json | 3 +++ keyboards/handwired/pill60/config.h | 3 --- keyboards/handwired/pill60/info.json | 5 +++++ keyboards/handwired/pill60/rules.mk | 1 - keyboards/handwired/prime_exl/config.h | 3 --- keyboards/handwired/prime_exl/info.json | 4 ++++ keyboards/handwired/riblee_f401/config.h | 3 --- keyboards/handwired/riblee_f401/info.json | 5 +++++ keyboards/handwired/riblee_f401/rules.mk | 1 - keyboards/handwired/steamvan/rev1/config.h | 6 ------ keyboards/handwired/steamvan/rev1/info.json | 4 ++++ keyboards/handwired/tritium_numpad/config.h | 6 ------ keyboards/handwired/tritium_numpad/info.json | 4 ++++ 34 files changed, 65 insertions(+), 65 deletions(-) (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h index 886b616c35..e847297296 100644 --- a/keyboards/handwired/aek64/config.h +++ b/keyboards/handwired/aek64/config.h @@ -32,7 +32,3 @@ along with this program. If not, see . /* Enable double tab */ #define TAPPING_TERM 175 - -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 5 diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json index 42349632e2..471208ca41 100644 --- a/keyboards/handwired/aek64/info.json +++ b/keyboards/handwired/aek64/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5, + "breathing": true + }, "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h index 9506696646..6861311460 100644 --- a/keyboards/handwired/arrow_pad/config.h +++ b/keyboards/handwired/arrow_pad/config.h @@ -31,8 +31,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { F0, F1, F4, F5, F6, F7 } #define MATRIX_COL_PINS { B0, B1, B2, B3 } -#define BACKLIGHT_PIN B7 - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json index 9adac5b74d..8451637df5 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/keyboards/handwired/arrow_pad/info.json @@ -8,6 +8,9 @@ "pid": "0x4096", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/bdn9_ble/config.h b/keyboards/handwired/bdn9_ble/config.h index 2dc8bb5327..3ed1c2ed30 100644 --- a/keyboards/handwired/bdn9_ble/config.h +++ b/keyboards/handwired/bdn9_ble/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define BACKLIGHT_PIN F6 -#define BACKLIGHT_LEVELS 5 - /* 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/handwired/bdn9_ble/info.json b/keyboards/handwired/bdn9_ble/info.json index 303e26ba05..4e218e1dd8 100644 --- a/keyboards/handwired/bdn9_ble/info.json +++ b/keyboards/handwired/bdn9_ble/info.json @@ -8,6 +8,10 @@ "pid": "0x1134", "device_version": "1.0.0" }, + "backlight": { + "pin": "F6", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "caterina", "matrix_pins": { diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h index 578d13a472..d881fecbaa 100644 --- a/keyboards/handwired/chiron/config.h +++ b/keyboards/handwired/chiron/config.h @@ -34,7 +34,3 @@ along with this program. If not, see . #define RGB_DI_PIN D3 #define RGBLED_NUM 4 - -#define BACKLIGHT_PIN B6 -#define BACKLIGHT_LEVELS 7 - diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index 6cf49275a7..b1590d8ded 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B6", + "levels": 7 + }, "split": { "soft_serial_pin": "D0" }, diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h index 4d58091ef8..c42a0d5b0c 100644 --- a/keyboards/handwired/co60/rev1/config.h +++ b/keyboards/handwired/co60/rev1/config.h @@ -34,11 +34,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#ifdef __AVR__ -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#endif - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/info.json index d48f322f87..05a7a3a336 100644 --- a/keyboards/handwired/co60/rev1/info.json +++ b/keyboards/handwired/co60/rev1/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "1.0.0" }, + "backlight": { + "pin": "B7", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h index aa7079f247..6f938b06b7 100644 --- a/keyboards/handwired/co60/rev6/config.h +++ b/keyboards/handwired/co60/rev6/config.h @@ -29,9 +29,3 @@ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE - -/* Backlight configuration - * Backlight LEDs on B8 - */ -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING diff --git a/keyboards/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/info.json index 48bc08982b..a189309496 100644 --- a/keyboards/handwired/co60/rev6/info.json +++ b/keyboards/handwired/co60/rev6/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "6.0.0" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index 19ddb6be2c..6647698dfb 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/config.h @@ -31,12 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - * Backlight LEDs on B8 - */ -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING - /* RGB underglow configuration */ #define WS2812_SPI SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json index 1c2c38f0fe..67d54fb0fb 100644 --- a/keyboards/handwired/co60/rev7/info.json +++ b/keyboards/handwired/co60/rev7/info.json @@ -3,6 +3,10 @@ "usb": { "device_version": "7.0.0" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h index e5c60800af..2f3caa2b2f 100644 --- a/keyboards/handwired/hacked_motospeed/config.h +++ b/keyboards/handwired/hacked_motospeed/config.h @@ -38,8 +38,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json index e0c8c42566..57b66e3bdf 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/info.json @@ -8,6 +8,9 @@ "pid": "0x0690", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7" + }, "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h index 13367a2577..a942bd253d 100644 --- a/keyboards/handwired/hnah108/config.h +++ b/keyboards/handwired/hnah108/config.h @@ -37,10 +37,6 @@ along with this program. If not, see . #define ENCODERS_PAD_A { B2 } #define ENCODERS_PAD_B { B3 } -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_BREATHING -#define BACKLIGHT_LEVELS 4 - #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 30 // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json index 257fcf279c..c9dcc020cc 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "backlight": { + "pin": "B7", + "levels": 4, + "breathing": true + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h index 7f9a8c5ab6..4cb70762fb 100644 --- a/keyboards/handwired/jot50/config.h +++ b/keyboards/handwired/jot50/config.h @@ -5,10 +5,6 @@ #define MATRIX_ROW_PINS { D7, E6, B4, B6, B2 } #define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 } -/* leds */ -#define BACKLIGHT_PIN B5 -#define BACKLIGHT_BREATHING - /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json index db08eef195..1bcf932946 100644 --- a/keyboards/handwired/jot50/info.json +++ b/keyboards/handwired/jot50/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5", + "breathing": true + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x12"], diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h index 7e54b2636f..66b0bf2b75 100644 --- a/keyboards/handwired/nozbe_macro/config.h +++ b/keyboards/handwired/nozbe_macro/config.h @@ -27,8 +27,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B5 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json index 27b088958b..162b3a6803 100644 --- a/keyboards/handwired/nozbe_macro/info.json +++ b/keyboards/handwired/nozbe_macro/info.json @@ -8,6 +8,9 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "backlight": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h index 1544eb0e19..d374143192 100644 --- a/keyboards/handwired/pill60/config.h +++ b/keyboards/handwired/pill60/config.h @@ -18,11 +18,8 @@ #define DIODE_DIRECTION COL2ROW -/* Backlighting include */ -#define BACKLIGHT_PIN B14 #define BACKLIGHT_PWM_DRIVER PWMD5 #define BACKLIGHT_PWM_CHANNEL 1 -#define BACKLIGHT_LEVELS 5 /* Encoder */ #define ENCODERS_PAD_A \ diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json index bc92cf7585..891196f87b 100644 --- a/keyboards/handwired/pill60/info.json +++ b/keyboards/handwired/pill60/info.json @@ -8,6 +8,11 @@ "pid": "0x5444", "device_version": "0.0.1" }, + "backlight": { + "driver": "software", + "pin": "B14", + "levels": 5 + }, "debounce": 1, "layouts": { "LAYOUT": { diff --git a/keyboards/handwired/pill60/rules.mk b/keyboards/handwired/pill60/rules.mk index 57681a7cda..f8bae6b6df 100644 --- a/keyboards/handwired/pill60/rules.mk +++ b/keyboards/handwired/pill60/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = yes # Console for debug COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality -BACKLIGHT_DRIVER = software RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output SLEEP_LED_ENABLE = yes diff --git a/keyboards/handwired/prime_exl/config.h b/keyboards/handwired/prime_exl/config.h index b08731f0a2..c4d0c8a8a2 100644 --- a/keyboards/handwired/prime_exl/config.h +++ b/keyboards/handwired/prime_exl/config.h @@ -25,9 +25,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN B7 -#define BACKLIGHT_LEVELS 5 - /* 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/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index d8949ec389..e1a3955d5d 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/info.json @@ -8,6 +8,10 @@ "pid": "0x6578", "device_version": "0.0.1" }, + "backlight": { + "pin": "B7", + "levels": 5 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h index 886c1f7fc7..2cee851436 100644 --- a/keyboards/handwired/riblee_f401/config.h +++ b/keyboards/handwired/riblee_f401/config.h @@ -22,9 +22,6 @@ #define DIODE_DIRECTION COL2ROW -#define BACKLIGHT_PIN A0 -#define BACKLIGHT_LEVELS 5 - #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175 \ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index ec9c7631af..94cc2c35f2 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -8,6 +8,11 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "backlight": { + "driver": "software", + "pin": "A0", + "levels": 5 + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401", diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk index 6f9a638f4b..4c2d255a18 100644 --- a/keyboards/handwired/riblee_f401/rules.mk +++ b/keyboards/handwired/riblee_f401/rules.mk @@ -9,6 +9,5 @@ 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 = software RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h index a953888dc8..b52e370419 100644 --- a/keyboards/handwired/steamvan/rev1/config.h +++ b/keyboards/handwired/steamvan/rev1/config.h @@ -31,12 +31,6 @@ along with this program. If not, see . /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -/* Backlight configuration - * Backlight LEDs on B8 - */ -#define BACKLIGHT_PIN B8 -#define BACKLIGHT_BREATHING - #define WS2812_SPI SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json index ddadbcb97c..ed10d8005b 100644 --- a/keyboards/handwired/steamvan/rev1/info.json +++ b/keyboards/handwired/steamvan/rev1/info.json @@ -8,6 +8,10 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "backlight": { + "pin": "B8", + "breathing": true + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h index 21e3abe491..5782f0e058 100644 --- a/keyboards/handwired/tritium_numpad/config.h +++ b/keyboards/handwired/tritium_numpad/config.h @@ -23,8 +23,6 @@ along with this program. If not, see . #define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6 } #define MATRIX_COL_PINS { F4, F6, B1, B2 } -#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/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index 8dc967df96..b2ca85264e 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -8,6 +8,10 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "backlight": { + "pin": "B6", + "levels": 4 + }, "indicators": { "num_lock": "D5", "on_state": 0 -- cgit v1.2.3