1
0
Fork 0

Migrate RGB Matrix config to info.json - RS (#22909)

This commit is contained in:
Joel Challis 2024-01-16 01:03:55 +00:00 committed by GitHub
parent de6ae3408c
commit a90b45e832
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 839 additions and 1201 deletions

View file

@ -45,12 +45,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
#endif
/* RGB matrix support */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
# define RGB_MATRIX_SPLIT { 10, 10 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_MATRIX_SLEEP
#endif

View file

@ -9,7 +9,10 @@
"split_count": [10, 10]
},
"rgb_matrix": {
"driver": "ws2812"
"driver": "ws2812",
"max_brightness": 170,
"sleep": true,
"split_count": [10, 10]
},
"matrix_pins": {
"cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"],
@ -28,6 +31,11 @@
{"pin_a": "B5", "pin_b": "C6"}
]
}
},
"transport": {
"sync": {
"matrix_state": true
}
}
},
"layout_aliases": {

View file

@ -50,12 +50,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
#endif
/* RGB matrix support */
#ifdef RGB_MATRIX_ENABLE
# define SPLIT_TRANSPORT_MIRROR
# define RGB_MATRIX_LED_COUNT 20 // Number of LEDs
# define RGB_MATRIX_SPLIT { 10, 10 }
# define RGB_MATRIX_MAXIMUM_BRIGHTNESS 170
# define RGB_MATRIX_SLEEP
#endif

View file

@ -9,7 +9,10 @@
"split_count": [10, 10]
},
"rgb_matrix": {
"driver": "ws2812"
"driver": "ws2812",
"max_brightness": 170,
"sleep": true,
"split_count": [10, 10]
},
"matrix_pins": {
"cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4"],
@ -34,6 +37,11 @@
"cols": ["B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6"],
"rows": ["D4", "C6", "D7", "E6"]
}
},
"transport": {
"sync": {
"matrix_state": true
}
}
},
"layout_aliases": {

View file

@ -25,10 +25,3 @@
# define OLED_DISPLAY_128X64
# define SPLIT_OLED_ENABLE
#endif
// Not yet available in `info.json`
#ifdef RGB_MATRIX_ENABLE
# define RGB_MATRIX_LED_COUNT 62
# define RGB_MATRIX_SPLIT { 31, 31 }
# define SPLIT_TRANSPORT_MIRROR
#endif

View file

@ -110,6 +110,11 @@
{"pin_a": "F4", "pin_b": "F5"}
]
}
},
"transport": {
"sync": {
"matrix_state": true
}
}
},
"rgblight": {
@ -187,6 +192,7 @@
{"flags": 4, "matrix": [4, 5], "x": 210, "y": 11}, // R SW05
{"flags": 4, "matrix": [4, 6], "x": 224, "y": 11} // R SW06
],
"max_brightness": 128
"max_brightness": 128,
"split_count": [31, 31]
}
}