diff options
| author | Ryan <fauxpark@gmail.com> | 2023-05-27 12:27:44 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-27 12:27:44 +1000 |
| commit | 363bfdbfda5ea9fa996390920a9e8982535b76c8 (patch) | |
| tree | 65684518b21240b47f7a64d8f0462e246ede70cc /keyboards/merge | |
| parent | 8fdcba12e684e7b1f0934fc9dc622e8e51f1deb9 (diff) | |
Move `RGBLIGHT_LIMIT_VAL` to data driven (#20974)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/uc1/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/um70/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/um70/info.json | 3 | ||||
| -rw-r--r-- | keyboards/merge/um80/config.h | 1 | ||||
| -rw-r--r-- | keyboards/merge/um80/info.json | 3 |
5 files changed, 6 insertions, 3 deletions
diff --git a/keyboards/merge/uc1/config.h b/keyboards/merge/uc1/config.h index 7f80333ad3..945f753599 100644 --- a/keyboards/merge/uc1/config.h +++ b/keyboards/merge/uc1/config.h @@ -30,5 +30,4 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 10 #define RGBLIGHT_VAL_STEP 10 -#define RGBLIGHT_LIMIT_VAL 255 #define RGBLIGHT_SLEEP diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index 57c2dcb6fb..bbc2f5b5fb 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -28,7 +28,6 @@ # define RGB_MATRIX_SPLIT RGBLED_SPLIT #endif #define RGBLIGHT_SLEEP -#define RGBLIGHT_LIMIT_VAL 150 #define B6_AUDIO diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index f067225e0b..84f44ba6d1 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -24,6 +24,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 150 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index f267fa3670..84b23cd33b 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -28,7 +28,6 @@ # define RGB_MATRIX_SPLIT RGBLED_SPLIT #endif #define RGBLIGHT_SLEEP -#define RGBLIGHT_LIMIT_VAL 120 #define AUDIO_PIN B6 diff --git a/keyboards/merge/um80/info.json b/keyboards/merge/um80/info.json index fb2b86f9b1..2223b3d4c0 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -24,6 +24,9 @@ "ws2812": { "pin": "D3" }, + "rgblight": { + "max_brightness": 120 + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { |