diff options
author | Ryan <fauxpark@gmail.com> | 2023-02-17 13:14:29 +1100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-17 13:14:29 +1100 |
commit | f4ba17c4a0ee59603c167b04f2d6f6eee8b2cf1b (patch) | |
tree | 11fec680226404eb46d2c61305cf7e848450c4d9 /keyboards/mechlovin | |
parent | d784f78bd0a034c1d6085379615014fd701536ab (diff) |
Move LED indicator config to data driven (#19800)
Diffstat (limited to 'keyboards/mechlovin')
64 files changed, 133 insertions, 134 deletions
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index cb8a0687f8..f668bd88ed 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -61,7 +61,3 @@ # define ENABLE_RGB_MATRIX_MULTISPLASH # define ENABLE_RGB_MATRIX_SOLID_SPLASH # define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH - -#define LED_NUM_LOCK_PIN C15 -#define LED_CAPS_LOCK_PIN B2 -#define LED_SCROLL_LOCK_PIN B9 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index 92ee67be74..e93c3b77b8 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Adelais En Ciel", "usb": { "pid": "0xAEC1" + }, + "indicators": { + "caps_lock": "B2", + "num_lock": "C15", + "scroll_lock": "B9" } } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index 6a50274f58..9611ed6744 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -96,8 +96,3 @@ #define ENCODER_RESOLUTION 4 #define TAP_CODE_DELAY 10 - - -#define LED_NUM_LOCK_PIN C15 -#define LED_CAPS_LOCK_PIN B2 -#define LED_SCROLL_LOCK_PIN B9 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 8af90a2c55..556c8bf7e5 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Adelais En Ciel Rev2", "usb": { "pid": "0xAEC2" + }, + "indicators": { + "caps_lock": "B2", + "num_lock": "C15", + "scroll_lock": "B9" } } diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index 92fa229523..faf032647f 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -119,7 +119,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ENCODER_RESOLUTION 4 #define TAP_CODE_DELAY 10 #endif - -#define LED_NUM_LOCK_PIN A0 -#define LED_CAPS_LOCK_PIN C14 -#define LED_SCROLL_LOCK_PIN C15 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index 2f963ec895..d49fd7970a 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Adelais En Ciel Rev3", "usb": { "pid": "0xAEC3" + }, + "indicators": { + "caps_lock": "C14", + "num_lock": "A0", + "scroll_lock": "C15" } } diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index ef69fd27d1..90a5cf6575 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -41,7 +41,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE - -#define LED_NUM_LOCK_PIN C15 -#define LED_CAPS_LOCK_PIN B2 -#define LED_SCROLL_LOCK_PIN B9 diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json index 68e7b3d144..3835f71f94 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -1,3 +1,8 @@ { - "keyboard_name": "Adelais" + "keyboard_name": "Adelais", + "indicators": { + "caps_lock": "B2", + "num_lock": "C15", + "scroll_lock": "B9" + } } diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h index c44559c3ca..abd17c2b2f 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h @@ -31,11 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define LED_NUM_LOCK_PIN D7 -#define LED_CAPS_LOCK_PIN E6 -#define LED_SCROLL_LOCK_PIN F7 -#define LED_PIN_ON_STATE 1 - #define BACKLIGHT_PIN B5 #define BACKLIGHT_LEVELS 3 #define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json index d827607b81..0103bf09b6 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -2,5 +2,10 @@ "keyboard_name": "Adelais AVR", "usb": { "pid": "0xAD04" + }, + "indicators": { + "caps_lock": "E6", + "num_lock": "D7", + "scroll_lock": "F7" } } diff --git a/keyboards/mechlovin/delphine/config.h b/keyboards/mechlovin/delphine/config.h index 21b8ab654d..de0fbbfe8c 100644 --- a/keyboards/mechlovin/delphine/config.h +++ b/keyboards/mechlovin/delphine/config.h @@ -36,5 +36,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_COL_PINS { F7, D7, D6, D2 } #define DIODE_DIRECTION COL2ROW - -#define LED_NUM_LOCK_PIN B5 diff --git a/keyboards/mechlovin/delphine/info.json b/keyboards/mechlovin/delphine/info.json index 5958db55d0..4495943544 100644 --- a/keyboards/mechlovin/delphine/info.json +++ b/keyboards/mechlovin/delphine/info.json @@ -6,6 +6,9 @@ "usb": { "vid": "0x4D4C" }, + "indicators": { + "num_lock": "B5" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["numpad_6x4", "ortho_6x4"], diff --git a/keyboards/mechlovin/foundation/config.h b/keyboards/mechlovin/foundation/config.h index 2e8c992d10..e2d846cfed 100644 --- a/keyboards/mechlovin/foundation/config.h +++ b/keyboards/mechlovin/foundation/config.h @@ -39,11 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_PIN_ON_STATE 0 -#define LED_CAPS_LOCK_PIN A1 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - #define RGB_DI_PIN B15 #ifdef RGB_DI_PIN # define RGBLED_NUM 22 diff --git a/keyboards/mechlovin/foundation/info.json b/keyboards/mechlovin/foundation/info.json index 2ed9cbdc06..38f9cace08 100644 --- a/keyboards/mechlovin/foundation/info.json +++ b/keyboards/mechlovin/foundation/info.json @@ -8,6 +8,10 @@ "pid": "0x0180", "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "A1", + "on_state": 0 + }, "processor": "STM32F103", "bootloader": "stm32duino", "layout_aliases": { diff --git a/keyboards/mechlovin/hannah65/config.h b/keyboards/mechlovin/hannah65/config.h index a11338a5e1..2e39b676c7 100644 --- a/keyboards/mechlovin/hannah65/config.h +++ b/keyboards/mechlovin/hannah65/config.h @@ -36,9 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN B9 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B8 #define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD4 diff --git a/keyboards/mechlovin/hannah65/info.json b/keyboards/mechlovin/hannah65/info.json index c06ffbaf06..8ec49a784e 100644 --- a/keyboards/mechlovin/hannah65/info.json +++ b/keyboards/mechlovin/hannah65/info.json @@ -1,4 +1,8 @@ { + "indicators": { + "caps_lock": "B9", + "on_state": 0 + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/mechlovin/hex4b/config.h b/keyboards/mechlovin/hex4b/config.h index 97e768fa61..ec84279b82 100644 --- a/keyboards/mechlovin/hex4b/config.h +++ b/keyboards/mechlovin/hex4b/config.h @@ -35,5 +35,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW - -#define LED_PIN_ON_STATE 0 diff --git a/keyboards/mechlovin/hex4b/rev1/config.h b/keyboards/mechlovin/hex4b/rev1/config.h index c4e588e678..abd2a73e0e 100644 --- a/keyboards/mechlovin/hex4b/rev1/config.h +++ b/keyboards/mechlovin/hex4b/rev1/config.h @@ -32,12 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { B7, A2, A1, A3, A4, A5 } #define MATRIX_COL_PINS { B6, B5, B3, B2, B1, B0, A0, A6, A7, C7, C6, C5, C4, D1, D0 } -#define LED_NUM_LOCK_PIN D6 -#define LED_CAPS_LOCK_PIN D7 -#define LED_SCROLL_LOCK_PIN D5 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - #define BACKLIGHT_PIN D4 #define BACKLIGHT_LEVELS 5 #define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/hex4b/rev1/info.json b/keyboards/mechlovin/hex4b/rev1/info.json index be59552b33..79bef8e9a7 100644 --- a/keyboards/mechlovin/hex4b/rev1/info.json +++ b/keyboards/mechlovin/hex4b/rev1/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D7", + "num_lock": "D6", + "scroll_lock": "D5", + "on_state": 0 + }, "processor": "atmega32a", "bootloader": "usbasploader" } diff --git a/keyboards/mechlovin/hex4b/rev2/config.h b/keyboards/mechlovin/hex4b/rev2/config.h index db994638c8..cff2b7f915 100644 --- a/keyboards/mechlovin/hex4b/rev2/config.h +++ b/keyboards/mechlovin/hex4b/rev2/config.h @@ -32,12 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MATRIX_ROW_PINS { A4, B12, B13, B14, B15, A1 } #define MATRIX_COL_PINS { B11, B10, B2, B1, B0, A7, A6, A5, A3, C13, B7, B6, B5, B4, B3 } -#define LED_NUM_LOCK_PIN C15 -#define LED_CAPS_LOCK_PIN B9 -#define LED_SCROLL_LOCK_PIN A15 -//#define LED_COMPOSE_PIN B3 -//#define LED_KANA_PIN B4 - #define BACKLIGHT_PIN B8 #define BACKLIGHT_LEVELS 5 #define BACKLIGHT_PWM_DRIVER PWMD4 diff --git a/keyboards/mechlovin/hex4b/rev2/info.json b/keyboards/mechlovin/hex4b/rev2/info.json index 040f96b010..6f5ddff9f7 100644 --- a/keyboards/mechlovin/hex4b/rev2/info.json +++ b/keyboards/mechlovin/hex4b/rev2/info.json @@ -3,6 +3,12 @@ "usb": { "device_version": "0.0.2" }, + "indicators": { + "caps_lock": "B9", + "num_lock": "C15", + "scroll_lock": "A15", + "on_state": 0 + }, "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/mechlovin/hex6c/config.h b/keyboards/mechlovin/hex6c/config.h index f32a0d4b5d..88f115fe8f 100644 --- a/keyboards/mechlovin/hex6c/config.h +++ b/keyboards/mechlovin/hex6c/config.h @@ -38,11 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN A3 -#define LED_CAPS_LOCK_PIN A4 -#define LED_SCROLL_LOCK_PIN A8 -#define LED_PIN_ON_STATE 0 - #define BACKLIGHT_PIN B0 #define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 diff --git a/keyboards/mechlovin/hex6c/info.json b/keyboards/mechlovin/hex6c/info.json index 990dbfd48c..c076b7198b 100644 --- a/keyboards/mechlovin/hex6c/info.json +++ b/keyboards/mechlovin/hex6c/info.json @@ -8,6 +8,12 @@ "pid": "0x6C01", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "A4", + "num_lock": "A3", + "scroll_lock": "A8", + "on_state": 0 + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", diff --git a/keyboards/mechlovin/infinity87/rev1/config.h b/keyboards/mechlovin/infinity87/rev1/config.h index 467d47c6f4..7de2a2cc79 100644 --- a/keyboards/mechlovin/infinity87/rev1/config.h +++ b/keyboards/mechlovin/infinity87/rev1/config.h @@ -24,8 +24,4 @@ #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 - -#define LED_CAPS_LOCK_PIN A4 -#define LED_SCROLL_LOCK_PIN A8 - #define DIODE_DIRECTION COL2ROW
\ No newline at end of file diff --git a/keyboards/mechlovin/infinity87/rev1/info.json b/keyboards/mechlovin/infinity87/rev1/info.json index c06ffbaf06..0bcf668f11 100644 --- a/keyboards/mechlovin/infinity87/rev1/info.json +++ b/keyboards/mechlovin/infinity87/rev1/info.json @@ -1,4 +1,8 @@ { + "indicators": { + "caps_lock": "A4", + "scroll_lock": "A8" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C" diff --git a/keyboards/mechlovin/infinity87/rev2/config.h b/keyboards/mechlovin/infinity87/rev2/config.h index e619e818de..5d0d064e28 100644 --- a/keyboards/mechlovin/infinity87/rev2/config.h +++ b/keyboards/mechlovin/infinity87/rev2/config.h @@ -31,11 +31,6 @@ /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define LED_NUM_LOCK_PIN D7 -#define LED_CAPS_LOCK_PIN D6 -#define LED_SCROLL_LOCK_PIN B4 -#define LED_PIN_ON_STATE 1 - #define BACKLIGHT_PIN B6 #define BACKLIGHT_LEVELS 3 #define BACKLIGHT_BREATHING diff --git a/keyboards/mechlovin/infinity87/rev2/info.json b/keyboards/mechlovin/infinity87/rev2/info.json index 858f906ed2..548e55f563 100644 --- a/keyboards/mechlovin/infinity87/rev2/info.json +++ b/keyboards/mechlovin/infinity87/rev2/info.json @@ -8,6 +8,11 @@ "pid": "0x8702", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D6", + "num_lock": "D7", + "scroll_lock": "B4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/infinity875/config.h b/keyboards/mechlovin/infinity875/config.h index 385774b876..697ef34ccb 100644 --- a/keyboards/mechlovin/infinity875/config.h +++ b/keyboards/mechlovin/infinity875/config.h @@ -38,10 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define LED_CAPS_LOCK_PIN D6 -#define LED_SCROLL_LOCK_PIN B4 -#define LED_PIN_ON_STATE 1 - #ifdef RGB_MATRIX_ENABLE #define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 42 diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json index 3b31aee81a..f27235b8c5 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/info.json @@ -8,6 +8,10 @@ "pid": "0x0875", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "D6", + "scroll_lock": "B4" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mechlovin/infinity88/config.h b/keyboards/mechlovin/infinity88/config.h index a0ffad2658..6b6a992116 100644 --- a/keyboards/mechlovin/infinity88/config.h +++ b/keyboards/mechlovin/infinity88/config.h @@ -37,9 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define DIODE_DIRECTION COL2ROW -#define LED_NUM_LOCK_PIN A3 -#define LED_CAPS_LOCK_PIN A4 - #define BACKLIGHT_PIN B0 #define BACKLIGHT_BREATHING #define BACKLIGHT_PWM_DRIVER PWMD3 diff --git a/keyboards/mechlovin/infinity88/info.json b/keyboards/mechlovin/infinity88/info.json index 975d40a8a9..8fd53b54cd 100644 --- a/keyboards/mechlovin/infinity88/info.json +++ b/ |