sirrow/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move LED Matrix LED config to data driven (#24122)

Browse Source
This commit is contained in:
Ryan
2024-07-19 08:13:49 +10:00
committed by GitHub
parent 8b46500a74
commit 7b4e806c25
17 changed files with 685 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
keyboards/keychron/c1_pro/ansi/white/keyboard.json
View File

@@ -190,9 +190,9 @@
{"matrix":[3, 11], "flags":4, "x":153, "y":39},
{"matrix":[3, 13], "flags":1, "x":174, "y":39},
{"matrix":[4, 12], "flags":8, "x":198, "y":39},
{"matrix":[4, 12], "flags":8, "x":211, "y":39},
{"matrix":[4, 12], "flags":8, "x":224, "y":39},
{"flags":8, "x":198, "y":39},
{"flags":8, "x":211, "y":39},
{"flags":8, "x":224, "y":39},
{"matrix":[4, 0], "flags":1, "x":8, "y":52},
{"matrix":[4, 2], "flags":4, "x":29, "y":52},

8
keyboards/keychron/c2_pro/ansi/white/keyboard.json
View File

@@ -157,10 +157,10 @@
{"matrix":[0, 15], "flags":1, "x":169, "y":0},
{"matrix":[0, 16], "flags":1, "x":180, "y":0},
{"matrix":[0, 13], "flags":8, "x":193, "y":0},
{"matrix":[0, 13], "flags":8, "x":203, "y":0},
{"matrix":[0, 13], "flags":8, "x":214, "y":0},
{"matrix":[0, 13], "flags":8, "x":224, "y":0},
{"flags":8, "x":193, "y":0},
{"flags":8, "x":203, "y":0},
{"flags":8, "x":214, "y":0},
{"flags":8, "x":224, "y":0},
{"matrix":[1, 0], "flags":4, "x":0, "y":15},
{"matrix":[1, 1], "flags":4, "x":10, "y":15},

86
keyboards/keychron/s1/ansi/white/keyboard.json
View File

@@ -31,6 +31,92 @@
"wave_left_right": true,
"wave_up_down": true
},
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 1], "x": 15, "y": 0, "flags": 1},
{"matrix": [0, 2], "x": 30, "y": 0, "flags": 1},
{"matrix": [0, 3], "x": 45, "y": 0, "flags": 1},
{"matrix": [0, 4], "x": 60, "y": 0, "flags": 1},
{"matrix": [0, 5], "x": 75, "y": 0, "flags": 1},
{"matrix": [0, 6], "x": 90, "y": 0, "flags": 1},
{"matrix": [0, 7], "x": 105, "y": 0, "flags": 1},
{"matrix": [0, 8], "x": 119, "y": 0, "flags": 1},
{"matrix": [0, 9], "x": 134, "y": 0, "flags": 1},
{"matrix": [0, 10], "x": 149, "y": 0, "flags": 1},
{"matrix": [0, 11], "x": 164, "y": 0, "flags": 1},
{"matrix": [0, 12], "x": 179, "y": 0, "flags": 1},
{"matrix": [0, 13], "x": 194, "y": 0, "flags": 1},
{"matrix": [3, 12], "x": 209, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 0, "y": 13, "flags": 1},
{"matrix": [1, 1], "x": 15, "y": 13, "flags": 4},
{"matrix": [1, 2], "x": 30, "y": 13, "flags": 4},
{"matrix": [1, 3], "x": 45, "y": 13, "flags": 4},
{"matrix": [1, 4], "x": 60, "y": 13, "flags": 4},
{"matrix": [1, 5], "x": 75, "y": 13, "flags": 4},
{"matrix": [1, 6], "x": 90, "y": 13, "flags": 4},
{"matrix": [1, 7], "x": 105, "y": 13, "flags": 4},
{"matrix": [1, 8], "x": 119, "y": 13, "flags": 4},
{"matrix": [1, 9], "x": 134, "y": 13, "flags": 4},
{"matrix": [1, 10], "x": 149, "y": 13, "flags": 4},
{"matrix": [1, 11], "x": 164, "y": 13, "flags": 4},
{"matrix": [1, 12], "x": 179, "y": 13, "flags": 4},
{"matrix": [1, 13], "x": 202, "y": 13, "flags": 1},
{"matrix": [1, 14], "x": 224, "y": 13, "flags": 1},
{"matrix": [2, 0], "x": 4, "y": 26, "flags": 1},
{"matrix": [2, 1], "x": 22, "y": 26, "flags": 4},
{"matrix": [2, 2], "x": 37, "y": 26, "flags": 4},
{"matrix": [2, 3], "x": 52, "y": 26, "flags": 4},
{"matrix": [2, 4], "x": 67, "y": 26, "flags": 4},
{"matrix": [2, 5], "x": 82, "y": 26, "flags": 4},
{"matrix": [2, 6], "x": 97, "y": 26, "flags": 4},
{"matrix": [2, 7], "x": 112, "y": 26, "flags": 4},
{"matrix": [2, 8], "x": 127, "y": 26, "flags": 4},
{"matrix": [2, 9], "x": 142, "y": 26, "flags": 4},
{"matrix": [2, 10], "x": 157, "y": 26, "flags": 4},
{"matrix": [2, 11], "x": 172, "y": 26, "flags": 4},
{"matrix": [2, 12], "x": 187, "y": 26, "flags": 4},
{"matrix": [2, 13], "x": 205, "y": 26, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
{"matrix": [3, 0], "x": 6, "y": 38, "flags": 1},
{"matrix": [3, 1], "x": 26, "y": 38, "flags": 4},
{"matrix": [3, 2], "x": 41, "y": 38, "flags": 4},
{"matrix": [3, 3], "x": 56, "y": 38, "flags": 4},
{"matrix": [3, 4], "x": 71, "y": 38, "flags": 4},
{"matrix": [3, 5], "x": 86, "y": 38, "flags": 4},
{"matrix": [3, 6], "x": 101, "y": 38, "flags": 4},
{"matrix": [3, 7], "x": 116, "y": 38, "flags": 4},
{"matrix": [3, 8], "x": 131, "y": 38, "flags": 4},
{"matrix": [3, 9], "x": 146, "y": 38, "flags": 4},
{"matrix": [3, 10], "x": 160, "y": 38, "flags": 4},
{"matrix": [3, 11], "x": 175, "y": 38, "flags": 4},
{"matrix": [3, 13], "x": 200, "y": 38, "flags": 1},
{"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
{"matrix": [4, 0], "x": 9, "y": 51, "flags": 1},
{"matrix": [4, 2], "x": 34, "y": 51, "flags": 4},
{"matrix": [4, 3], "x": 48, "y": 51, "flags": 4},
{"matrix": [4, 4], "x": 63, "y": 51, "flags": 4},
{"matrix": [4, 5], "x": 78, "y": 51, "flags": 4},
{"matrix": [4, 6], "x": 93, "y": 51, "flags": 4},
{"matrix": [4, 7], "x": 108, "y": 51, "flags": 4},
{"matrix": [4, 8], "x": 123, "y": 51, "flags": 4},
{"matrix": [4, 9], "x": 138, "y": 51, "flags": 4},
{"matrix": [4, 10], "x": 153, "y": 51, "flags": 4},
{"matrix": [4, 11], "x": 168, "y": 51, "flags": 4},
{"matrix": [4, 12], "x": 189, "y": 51, "flags": 1},
{"matrix": [4, 13], "x": 209, "y": 51, "flags": 1},
{"matrix": [4, 14], "x": 224, "y": 51, "flags": 1},
{"matrix": [5, 0], "x": 2, "y": 64, "flags": 1},
{"matrix": [5, 1], "x": 21, "y": 64, "flags": 1},
{"matrix": [5, 2], "x": 39, "y": 64, "flags": 1},
{"matrix": [5, 6], "x": 95, "y": 64, "flags": 4},
{"matrix": [5, 9], "x": 149, "y": 64, "flags": 1},
{"matrix": [5, 10], "x": 164, "y": 64, "flags": 1},
{"matrix": [5, 11], "x": 179, "y": 64, "flags": 1},
{"matrix": [5, 12], "x": 194, "y": 64, "flags": 1},
{"matrix": [5, 13], "x": 209, "y": 64, "flags": 1},
{"matrix": [5, 14], "x": 224, "y": 64, "flags": 1}
],
"driver": "snled27351",
"sleep": true,
"react_on_keyup": true

35
keyboards/keychron/s1/ansi/white/white.c
View File

@@ -115,37 +115,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
{0, CB1_CA14}, // down
{0, CB1_CA16}, // right
};
#define __ NO_LED
led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 15 },
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
{ 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45 },
{ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 14, 58, 59 },
{ 60, __, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73 },
{ 74, 75, 76, __, __, __, 77, __, __, 78, 79, 80, 81, 82, 83 }
},
{
// LED Index to Physical Position
{0,0}, {15,0}, {30,0}, {45,0}, {60,0}, {75,0}, {90,0}, {105,0}, {119,0}, {134,0}, {149,0}, {164,0}, {179,0}, {194,0}, {209,0}, {224,0},
{0,13}, {15,13}, {30,13}, {45,13}, {60,13}, {75,13}, {90,13}, {105,13}, {119,13}, {134,13}, {149,13}, {164,13}, {179,13}, {202,13}, {224,13},
{4,26}, {22,26}, {37,26}, {52,26}, {67,26}, {82,26}, {97,26}, {112,26}, {127,26}, {142,26}, {157,26}, {172,26}, {187,26}, {205,26}, {224,26},
{6,38}, {26,38}, {41,38}, {56,38}, {71,38}, {86,38}, {101,38}, {116,38}, {131,38}, {146,38}, {160,38}, {175,38}, {200,38}, {224,38},
{9,51}, {34,51}, {48,51}, {63,51}, {78,51}, {93,51}, {108,51}, {123,51}, {138,51}, {153,51}, {168,51}, {189,51}, {209,51}, {224,51},
{2,64}, {21,64}, {39,64}, {95,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64}
},
{
// RGB LED Index to Flag
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 4, 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, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1,
}
};
#endif // RGB_MATRIX_ENABLE
#endif