diff options
| author | Ryan <fauxpark@gmail.com> | 2023-04-06 18:00:54 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 18:00:54 +1000 |
| commit | 47966dc2a65c88ac90fcd64d12243d72f3f6753b (patch) | |
| tree | d2f54974c74f66bf11565a64381ea8834f49d481 /keyboards/merge | |
| parent | 71c22a12db58c71952a12df6bbe445f6f9a4e858 (diff) | |
Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303)
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/uc1/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/uc1/info.json | 3 | ||||
| -rw-r--r-- | keyboards/merge/um70/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/um70/info.json | 3 | ||||
| -rw-r--r-- | keyboards/merge/um80/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/um80/info.json | 3 |
6 files changed, 9 insertions, 3 deletions
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index dec57f0dbd..7f80333ad3 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGB_DI_PIN B5 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index 807a8ed980..95de5a2e20 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -8,6 +8,9 @@ "pid": "0x5543", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "matrix_pins": { "cols": ["B3", "B4"], "rows": ["B1", "B2"] diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index 4ee40b4071..57c2dcb6fb 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -20,7 +20,6 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_SPLIT #define RGBLED_NUM 83 #define RGBLED_SPLIT { 39, 44 } diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index a8816d8dd0..fd566ab395 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index ed66f143c0..f267fa3670 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -20,7 +20,6 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGB_DI_PIN D3 #define RGBLIGHT_SPLIT #define RGBLED_NUM 100 #define RGBLED_SPLIT { 48, 52 } diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index f67817659b..9b7e73b2da 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -21,6 +21,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { |