1
0

Migrate g_led_config to DD (0-9, A) (#25558)

This commit is contained in:
Jack Sangdahl
2025-09-30 10:09:31 -06:00
committed by GitHub
parent bbd6e8ab34
commit 36fd2437b0
22 changed files with 762 additions and 446 deletions

View File

@@ -37,7 +37,71 @@
"default": {
"val": 80
},
"driver": "is31fl3733"
"driver": "is31fl3733",
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 16, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 32, "y": 0, "flags": 4},
{"matrix": [1, 1], "x": 48, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 65, "y": 0, "flags": 4},
{"matrix": [1, 2], "x": 81, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 97, "y": 0, "flags": 4},
{"matrix": [1, 3], "x": 113, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 129, "y": 0, "flags": 4},
{"matrix": [1, 4], "x": 145, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 161, "y": 0, "flags": 4},
{"matrix": [1, 5], "x": 178, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 194, "y": 0, "flags": 4},
{"matrix": [3, 6], "x": 218, "y": 0, "flags": 1},
{"matrix": [2, 0], "x": 4, "y": 16, "flags": 1},
{"matrix": [3, 0], "x": 24, "y": 16, "flags": 4},
{"matrix": [2, 1], "x": 40, "y": 16, "flags": 4},
{"matrix": [3, 1], "x": 57, "y": 16, "flags": 4},
{"matrix": [2, 2], "x": 73, "y": 16, "flags": 4},
{"matrix": [3, 2], "x": 89, "y": 16, "flags": 4},
{"matrix": [2, 3], "x": 105, "y": 16, "flags": 4},
{"matrix": [3, 3], "x": 121, "y": 16, "flags": 4},
{"matrix": [2, 4], "x": 137, "y": 16, "flags": 4},
{"matrix": [3, 4], "x": 153, "y": 16, "flags": 4},
{"matrix": [2, 5], "x": 170, "y": 16, "flags": 4},
{"matrix": [3, 5], "x": 186, "y": 16, "flags": 4},
{"matrix": [2, 6], "x": 202, "y": 16, "flags": 4},
{"matrix": [7, 6], "x": 224, "y": 24, "flags": 1},
{"matrix": [4, 0], "x": 6, "y": 32, "flags": 8},
{"matrix": [5, 0], "x": 28, "y": 32, "flags": 4},
{"matrix": [4, 1], "x": 44, "y": 32, "flags": 4},
{"matrix": [5, 1], "x": 61, "y": 32, "flags": 4},
{"matrix": [4, 2], "x": 77, "y": 32, "flags": 4},
{"matrix": [5, 2], "x": 93, "y": 32, "flags": 4},
{"matrix": [4, 3], "x": 109, "y": 32, "flags": 4},
{"matrix": [5, 3], "x": 125, "y": 32, "flags": 4},
{"matrix": [4, 4], "x": 141, "y": 32, "flags": 4},
{"matrix": [5, 4], "x": 157, "y": 32, "flags": 4},
{"matrix": [4, 5], "x": 174, "y": 32, "flags": 4},
{"matrix": [5, 5], "x": 190, "y": 32, "flags": 4},
{"matrix": [4, 6], "x": 206, "y": 32, "flags": 1},
{"matrix": [6, 0], "x": 2, "y": 48, "flags": 1},
{"matrix": [7, 0], "x": 20, "y": 48, "flags": 4},
{"matrix": [6, 1], "x": 36, "y": 48, "flags": 4},
{"matrix": [7, 1], "x": 52, "y": 48, "flags": 4},
{"matrix": [6, 2], "x": 69, "y": 48, "flags": 4},
{"matrix": [7, 2], "x": 85, "y": 48, "flags": 4},
{"matrix": [6, 3], "x": 101, "y": 48, "flags": 4},
{"matrix": [7, 3], "x": 117, "y": 48, "flags": 4},
{"matrix": [6, 4], "x": 133, "y": 48, "flags": 4},
{"matrix": [7, 4], "x": 149, "y": 48, "flags": 4},
{"matrix": [6, 5], "x": 165, "y": 48, "flags": 4},
{"matrix": [7, 5], "x": 182, "y": 48, "flags": 4},
{"matrix": [8, 6], "x": 212, "y": 48, "flags": 1},
{"matrix": [8, 0], "x": 2, "y": 64, "flags": 1},
{"matrix": [8, 1], "x": 22, "y": 64, "flags": 1},
{"matrix": [9, 0], "x": 42, "y": 64, "flags": 1},
{"matrix": [8, 3], "x": 103, "y": 64, "flags": 4},
{"matrix": [9, 3], "x": 163, "y": 64, "flags": 1},
{"matrix": [9, 4], "x": 184, "y": 64, "flags": 1},
{"matrix": [8, 5], "x": 204, "y": 64, "flags": 1},
{"matrix": [9, 5], "x": 224, "y": 64, "flags": 1}
]
},
"features": {
"bootmagic": true,

View File

@@ -31,99 +31,68 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
{ 0, SW11_CS2, SW10_CS2, SW12_CS2 }, //D402
{ 0, SW11_CS3, SW10_CS3, SW12_CS3 }, //D403
{ 0, SW11_CS4, SW10_CS4, SW12_CS4 }, //D404
{ 0, SW11_CS5, SW10_CS5, SW12_CS5 }, //D405
{ 0, SW11_CS6, SW10_CS6, SW12_CS6 }, //D406
{ 0, SW11_CS7, SW10_CS7, SW12_CS7 }, //D407
{ 0, SW11_CS8, SW10_CS8, SW12_CS8 }, //D408
{ 0, SW11_CS9, SW10_CS9, SW12_CS9 }, //D409
{ 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //D410
{ 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //D411
{ 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //D412
{ 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //D413
{ 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //D414
{ 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //D415
{ 0, SW11_CS1, SW10_CS1, SW12_CS1 }, //D401
{ 0, SW8_CS4, SW7_CS4, SW9_CS4 }, //D420
{ 0, SW8_CS5, SW7_CS5, SW9_CS5 }, //D421
{ 0, SW8_CS6, SW7_CS6, SW9_CS6 }, //D422
{ 0, SW8_CS7, SW7_CS7, SW9_CS7 }, //D423
{ 0, SW8_CS8, SW7_CS8, SW9_CS8 }, //D424
{ 0, SW8_CS9, SW7_CS9, SW9_CS9 }, //D425
{ 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //D426
{ 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //D427
{ 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //D428
{ 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //D429
{ 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //D430
{ 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //D431
{ 0, SW11_CS16, SW10_CS16, SW12_CS16 }, //D416
{ 0, SW8_CS2, SW7_CS2, SW9_CS2 }, //D418
{ 0, SW8_CS3, SW7_CS3, SW9_CS3 }, //D419
{ 0, SW5_CS5, SW4_CS5, SW6_CS5 }, //D437
{ 0, SW5_CS6, SW4_CS6, SW6_CS6 }, //D438
{ 0, SW5_CS7, SW4_CS7, SW6_CS7 }, //D439
{ 0, SW5_CS8, SW4_CS8, SW6_CS8 }, //D440
{ 0, SW5_CS9, SW4_CS9, SW6_CS9 }, //D441
{ 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //D442
{ 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //D443
{ 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //D444
{ 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //D445
{ 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //D446
{ 0, SW8_CS16, SW7_CS16, SW9_CS16 }, //D432
{ 0, SW8_CS1, SW7_CS1, SW9_CS1 }, //D417
{ 0, SW5_CS3, SW4_CS3, SW6_CS3 }, //D435
{ 0, SW5_CS4, SW4_CS4, SW6_CS4 }, //D436
{ 0, SW2_CS2, SW1_CS2, SW3_CS2 }, //D450
{ 0, SW2_CS3, SW1_CS3, SW3_CS3 }, //D451
{ 0, SW2_CS4, SW1_CS4, SW3_CS4 }, //D452
{ 0, SW2_CS6, SW1_CS6, SW3_CS6 }, //D454
{ 0, SW2_CS8, SW1_CS8, SW3_CS8 }, //D456
{ 0, SW2_CS9, SW1_CS9, SW3_CS9 }, //D457
{ 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //D458
{ 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //D460
{ 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //D461
{ 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //D447
{ 0, SW5_CS1, SW4_CS1, SW6_CS1 }, //D433
{ 0, SW5_CS2, SW4_CS2, SW6_CS2 }, //D434
{ 0, SW2_CS1, SW1_CS1, SW3_CS1 }, //D449
{ 0, SW2_CS7, SW1_CS7, SW3_CS7 }, //D455
{ 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //D459
{ 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //D462
{ 0, SW2_CS15, SW1_CS15, SW3_CS15 }, //D463
{ 0, SW2_CS16, SW1_CS16, SW3_CS16 } //D464
};
#define XXX NO_LED
led_config_t g_led_config = {
{
{ 0, 2, 4, 6, 8, 10, 12 },
{ 1, 3, 5, 7, 9, 11, XXX },
{ 14, 16, 18, 20, 22, 24, 26 },
{ 15, 17, 19, 21, 23, 25, 13 },
{ 28, 30, 32, 34, 36, 38, 40 },
{ 29, 31, 33, 35, 37, 39, XXX },
{ 41, 43, 45, 47, 49, 51, XXX },
{ 42, 44, 46, 48, 50, 52, 27 },
{ 54, 55, XXX, 57, XXX, 60, 53 },
{ 56, XXX, XXX, 58, 59, 61, XXX },
}, {
{ 0,0 }, { 16,0 }, { 32,0 }, { 48,0 }, { 65,0 }, { 81,0 }, { 97,0 }, {113,0 }, {129,0 }, {145,0 },
{161,0 }, {178,0 }, {194,0 }, {218,0 }, { 4,16 }, { 24,16 }, { 40,16 }, { 57,16 }, { 73,16 }, { 89,16 },
{105,16 }, {121,16 }, {137,16 }, {153,16 }, {170,16 }, {186,16 }, {202,16 }, {224,24 }, { 6,32 }, { 28,32 },
{ 44,32 }, { 61,32 }, { 77,32 }, { 93,32 }, {109,32 }, {125,32 }, {141,32 }, {157,32 }, {174,32 }, {190,32 },
{206,32 }, { 2,48 }, { 20,48 }, { 36,48 }, { 52,48 }, { 69,48 }, { 85,48 }, {101,48 }, {117,48 }, {133,48 },
{149,48 }, {165,48 }, {182,48 }, {212,48 }, { 2,64 }, { 22,64 }, { 42,64 }, {103,64 }, {163,64 }, {184,64 },
{204,64 }, {224,64 },
}, {
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 1, 4, 1, 1, 1, 1
}
{0, SW11_CS2, SW10_CS2, SW12_CS2}, // D402
{0, SW11_CS3, SW10_CS3, SW12_CS3}, // D403
{0, SW11_CS4, SW10_CS4, SW12_CS4}, // D404
{0, SW11_CS5, SW10_CS5, SW12_CS5}, // D405
{0, SW11_CS6, SW10_CS6, SW12_CS6}, // D406
{0, SW11_CS7, SW10_CS7, SW12_CS7}, // D407
{0, SW11_CS8, SW10_CS8, SW12_CS8}, // D408
{0, SW11_CS9, SW10_CS9, SW12_CS9}, // D409
{0, SW11_CS10, SW10_CS10, SW12_CS10}, // D410
{0, SW11_CS11, SW10_CS11, SW12_CS11}, // D411
{0, SW11_CS12, SW10_CS12, SW12_CS12}, // D412
{0, SW11_CS13, SW10_CS13, SW12_CS13}, // D413
{0, SW11_CS14, SW10_CS14, SW12_CS14}, // D414
{0, SW11_CS15, SW10_CS15, SW12_CS15}, // D415
{0, SW11_CS1, SW10_CS1, SW12_CS1}, // D401
{0, SW8_CS4, SW7_CS4, SW9_CS4}, // D420
{0, SW8_CS5, SW7_CS5, SW9_CS5}, // D421
{0, SW8_CS6, SW7_CS6, SW9_CS6}, // D422
{0, SW8_CS7, SW7_CS7, SW9_CS7}, // D423
{0, SW8_CS8, SW7_CS8, SW9_CS8}, // D424
{0, SW8_CS9, SW7_CS9, SW9_CS9}, // D425
{0, SW8_CS10, SW7_CS10, SW9_CS10}, // D426
{0, SW8_CS11, SW7_CS11, SW9_CS11}, // D427
{0, SW8_CS12, SW7_CS12, SW9_CS12}, // D428
{0, SW8_CS13, SW7_CS13, SW9_CS13}, // D429
{0, SW8_CS14, SW7_CS14, SW9_CS14}, // D430
{0, SW8_CS15, SW7_CS15, SW9_CS15}, // D431
{0, SW11_CS16, SW10_CS16, SW12_CS16}, // D416
{0, SW8_CS2, SW7_CS2, SW9_CS2}, // D418
{0, SW8_CS3, SW7_CS3, SW9_CS3}, // D419
{0, SW5_CS5, SW4_CS5, SW6_CS5}, // D437
{0, SW5_CS6, SW4_CS6, SW6_CS6}, // D438
{0, SW5_CS7, SW4_CS7, SW6_CS7}, // D439
{0, SW5_CS8, SW4_CS8, SW6_CS8}, // D440
{0, SW5_CS9, SW4_CS9, SW6_CS9}, // D441
{0, SW5_CS10, SW4_CS10, SW6_CS10}, // D442
{0, SW5_CS11, SW4_CS11, SW6_CS11}, // D443
{0, SW5_CS12, SW4_CS12, SW6_CS12}, // D444
{0, SW5_CS13, SW4_CS13, SW6_CS13}, // D445
{0, SW5_CS14, SW4_CS14, SW6_CS14}, // D446
{0, SW8_CS16, SW7_CS16, SW9_CS16}, // D432
{0, SW8_CS1, SW7_CS1, SW9_CS1}, // D417
{0, SW5_CS3, SW4_CS3, SW6_CS3}, // D435
{0, SW5_CS4, SW4_CS4, SW6_CS4}, // D436
{0, SW2_CS2, SW1_CS2, SW3_CS2}, // D450
{0, SW2_CS3, SW1_CS3, SW3_CS3}, // D451
{0, SW2_CS4, SW1_CS4, SW3_CS4}, // D452
{0, SW2_CS6, SW1_CS6, SW3_CS6}, // D454
{0, SW2_CS8, SW1_CS8, SW3_CS8}, // D456
{0, SW2_CS9, SW1_CS9, SW3_CS9}, // D457
{0, SW2_CS10, SW1_CS10, SW3_CS10}, // D458
{0, SW2_CS12, SW1_CS12, SW3_CS12}, // D460
{0, SW2_CS13, SW1_CS13, SW3_CS13}, // D461
{0, SW5_CS15, SW4_CS15, SW6_CS15}, // D447
{0, SW5_CS1, SW4_CS1, SW6_CS1}, // D433
{0, SW5_CS2, SW4_CS2, SW6_CS2}, // D434
{0, SW2_CS1, SW1_CS1, SW3_CS1}, // D449
{0, SW2_CS7, SW1_CS7, SW3_CS7}, // D455
{0, SW2_CS11, SW1_CS11, SW3_CS11}, // D459
{0, SW2_CS14, SW1_CS14, SW3_CS14}, // D462
{0, SW2_CS15, SW1_CS15, SW3_CS15}, // D463
{0, SW2_CS16, SW1_CS16, SW3_CS16} // D464
};
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {