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/mechlovin/adelais/rgb_led/rev1/config.h | 1 - keyboards/mechlovin/adelais/rgb_led/rev1/info.json | 3 +++ keyboards/mechlovin/adelais/rgb_led/rev2/config.h | 1 - keyboards/mechlovin/adelais/rgb_led/rev2/info.json | 3 +++ keyboards/mechlovin/adelais/rgb_led/rev3/config.h | 1 - keyboards/mechlovin/adelais/rgb_led/rev3/info.json | 1 + keyboards/mechlovin/adelais/standard_led/arm/config.h | 1 - keyboards/mechlovin/adelais/standard_led/arm/info.json | 3 +++ keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h | 1 - keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json | 3 +++ 10 files changed, 13 insertions(+), 5 deletions(-) (limited to 'keyboards/mechlovin/adelais') diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h index 658e29ccf3..909bc7f83a 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT 91 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json index 92ff0d8952..249d85c084 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev1/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev1/info.json @@ -16,6 +16,9 @@ "num_lock": "C15", "scroll_lock": "B9" }, + "ws2812": { + "pin": "A7" + }, "layout_aliases": { "LAYOUT_all": "LAYOUT_alice_split_bs" }, diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h index ac91d0f950..1e549f9a89 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/config.h @@ -1,6 +1,5 @@ #pragma once -#define RGB_DI_PIN A15 #define RGBLED_NUM 23 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json index 16e0ea109d..2d71c2b5f9 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev2/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev2/info.json @@ -13,6 +13,9 @@ {"pin_a": "A4", "pin_b": "A3"} ] }, + "ws2812": { + "pin": "A15" + }, "processor": "STM32F303", "board": "QMK_PROTON_C", "bootloader": "stm32-dfu", diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h index d3e4fc6ba1..c4f801b40d 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/config.h +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN A7 #define WS2812_SPI SPID1 // default: SPID1 #define WS2812_SPI_MOSI_PAL_MODE 5 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 5 #define RGBLED_NUM 23 diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json index 8fa908858d..9639ad3c1c 100644 --- a/keyboards/mechlovin/adelais/rgb_led/rev3/info.json +++ b/keyboards/mechlovin/adelais/rgb_led/rev3/info.json @@ -21,6 +21,7 @@ "scroll_lock": "C15" }, "ws2812": { + "pin": "A7", "driver": "spi" }, "layout_aliases": { diff --git a/keyboards/mechlovin/adelais/standard_led/arm/config.h b/keyboards/mechlovin/adelais/standard_led/arm/config.h index fc7e2ad9b6..1ba9c573b1 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/config.h +++ b/keyboards/mechlovin/adelais/standard_led/arm/config.h @@ -20,7 +20,6 @@ along with this program. If not, see . #define BACKLIGHT_PWM_DRIVER PWMD3 #define BACKLIGHT_PWM_CHANNEL 3 -#define RGB_DI_PIN A7 #define RGBLED_NUM 23 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/adelais/standard_led/arm/info.json b/keyboards/mechlovin/adelais/standard_led/arm/info.json index 2c4386a862..9c6bd46a70 100644 --- a/keyboards/mechlovin/adelais/standard_led/arm/info.json +++ b/keyboards/mechlovin/adelais/standard_led/arm/info.json @@ -9,6 +9,9 @@ "pin": "B0", "breathing": true }, + "ws2812": { + "pin": "A7" + }, "indicators": { "caps_lock": "B2", "num_lock": "C15", diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h index 831642126b..da42bf05d2 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/config.h @@ -31,7 +31,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION ROW2COL -#define RGB_DI_PIN E2 #define RGBLED_NUM 23 #define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json index 5ac0db3260..31de7de957 100644 --- a/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json +++ b/keyboards/mechlovin/adelais/standard_led/avr/rev1/info.json @@ -14,6 +14,9 @@ "pin": "B5", "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "indicators": { -- cgit v1.2.3