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/handwired/6macro/info.json | 3 +++ keyboards/handwired/6macro/rules.mk | 1 - keyboards/handwired/colorlice/info.json | 3 +++ keyboards/handwired/colorlice/rules.mk | 1 - keyboards/handwired/dactyl_manuform/3x5_3/info.json | 3 +++ keyboards/handwired/dactyl_manuform/3x5_3/rules.mk | 1 - keyboards/handwired/dygma/raise/info.json | 3 +++ keyboards/handwired/dygma/raise/rules.mk | 1 - keyboards/handwired/hnah108/info.json | 3 +++ keyboards/handwired/hnah108/rules.mk | 1 - keyboards/handwired/hnah40rgb/info.json | 3 +++ keyboards/handwired/hnah40rgb/rules.mk | 1 - keyboards/handwired/orbweaver/info.json | 3 +++ keyboards/handwired/orbweaver/rules.mk | 1 - keyboards/handwired/p65rgb/info.json | 3 +++ keyboards/handwired/p65rgb/rules.mk | 1 - keyboards/handwired/tractyl_manuform/4x6_right/info.json | 3 +++ keyboards/handwired/tractyl_manuform/4x6_right/rules.mk | 2 -- 18 files changed, 27 insertions(+), 10 deletions(-) (limited to 'keyboards/handwired') diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json index 8c9b3e832f..5bc9833fa5 100644 --- a/keyboards/handwired/6macro/info.json +++ b/keyboards/handwired/6macro/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "D2" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["B0", "B1", "B2"], "rows": ["B3", "B4"] diff --git a/keyboards/handwired/6macro/rules.mk b/keyboards/handwired/6macro/rules.mk index 8c51d38be3..083cc21a34 100644 --- a/keyboards/handwired/6macro/rules.mk +++ b/keyboards/handwired/6macro/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 RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_DRIVER = WS2812 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index 11ac235065..0cba448703 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "B1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], "rows": ["D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk index 972181a4b4..16e007dd34 100644 --- a/keyboards/handwired/colorlice/rules.mk +++ b/keyboards/handwired/colorlice/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use link time optimization RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index 13aee1eaaf..cfe109fb37 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "D3" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["C6", "D7", "E6", "B4", "B5"], "rows": ["B1", "B3", "B2", "B6"] diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk index 275ece3219..38ee6f4252 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk +++ b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow # AUDIO_ENABLE = yes # Audio output RGB_MATRIX_ENABLE = yes # Enable WS2812 RGB matrix -RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes RGBLIGHT_SUPPORTED = yes diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index 312a0693a9..5c287bcc7e 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -8,6 +8,9 @@ "pid": "0x2201", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "custom" + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411", diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk index 362a47d7da..761e075500 100644 --- a/keyboards/handwired/dygma/raise/rules.mk +++ b/keyboards/handwired/dygma/raise/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = custom CUSTOM_MATRIX = lite # TODO(ibash) we don't actually need to enable raw, but there's some side effect diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json index 5f43b185cf..4d7d3e0386 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F7", "F6", "F5", "F4", "F1", "C7", "B4", "B5", "B6", "C6"] diff --git a/keyboards/handwired/hnah108/rules.mk b/keyboards/handwired/hnah108/rules.mk index ae9acc534f..ec5f27bde8 100644 --- a/keyboards/handwired/hnah108/rules.mk +++ b/keyboards/handwired/hnah108/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json index 89ac784207..3eb92ce1ef 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "E2" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], "rows": ["B7", "D7", "F1", "F0"] diff --git a/keyboards/handwired/hnah40rgb/rules.mk b/keyboards/handwired/hnah40rgb/rules.mk index cab4eea965..7c04c86483 100644 --- a/keyboards/handwired/hnah40rgb/rules.mk +++ b/keyboards/handwired/hnah40rgb/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json index e9b37e1c81..d0b6d7f48a 100644 --- a/keyboards/handwired/orbweaver/info.json +++ b/keyboards/handwired/orbweaver/info.json @@ -12,6 +12,9 @@ "mousekey": true, "nkro": true }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"], "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"] diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk index 07c357daac..01f9d9397a 100644 --- a/keyboards/handwired/orbweaver/rules.mk +++ b/keyboards/handwired/orbweaver/rules.mk @@ -1,3 +1,2 @@ # Add support for 3731 RGB matrix controller RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json index 78b630e512..c752501362 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "B4" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"], "rows": ["C7", "C6", "B6", "B5", "D5"] diff --git a/keyboards/handwired/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk index b5bcf508c4..5e57c341f1 100644 --- a/keyboards/handwired/p65rgb/rules.mk +++ b/keyboards/handwired/p65rgb/rules.mk @@ -10,6 +10,5 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index 55d17ee09b..4d0f97fb42 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -6,6 +6,9 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], "rows": ["A0", "A1", "A2", "A3", "A4"] diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk index 8c9bf430d8..aabe18457a 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk @@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = no -RGB_MATRIX_DRIVER = WS2812 - POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 -- cgit v1.2.3