diff options
| author | Joel Challis <git@zvecr.com> | 2024-01-16 01:04:09 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-16 01:04:09 +0000 |
| commit | e30d0e52871ce46e6f94d5535c1d60aa75668fe5 (patch) | |
| tree | b5966e5a4019b17d3d0ebe4325ea15ade7c7bf55 /keyboards/merge | |
| parent | a90b45e8320389160ee1a649ccf95d6d820fd277 (diff) | |
Migrate RGB Matrix config to info.json - M (#22908)
Diffstat (limited to 'keyboards/merge')
| -rw-r--r-- | keyboards/merge/um70/config.h | 5 | ||||
| -rw-r--r-- | keyboards/merge/um70/info.json | 4 | ||||
| -rw-r--r-- | keyboards/merge/um80/config.h | 5 |
3 files changed, 4 insertions, 10 deletions
diff --git a/keyboards/merge/um70/config.h b/keyboards/merge/um70/config.h index 04569dc989..2d9f73d61a 100644 --- a/keyboards/merge/um70/config.h +++ b/keyboards/merge/um70/config.h @@ -20,11 +20,6 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 83 -# define RGB_MATRIX_SPLIT { 39, 44 } -#endif - #define B6_AUDIO #ifdef AUDIO_ENABLE diff --git a/keyboards/merge/um70/info.json b/keyboards/merge/um70/info.json index 95f3bb1cea..9c120b9224 100644 --- a/keyboards/merge/um70/info.json +++ b/keyboards/merge/um70/info.json @@ -24,6 +24,10 @@ "ws2812": { "pin": "D3" }, + "rgb_matrix": { + "driver": "ws2812", + "split_count": [39, 44] + }, "rgblight": { "led_count": 83, "max_brightness": 150, diff --git a/keyboards/merge/um80/config.h b/keyboards/merge/um80/config.h index 70a5d7ba59..d23f9163a7 100644 --- a/keyboards/merge/um80/config.h +++ b/keyboards/merge/um80/config.h @@ -20,11 +20,6 @@ #define MASTER_LEFT #define SPLIT_MODS_ENABLE -#ifdef RGB_MATRIX_ENABLE -# define RGB_MATRIX_LED_COUNT 100 -# define RGB_MATRIX_SPLIT { 48, 52 } -#endif - #define AUDIO_PIN B6 #ifdef AUDIO_ENABLE |