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/kbdfans/baguette66/rgb/info.json | 3 +++ keyboards/kbdfans/baguette66/rgb/rules.mk | 1 - keyboards/kbdfans/bella/rgb/info.json | 3 +++ keyboards/kbdfans/bella/rgb/rules.mk | 1 - keyboards/kbdfans/bella/rgb_iso/info.json | 3 +++ keyboards/kbdfans/bella/rgb_iso/rules.mk | 1 - keyboards/kbdfans/boop65/rgb/info.json | 3 +++ keyboards/kbdfans/boop65/rgb/rules.mk | 1 - keyboards/kbdfans/kbd67/mkiirgb/v1/info.json | 3 +++ keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk | 1 - keyboards/kbdfans/kbd67/mkiirgb/v2/info.json | 3 +++ keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk | 1 - keyboards/kbdfans/kbd67/mkiirgb/v3/info.json | 3 +++ keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk | 1 - keyboards/kbdfans/kbd67/mkiirgb/v4/info.json | 3 +++ keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk | 1 - keyboards/kbdfans/kbd67/mkiirgb_iso/info.json | 3 +++ keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk | 1 - keyboards/kbdfans/kbd75rgb/info.json | 3 +++ keyboards/kbdfans/kbd75rgb/rules.mk | 1 - keyboards/kbdfans/kbdmini/info.json | 3 +++ keyboards/kbdfans/kbdmini/rules.mk | 1 - keyboards/kbdfans/maja/info.json | 3 +++ keyboards/kbdfans/maja/rules.mk | 1 - keyboards/kbdfans/odin/rgb/info.json | 3 +++ keyboards/kbdfans/odin/rgb/rules.mk | 1 - 26 files changed, 39 insertions(+), 13 deletions(-) (limited to 'keyboards/kbdfans') diff --git a/keyboards/kbdfans/baguette66/rgb/info.json b/keyboards/kbdfans/baguette66/rgb/info.json index 77277441da..40e02c9515 100644 --- a/keyboards/kbdfans/baguette66/rgb/info.json +++ b/keyboards/kbdfans/baguette66/rgb/info.json @@ -10,6 +10,9 @@ "ws2812": { "pin": "E6" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "B0", "B1", "B2", "B3", "D0", "D1", "D2", "D3", "D5", "D4", "D6"], "rows": ["F0", "F1", "F4", "F5", "B6"] diff --git a/keyboards/kbdfans/baguette66/rgb/rules.mk b/keyboards/kbdfans/baguette66/rgb/rules.mk index 2972c82a31..c9c55ceed1 100644 --- a/keyboards/kbdfans/baguette66/rgb/rules.mk +++ b/keyboards/kbdfans/baguette66/rgb/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 # Use RGB matrix -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json index 102591107f..818283adc1 100644 --- a/keyboards/kbdfans/bella/rgb/info.json +++ b/keyboards/kbdfans/bella/rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x0008", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3741" + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "B7", "B6"] diff --git a/keyboards/kbdfans/bella/rgb/rules.mk b/keyboards/kbdfans/bella/rgb/rules.mk index d65c419c55..d4493d25e0 100644 --- a/keyboards/kbdfans/bella/rgb/rules.mk +++ b/keyboards/kbdfans/bella/rgb/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 = IS31FL3741 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json index 711977a2ac..aa5202c1d4 100644 --- a/keyboards/kbdfans/bella/rgb_iso/info.json +++ b/keyboards/kbdfans/bella/rgb_iso/info.json @@ -8,6 +8,9 @@ "pid": "0x0009", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3741" + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B1", "B2", "B3", "B7", "B6"] diff --git a/keyboards/kbdfans/bella/rgb_iso/rules.mk b/keyboards/kbdfans/bella/rgb_iso/rules.mk index d65c419c55..d4493d25e0 100644 --- a/keyboards/kbdfans/bella/rgb_iso/rules.mk +++ b/keyboards/kbdfans/bella/rgb_iso/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 = IS31FL3741 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in LTO_ENABLE = yes diff --git a/keyboards/kbdfans/boop65/rgb/info.json b/keyboards/kbdfans/boop65/rgb/info.json index fe9e96ba37..db7c70a981 100644 --- a/keyboards/kbdfans/boop65/rgb/info.json +++ b/keyboards/kbdfans/boop65/rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3741" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/kbdfans/boop65/rgb/rules.mk b/keyboards/kbdfans/boop65/rgb/rules.mk index 2e8325c39d..65ec78fd37 100644 --- a/keyboards/kbdfans/boop65/rgb/rules.mk +++ b/keyboards/kbdfans/boop65/rgb/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 # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3741 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json index ecfc530ea8..733d68cc59 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/info.json @@ -4,6 +4,9 @@ "pid": "0x1224", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["A6", "A7", "B0", "B13", "B15", "A8", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15"], "rows": ["B1", "B10", "B11", "B14", "B12"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk index cd78765d76..8e872c17ff 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk @@ -10,4 +10,3 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover AUDIO_ENABLE = no RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json index 88e3cd5a31..441c543913 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/info.json @@ -4,6 +4,9 @@ "pid": "0x1225", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk index 39afa4b348..05b460b165 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk @@ -10,5 +10,4 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3731 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json index 73410774ae..378ffa7845 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/info.json @@ -4,6 +4,9 @@ "pid": "0x1226", "device_version": "0.0.3" }, + "rgb_matrix": { + "driver": "IS31FL3741" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "C7", "B0", "B1", "B2", "B3", "B4", "D7", "D6", "D4", "D5", "D3", "D2"], "rows": ["F0", "F1", "F4", "E6", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk index 67366c7a00..bbe22adb0c 100755 --- a/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/rules.mk @@ -13,5 +13,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3741 LTO_ENABLE = yes diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json index 4276e8ef93..f7d5ab552f 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/info.json @@ -7,6 +7,9 @@ "ws2812": { "pin": "C7" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B1", "F1", "B2", "B3", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk index 653cd377ab..c552dae7c7 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb/v4/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb/v4/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/kbdfans/kbd67/mkiirgb_iso/info.json b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json index 5e8a3f00d5..4c7d09aa8e 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "C7" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "B0", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["B1", "F1", "B2", "B3", "C6"] diff --git a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk index 699a9f9384..5cd6062134 100644 --- a/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk +++ b/keyboards/kbdfans/kbd67/mkiirgb_iso/rules.mk @@ -13,4 +13,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/kbdfans/kbd75rgb/info.json b/keyboards/kbdfans/kbd75rgb/info.json index 9452fabd9e..231f13f412 100644 --- a/keyboards/kbdfans/kbd75rgb/info.json +++ b/keyboards/kbdfans/kbd75rgb/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "C7" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["F7", "F6", "F5", "F4", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], "rows": ["F0", "F1", "B0", "B1", "B2", "C6"] diff --git a/keyboards/kbdfans/kbd75rgb/rules.mk b/keyboards/kbdfans/kbd75rgb/rules.mk index d8e620b77d..bc6cd404cc 100644 --- a/keyboards/kbdfans/kbd75rgb/rules.mk +++ b/keyboards/kbdfans/kbd75rgb/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 RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json index f01b329e67..b329a4ec56 100644 --- a/keyboards/kbdfans/kbdmini/info.json +++ b/keyboards/kbdfans/kbdmini/info.json @@ -8,6 +8,9 @@ "pid": "0x2001", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "matrix_pins": { "cols": ["B3", "B2", "B1", "B0", "F1", "F0", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], "rows": ["B7", "E6", "F5", "F4"] diff --git a/keyboards/kbdfans/kbdmini/rules.mk b/keyboards/kbdfans/kbdmini/rules.mk index daa102eb3f..4a443969ff 100644 --- a/keyboards/kbdfans/kbdmini/rules.mk +++ b/keyboards/kbdfans/kbdmini/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 = IS31FL3733 diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json index 96f1e27a36..9df60b9bfa 100644 --- a/keyboards/kbdfans/maja/info.json +++ b/keyboards/kbdfans/maja/info.json @@ -8,6 +8,9 @@ "pid": "0x6068", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "cols": ["C6", "C7", "F7", "F6", "F5", "F4", "F1", "B0", "B1", "B2", "B3", "B7", "D2", "D3", "D5"], "rows": ["F0", "B6", "B5", "B4", "D7"] diff --git a/keyboards/kbdfans/maja/rules.mk b/keyboards/kbdfans/maja/rules.mk index ba5c2a94f7..d0606ec4dd 100755 --- a/keyboards/kbdfans/maja/rules.mk +++ b/keyboards/kbdfans/maja/rules.mk @@ -10,5 +10,4 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes # Use RGB matrix -RGB_MATRIX_DRIVER = IS31FL3731 NO_USB_STARTUP_CHECK = no # Disable initialization only when usb is plugged in diff --git a/keyboards/kbdfans/odin/rgb/info.json b/keyboards/kbdfans/odin/rgb/info.json index 5b25de9f49..026458452c 100644 --- a/keyboards/kbdfans/odin/rgb/info.json +++ b/keyboards/kbdfans/odin/rgb/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "B15" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["A3", "A4", "A5", "A6", "A7", "B0", "B1", "B2", "B12", "A15", "B3", "B4", "B5", "B6", "B7", "B8", "C13", "C14", "C15", "A0"], "rows": ["A10", "A9", "A8", "B14", "B13", "A2"] diff --git a/keyboards/kbdfans/odin/rgb/rules.mk b/keyboards/kbdfans/odin/rgb/rules.mk index 38a6bb6887..b7807ae418 100644 --- a/keyboards/kbdfans/odin/rgb/rules.mk +++ b/keyboards/kbdfans/odin/rgb/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 = WS2812 # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE -- cgit v1.2.3