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/jacky_studio/bear_65/rev1/info.json | 3 +++ keyboards/jacky_studio/bear_65/rev1/rules.mk | 1 - keyboards/jacky_studio/bear_65/rev2/info.json | 3 +++ keyboards/jacky_studio/bear_65/rev2/rules.mk | 1 - keyboards/jacky_studio/piggy60/rev2/config.h | 1 - keyboards/jacky_studio/piggy60/rev2/info.json | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) (limited to 'keyboards/jacky_studio') diff --git a/keyboards/jacky_studio/bear_65/rev1/info.json b/keyboards/jacky_studio/bear_65/rev1/info.json index 5d50328335..8bc527606f 100644 --- a/keyboards/jacky_studio/bear_65/rev1/info.json +++ b/keyboards/jacky_studio/bear_65/rev1/info.json @@ -10,6 +10,9 @@ "pid": "0x000A", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/jacky_studio/bear_65/rev1/rules.mk b/keyboards/jacky_studio/bear_65/rev1/rules.mk index 5d90baa2af..7e03810942 100644 --- a/keyboards/jacky_studio/bear_65/rev1/rules.mk +++ b/keyboards/jacky_studio/bear_65/rev1/rules.mk @@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use LTO flags to reduce firmware size RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) -RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support diff --git a/keyboards/jacky_studio/bear_65/rev2/info.json b/keyboards/jacky_studio/bear_65/rev2/info.json index 3377f36d6b..c6565255ed 100644 --- a/keyboards/jacky_studio/bear_65/rev2/info.json +++ b/keyboards/jacky_studio/bear_65/rev2/info.json @@ -10,6 +10,9 @@ "pid": "0x0428", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["B0", "B1", "B2", "B3", "B7"] diff --git a/keyboards/jacky_studio/bear_65/rev2/rules.mk b/keyboards/jacky_studio/bear_65/rev2/rules.mk index 5d90baa2af..7e03810942 100644 --- a/keyboards/jacky_studio/bear_65/rev2/rules.mk +++ b/keyboards/jacky_studio/bear_65/rev2/rules.mk @@ -14,4 +14,3 @@ AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use LTO flags to reduce firmware size RGB_MATRIX_ENABLE = no # Enable keyboard RGB matrix (do not use together with RGBLIGHT_ENABLE) -RGB_MATRIX_DRIVER = WS2812 # RGB matrix driver support diff --git a/keyboards/jacky_studio/piggy60/rev2/config.h b/keyboards/jacky_studio/piggy60/rev2/config.h index 932983d173..fa884d5f18 100644 --- a/keyboards/jacky_studio/piggy60/rev2/config.h +++ b/keyboards/jacky_studio/piggy60/rev2/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B9 #define RGB_MATRIX_LED_COUNT 14 #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/jacky_studio/piggy60/rev2/info.json b/keyboards/jacky_studio/piggy60/rev2/info.json index 142d4b7e76..91b28898ec 100644 --- a/keyboards/jacky_studio/piggy60/rev2/info.json +++ b/keyboards/jacky_studio/piggy60/rev2/info.json @@ -20,6 +20,7 @@ }, "processor": "STM32F103", "ws2812": { + "pin": "B9", "driver": "pwm" }, "rgb_matrix": { -- cgit v1.2.3