From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/mechlovin/adelais/rgb_led/rev1/info.json | 3 +++ keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk | 1 - keyboards/mechlovin/adelais/rgb_led/rev2/info.json | 3 +++ keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk | 1 - keyboards/mechlovin/adelais/rgb_led/rev3/info.json | 3 +++ keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk | 1 - keyboards/mechlovin/delphine/rgb_led/info.json | 3 +++ keyboards/mechlovin/delphine/rgb_led/rules.mk | 1 - keyboards/mechlovin/hannah60rgb/rev1/info.json | 3 +++ keyboards/mechlovin/hannah60rgb/rev1/rules.mk | 1 - keyboards/mechlovin/hannah60rgb/rev2/info.json | 3 +++ keyboards/mechlovin/hannah60rgb/rev2/rules.mk | 1 - keyboards/mechlovin/infinity87/rgb_rev1/info.json | 3 +++ keyboards/mechlovin/infinity87/rgb_rev1/rules.mk | 1 - keyboards/mechlovin/infinity875/info.json | 3 +++ keyboards/mechlovin/infinity875/rules.mk | 1 - keyboards/mechlovin/olly/octagon/info.json | 3 +++ keyboards/mechlovin/olly/octagon/rules.mk | 1 - keyboards/mechlovin/zed65/mono_led/info.json | 3 +++ keyboards/mechlovin/zed65/mono_led/rules.mk | 1 - 20 files changed, 30 insertions(+), 10 deletions(-) (limited to 'keyboards/mechlovin') diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index 249d85c084..816b9414c1 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -3,6 +3,9 @@ "usb": { "pid": "0xAEC1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A15"], "rows": ["B1", "A0", "C13", "A1", "A2"] diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk index 9be57067bb..aad92997d0 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk @@ -1,2 +1 @@ RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 2d71c2b5f9..4ac693f894 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -3,6 +3,9 @@ "usb": { "pid": "0xAEC2" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "B11", "B10", "B8", "B4", "B5", "B3", "C14", "A7"], "rows": ["B1", "A0", "C13", "A1", "A2"] diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk index b52c4f9db3..e79b2862e6 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk @@ -1,4 +1,3 @@ RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3731 RGBLIGHT_ENABLE = yes ENCODER_ENABLE = yes diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index 9639ad3c1c..d1775ccb83 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -3,6 +3,9 @@ "usb": { "pid": "0xAEC3" }, + "rgb_matrix": { + "driver": "IS31FL3741" + }, "matrix_pins": { "cols": ["B10", "B11", "B2", "B1", "B0", "A6", "A5", "A10", "A9", "A15", "B3", "B4", "B5", "B8", "B9"], "rows": ["A4", "A3", "C13", "A1", "A2"] diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk index 188d06aee1..5664ce6844 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rules.mk @@ -2,7 +2,6 @@ # change yes to no to disable # RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3741 RGBLIGHT_ENABLE = yes ENCODER_ENABLE = yes CONSOLE_ENABLE = no # Console for debug diff --git a/keyboards/mechlovin/delphine/rgb_led/info.json b/keyboards/mechlovin/delphine/rgb_led/info.json index 0255aae44a..3b9fb036e9 100644 --- a/keyboards/mechlovin/delphine/rgb_led/info.json +++ b/keyboards/mechlovin/delphine/rgb_led/info.json @@ -5,5 +5,8 @@ }, "ws2812": { "pin": "E2" + }, + "rgb_matrix": { + "driver": "IS31FL3731" } } diff --git a/keyboards/mechlovin/delphine/rgb_led/rules.mk b/keyboards/mechlovin/delphine/rgb_led/rules.mk index 204fb1241b..5c624bc68f 100644 --- a/keyboards/mechlovin/delphine/rgb_led/rules.mk +++ b/keyboards/mechlovin/delphine/rgb_led/rules.mk @@ -1,3 +1,2 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/mechlovin/hannah60rgb/rev1/info.json b/keyboards/mechlovin/hannah60rgb/rev1/info.json index 6d5223a32a..af4db50699 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev1/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "A15" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], "rows": ["A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk index 9be57067bb..aad92997d0 100644 --- a/keyboards/mechlovin/hannah60rgb/rev1/rules.mk +++ b/keyboards/mechlovin/hannah60rgb/rev1/rules.mk @@ -1,2 +1 @@ RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/mechlovin/hannah60rgb/rev2/info.json b/keyboards/mechlovin/hannah60rgb/rev2/info.json index 2074fceb8b..c03bb99161 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/info.json +++ b/keyboards/mechlovin/hannah60rgb/rev2/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "A15" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["B11", "B10", "B2", "B1", "B0", "A7", "A6", "A0", "C15", "B4", "B5", "B3", "C13", "C14"], "rows": ["A4", "A5", "A3", "A2", "A1"] diff --git a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk index fcd42ec58e..e1f93c7525 100644 --- a/keyboards/mechlovin/hannah60rgb/rev2/rules.mk +++ b/keyboards/mechlovin/hannah60rgb/rev2/rules.mk @@ -1,3 +1,2 @@ RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/info.json b/keyboards/mechlovin/infinity87/rgb_rev1/info.json index 332606561c..097fc6a820 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/info.json +++ b/keyboards/mechlovin/infinity87/rgb_rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x8710", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3741" + }, "matrix_pins": { "cols": ["B12", "B13", "B14", "B15", "A8", "A9", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A2", "A1", "A0"], "rows": ["A10", "A13", "A14", "C13", "A4", "A3"] diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk index 5a28c2e1c2..e408bde91c 100644 --- a/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk +++ b/keyboards/mechlovin/infinity87/rgb_rev1/rules.mk @@ -1,2 +1 @@ RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3741 diff --git a/keyboards/mechlovin/infinity875/info.json b/keyboards/mechlovin/infinity875/info.json index d85cccbe36..fcec3c2afa 100644 --- a/keyboards/mechlovin/infinity875/info.json +++ b/keyboards/mechlovin/infinity875/info.json @@ -8,6 +8,9 @@ "pid": "0x0875", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "indicators": { "caps_lock": "D6", "scroll_lock": "B4" diff --git a/keyboards/mechlovin/infinity875/rules.mk b/keyboards/mechlovin/infinity875/rules.mk index 202f5f759b..33f549f3ae 100644 --- a/keyboards/mechlovin/infinity875/rules.mk +++ b/keyboards/mechlovin/infinity875/rules.mk @@ -12,6 +12,5 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output CUSTOM_MATRIX = lite RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 SRC += matrix.c diff --git a/keyboards/mechlovin/olly/octagon/info.json b/keyboards/mechlovin/olly/octagon/info.json index 0e1054a1fb..712b3096f4 100644 --- a/keyboards/mechlovin/olly/octagon/info.json +++ b/keyboards/mechlovin/olly/octagon/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "A7" }, + "led_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], "rows": ["B0", "B12", "A6", "A5", "A4", "A3"] diff --git a/keyboards/mechlovin/olly/octagon/rules.mk b/keyboards/mechlovin/olly/octagon/rules.mk index 25096b03d7..97303c7e2f 100644 --- a/keyboards/mechlovin/olly/octagon/rules.mk +++ b/keyboards/mechlovin/olly/octagon/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = IS31FL3731 RGBLIGHT_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/zed65/mono_led/info.json b/keyboards/mechlovin/zed65/mono_led/info.json index e0debf3cc5..25dc91a8f9 100644 --- a/keyboards/mechlovin/zed65/mono_led/info.json +++ b/keyboards/mechlovin/zed65/mono_led/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "A7" }, + "led_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B2", "B1", "A15", "B3", "B9", "B8", "B7", "B6", "B5", "B4"], "rows": ["B12", "A6", "A5", "A4", "A3"] diff --git a/keyboards/mechlovin/zed65/mono_led/rules.mk b/keyboards/mechlovin/zed65/mono_led/rules.mk index 78624e6fd3..55d38a7b91 100644 --- a/keyboards/mechlovin/zed65/mono_led/rules.mk +++ b/keyboards/mechlovin/zed65/mono_led/rules.mk @@ -1,5 +1,4 @@ NKRO_ENABLE = yes # Enable N-Key Rollover LED_MATRIX_ENABLE = yes -LED_MATRIX_DRIVER = IS31FL3731 RGBLIGHT_ENABLE = yes \ No newline at end of file -- cgit v1.2.3