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/mwstudio/alicekk/config.h | 3 --- keyboards/mwstudio/alicekk/info.json | 3 +++ keyboards/mwstudio/mw65_black/config.h | 1 - keyboards/mwstudio/mw65_black/info.json | 3 +++ keyboards/mwstudio/mw65_rgb/config.h | 3 --- keyboards/mwstudio/mw65_rgb/info.json | 3 +++ keyboards/mwstudio/mw660/config.h | 2 -- keyboards/mwstudio/mw660/info.json | 3 +++ keyboards/mwstudio/mw75/config.h | 1 - keyboards/mwstudio/mw75/info.json | 3 +++ keyboards/mwstudio/mw75r2/config.h | 1 - keyboards/mwstudio/mw75r2/info.json | 3 +++ keyboards/mwstudio/mw80/info.json | 2 +- 13 files changed, 19 insertions(+), 12 deletions(-) (limited to 'keyboards/mwstudio') diff --git a/keyboards/mwstudio/alicekk/config.h b/keyboards/mwstudio/alicekk/config.h index b4d733a212..53ac3aa161 100644 --- a/keyboards/mwstudio/alicekk/config.h +++ b/keyboards/mwstudio/alicekk/config.h @@ -18,9 +18,6 @@ #define FORCE_NKRO - -#define RGB_DI_PIN B1 - #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_DEFAULT_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS #define RGBLED_NUM 87 diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json index f33b5d2ccc..b88dd97b3a 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/info.json @@ -16,6 +16,9 @@ {"pin_a": "B11", "pin_b": "B10"} ] }, + "ws2812": { + "pin": "B1" + }, "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { diff --git a/keyboards/mwstudio/mw65_black/config.h b/keyboards/mwstudio/mw65_black/config.h index c54f6bf281..f987360d4a 100644 --- a/keyboards/mwstudio/mw65_black/config.h +++ b/keyboards/mwstudio/mw65_black/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN C7 #define RGBLED_NUM 21 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/mwstudio/mw65_black/info.json b/keyboards/mwstudio/mw65_black/info.json index 1a53a22195..3e433aff92 100644 --- a/keyboards/mwstudio/mw65_black/info.json +++ b/keyboards/mwstudio/mw65_black/info.json @@ -8,6 +8,9 @@ "pid": "0x6500", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C7" + }, "matrix_pins": { "cols": ["B0", "B1", "B2", "D0", "D1", "D2", "D3", "D5", "C6", "F7", "F4", "F6", "F5", "F1", "F0"], "rows": ["D4", "D7", "B4", "B3", "B6"] diff --git a/keyboards/mwstudio/mw65_rgb/config.h b/keyboards/mwstudio/mw65_rgb/config.h index 94388ff316..ebde358b49 100644 --- a/keyboards/mwstudio/mw65_rgb/config.h +++ b/keyboards/mwstudio/mw65_rgb/config.h @@ -16,9 +16,6 @@ #pragma once -/* RGB Matrix config */ -#define RGB_DI_PIN B3 - #ifdef RGB_MATRIX_ENABLE #define RGB_MATRIX_LED_COUNT 83 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json index 8cace68cce..79dc8c0c7e 100644 --- a/keyboards/mwstudio/mw65_rgb/info.json +++ b/keyboards/mwstudio/mw65_rgb/info.json @@ -8,6 +8,9 @@ "pid": "0x6502", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["C6", "B6", "B5", "B4", "D7", "D6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "E6"], "rows": ["D0", "D1", "D2", "D3", "B7"] diff --git a/keyboards/mwstudio/mw660/config.h b/keyboards/mwstudio/mw660/config.h index f9040f64ad..9603e1db2b 100644 --- a/keyboards/mwstudio/mw660/config.h +++ b/keyboards/mwstudio/mw660/config.h @@ -18,8 +18,6 @@ #define FORCE_NKRO - -#define RGB_DI_PIN B8 #define DRIVER_LED_TOTAL 34 #define RGBLED_NUM 34 diff --git a/keyboards/mwstudio/mw660/info.json b/keyboards/mwstudio/mw660/info.json index 7e7b9609ff..8bf0f3f2fc 100644 --- a/keyboards/mwstudio/mw660/info.json +++ b/keyboards/mwstudio/mw660/info.json @@ -12,6 +12,9 @@ "nkro": true, "rgblight": true }, + "ws2812": { + "pin": "B8" + }, "matrix_pins": { "cols": ["A7", "B0", "B1", "B10", "B11", "B12", "B13", "B14", "B15", "A15", "B3", "B4", "B5", "B6", "B7" ], "rows": ["A3", "A4", "A5", "A6", "A2" ] diff --git a/keyboards/mwstudio/mw75/config.h b/keyboards/mwstudio/mw75/config.h index cbfaa2221d..0a9b073ce1 100644 --- a/keyboards/mwstudio/mw75/config.h +++ b/keyboards/mwstudio/mw75/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json index f7497ec325..e15905a629 100644 --- a/keyboards/mwstudio/mw75/info.json +++ b/keyboards/mwstudio/mw75/info.json @@ -21,6 +21,9 @@ "bootmagic": { "matrix": [0, 1] }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/mwstudio/mw75r2/config.h b/keyboards/mwstudio/mw75r2/config.h index 387015e937..ded31181aa 100644 --- a/keyboards/mwstudio/mw75r2/config.h +++ b/keyboards/mwstudio/mw75r2/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B3 #define RGBLIGHT_SLEEP #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json index e479c68c96..b92412ae02 100644 --- a/keyboards/mwstudio/mw75r2/info.json +++ b/keyboards/mwstudio/mw75r2/info.json @@ -8,6 +8,9 @@ "pid": "0x7502", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B3" + }, "matrix_pins": { "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D4", "D6", "F7", "F6", "E6", "F0", "F1", "F4", "F5"], "rows": ["B7", "D0", "D1", "D2", "D3", "D5"] diff --git a/keyboards/mwstudio/mw80/info.json b/keyboards/mwstudio/mw80/info.json index 718493f576..0b0a9717d3 100644 --- a/keyboards/mwstudio/mw80/info.json +++ b/keyboards/mwstudio/mw80/info.json @@ -23,11 +23,11 @@ "caps_lock": "A0" }, "ws2812": { + "pin": "B8", "driver": "pwm" }, "rgblight": { "led_count": 16, - "pin": "B8", "hue_steps": 10, "saturation_steps": 17, "brightness_steps": 17, -- cgit v1.2.3