diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-08-29 21:24:43 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-08-29 21:24:43 +1000 |
| commit | 31a91add168c956655ace8ec4cf9750db1e2cfc6 (patch) | |
| tree | 12cea9b5f8e769f9611a31cbaede9537edad71cc /keyboards/merge/um80 | |
| parent | f07490bc092e365ba03dc685b3fc30ad0bf0b752 (diff) | |
| parent | edaf8a87ef3164f8986b0a8eb171d4879b45414c (diff) | |
Merge branch 'develop'
Diffstat (limited to 'keyboards/merge/um80')
| -rw-r--r-- | keyboards/merge/um80/config.h | 8 | ||||
| -rw-r--r-- | keyboards/merge/um80/info.json | 5 | ||||
| -rw-r--r-- | keyboards/merge/um80/rules.mk | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index 84b23cd33b..70a5d7ba59 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -20,14 +20,10 @@ #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_LED_COUNT 100 +# 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..554d1997a3 100644 --- a/keyboards/merge/um80/info.json +++ b/keyboards/merge/um80/info.json @@ -25,7 +25,10 @@ "pin": "D3" }, "rgblight": { - "max_brightness": 120 + "led_count": 100, + "max_brightness": 120, + "sleep": true, + "split_count": [48, 52] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", diff --git a/keyboards/merge/um80/rules.mk b/keyboards/merge/um80/rules.mk index de0aec2ab2..11776618e2 100644 --- a/keyboards/merge/um80/rules.mk +++ b/keyboards/merge/um80/rules.mk @@ -13,4 +13,3 @@ AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes SPLIT_KEYBOARD = yes OLED_ENABLE = yes -OLED_DRIVER = SSD1306 |