summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/uc1/config.h1
-rw-r--r--keyboards/merge/uc1/info.json3
-rw-r--r--keyboards/merge/um70/config.h1
-rw-r--r--keyboards/merge/um70/info.json3
-rw-r--r--keyboards/merge/um80/config.h1
-rw-r--r--keyboards/merge/um80/info.json3
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": {