summaryrefslogtreecommitdiffstats
path: root/keyboards/merge
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-06-16 14:04:45 +1000
committerGitHub <noreply@github.com>2023-06-16 14:04:45 +1000
commit2367d8129c92474eb0da66ebc5ace893097cf574 (patch)
tree07dd36030e6b490cf2c33a43bb434d419a02d0c2 /keyboards/merge
parent579db6131e271a6b3a52c3e19b2fe3a15fd403c7 (diff)
Move `RGBLIGHT_SLEEP` to data driven (#21072)
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.json1
-rw-r--r--keyboards/merge/um80/config.h1
-rw-r--r--keyboards/merge/um80/info.json1
6 files changed, 5 insertions, 3 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 3b63468bc8..b68c84b426 100644
--- a/keyboards/merge/um70/config.h
+++ b/keyboards/merge/um70/config.h
@@ -25,7 +25,6 @@
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# 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 bc9d0683f2..e3e976d2f9 100644
--- a/keyboards/merge/um70/info.json
+++ b/keyboards/merge/um70/info.json
@@ -26,6 +26,7 @@
},
"rgblight": {
"max_brightness": 150,
+ "sleep": true,
"split_count": [39, 44]
},
"processor": "atmega32u4",
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h
index c260e83805..396d6ef87e 100644
--- a/keyboards/merge/um80/config.h
+++ b/keyboards/merge/um80/config.h
@@ -25,7 +25,6 @@
# define RGB_MATRIX_LED_COUNT RGBLED_NUM
# 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 d91a4d93ba..0cdec21a3c 100644
--- a/keyboards/merge/um80/info.json
+++ b/keyboards/merge/um80/info.json
@@ -26,6 +26,7 @@
},
"rgblight": {
"max_brightness": 120,
+ "sleep": true,
"split_count": [48, 52]
},
"processor": "atmega32u4",