summaryrefslogtreecommitdiff
path: root/keyboards/merge
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-06-06 11:08:04 +1000
committerGitHub <noreply@github.com>2023-06-06 11:08:04 +1000
commitc9cf9712aaefc2356305cbc731d06f1b1948d8c1 (patch)
treef5a65b4859b44144b1d9b756f8a7f3bb39191198 /keyboards/merge
parentf91ca76c783b10b5edc167efeb0825cf8249e097 (diff)
Move `RGBLED_SPLIT` to data driven (#21113)
Co-authored-by: Joel Challis <git@zvecr.com>
Diffstat (limited to 'keyboards/merge')
-rw-r--r--keyboards/merge/um70/config.h3
-rw-r--r--keyboards/merge/um70/info.json3
-rw-r--r--keyboards/merge/um80/config.h3
-rw-r--r--keyboards/merge/um80/info.json3
4 files changed, 6 insertions, 6 deletions
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h
index bbc2f5b5fb..1e13c06ed3 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -22,10 +22,9 @@
#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
diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json
index 84f44ba6d1..bc9d0683f2 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -25,7 +25,8 @@
"pin": "D3"
},
"rgblight": {
- "max_brightness": 150
+ "max_brightness": 150,
+ "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..c1fe724879 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -22,10 +22,9 @@
#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
diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json
index 2223b3d4c0..d91a4d93ba 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -25,7 +25,8 @@
"pin": "D3"
},
"rgblight": {
- "max_brightness": 120
+ "max_brightness": 120,
+ "split_count": [48, 52]
},
"processor": "atmega32u4",
"bootloader": "atmel-dfu",