Skip to content

Commit 3719b13

Browse files
zvecrmechlovin
zvecr
authored and
mechlovin
committed
Migrate RGB Matrix config to info.json - B (qmk#22806)
1 parent c2993d9 commit 3719b13

File tree

46 files changed

+429
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+429
-760
lines changed

‎keyboards/bandominedoni/config.h

+2-12
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,10 @@
2424
#define SPLIT_USB_DETECT
2525

2626
#ifdef RGB_MATRIX_ENABLE
27-
28-
/* ws2812 RGB MATRIX */
29-
# define RGB_MATRIX_LED_COUNT 76
30-
31-
// reacts to keypresses
32-
# define RGB_MATRIX_KEYPRESSES
33-
3427
// for all fingers used at once.
3528
# define LED_HITS_TO_REMEMBER 10
3629

37-
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
38-
// the above brighness setting has no effect on rgb_matrix_set_color().
30+
// the max brightness setting has no effect on rgb_matrix_set_color().
3931
// Use darker colors instead.
4032
/* RGB darker COLORS */
4133
# define RGB_DARKWHITE 0x33, 0x33, 0x33
@@ -58,8 +50,6 @@
5850
# define RGB_DARKPINK 0x33, 0x19, 0x26
5951

6052
// https://docs.qmk.fm/#/feature_rgb_matrix
61-
// Enable suspend mode.
62-
# define RGB_MATRIX_SLEEP
6353

6454
# ifdef CONSOLE_ENABLE
6555
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
@@ -84,7 +74,7 @@
8474
// RAINDROPS don't match well with layer LED indicator (oc) using rgb_matrix_set_color().
8575
// #define ENABLE_RGB_MATRIX_RAINDROPS
8676
// #define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
87-
// Recommendend not to use these.
77+
// Recommended not to use these.
8878
# ifndef VIA_ENABLE
8979
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
9080
# define ENABLE_RGB_MATRIX_BAND_VAL

‎keyboards/bandominedoni/info.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"device_version": "0.0.1"
1010
},
1111
"rgb_matrix": {
12-
"driver": "ws2812"
12+
"driver": "ws2812",
13+
"max_brightness": 50,
14+
"sleep": true
1315
},
1416
"matrix_pins": {
1517
"cols": ["D1", "E6", "F7", "B1", "B3", "B2", "D0"],

‎keyboards/basekeys/trifecta/config.h

-64
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616

1717
#pragma once
1818

19-
#define RGB_MATRIX_LED_COUNT 80
20-
2119
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
2220
#define LOCKING_SUPPORT_ENABLE
2321

@@ -26,65 +24,3 @@
2624

2725
/* EEPROM for via */
2826
#define DYNAMIC_KEYMAP_LAYER_COUNT 3
29-
30-
#ifdef RGB_MATRIX_ENABLE
31-
# define RGB_MATRIX_KEYPRESSES // reacts to keypresses
32-
// # define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
33-
//# define RGB_MATRIX_SLEEP // turn off effects when suspended
34-
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
35-
# define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
36-
# define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
37-
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash.
38-
39-
/* Disable the animations you don't want/need. You will need to disable a good number of these *
40-
* because they take up a lot of space. Disable until you can successfully compile your firmware. */
41-
// RGB Matrix Animation modes. Explicitly enabled
42-
// For full list of effects, see:
43-
// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
44-
# define ENABLE_RGB_MATRIX_ALPHAS_MODS
45-
# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
46-
# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
47-
# define ENABLE_RGB_MATRIX_BREATHING
48-
# define ENABLE_RGB_MATRIX_BAND_SAT
49-
# define ENABLE_RGB_MATRIX_BAND_VAL
50-
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
51-
# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
52-
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
53-
# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
54-
# define ENABLE_RGB_MATRIX_CYCLE_ALL
55-
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
56-
# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
57-
# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
58-
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
59-
# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
60-
# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
61-
# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
62-
# define ENABLE_RGB_MATRIX_DUAL_BEACON
63-
# define ENABLE_RGB_MATRIX_RAINBOW_BEACON
64-
# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
65-
# define ENABLE_RGB_MATRIX_RAINDROPS
66-
# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
67-
# define ENABLE_RGB_MATRIX_HUE_BREATHING
68-
# define ENABLE_RGB_MATRIX_HUE_PENDULUM
69-
# define ENABLE_RGB_MATRIX_HUE_WAVE
70-
# define ENABLE_RGB_MATRIX_PIXEL_RAIN
71-
# define ENABLE_RGB_MATRIX_PIXEL_FLOW
72-
# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
73-
// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
74-
# define ENABLE_RGB_MATRIX_TYPING_HEATMAP
75-
# define ENABLE_RGB_MATRIX_DIGITAL_RAIN
76-
// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
77-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
78-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE
79-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
80-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
81-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
82-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
83-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
84-
# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
85-
# define ENABLE_RGB_MATRIX_SPLASH
86-
# define ENABLE_RGB_MATRIX_MULTISPLASH
87-
# define ENABLE_RGB_MATRIX_SOLID_SPLASH
88-
# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
89-
90-
#endif

‎keyboards/basekeys/trifecta/info.json

+48-2
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,57 @@
4646
"rgb_matrix": {
4747
"sat_steps": 8,
4848
"val_steps": 8,
49-
"speed_steps": 10
49+
"speed_steps": 10,
50+
"max_brightness": 150,
51+
"animations": {
52+
"alphas_mods": true,
53+
"gradient_up_down": true,
54+
"gradient_left_right": true,
55+
"breathing": true,
56+
"band_sat": true,
57+
"band_val": true,
58+
"band_pinwheel_sat": true,
59+
"band_pinwheel_val": true,
60+
"band_spiral_sat": true,
61+
"band_spiral_val": true,
62+
"cycle_all": true,
63+
"cycle_left_right": true,
64+
"cycle_up_down": true,
65+
"rainbow_moving_chevron": true,
66+
"cycle_out_in": true,
67+
"cycle_out_in_dual": true,
68+
"cycle_pinwheel": true,
69+
"cycle_spiral": true,
70+
"dual_beacon": true,
71+
"rainbow_beacon": true,
72+
"rainbow_pinwheels": true,
73+
"raindrops": true,
74+
"jellybean_raindrops": true,
75+
"hue_breathing": true,
76+
"hue_pendulum": true,
77+
"hue_wave": true,
78+
"pixel_rain": true,
79+
"pixel_flow": true,
80+
"pixel_fractal": true,
81+
"typing_heatmap": true,
82+
"digital_rain": true,
83+
"solid_reactive_simple": true,
84+
"solid_reactive": true,
85+
"solid_reactive_wide": true,
86+
"solid_reactive_multiwide": true,
87+
"solid_reactive_cross": true,
88+
"solid_reactive_multicross": true,
89+
"solid_reactive_nexus": true,
90+
"solid_reactive_multinexus": true,
91+
"splash": true,
92+
"multisplash": true,
93+
"solid_splash": true,
94+
"solid_multisplash": true
95+
}
5096
},
5197
"processor": "atmega32u4",
5298
"bootloader": "atmel-dfu",
53-
"layouts": {
99+
"layouts": {
54100
"LAYOUT": {
55101
"layout": [
56102
{"matrix": [1, 0], "x": 0, "y": 0},

‎keyboards/bastardkb/charybdis/3x5/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,3 @@
2020

2121
/* Trackball angle adjustment. */
2222
#define ROTATIONAL_TRANSFORM_ANGLE -25
23-
24-
/* RGB settings. */
25-
#ifdef RGB_MATRIX_ENABLE
26-
# define RGB_MATRIX_LED_COUNT 36
27-
# define RGB_MATRIX_SPLIT \
28-
{ 18, 18 }
29-
#endif

‎keyboards/bastardkb/charybdis/3x5/info.json

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"pid": "0x1832",
66
"vid": "0xA8F8"
77
},
8+
"rgb_matrix": {
9+
"split_count": [18, 18]
10+
},
811
"layout_aliases": {
912
"LAYOUT_charybdis_3x5": "LAYOUT"
1013
},

‎keyboards/bastardkb/charybdis/3x6/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,3 @@
2020

2121
/* Trackball angle adjustment. */
2222
#define ROTATIONAL_TRANSFORM_ANGLE -25
23-
24-
/* RGB settings. */
25-
#ifdef RGB_MATRIX_ENABLE
26-
# define RGB_MATRIX_LED_COUNT 42
27-
# define RGB_MATRIX_SPLIT \
28-
{ 21, 21 }
29-
#endif

‎keyboards/bastardkb/charybdis/3x6/info.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@
33
"usb": {
44
"pid": "0x1834"
55
},
6+
"rgb_matrix": {
7+
"split_count": [21, 21]
8+
},
69
"layout_aliases": {
710
"LAYOUT_charybdis_3x6": "LAYOUT"
811
},
9-
"layouts": {
12+
"layouts": {
1013
"LAYOUT": {
1114
"layout": [
1215
{"label": "L00", "matrix": [0, 0], "x": 0, "y": 0},

‎keyboards/bastardkb/charybdis/4x6/config.h

-7
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,3 @@
2020

2121
/* Trackball angle adjustment. */
2222
#define ROTATIONAL_TRANSFORM_ANGLE -25
23-
24-
/* RGB settings. */
25-
#ifdef RGB_MATRIX_ENABLE
26-
# define RGB_MATRIX_LED_COUNT 58
27-
# define RGB_MATRIX_SPLIT \
28-
{ 29, 29 }
29-
#endif

‎keyboards/bastardkb/charybdis/4x6/info.json

+3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
"pid": "0x1833",
66
"vid": "0xA8F8"
77
},
8+
"rgb_matrix": {
9+
"split_count": [29, 29]
10+
},
811
"layout_aliases": {
912
"LAYOUT_charybdis_4x6": "LAYOUT"
1013
},

‎keyboards/bastardkb/charybdis/config.h

-16
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#pragma once
2020

21-
2221
/* Pointing device configuration. */
2322

2423
// Enable use of pointing device on slave split.
@@ -35,21 +34,6 @@
3534

3635
/* RGB matrix support. */
3736
#ifdef RGB_MATRIX_ENABLE
38-
# define SPLIT_TRANSPORT_MIRROR
39-
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255
40-
# define RGB_MATRIX_SLEEP
41-
# define RGB_MATRIX_KEYPRESSES
42-
43-
// Startup values.
44-
# define RGB_MATRIX_DEFAULT_VAL 64
45-
46-
// Rainbow swirl as startup mode.
47-
# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
48-
# define RGB_MATRIX_DEFAULT_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT
49-
50-
// Slow swirl at startup.
51-
# define RGB_MATRIX_DEFAULT_SPD 32
52-
5337
# ifndef __arm__
5438
// Disable control of RGB matrix by keycodes (must use firmware implementation
5539
// to control the feature).

‎keyboards/bastardkb/charybdis/info.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"rgb_matrix": {
3+
"animations": {
4+
"cycle_left_right": true
5+
},
6+
"default": {
7+
"speed": 32,
8+
"val": 64
9+
},
10+
"sleep": true
11+
},
12+
"split": {
13+
"transport": {
14+
"sync": {
15+
"matrix_state": true
16+
}
17+
}
18+
}
19+
}

‎keyboards/bastardkb/dilemma/3x5_3/config.h

-12
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,3 @@
4242
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET
4343
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_LED GP17
4444
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
45-
46-
/* RGB matrix support. */
47-
#ifdef RGB_MATRIX_ENABLE
48-
# define SPLIT_TRANSPORT_MIRROR
49-
# define RGB_MATRIX_SLEEP
50-
# define RGB_MATRIX_KEYPRESSES
51-
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
52-
53-
// Startup values.
54-
# define RGB_MATRIX_DEFAULT_VAL 128
55-
# define RGB_MATRIX_DEFAULT_SPD 32
56-
#endif

‎keyboards/bastardkb/dilemma/3x5_3/info.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
"soft_serial_pin": "GP1",
1818
"bootmagic": {
1919
"matrix": [4, 0]
20+
},
21+
"transport":{
22+
"sync": {
23+
"matrix_state": true
24+
}
2025
}
2126
},
2227
"encoder": {
@@ -90,6 +95,10 @@
9095
"solid_splash": true,
9196
"solid_multisplash": true
9297
},
98+
"default": {
99+
"speed": 32,
100+
"val": 128
101+
},
93102
"layout": [
94103
{"x": 82, "y": 0, "flags": 2},
95104
{"x": 60, "y": 0, "flags": 2},
@@ -180,7 +189,8 @@
180189
{"matrix": [7, 2], "x": 179, "y": 51, "flags": 4},
181190
{"matrix": [7, 0], "x": 160, "y": 53, "flags": 4},
182191
{"matrix": [7, 1], "x": 143, "y": 60, "flags": 4}
183-
]
192+
],
193+
"sleep": true
184194
},
185195
"community_layouts": ["split_3x5_3"],
186196
"layouts": {

‎keyboards/bastardkb/dilemma/4x6_4/config.h

+1-8
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,4 @@
4444
#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U
4545

4646
/* RGB matrix support. */
47-
#define SPLIT_TRANSPORT_MIRROR
48-
#define RGB_MATRIX_SLEEP
49-
#define RGB_MATRIX_KEYPRESSES
50-
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
51-
52-
// Startup values.
53-
#define RGB_MATRIX_DEFAULT_VAL 64
54-
#define RGB_MATRIX_DEFAULT_SPD 32
47+
#define SPLIT_TRANSPORT_MIRROR

‎keyboards/bastardkb/dilemma/4x6_4/info.json

+11-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
"soft_serial_pin": "GP1",
1818
"bootmagic": {
1919
"matrix": [5, 0]
20+
},
21+
"transport":{
22+
"sync": {
23+
"matrix_state": true
24+
}
2025
}
2126
},
2227
"encoder": {
@@ -91,6 +96,10 @@
9196
"solid_splash": true,
9297
"solid_multisplash": true
9398
},
99+
"default": {
100+
"speed": 32,
101+
"val": 128
102+
},
94103
"layout": [
95104
{"x": 81, "y": 4, "flags": 2},
96105
{"x": 65, "y": 2, "flags": 2},
@@ -199,7 +208,8 @@
199208
{"matrix": [9, 2], "x": 156, "y": 53, "flags": 4},
200209
{"matrix": [9, 1], "x": 143, "y": 57, "flags": 4},
201210
{"matrix": [9, 3], "x": 132, "y": 64, "flags": 4}
202-
]
211+
],
212+
"sleep": true
203213
},
204214
"layouts": {
205215
"LAYOUT": {

0 commit comments

Comments
 (0)