diff options
| author | Ryan <fauxpark@gmail.com> | 2023-06-18 14:39:07 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-18 14:39:07 +1000 |
| commit | b1783db4eacacaf8181cfbce13146db1941486ba (patch) | |
| tree | d464d835a882fa7b2c205eb0b2d73f7ddf0b7145 /keyboards/merge | |
| parent | 7178645be79510eb623098bccbf1724ff9970edc (diff) | |
Move `RGBLED_NUM` to data driven (#21278)
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/uc1/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/uc1/info.json | 1 | ||||
| -rw-r--r-- | keyboards/merge/um70/config.h | 3 | ||||
| -rw-r--r-- | keyboards/merge/um70/info.json | 1 | ||||
| -rw-r--r-- | keyboards/merge/um80/config.h | 3 | ||||
| -rw-r--r-- | keyboards/merge/um80/info.json | 1 |
6 files changed, 5 insertions, 5 deletions
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 486e6a48a0..b62efc4aae 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -16,7 +16,6 @@ #pragma once -#define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/merge/uc1/info.json b/keyboards/merge/uc1/info.json index a3b0b778e8..818b34b78c 100644 --- a/keyboards/merge/uc1/info.json +++ b/keyboards/merge/uc1/info.json @@ -9,6 +9,7 @@ "device_version": "0.0.1" }, "rgblight": { + "led_count": 12, "sleep": true }, "ws2812": { diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index b68c84b426..04569dc989 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -20,9 +20,8 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGBLED_NUM 83 #ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT RGBLED_NUM +# define RGB_MATRIX_LED_COUNT 83 # define RGB_MATRIX_SPLIT { 39, 44 } #endif diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index e3e976d2f9..95f3bb1cea 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -25,6 +25,7 @@ "pin": "D3" }, "rgblight": { + "led_count": 83, "max_brightness": 150, "sleep": true, "split_count": [39, 44] diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index 396d6ef87e..70a5d7ba59 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -20,9 +20,8 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#define RGBLED_NUM 100 #ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT RGBLED_NUM +# define RGB_MATRIX_LED_COUNT 100 # define RGB_MATRIX_SPLIT { 48, 52 } #endif diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index 0cdec21a3c..554d1997a3 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -25,6 +25,7 @@ "pin": "D3" }, "rgblight": { + "led_count": 100, "max_brightness": 120, "sleep": true, "split_count": [48, 52] |