Skip to content

Commit

Permalink
Move LED Matrix LED config to data driven (#24122)
Browse files Browse the repository at this point in the history
  • Loading branch information
@fauxpark
fauxpark authored Jul 18, 2024
1 parent 8b46500 commit 7b4e806
Show file tree
Hide file tree
Showing 17 changed files with 685 additions and 382 deletions.
30 changes: 0 additions & 30 deletions keyboards/clueboard/66_hotswap/gen1/gen1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,34 +93,4 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
{ 0, C5_14 }, // k96 KC_DOWN
{ 0, C5_15 } // k97 KC_RGHT
};

led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, 1, 2, 3, 4, 5, 6, 7 },
{ 15, 16, 17, 18, 19, 20, 21, 22 },
{ 30, 31, 32, 33, 34, 35, 36, 37 },
{ 43, NO_LED, 44, 45, 46, 47, 48, 49 },
{ 56, 57, 58, NO_LED, NO_LED, 60, 61, NO_LED },
{ 8, 9, 10, 11, 12, 13, NO_LED, 14 },
{ 23, 24, 25, 26, 27, 28, NO_LED, 29 },
{ 38, 39, 40, 41, NO_LED, 42, NO_LED, NO_LED },
{ 50, 51, 52, 53, NO_LED, 54, 55, NO_LED },
{ 64, NO_LED, 65, 66, 67, 68, 69, 70 }
}, {
// LED Index to Physical Position
{ 0, 0 }, { 15, 0 }, { 29, 0 }, { 43, 0 }, { 58, 0 }, { 72, 0 }, { 87, 0 }, { 101, 0 }, { 116, 0 }, { 130, 0 }, { 145, 0 }, { 159, 0 }, { 173, 0 }, { 195, 0 }, { 224, 0 },
{ 4, 16 }, { 22, 16 }, { 36, 16 }, { 51, 16 }, { 65, 16 }, { 80, 16 }, { 94, 16 }, { 108, 16 }, { 123, 16 }, { 137, 16 }, { 152, 16 }, { 166, 16 }, { 181, 16 }, { 199, 16 }, { 224, 16 },
{ 5, 32 }, { 25, 32 }, { 40, 32 }, { 54, 32 }, { 69, 32 }, { 83, 32 }, { 98, 32 }, { 112, 32 }, { 126, 32 }, { 141, 32 }, { 155, 32 }, { 170, 32 }, { 184, 32 },
{ 16, 48 }, { 33, 48 }, { 47, 48 }, { 61, 48 }, { 76, 48 }, { 90, 48 }, { 105, 48 }, { 119, 48 }, { 134, 48 }, { 148, 48 }, { 163, 48 }, { 188, 48 }, { 210, 48 },
{ 9, 64 }, { 27, 64 }, { 45, 64 }, { 60, 64 }, { 74, 64 }, { 88, 64 }, { 103, 64 }, { 117, 64 }, { 136, 64 }, { 154, 64 }, { 168, 64 }, { 186, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 }
}, {
// LED Index to Flag
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, 1, 1,
1, 4, 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, 1,
}
};
#endif
73 changes: 73 additions & 0 deletions keyboards/clueboard/66_hotswap/gen1/keyboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,79 @@
"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": 4},
{"matrix": [0, 2], "x": 29, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 43, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 58, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 72, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 87, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 101, "y": 0, "flags": 4},
{"matrix": [5, 0], "x": 116, "y": 0, "flags": 4},
{"matrix": [5, 1], "x": 130, "y": 0, "flags": 4},
{"matrix": [5, 2], "x": 145, "y": 0, "flags": 4},
{"matrix": [5, 3], "x": 159, "y": 0, "flags": 4},
{"matrix": [5, 4], "x": 173, "y": 0, "flags": 4},
{"matrix": [5, 5], "x": 195, "y": 0, "flags": 1},
{"matrix": [5, 7], "x": 224, "y": 0, "flags": 1},
{"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
{"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 36, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 51, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 65, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 94, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 108, "y": 16, "flags": 4},
{"matrix": [6, 0], "x": 123, "y": 16, "flags": 4},
{"matrix": [6, 1], "x": 137, "y": 16, "flags": 4},
{"matrix": [6, 2], "x": 152, "y": 16, "flags": 4},
{"matrix": [6, 3], "x": 166, "y": 16, "flags": 4},
{"matrix": [6, 4], "x": 181, "y": 16, "flags": 4},
{"matrix": [6, 5], "x": 199, "y": 16, "flags": 1},
{"matrix": [6, 7], "x": 224, "y": 16, "flags": 1},
{"matrix": [2, 0], "x": 5, "y": 32, "flags": 1},
{"matrix": [2, 1], "x": 25, "y": 32, "flags": 4},
{"matrix": [2, 2], "x": 40, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 54, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 69, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 83, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 98, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 112, "y": 32, "flags": 4},
{"matrix": [7, 0], "x": 126, "y": 32, "flags": 4},
{"matrix": [7, 1], "x": 141, "y": 32, "flags": 4},
{"matrix": [7, 2], "x": 155, "y": 32, "flags": 4},
{"matrix": [7, 3], "x": 170, "y": 32, "flags": 4},
{"matrix": [7, 5], "x": 184, "y": 32, "flags": 1},
{"matrix": [3, 0], "x": 16, "y": 48, "flags": 1},
{"matrix": [3, 2], "x": 33, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 47, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 61, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 76, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 90, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 105, "y": 48, "flags": 4},
{"matrix": [8, 0], "x": 119, "y": 48, "flags": 4},
{"matrix": [8, 1], "x": 134, "y": 48, "flags": 4},
{"matrix": [8, 2], "x": 148, "y": 48, "flags": 4},
{"matrix": [8, 3], "x": 163, "y": 48, "flags": 4},
{"matrix": [8, 5], "x": 188, "y": 48, "flags": 1},
{"matrix": [8, 6], "x": 210, "y": 48, "flags": 1},
{"matrix": [4, 0], "x": 9, "y": 64, "flags": 1},
{"matrix": [4, 1], "x": 27, "y": 64, "flags": 1},
{"matrix": [4, 2], "x": 45, "y": 64, "flags": 1},
{"x": 60, "y": 64, "flags": 1},
{"matrix": [4, 5], "x": 74, "y": 64, "flags": 1},
{"matrix": [4, 6], "x": 88, "y": 64, "flags": 1},
{"x": 103, "y": 64, "flags": 1},
{"x": 117, "y": 64, "flags": 1},
{"matrix": [9, 0], "x": 136, "y": 64, "flags": 1},
{"matrix": [9, 2], "x": 154, "y": 64, "flags": 1},
{"matrix": [9, 3], "x": 168, "y": 64, "flags": 1},
{"matrix": [9, 4], "x": 186, "y": 64, "flags": 1},
{"matrix": [9, 5], "x": 195, "y": 64, "flags": 1},
{"matrix": [9, 6], "x": 210, "y": 64, "flags": 1},
{"matrix": [9, 7], "x": 224, "y": 64, "flags": 1}
],
"driver": "is31fl3731"
},
"matrix_pins": {
Expand Down
66 changes: 0 additions & 66 deletions keyboards/input_club/ergodox_infinity/ergodox_infinity.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,72 +209,6 @@ const is31fl3731_led_t PROGMEM g_is31fl3731_leds[IS31FL3731_LED_COUNT] = {
// 71 70 69
{ 0, C3_7 }, { 0, C2_7 }, { 0, C1_7 },
};

led_config_t g_led_config = {
{
// Key Matrix to LED Index
// Left half
{ NO_LED, NO_LED, NO_LED, 33, 34 },
{ NO_LED, NO_LED, NO_LED, 32, 37 },
{ 6, 13, NO_LED, 26, 36 },
{ 5, 12, 19, 25, 35 },
{ 4, 11, 18, 24, 31 },
{ 3, 10, 17, 23, 30 },
{ 2, 9, 16, 22, 29 },
{ 1, 8, 15, 21, 28 },
{ 0, 7, 14, 20, 27 },
// Right half
{ NO_LED, NO_LED, NO_LED, 71, 72 },
{ NO_LED, NO_LED, NO_LED, 70, 75 },
{ 44, 51, NO_LED, 64, 74 },
{ 43, 50, 57, 63, 73 },
{ 42, 49, 56, 62, 69 },
{ 41, 48, 55, 61, 68 },
{ 40, 47, 54, 60, 67 },
{ 39, 46, 53, 59, 66 },
{ 38, 45, 52, 58, 65 },
}, {
// LED Index to Physical Position (assumes a reasonable gap between halves)
// Left half
{ 0, 3 }, { 15, 3 }, { 27, 1 }, { 39, 0 }, { 51, 1 }, { 63, 2 }, { 75, 2 },
{ 0, 13 }, { 15, 13 }, { 27, 11 }, { 39, 10 }, { 51, 11 }, { 63, 12 }, { 78, 17 },
{ 0, 23 }, { 15, 23 }, { 27, 21 }, { 39, 20 }, { 51, 21 }, { 63, 22 },
{ 0, 33 }, { 15, 33 }, { 27, 31 }, { 39, 30 }, { 51, 31 }, { 63, 32 }, { 78, 32 },
{ 4, 43 }, { 15, 43 }, { 27, 41 }, { 39, 40 }, { 51, 41 },
{ 89, 41 }, { 100, 46 },
{ 95, 55 },
{ 72, 54 }, { 83, 59 }, { 90, 64 },
// Right half (mirrored)
{ 224, 3 }, { 209, 3 }, { 197, 1 }, { 185, 0 }, { 173, 1 }, { 161, 2 }, { 149, 2 },
{ 224, 13 }, { 209, 13 }, { 197, 11 }, { 185, 10 }, { 173, 11 }, { 161, 12 }, { 146, 17 },
{ 224, 23 }, { 209, 23 }, { 197, 21 }, { 185, 20 }, { 173, 21 }, { 161, 22 },
{ 224, 33 }, { 209, 33 }, { 197, 31 }, { 185, 30 }, { 173, 31 }, { 161, 32 }, { 146, 32 },
{ 220, 43 }, { 209, 43 }, { 197, 41 }, { 185, 40 }, { 173, 41 },
{ 135, 41 }, { 124, 46 },
{ 129, 55 },
{ 152, 54 }, { 141, 59 }, { 134, 64 },
}, {
// LED Index to Flag
// Left half
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1,
1,
1, 1, 1,
// Right half (mirrored)
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4,
1, 4, 4, 4, 4, 4, 1,
1, 1, 1, 1, 1,
1, 1,
1,
1, 1, 1,
}
};
#endif

#ifdef ST7565_ENABLE
Expand Down
78 changes: 78 additions & 0 deletions keyboards/input_club/ergodox_infinity/keyboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,84 @@
"wave_left_right": true,
"wave_up_down": true
},
"layout": [
{"matrix": [8, 0], "x": 0, "y": 3, "flags": 1},
{"matrix": [7, 0], "x": 15, "y": 3, "flags": 4},
{"matrix": [6, 0], "x": 27, "y": 1, "flags": 4},
{"matrix": [5, 0], "x": 39, "y": 0, "flags": 4},
{"matrix": [4, 0], "x": 51, "y": 1, "flags": 4},
{"matrix": [3, 0], "x": 63, "y": 2, "flags": 4},
{"matrix": [2, 0], "x": 75, "y": 2, "flags": 1},
{"matrix": [8, 1], "x": 0, "y": 13, "flags": 1},
{"matrix": [7, 1], "x": 15, "y": 13, "flags": 4},
{"matrix": [6, 1], "x": 27, "y": 11, "flags": 4},
{"matrix": [5, 1], "x": 39, "y": 10, "flags": 4},
{"matrix": [4, 1], "x": 51, "y": 11, "flags": 4},
{"matrix": [3, 1], "x": 63, "y": 12, "flags": 4},
{"matrix": [2, 1], "x": 78, "y": 17, "flags": 1},
{"matrix": [8, 2], "x": 0, "y": 23, "flags": 1},
{"matrix": [7, 2], "x": 15, "y": 23, "flags": 4},
{"matrix": [6, 2], "x": 27, "y": 21, "flags": 4},
{"matrix": [5, 2], "x": 39, "y": 20, "flags": 4},
{"matrix": [4, 2], "x": 51, "y": 21, "flags": 4},
{"matrix": [3, 2], "x": 63, "y": 22, "flags": 4},
{"matrix": [8, 3], "x": 0, "y": 33, "flags": 1},
{"matrix": [7, 3], "x": 15, "y": 33, "flags": 4},
{"matrix": [6, 3], "x": 27, "y": 31, "flags": 4},
{"matrix": [5, 3], "x": 39, "y": 30, "flags": 4},
{"matrix": [4, 3], "x": 51, "y": 31, "flags": 4},
{"matrix": [3, 3], "x": 63, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 78, "y": 32, "flags": 1},
{"matrix": [8, 4], "x": 4, "y": 43, "flags": 1},
{"matrix": [7, 4], "x": 15, "y": 43, "flags": 1},
{"matrix": [6, 4], "x": 27, "y": 41, "flags": 1},
{"matrix": [5, 4], "x": 39, "y": 40, "flags": 1},
{"matrix": [4, 4], "x": 51, "y": 41, "flags": 1},
{"matrix": [1, 3], "x": 89, "y": 41, "flags": 1},
{"matrix": [0, 3], "x": 100, "y": 46, "flags": 1},
{"matrix": [0, 4], "x": 95, "y": 55, "flags": 1},
{"matrix": [3, 4], "x": 72, "y": 54, "flags": 1},
{"matrix": [2, 4], "x": 83, "y": 59, "flags": 1},
{"matrix": [1, 4], "x": 90, "y": 64, "flags": 1},
{"matrix": [17, 0], "x": 224, "y": 3, "flags": 1},
{"matrix": [16, 0], "x": 209, "y": 3, "flags": 4},
{"matrix": [15, 0], "x": 197, "y": 1, "flags": 4},
{"matrix": [14, 0], "x": 185, "y": 0, "flags": 4},
{"matrix": [13, 0], "x": 173, "y": 1, "flags": 4},
{"matrix": [12, 0], "x": 161, "y": 2, "flags": 4},
{"matrix": [11, 0], "x": 149, "y": 2, "flags": 1},
{"matrix": [17, 1], "x": 224, "y": 13, "flags": 1},
{"matrix": [16, 1], "x": 209, "y": 13, "flags": 4},
{"matrix": [15, 1], "x": 197, "y": 11, "flags": 4},
{"matrix": [14, 1], "x": 185, "y": 10, "flags": 4},
{"matrix": [13, 1], "x": 173, "y": 11, "flags": 4},
{"matrix": [12, 1], "x": 161, "y": 12, "flags": 4},
{"matrix": [11, 1], "x": 146, "y": 17, "flags": 1},
{"matrix": [17, 2], "x": 224, "y": 23, "flags": 1},
{"matrix": [16, 2], "x": 209, "y": 23, "flags": 4},
{"matrix": [15, 2], "x": 197, "y": 21, "flags": 4},
{"matrix": [14, 2], "x": 185, "y": 20, "flags": 4},
{"matrix": [13, 2], "x": 173, "y": 21, "flags": 4},
{"matrix": [12, 2], "x": 161, "y": 22, "flags": 4},
{"matrix": [17, 3], "x": 224, "y": 33, "flags": 1},
{"matrix": [16, 3], "x": 209, "y": 33, "flags": 4},
{"matrix": [15, 3], "x": 197, "y": 31, "flags": 4},
{"matrix": [14, 3], "x": 185, "y": 30, "flags": 4},
{"matrix": [13, 3], "x": 173, "y": 31, "flags": 4},
{"matrix": [12, 3], "x": 161, "y": 32, "flags": 4},
{"matrix": [11, 3], "x": 146, "y": 32, "flags": 1},
{"matrix": [17, 4], "x": 220, "y": 43, "flags": 1},
{"matrix": [16, 4], "x": 209, "y": 43, "flags": 1},
{"matrix": [15, 4], "x": 197, "y": 41, "flags": 1},
{"matrix": [14, 4], "x": 185, "y": 40, "flags": 1},
{"matrix": [13, 4], "x": 173, "y": 41, "flags": 1},
{"matrix": [10, 3], "x": 135, "y": 41, "flags": 1},
{"matrix": [9, 3], "x": 124, "y": 46, "flags": 1},
{"matrix": [9, 4], "x": 129, "y": 55, "flags": 1},
{"matrix": [12, 4], "x": 152, "y": 54, "flags": 1},
{"matrix": [11, 4], "x": 141, "y": 59, "flags": 1},
{"matrix": [10, 4], "x": 134, "y": 64, "flags": 1}
],
"driver": "is31fl3731",
"sleep": true,
"split_count": [38, 38]
Expand Down
Loading

0 comments on commit 7b4e806

Please sign in to comment.