From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/idobao/id42/config.h | 1 - keyboards/idobao/id42/info.json | 3 +++ keyboards/idobao/id61/config.h | 2 -- keyboards/idobao/id61/info.json | 3 +++ keyboards/idobao/id63/config.h | 2 -- keyboards/idobao/id63/info.json | 3 +++ keyboards/idobao/id67/config.h | 3 --- keyboards/idobao/id67/info.json | 3 +++ keyboards/idobao/id75/v1/config.h | 1 - keyboards/idobao/id75/v1/info.json | 3 +++ keyboards/idobao/id75/v2/config.h | 2 -- keyboards/idobao/id75/v2/info.json | 3 +++ keyboards/idobao/id80/v2/config.h | 1 - keyboards/idobao/id80/v2/info.json | 3 +++ keyboards/idobao/id80/v3/ansi/config.h | 2 -- keyboards/idobao/id80/v3/ansi/info.json | 3 +++ keyboards/idobao/id87/v1/config.h | 1 - keyboards/idobao/id87/v1/info.json | 3 +++ keyboards/idobao/id87/v2/config.h | 2 -- keyboards/idobao/id87/v2/info.json | 3 +++ keyboards/idobao/id96/config.h | 1 - keyboards/idobao/id96/info.json | 3 +++ keyboards/idobao/montex/v1/config.h | 1 - keyboards/idobao/montex/v1/info.json | 3 +++ keyboards/idobao/montex/v1rgb/config.h | 2 -- keyboards/idobao/montex/v1rgb/info.json | 3 +++ keyboards/idobao/montex/v2/config.h | 4 ---- keyboards/idobao/montex/v2/info.json | 3 +++ 28 files changed, 42 insertions(+), 25 deletions(-) (limited to 'keyboards/idobao') diff --git a/keyboards/idobao/id42/config.h b/keyboards/idobao/id42/config.h index b588cc2bf0..6f43a71054 100755 --- a/keyboards/idobao/id42/config.h +++ b/keyboards/idobao/id42/config.h @@ -17,7 +17,6 @@ /* LED Matrix & Animations */ #ifdef RGB_MATRIX_ENABLE - #define RGB_DI_PIN B3 #define RGB_MATRIX_LED_COUNT 42 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended diff --git a/keyboards/idobao/id42/info.json b/keyboards/idobao/id42/info.json index 16670715f3..4733c8230a 100644 --- a/keyboards/idobao/id42/info.json +++ b/keyboards/idobao/id42/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["B4", "D7", "D6", "D4", "B5", "C7", "F0", "F7", "F6", "F1", "F4", "F5"], "rows": ["D5", "C6", "B6", "E6"] diff --git a/keyboards/idobao/id61/config.h b/keyboards/idobao/id61/config.h index 2824a91000..5513787c4e 100644 --- a/keyboards/idobao/id61/config.h +++ b/keyboards/idobao/id61/config.h @@ -8,8 +8,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN F0 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id61/info.json b/keyboards/idobao/id61/info.json index 62b6f03f52..03d0649d9f 100644 --- a/keyboards/idobao/id61/info.json +++ b/keyboards/idobao/id61/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/idobao/id63/config.h b/keyboards/idobao/id63/config.h index f3a8c7a3e9..214fb6ba6d 100644 --- a/keyboards/idobao/id63/config.h +++ b/keyboards/idobao/id63/config.h @@ -10,8 +10,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN B7 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id63/info.json b/keyboards/idobao/id63/info.json index 0d05c05eb3..74aed63503 100644 --- a/keyboards/idobao/id63/info.json +++ b/keyboards/idobao/id63/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B7" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B3", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7"], "rows": ["B0", "B1", "B2", "E6", "F7"] diff --git a/keyboards/idobao/id67/config.h b/keyboards/idobao/id67/config.h index 6e6b15e076..7834bd33bb 100644 --- a/keyboards/idobao/id67/config.h +++ b/keyboards/idobao/id67/config.h @@ -5,9 +5,6 @@ #pragma once - -#define RGB_DI_PIN F0 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) #ifndef ID67_DISABLE_UNDERGLOW diff --git a/keyboards/idobao/id67/info.json b/keyboards/idobao/id67/info.json index 34cec9b931..490921f457 100644 --- a/keyboards/idobao/id67/info.json +++ b/keyboards/idobao/id67/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["C7", "F6", "F5", "F4", "F1", "B7", "D5", "D1", "D2", "D3", "D4", "D0", "D6", "D7", "B4"], "rows": ["B0", "B1", "B2", "B3", "F7"] diff --git a/keyboards/idobao/id75/v1/config.h b/keyboards/idobao/id75/v1/config.h index 21f3ca0cc8..2174e39bd2 100644 --- a/keyboards/idobao/id75/v1/config.h +++ b/keyboards/idobao/id75/v1/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F0 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/id75/v1/info.json b/keyboards/idobao/id75/v1/info.json index 3777bf03e0..1407d02c80 100644 --- a/keyboards/idobao/id75/v1/info.json +++ b/keyboards/idobao/id75/v1/info.json @@ -12,6 +12,9 @@ "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] }, + "ws2812": { + "pin": "F0" + }, "diode_direction": "COL2ROW", "backlight": { "pin": "B7", diff --git a/keyboards/idobao/id75/v2/config.h b/keyboards/idobao/id75/v2/config.h index 707f040992..54d74c8da5 100644 --- a/keyboards/idobao/id75/v2/config.h +++ b/keyboards/idobao/id75/v2/config.h @@ -16,8 +16,6 @@ #pragma once -#undef RGB_DI_PIN -#define RGB_DI_PIN F0 #ifdef RGB_MATRIX_ENABLE # define RGB_MATRIX_LED_COUNT 85 /* 10 Bottom 75 top*/ // RGB Matrix Animation modes. Explicitly enabled diff --git a/keyboards/idobao/id75/v2/info.json b/keyboards/idobao/id75/v2/info.json index 540ecc006a..5273a7227d 100644 --- a/keyboards/idobao/id75/v2/info.json +++ b/keyboards/idobao/id75/v2/info.json @@ -8,6 +8,9 @@ "pid": "0x0075", "device_version": "0.0.2" }, + "ws2812": { + "pin": "F0" + }, "matrix_pins": { "cols": ["F6", "F5", "F4", "F1", "E6", "D5", "D3", "D2", "D1", "D0", "D4", "D6", "D7", "B4", "B5"], "rows": ["B0", "B3", "C7", "B6", "C6"] diff --git a/keyboards/idobao/id80/v2/config.h b/keyboards/idobao/id80/v2/config.h index 34f8b57fa9..aa409bc487 100644 --- a/keyboards/idobao/id80/v2/config.h +++ b/keyboards/idobao/id80/v2/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLED_NUM 20 /* 16 underglow LEDs, 4 top LEDs */ #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/idobao/id80/v2/info.json b/keyboards/idobao/id80/v2/info.json index c8ee450e44..247c3cb113 100644 --- a/keyboards/idobao/id80/v2/info.json +++ b/keyboards/idobao/id80/v2/info.json @@ -15,6 +15,9 @@ "pin": "B6", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "on_state": 0 diff --git a/keyboards/idobao/id80/v3/ansi/config.h b/keyboards/idobao/id80/v3/ansi/config.h index 515f2d8cfa..afe880fa8a 100644 --- a/keyboards/idobao/id80/v3/ansi/config.h +++ b/keyboards/idobao/id80/v3/ansi/config.h @@ -7,8 +7,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN E2 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id80/v3/ansi/info.json b/keyboards/idobao/id80/v3/ansi/info.json index 9797c60dfe..c121ff8e3d 100644 --- a/keyboards/idobao/id80/v3/ansi/info.json +++ b/keyboards/idobao/id80/v3/ansi/info.json @@ -25,6 +25,9 @@ "pid": "0x0380", "device_version": "3.0.0" }, + "ws2812": { + "pin": "E2" + }, "bootmagic": { "matrix": [0, 5] }, diff --git a/keyboards/idobao/id87/v1/config.h b/keyboards/idobao/id87/v1/config.h index f856e51c82..9b7459de6c 100644 --- a/keyboards/idobao/id87/v1/config.h +++ b/keyboards/idobao/id87/v1/config.h @@ -14,7 +14,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/id87/v1/info.json b/keyboards/idobao/id87/v1/info.json index b520de2d4d..2a7b4a9bf9 100644 --- a/keyboards/idobao/id87/v1/info.json +++ b/keyboards/idobao/id87/v1/info.json @@ -19,6 +19,9 @@ "indicators": { "caps_lock": "C7" }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["tkl_ansi"], diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h index 02b62fc61f..17b63471fa 100644 --- a/keyboards/idobao/id87/v2/config.h +++ b/keyboards/idobao/id87/v2/config.h @@ -8,8 +8,6 @@ * RGB Matrix stuff * ---------------- */ -#define RGB_DI_PIN E2 - // RGB Matrix config #if defined(RGB_MATRIX_ENABLE) diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json index 6272c02d96..7f21832a03 100644 --- a/keyboards/idobao/id87/v2/info.json +++ b/keyboards/idobao/id87/v2/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "E2" + }, "matrix_pins": { "cols": ["D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7", "B4"], "rows": ["E6", "B0", "B1", "B2", "B3", "B7", "F7", "F6", "F5", "F4", "F1"] diff --git a/keyboards/idobao/id96/config.h b/keyboards/idobao/id96/config.h index 41471a4e97..a857f49125 100644 --- a/keyboards/idobao/id96/config.h +++ b/keyboards/idobao/id96/config.h @@ -24,7 +24,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN E2 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index 5acdaba228..f9a1a003f4 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -18,6 +18,9 @@ "levels": 7, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "indicators": { "caps_lock": "C7", "num_lock": "C6", diff --git a/keyboards/idobao/montex/v1/config.h b/keyboards/idobao/montex/v1/config.h index 85cbcfcc14..87ed689f66 100644 --- a/keyboards/idobao/montex/v1/config.h +++ b/keyboards/idobao/montex/v1/config.h @@ -22,7 +22,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN B1 #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_CHRISTMAS diff --git a/keyboards/idobao/montex/v1/info.json b/keyboards/idobao/montex/v1/info.json index 7d437655bb..666ffbdf89 100644 --- a/keyboards/idobao/montex/v1/info.json +++ b/keyboards/idobao/montex/v1/info.json @@ -16,6 +16,9 @@ "backlight": { "pin": "B6" }, + "ws2812": { + "pin": "B1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/idobao/montex/v1rgb/config.h b/keyboards/idobao/montex/v1rgb/config.h index e405e2059f..789479de05 100755 --- a/keyboards/idobao/montex/v1rgb/config.h +++ b/keyboards/idobao/montex/v1rgb/config.h @@ -3,8 +3,6 @@ #pragma once -#define RGB_DI_PIN B1 - #if defined(RGB_MATRIX_ENABLE) // The number of LEDs connected diff --git a/keyboards/idobao/montex/v1rgb/info.json b/keyboards/idobao/montex/v1rgb/info.json index 08f427d967..9860f7193a 100755 --- a/keyboards/idobao/montex/v1rgb/info.json +++ b/keyboards/idobao/montex/v1rgb/info.json @@ -10,6 +10,9 @@ "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] }, + "ws2812": { + "pin": "B1" + }, "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/idobao/montex/v2/config.h b/keyboards/idobao/montex/v2/config.h index a7527d4bb7..a7cd0d6114 100755 --- a/keyboards/idobao/montex/v2/config.h +++ b/keyboards/idobao/montex/v2/config.h @@ -3,10 +3,6 @@ #pragma once - -/* LED Matrix & Animations */ -#define RGB_DI_PIN B1 - #if defined(RGB_MATRIX_ENABLE) #ifndef ID27_DISABLE_UNDERGLOW #define RGB_MATRIX_LED_COUNT 31 // The number of LEDs connected diff --git a/keyboards/idobao/montex/v2/info.json b/keyboards/idobao/montex/v2/info.json index 55b330609f..71c92c3331 100755 --- a/keyboards/idobao/montex/v2/info.json +++ b/keyboards/idobao/montex/v2/info.json @@ -14,6 +14,9 @@ "backlight": false, "rgblight": false }, + "ws2812": { + "pin": "B1" + }, "matrix_pins": { "cols": ["D5", "D3", "D2", "D1", "D0"], "rows": ["D4", "D6", "D7", "B4", "B5", "C6"] -- cgit v1.2.3