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/rgbkb/mun/rev1/info.json | 3 +++ keyboards/rgbkb/mun/rules.mk | 1 - keyboards/rgbkb/pan/info.json | 3 +++ keyboards/rgbkb/pan/rev1/rules.mk | 3 --- keyboards/rgbkb/pan/rules.mk | 3 ++- keyboards/rgbkb/sol/rev1/info.json | 3 +++ keyboards/rgbkb/sol/rev1/rules.mk | 1 - keyboards/rgbkb/sol/rev2/info.json | 3 +++ keyboards/rgbkb/sol/rev2/rules.mk | 1 - keyboards/rgbkb/sol3/rev1/info.json | 3 +++ keyboards/rgbkb/sol3/rules.mk | 1 - keyboards/rgbkb/zygomorph/rev1/info.json | 3 +++ keyboards/rgbkb/zygomorph/rules.mk | 1 - 13 files changed, 20 insertions(+), 9 deletions(-) (limited to 'keyboards/rgbkb') diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json index 9d5bf972c1..b447c4b58d 100644 --- a/keyboards/rgbkb/mun/rev1/info.json +++ b/keyboards/rgbkb/mun/rev1/info.json @@ -12,6 +12,9 @@ "pin": "B5", "driver": "pwm" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["A0", "B11", "B0", "B10", "B12", "B2", "A8"], "rows": ["A1", "A3", "B3", "A13", "B15", null, null] diff --git a/keyboards/rgbkb/mun/rules.mk b/keyboards/rgbkb/mun/rules.mk index 88f8890ce6..0862bde4e5 100644 --- a/keyboards/rgbkb/mun/rules.mk +++ b/keyboards/rgbkb/mun/rules.mk @@ -17,7 +17,6 @@ AUDIO_ENABLE = no # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 OLED_ENABLE = yes OLED_DRIVER = SSD1306 # Enable the OLED Driver diff --git a/keyboards/rgbkb/pan/info.json b/keyboards/rgbkb/pan/info.json index e12e7717eb..d151fd68d6 100644 --- a/keyboards/rgbkb/pan/info.json +++ b/keyboards/rgbkb/pan/info.json @@ -8,6 +8,9 @@ "pid": "0x8C9C", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "custom" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/rgbkb/pan/rev1/rules.mk b/keyboards/rgbkb/pan/rev1/rules.mk index 667c290059..4d3c0f6679 100644 --- a/keyboards/rgbkb/pan/rev1/rules.mk +++ b/keyboards/rgbkb/pan/rev1/rules.mk @@ -1,5 +1,2 @@ # The default configuration is a atmega32a DEFAULT_FOLDER = rgbkb/pan/rev1/32a - -RGB_MATRIX_DRIVER = custom -WS2812_DRIVER_REQUIRED := yes diff --git a/keyboards/rgbkb/pan/rules.mk b/keyboards/rgbkb/pan/rules.mk index aecabfe157..775fa48e12 100644 --- a/keyboards/rgbkb/pan/rules.mk +++ b/keyboards/rgbkb/pan/rules.mk @@ -9,7 +9,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = no # Enable N-Key Rollover AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 ENCODER_ENABLE = yes OLED_ENABLE = yes OLED_DRIVER = SSD1306 @@ -20,3 +19,5 @@ STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this. # Default to revision 1 DEFAULT_FOLDER = rgbkb/pan/rev1 + +WS2812_DRIVER_REQUIRED := yes diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index ae88231a49..b93857eb51 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] diff --git a/keyboards/rgbkb/sol/rev1/rules.mk b/keyboards/rgbkb/sol/rev1/rules.mk index cef623df1a..af9b588b7a 100644 --- a/keyboards/rgbkb/sol/rev1/rules.mk +++ b/keyboards/rgbkb/sol/rev1/rules.mk @@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = yes # Enable global lighting effects. Do not ena LED_MIRRORED = yes # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_DRIVER = WS2812 RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap. diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index 97b7921464..2daee64be4 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] diff --git a/keyboards/rgbkb/sol/rev2/rules.mk b/keyboards/rgbkb/sol/rev2/rules.mk index 681a3e0993..53aeba76ae 100644 --- a/keyboards/rgbkb/sol/rev2/rules.mk +++ b/keyboards/rgbkb/sol/rev2/rules.mk @@ -15,7 +15,6 @@ RGBLIGHT_ENABLE = no # Enable global lighting effects. Do not ena LED_MIRRORED = no # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master) RGB_MATRIX_ENABLE = yes # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_DRIVER = WS2812 RGB_MATRIX_KEYPRESSES = no # Enable reactive per-key effects. RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap. diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index 77116bb733..3dd7404c44 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -12,6 +12,9 @@ "pin": "B5", "driver": "pwm" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B2", "B1", "B9", "B3", "B4"], "rows": ["B15", "A8", "A15", "B12", "A3", null] diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index 336da6dd19..382b858f46 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -21,7 +21,6 @@ DIP_SWITCH_ENABLE = yes RGBLIGHT_ENABLE = no RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 OLED_ENABLE = yes OLED_DRIVER = SSD1306 # Enable the OLED Driver diff --git a/keyboards/rgbkb/zygomorph/rev1/info.json b/keyboards/rgbkb/zygomorph/rev1/info.json index c85e9e0a9c..4be3dd61d3 100644 --- a/keyboards/rgbkb/zygomorph/rev1/info.json +++ b/keyboards/rgbkb/zygomorph/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F4", "F6", "C7", "C6", "B6", "D4"], "rows": ["F1", "F5", "F7", "B5", "B4"] diff --git a/keyboards/rgbkb/zygomorph/rules.mk b/keyboards/rgbkb/zygomorph/rules.mk index e926ec7641..bc168c3983 100644 --- a/keyboards/rgbkb/zygomorph/rules.mk +++ b/keyboards/rgbkb/zygomorph/rules.mk @@ -10,7 +10,6 @@ NKRO_ENABLE = no # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output -RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes -- cgit v1.2.3