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/kprepublic/bm60hsrgb_iso/rev1/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk | 1 - keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json | 3 +++ keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk | 1 - 4 files changed, 6 insertions(+), 2 deletions(-) (limited to 'keyboards/kprepublic/bm60hsrgb_iso') diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json index 5511d3d00b..0148d1ef53 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "E2" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7"], "rows": ["B0", "B1", "B2", "B3", "E6"] diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk index 0459a2ad6b..bb8155a9b8 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/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 -RGB_MATRIX_DRIVER = WS2812 LTO_ENABLE = yes diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json index 9699a7d3c3..4fd7bc002a 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/info.json @@ -11,6 +11,9 @@ "ws2812": { "pin": "F0" }, + "rgb_matrix": { + "driver": "custom" + }, "matrix_pins": { "cols": ["B2", "B3", "B7", "B0", "B1", "F7", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7"], "rows": ["E6", "D2", "D3", "D5", "F6"] diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk index fde42415fe..b6b9ff1110 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rules.mk @@ -18,7 +18,6 @@ RGB_MATRIX_ENABLE = yes # The custom RGB Matrix driver combines IS31FL3733 and WS2812; things that are # normally done by common_features.mk for both of these drivers need to be done # here manually. -RGB_MATRIX_DRIVER = custom COMMON_VPATH += $(DRIVER_PATH)/led/issi SRC += is31fl3733.c QUANTUM_LIB_SRC += i2c_master.c -- cgit v1.2.3