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.h5
-rw-r--r--keyboards/merge/um70/info.json4
-rw-r--r--keyboards/merge/um80/config.h5
-rw-r--r--keyboards/merge/um80/info.json4
6 files changed, 11 insertions, 11 deletions
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h
index 945f753599..486e6a48a0 100644
--- a/keyboards/merge/uc1/config.h
+++ b/keyboards/merge/uc1/config.h
@@ -30,4 +30,3 @@
#define RGBLIGHT_HUE_STEP 10
#define RGBLIGHT_SAT_STEP 10
#define RGBLIGHT_VAL_STEP 10
-#define RGBLIGHT_SLEEP
diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json
index 95de5a2e20..a3b0b778e8 100644
--- a/keyboards/merge/uc1/info.json
+++ b/keyboards/merge/uc1/info.json
@@ -8,6 +8,9 @@
"pid": "0x5543",
"device_version": "0.0.1"
},
+ "rgblight": {
+ "sleep": true
+ },
"ws2812": {
"pin": "B5"
},
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index bbc2f5b5fb..b68c84b426 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -20,14 +20,11 @@
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
-#define RGBLIGHT_SPLIT
#define RGBLED_NUM 83
-#define RGBLED_SPLIT { 39, 44 }
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
-# define RGB_MATRIX_SPLIT RGBLED_SPLIT
+# define RGB_MATRIX_SPLIT { 39, 44 }
#endif
-#define RGBLIGHT_SLEEP
#define B6_AUDIO
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index 84f44ba6d1..e3e976d2f9 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -25,7 +25,9 @@
"pin": "D3"
},
"rgblight": {
- "max_brightness": 150
+ "max_brightness": 150,
+ "sleep": true,
+ "split_count": [39, 44]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index 84b23cd33b..396d6ef87e 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -20,14 +20,11 @@
#define MASTER_LEFT
#define SPLIT_MODS_ENABLE
-#define RGBLIGHT_SPLIT
#define RGBLED_NUM 100
-#define RGBLED_SPLIT { 48, 52 }
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
-# define RGB_MATRIX_SPLIT RGBLED_SPLIT
+# define RGB_MATRIX_SPLIT { 48, 52 }
#endif
-#define RGBLIGHT_SLEEP
#define AUDIO_PIN B6
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index 2223b3d4c0..0cdec21a3c 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -25,7 +25,9 @@
"pin": "D3"
},
"rgblight": {
- "max_brightness": 120
+ "max_brightness": 120,
+ "sleep": true,
+ "split_count": [48, 52]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",