Migrate g_led_config to DD (YZ) (#25650)

This commit is contained in:
Jack Sangdahl 2025-09-11 11:34:10 -06:00 committed by GitHub
parent 6eee1940e8
commit 74b0f054c1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 380 additions and 303 deletions

View file

@ -59,6 +59,90 @@
},
"center_point": [96, 32],
"driver": "ws2812",
"layout": [
{"matrix": [4, 13], "x": 224, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 207, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 190, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 172, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 155, "y": 64, "flags": 4},
{"x": 121, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 86, "y": 64, "flags": 4},
{"x": 52, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 34, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 17, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [3, 13], "x": 224, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 207, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 190, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 172, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 155, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 138, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 121, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 103, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 86, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 69, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 52, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 34, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 17, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
{"matrix": [2, 13], "x": 224, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 190, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 172, "y": 32, "flags": 4},
{"matrix": [2, 9], "x": 155, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 138, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 121, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 103, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 69, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 52, "y": 32, "flags": 4},
{"matrix": [2, 2], "x": 34, "y": 32, "flags": 4},
{"matrix": [2, 1], "x": 17, "y": 32, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
{"matrix": [1, 13], "x": 224, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 207, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 190, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 172, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 155, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 138, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 121, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 103, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 86, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 69, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 34, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 17, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [0, 13], "x": 224, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 207, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 190, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 172, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 155, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 138, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 121, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 103, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 86, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 52, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 34, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 17, "y": 0, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"x": 0, "y": 0, "flags": 2},
{"x": 37, "y": 0, "flags": 2},
{"x": 75, "y": 0, "flags": 2},
{"x": 112, "y": 0, "flags": 2},
{"x": 149, "y": 0, "flags": 2},
{"x": 187, "y": 0, "flags": 2},
{"x": 224, "y": 0, "flags": 2},
{"x": 0, "y": 32, "flags": 2},
{"x": 224, "y": 64, "flags": 2},
{"x": 187, "y": 64, "flags": 2},
{"x": 149, "y": 64, "flags": 2},
{"x": 112, "y": 64, "flags": 2},
{"x": 75, "y": 64, "flags": 2},
{"x": 37, "y": 64, "flags": 2},
{"x": 0, "y": 64, "flags": 2},
{"x": 224, "y": 32, "flags": 2}
],
"max_brightness": 180,
"sleep": true
},

View file

@ -23,40 +23,6 @@ typedef union {
} kb_cums_t;
kb_cums_t kb_cums;
led_config_t g_led_config = {
{
{ 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52 },
{ 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38 },
{ 37, 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, NO_LED, 25 },
{ 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12, 11 },
{ 10, 9, 8, NO_LED, NO_LED, 6, NO_LED, NO_LED, NO_LED, 4, 3, 2, 1, 0 }
},
{
/* LED Index to Physical Position */
{224,64},{207,64},{190,64},{172,64},{155,64}, {121,64}, {86,64}, {52,64}, {34,64},{17,64},{0,64},
{224,48},{207,48},{190,48},{172,48},{155,48},{138,48},{121,48},{103,48},{86,48},{69,48},{52,48},{34,48},{17,48},{0,48},
{224,32},{190,32},{172,32},{155,32},{138,32},{121,32},{103,32},{86,32},{69,32},{52,32},{34,32},{17,32},{0,32},
{224,16},{207,16},{190,16},{172,16},{155,16},{138,16},{121,16},{103,16},{86,16},{69,16},{52,16},{34,16},{17,16},{0,16},
{224,0},{207,0},{190,0},{172,0},{155,0},{138,0},{121,0},{103,0},{86,0},{69,0},{52,0},{34,0},{17,0},{0,0},
{0,0},{37,0},{75,0},{112,0},{149,0},{187,0},{224,0},
{0,32},
{224,64},{187,64},{149,64},{112,64},{75,64},{37,64},{0,64},
{224,32}
},
{
/* LED Index to Flag */
4,4,4,4,4, 4,4,4,4,4,
4,4,4,4,4, 4,4,4,4,4,
4,4,4,4,4, 4,4,4,4,4,
4,4,4,4,4, 4,4,4,4,4,
4,4,4,4,4, 4,4,4,4,4,
4,4,4,4,4, 4,4,4,4,4,
4,4,4,4,4, 4,
2,2,2,2,2, 2,2,2,2,2,
2,2,2,2,2, 2
}
};
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;

View file

@ -65,6 +65,94 @@
"solid_multisplash": true
},
"driver": "ws2812",
"layout": [
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 32, "y": 64, "flags": 4},
{"matrix": [4, 3], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 80, "y": 64, "flags": 4},
{"matrix": [4, 7], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 144, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 160, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 192, "y": 64, "flags": 4},
{"matrix": [4, 13], "x": 208, "y": 64, "flags": 4},
{"matrix": [4, 14], "x": 224, "y": 64, "flags": 4},
{"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
{"matrix": [3, 13], "x": 208, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
{"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
{"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 96, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 112, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 128, "y": 32, "flags": 4},
{"matrix": [2, 9], "x": 144, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 160, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
{"matrix": [2, 13], "x": 208, "y": 32, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
{"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 208, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 208, "y": 0, "flags": 4},
{"matrix": [0, 14], "x": 224, "y": 0, "flags": 4},
{"x": 224, "y": 0, "flags": 2},
{"x": 196, "y": 0, "flags": 2},
{"x": 168, "y": 0, "flags": 2},
{"x": 140, "y": 0, "flags": 2},
{"x": 112, "y": 0, "flags": 2},
{"x": 84, "y": 0, "flags": 2},
{"x": 56, "y": 0, "flags": 2},
{"x": 28, "y": 0, "flags": 2},
{"x": 0, "y": 0, "flags": 2},
{"x": 224, "y": 64, "flags": 2},
{"x": 196, "y": 64, "flags": 2},
{"x": 168, "y": 64, "flags": 2},
{"x": 140, "y": 64, "flags": 2},
{"x": 112, "y": 64, "flags": 2},
{"x": 84, "y": 64, "flags": 2},
{"x": 56, "y": 64, "flags": 2},
{"x": 28, "y": 64, "flags": 2}
],
"max_brightness": 180,
"sleep": true
},

View file

@ -24,36 +24,6 @@ typedef union {
} kb_cums_t;
kb_cums_t kb_cums;
led_config_t g_led_config = {
{
{54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68},
{53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39},
{25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, NO_LED, 37, 38},
{24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, NO_LED, 13, 12, 11},
{0, 1, 2, 3, NO_LED, 4, NO_LED, 5, NO_LED, 6, 7, NO_LED, 8, 9, 10}
},
{
{0,64},{16,64},{32,64},{48,64}, {80,64}, {112,64}, {144,64},{160,64}, {192,64},{208,64},{224,64},
{224,48},{208,48},{192,48}, {160,48},{144,48},{128,48},{112,48},{96,48},{80,48},{64,48},{48,48},{32,48},{16,48},{0,48},
{0,32},{16,32},{32,32},{48,32},{64,32},{80,32},{96,32},{112,32},{128,32},{144,32},{160,32},{176,32}, {208,32},{224,32},
{224,16},{208,16},{192,16},{176,16},{160,16},{144,16},{128,16},{112,16},{96,16},{80,16},{64,16},{48,16},{32,16},{16,16},{0,16},
{0,0},{16,0},{32,0},{48,0},{64,0},{80,0},{96,0},{112,0},{128,0},{144,0},{160,0},{176,0},{192,0},{208,0},{224,0},
{224,0},{196,0},{168,0},{140,0},{112,0},{84,0},{56,0},{28,0},{0,0},
{224,64},{196,64},{168,64},{140,64},{112,64},{84,64},{56,64},{28,64}
},
{
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2
}
};
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
return false;

View file

@ -64,6 +64,77 @@
"solid_multisplash": true
},
"driver": "ws2812",
"layout": [
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 32, "y": 64, "flags": 4},
{"x": 48, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 80, "y": 64, "flags": 4},
{"x": 112, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 144, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 160, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 192, "y": 64, "flags": 4},
{"matrix": [4, 13], "x": 208, "y": 64, "flags": 4},
{"matrix": [4, 14], "x": 224, "y": 64, "flags": 4},
{"matrix": [3, 14], "x": 224, "y": 48, "flags": 4},
{"matrix": [3, 13], "x": 208, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 32, "flags": 4},
{"matrix": [2, 1], "x": 16, "y": 32, "flags": 4},
{"matrix": [2, 2], "x": 32, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 48, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 64, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 80, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 96, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 112, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 128, "y": 32, "flags": 4},
{"matrix": [2, 9], "x": 144, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 160, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 176, "y": 32, "flags": 4},
{"matrix": [2, 13], "x": 208, "y": 32, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 32, "flags": 4},
{"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 208, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 16, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 32, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 48, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 64, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 80, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 96, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 112, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 128, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 144, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 160, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 176, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 192, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 208, "y": 0, "flags": 4},
{"matrix": [0, 14], "x": 224, "y": 0, "flags": 4}
],
"max_brightness": 250,
"sleep": true
},

View file

@ -1,46 +0,0 @@
/* Copyright 2022 JasonRen(biu)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {
{
{54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68},
{53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39},
{25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, NO_LED, 37, 38},
{24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, NO_LED, 13, 12, 11},
{0, 1, 2, NO_LED, NO_LED, 4, NO_LED, NO_LED, NO_LED, 6, 7, NO_LED, 8, 9, 10}
},
{
{0,64},{16,64},{32,64},{48,64}, {80,64}, {112,64}, {144,64},{160,64}, {192,64},{208,64},{224,64},
{224,48},{208,48},{192,48}, {160,48},{144,48},{128,48},{112,48},{96,48},{80,48},{64,48},{48,48},{32,48},{16,48},{0,48},
{0,32},{16,32},{32,32},{48,32},{64,32},{80,32},{96,32},{112,32},{128,32},{144,32},{160,32},{176,32}, {208,32},{224,32},
{224,16},{208,16},{192,16},{176,16},{160,16},{144,16},{128,16},{112,16},{96,16},{80,16},{64,16},{48,16},{32,16},{16,16},{0,16},
{0,0},{16,0},{32,0},{48,0},{64,0},{80,0},{96,0},{112,0},{128,0},{144,0},{160,0},{176,0},{192,0},{208,0},{224,0}
},
{
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4
}
};
#endif

View file

@ -41,7 +41,17 @@
"driver": "pwm"
},
"rgb_matrix": {
"driver": "ws2812"
"driver": "ws2812",
"layout": [
{"matrix": [3, 5], "x": 94, "y": 60, "flags": 255},
{"matrix": [2, 2], "x": 18, "y": 44, "flags": 255},
{"matrix": [1, 2], "x": 8, "y": 10, "flags": 255},
{"matrix": [1, 5], "x": 94, "y": 10, "flags": 255},
{"matrix": [1, 8], "x": 130, "y": 10, "flags": 255},
{"matrix": [1, 11], "x": 216, "y": 10, "flags": 255},
{"matrix": [2, 11], "x": 208, "y": 44, "flags": 255},
{"matrix": [3, 8], "x": 130, "y": 60, "flags": 255}
]
},
"matrix_pins": {
"cols": ["A14", "A15", "B13", "B14", "B15", "A13", "A0", "A1", "A2", "A3", "A6", "A7"],

View file

@ -33,37 +33,6 @@ void i2c_init(void) {
}
}
// LED matrix
// physical location
// 2 3 4 5
//
// 1 6
// 0 7
#ifdef RGB_MATRIX_ENABLE
// clang-format off
led_config_t g_led_config = {{
// Key Matrix to LED Index
// Since we only have 8 LEDs, map the keys near them to the same LED.
{2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5},
{2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5},
{1, 1, 1, 0, 0, 0, 7, 7, 7, 6, 6, 6},
{NO_LED, NO_LED, NO_LED, 0, 0, 0, 7, 7, 7, NO_LED, NO_LED, NO_LED},
}, {// LED Index to Physical Position
{94, 60},
{18, 44},
{8, 10},
{94, 10},
{130,10},
{216, 10},
{208, 44},
{130, 60}
}, {// LED Index to Flag
LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL,
LED_FLAG_ALL, LED_FLAG_ALL, LED_FLAG_ALL
}};
// clang-format on
#endif
#ifdef OLED_ENABLE
// OLED shared code
// The oled is vertical. Need to rotate 270 degrees.

View file

@ -1,43 +0,0 @@
/* Copyright 2022 Dennis Kruyt (dennis@kruyt.org)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#if defined(RGB_MATRIX_ENABLE)
led_config_t g_led_config = {
{
// Key Matrix to LED Index for center 2u
{11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0},
{23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13, 12},
{35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24},
{50, 49, 48, 47, 46, 43, 41, 40, 39, 38, 37, 36}
}, {
// LED Index to Physical Position, more positions due to extra leds for other layout options
{ 0, 0}, { 20, 0}, { 40, 0}, {61, 0}, {81, 0}, {101, 0}, {122, 0}, {142, 0}, {162, 0}, {183, 0}, {203, 0}, {224, 0},
{ 0, 21}, { 20, 21}, { 40, 21}, {61, 21}, {81, 21}, {101, 21}, {122, 21}, {142, 21}, {162, 21}, {183, 21}, {203, 21}, {224, 21},
{ 0, 42}, { 20, 42}, { 40, 42}, {61, 42}, {81, 42}, {101, 42}, {122, 42}, {142, 42}, {162, 42}, {183, 42}, {203, 42}, {224, 42},
{ 0, 64}, { 20, 64}, { 40, 64}, {61, 64}, {81, 64}, {85, 64}, {94, 64}, {103, 64}, {112, 64}, {122, 64}, {142, 64}, {162, 64}, {183, 64}, {203, 64}, {224, 64}
}, {
// LED Index to Flag
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1, 1 ,1 ,1, 1, 1, 1, 1, 1, 1, 1
}
};
#endif

View file

@ -60,6 +60,59 @@
"solid_multisplash": true
},
"driver": "ws2812",
"layout": [
{"matrix": [0, 11], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 20, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 40, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 61, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 81, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 101, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 122, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 142, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 162, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 183, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 203, "y": 0, "flags": 4},
{"matrix": [0, 0], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 11], "x": 0, "y": 21, "flags": 1},
{"matrix": [1, 10], "x": 20, "y": 21, "flags": 4},
{"matrix": [1, 9], "x": 40, "y": 21, "flags": 4},
{"matrix": [1, 8], "x": 61, "y": 21, "flags": 4},
{"matrix": [1, 7], "x": 81, "y": 21, "flags": 4},
{"matrix": [1, 6], "x": 101, "y": 21, "flags": 4},
{"matrix": [1, 5], "x": 122, "y": 21, "flags": 4},
{"matrix": [1, 4], "x": 142, "y": 21, "flags": 4},
{"matrix": [1, 3], "x": 162, "y": 21, "flags": 4},
{"matrix": [1, 2], "x": 183, "y": 21, "flags": 4},
{"matrix": [1, 1], "x": 203, "y": 21, "flags": 4},
{"matrix": [1, 0], "x": 224, "y": 21, "flags": 1},
{"matrix": [2, 11], "x": 0, "y": 42, "flags": 1},
{"matrix": [2, 10], "x": 20, "y": 42, "flags": 4},
{"matrix": [2, 9], "x": 40, "y": 42, "flags": 4},
{"matrix": [2, 8], "x": 61, "y": 42, "flags": 4},
{"matrix": [2, 7], "x": 81, "y": 42, "flags": 4},
{"matrix": [2, 6], "x": 101, "y": 42, "flags": 4},
{"matrix": [2, 5], "x": 122, "y": 42, "flags": 4},
{"matrix": [2, 4], "x": 142, "y": 42, "flags": 4},
{"matrix": [2, 3], "x": 162, "y": 42, "flags": 4},
{"matrix": [2, 2], "x": 183, "y": 42, "flags": 4},
{"matrix": [2, 1], "x": 203, "y": 42, "flags": 4},
{"matrix": [2, 0], "x": 224, "y": 42, "flags": 1},
{"matrix": [3, 11], "x": 0, "y": 64, "flags": 1},
{"matrix": [3, 10], "x": 20, "y": 64, "flags": 1},
{"matrix": [3, 9], "x": 40, "y": 64, "flags": 1},
{"matrix": [3, 8], "x": 61, "y": 64, "flags": 1},
{"matrix": [3, 7], "x": 81, "y": 64, "flags": 1},
{"matrix": [3, 6], "x": 85, "y": 64, "flags": 1},
{"x": 94, "y": 64, "flags": 1},
{"matrix": [3, 5], "x": 103, "y": 64, "flags": 1},
{"x": 112, "y": 64, "flags": 1},
{"x": 122, "y": 64, "flags": 1},
{"matrix": [3, 4], "x": 142, "y": 64, "flags": 1},
{"matrix": [3, 3], "x": 162, "y": 64, "flags": 1},
{"matrix": [3, 2], "x": 183, "y": 64, "flags": 1},
{"matrix": [3, 1], "x": 203, "y": 64, "flags": 1},
{"matrix": [3, 0], "x": 224, "y": 64, "flags": 1}
],
"max_brightness": 130,
"sleep": true
},

View file

@ -1,35 +0,0 @@
/* Copyright 2020 Yncognito
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config ={
{
{4 ,5 ,6 ,7 },
{0 ,1 ,2 ,3 }
},
{
{0,0},{75,0},{145,0},{224,0},
{0,64},{75,64},{145,64},{224,64}
},
{
0x04,0x04,0x04,0x04,
0x04,0x04,0x04,0x04
}
};
#endif

View file

@ -60,6 +60,16 @@
"animation": "cycle_all"
},
"driver": "ws2812",
"layout": [
{"matrix": [1, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [1, 1], "x": 75, "y": 0, "flags": 4},
{"matrix": [1, 2], "x": 145, "y": 0, "flags": 4},
{"matrix": [1, 3], "x": 224, "y": 0, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [0, 1], "x": 75, "y": 64, "flags": 4},
{"matrix": [0, 2], "x": 145, "y": 64, "flags": 4},
{"matrix": [0, 3], "x": 224, "y": 64, "flags": 4}
],
"react_on_keyup": true
},
"features": {

View file

@ -18,6 +18,26 @@
},
"rgb_matrix": {
"driver": "ws2812",
"layout": [
{"matrix": [1, 0], "x": 0, "y": 32, "flags": 4},
{"matrix": [1, 1], "x": 44, "y": 32, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [2, 1], "x": 44, "y": 64, "flags": 4},
{"matrix": [2, 2], "x": 89, "y": 64, "flags": 4},
{"matrix": [2, 3], "x": 134, "y": 64, "flags": 4},
{"matrix": [2, 4], "x": 179, "y": 64, "flags": 4},
{"matrix": [2, 5], "x": 224, "y": 64, "flags": 4},
{"matrix": [1, 5], "x": 224, "y": 32, "flags": 4},
{"matrix": [1, 4], "x": 179, "y": 32, "flags": 4},
{"matrix": [1, 3], "x": 134, "y": 32, "flags": 4},
{"matrix": [1, 2], "x": 89, "y": 32, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 44, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 89, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 134, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 179, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 224, "y": 0, "flags": 4}
],
"max_brightness": 150,
"sat_steps": 8,
"sleep": true,

View file

@ -1,37 +0,0 @@
/* Copyright 2021 yushakobo
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {
{
{12, 13, 14, 15, 16, 17},
{0, 1, 11, 10, 9, 8},
{2, 3, 4, 5, 6, 7}
},
{
{0,32}, {44,32}, {0,64}, {44,64}, {89,64}, {134,64},
{179,64},{224,64},{224,32},{179,32},{134,32},{89,32},
{0,0}, {44,0}, {89,0}, {134,0}, {179,0}, {224,0}
},
{
4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4
}
};
#endif

View file

@ -1,46 +0,0 @@
/*
Copyright 2022 Zykrah
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = {
{
// Key Matrix to LED Index
{NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
{NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
{NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
{NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
{NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED},
{NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED}
}, {
// LED Index to Physical Position
{112, 32}, {138, 17}, {112, 2}, { 86, 17}, { 86, 47}, {112, 62}, {138, 47}, // SNOWFLAKE
{ 0, 0}, { 16, 0}, { 32, 0}, { 48, 0}, { 64, 0}, { 80, 0}, { 96, 0}, {112, 0}, {128, 0}, {144, 0}, {160, 0}, {176, 0}, {192, 0}, {208, 0}, // UNDERGLOW
{208, 16}, {208, 32}, {208, 48}, // UNDERGLOW
{208, 64}, {192, 64}, {176, 64}, {160, 64}, {144, 64}, {128, 64}, {112, 64}, { 96, 64}, { 80, 64}, { 64, 64}, { 48, 64}, { 32, 64}, { 16, 64}, { 0, 64}, // UNDERGLOW
{ 0, 48}, { 0, 32}, { 0, 16} // UNDERGLOW
}, {
// LED Index to Flag
8, 8, 8, 8, 8, 8, 8, // SNOWFLAKE
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // UNDERGLOW
2, 2, 2, // UNDERGLOW
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // UNDERGLOW
2, 2, 2 // UNDERGLOW
}
};
#endif

View file

@ -60,6 +60,49 @@
"val": 150
},
"driver": "ws2812",
"layout": [
{"x": 112, "y": 32, "flags": 8},
{"x": 138, "y": 17, "flags": 8},
{"x": 112, "y": 2, "flags": 8},
{"x": 86, "y": 17, "flags": 8},
{"x": 86, "y": 47, "flags": 8},
{"x": 112, "y": 62, "flags": 8},
{"x": 138, "y": 47, "flags": 8},
{"x": 0, "y": 0, "flags": 2},
{"x": 16, "y": 0, "flags": 2},
{"x": 32, "y": 0, "flags": 2},
{"x": 48, "y": 0, "flags": 2},
{"x": 64, "y": 0, "flags": 2},
{"x": 80, "y": 0, "flags": 2},
{"x": 96, "y": 0, "flags": 2},
{"x": 112, "y": 0, "flags": 2},
{"x": 128, "y": 0, "flags": 2},
{"x": 144, "y": 0, "flags": 2},
{"x": 160, "y": 0, "flags": 2},
{"x": 176, "y": 0, "flags": 2},
{"x": 192, "y": 0, "flags": 2},
{"x": 208, "y": 0, "flags": 2},
{"x": 208, "y": 16, "flags": 2},
{"x": 208, "y": 32, "flags": 2},
{"x": 208, "y": 48, "flags": 2},
{"x": 208, "y": 64, "flags": 2},
{"x": 192, "y": 64, "flags": 2},
{"x": 176, "y": 64, "flags": 2},
{"x": 160, "y": 64, "flags": 2},
{"x": 144, "y": 64, "flags": 2},
{"x": 128, "y": 64, "flags": 2},
{"x": 112, "y": 64, "flags": 2},
{"x": 96, "y": 64, "flags": 2},
{"x": 80, "y": 64, "flags": 2},
{"x": 64, "y": 64, "flags": 2},
{"x": 48, "y": 64, "flags": 2},
{"x": 32, "y": 64, "flags": 2},
{"x": 16, "y": 64, "flags": 2},
{"x": 0, "y": 64, "flags": 2},
{"x": 0, "y": 48, "flags": 2},
{"x": 0, "y": 32, "flags": 2},
{"x": 0, "y": 16, "flags": 2}
],
"max_brightness": 200
},
"ws2812": {