ceres-sees-all/qmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Migrate g_led_config to DD (M2) (#25619)

Browse source
This commit is contained in:
Jack Sangdahl 2025-09-09 03:09:38 -06:00 • committed by GitHub
parent 7186a63172
commit 04978d490a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
28 changed files with 1115 additions and 352 deletions
Download patch file Download diff file Expand all files Collapse all files

103
keyboards/melgeek/mach80/rev1/keyboard.json
View file

@ -13,5 +13,106 @@
"cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
"rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
},
"diode_direction": "ROW2COL"
"diode_direction": "ROW2COL",
"rgb_matrix": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 12, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 24, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 36, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 48, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 60, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 72, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 84, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 96, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 108, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 120, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 132, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 144, "y": 0, "flags": 4},
{"matrix": [0, 14], "x": 156, "y": 0, "flags": 4},
{"matrix": [0, 15], "x": 168, "y": 0, "flags": 4},
{"matrix": [3, 13], "x": 180, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 12, "flags": 4},
{"matrix": [1, 1], "x": 12, "y": 12, "flags": 4},
{"matrix": [1, 2], "x": 24, "y": 12, "flags": 4},
{"matrix": [1, 3], "x": 36, "y": 12, "flags": 4},
{"matrix": [1, 4], "x": 48, "y": 12, "flags": 4},
{"matrix": [1, 5], "x": 60, "y": 12, "flags": 4},
{"matrix": [1, 6], "x": 72, "y": 12, "flags": 4},
{"matrix": [1, 7], "x": 84, "y": 12, "flags": 4},
{"matrix": [1, 8], "x": 96, "y": 12, "flags": 4},
{"matrix": [1, 9], "x": 108, "y": 12, "flags": 4},
{"matrix": [1, 10], "x": 120, "y": 12, "flags": 4},
{"matrix": [1, 11], "x": 132, "y": 12, "flags": 4},
{"matrix": [1, 12], "x": 144, "y": 12, "flags": 4},
{"x": 156, "y": 12, "flags": 4},
{"matrix": [1, 13], "x": 168, "y": 12, "flags": 4},
{"x": 180, "y": 12, "flags": 4},
{"matrix": [1, 14], "x": 192, "y": 12, "flags": 4},
{"matrix": [1, 15], "x": 204, "y": 12, "flags": 4},
{"matrix": [3, 14], "x": 216, "y": 12, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 24, "flags": 4},
{"matrix": [2, 1], "x": 12, "y": 24, "flags": 4},
{"matrix": [2, 2], "x": 24, "y": 24, "flags": 4},
{"matrix": [2, 3], "x": 36, "y": 24, "flags": 4},
{"matrix": [2, 4], "x": 48, "y": 24, "flags": 4},
{"matrix": [2, 5], "x": 60, "y": 24, "flags": 4},
{"matrix": [2, 6], "x": 72, "y": 24, "flags": 4},
{"matrix": [2, 7], "x": 84, "y": 24, "flags": 4},
{"matrix": [2, 8], "x": 96, "y": 24, "flags": 4},
{"matrix": [2, 9], "x": 108, "y": 24, "flags": 4},
{"matrix": [2, 10], "x": 120, "y": 24, "flags": 4},
{"matrix": [2, 11], "x": 132, "y": 24, "flags": 4},
{"matrix": [2, 12], "x": 144, "y": 24, "flags": 4},
{"matrix": [2, 13], "x": 156, "y": 24, "flags": 4},
{"matrix": [2, 14], "x": 168, "y": 24, "flags": 4},
{"matrix": [2, 15], "x": 180, "y": 24, "flags": 4},
{"matrix": [3, 15], "x": 192, "y": 24, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 36, "flags": 4},
{"matrix": [3, 1], "x": 12, "y": 36, "flags": 4},
{"matrix": [3, 2], "x": 24, "y": 36, "flags": 4},
{"matrix": [3, 3], "x": 36, "y": 36, "flags": 4},
{"matrix": [3, 4], "x": 48, "y": 36, "flags": 4},
{"matrix": [3, 5], "x": 60, "y": 36, "flags": 4},
{"matrix": [3, 6], "x": 72, "y": 36, "flags": 4},
{"matrix": [3, 7], "x": 84, "y": 36, "flags": 4},
{"matrix": [3, 8], "x": 96, "y": 36, "flags": 4},
{"matrix": [3, 9], "x": 108, "y": 36, "flags": 4},
{"matrix": [3, 10], "x": 120, "y": 36, "flags": 4},
{"matrix": [3, 11], "x": 132, "y": 36, "flags": 4},
{"x": 144, "y": 36, "flags": 4},
{"matrix": [3, 12], "x": 156, "y": 36, "flags": 4},
{"x": 168, "y": 36, "flags": 4},
{"x": 0, "y": 48, "flags": 4},
{"matrix": [4, 0], "x": 12, "y": 48, "flags": 4},
{"x": 24, "y": 48, "flags": 4},
{"matrix": [4, 1], "x": 36, "y": 48, "flags": 4},
{"matrix": [4, 2], "x": 48, "y": 48, "flags": 4},
{"matrix": [4, 3], "x": 60, "y": 48, "flags": 4},
{"matrix": [4, 4], "x": 72, "y": 48, "flags": 4},
{"matrix": [4, 5], "x": 84, "y": 48, "flags": 4},
{"matrix": [4, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [4, 7], "x": 108, "y": 48, "flags": 4},
{"matrix": [4, 8], "x": 120, "y": 48, "flags": 4},
{"matrix": [4, 9], "x": 132, "y": 48, "flags": 4},
{"matrix": [4, 10], "x": 144, "y": 48, "flags": 4},
{"x": 156, "y": 48, "flags": 4},
{"matrix": [4, 11], "x": 168, "y": 48, "flags": 4},
{"x": 180, "y": 48, "flags": 4},
{"matrix": [4, 14], "x": 192, "y": 48, "flags": 4},
{"matrix": [5, 0], "x": 0, "y": 60, "flags": 4},
{"matrix": [5, 1], "x": 12, "y": 60, "flags": 4},
{"matrix": [5, 2], "x": 24, "y": 60, "flags": 4},
{"x": 36, "y": 60, "flags": 4},
{"matrix": [5, 5], "x": 48, "y": 60, "flags": 4},
{"x": 60, "y": 60, "flags": 4},
{"matrix": [5, 9], "x": 72, "y": 60, "flags": 4},
{"matrix": [5, 10], "x": 84, "y": 60, "flags": 4},
{"matrix": [5, 11], "x": 96, "y": 60, "flags": 4},
{"matrix": [5, 12], "x": 108, "y": 60, "flags": 4},
{"matrix": [5, 13], "x": 120, "y": 60, "flags": 4},
{"matrix": [5, 14], "x": 132, "y": 60, "flags": 4},
{"matrix": [5, 15], "x": 144, "y": 60, "flags": 4}
],
}
}

25
keyboards/melgeek/mach80/rev1/rev1.c
View file

@ -118,31 +118,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB111 */
{0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB112 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */
{ 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, 32, 33 }, /* R1 */
{ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50 }, /* R2 */
{ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 65, 15, 34, 51 }, /* R3 */
{ 68, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, NO_LED, NO_LED, 83, NO_LED }, /* R4 */
{ 84, 85, 86, NO_LED, NO_LED, 88, NO_LED, NO_LED, NO_LED, 90, 91, 92, 93, 94, 95, 96 } /* R5 */
}, {
{0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, {180, 0}, //16
{0, 12}, {12, 12}, {24, 12}, {36, 12}, {48, 12}, {60, 12}, {72, 12}, {84, 12}, {96, 12}, {108, 12}, {120, 12}, {132, 12}, {144, 12}, {156, 12}, {168, 12}, {180, 12}, {192, 12}, {204, 12}, {216, 12}, //19
{0, 24}, {12, 24}, {24, 24}, {36, 24}, {48, 24}, {60, 24}, {72, 24}, {84, 24}, {96, 24}, {108, 24}, {120, 24}, {132, 24}, {144, 24}, {156, 24}, {168, 24}, {180, 24}, {192, 24}, //17
{0, 36}, {12, 36}, {24, 36}, {36, 36}, {48, 36}, {60, 36}, {72, 36}, {84, 36}, {96, 36}, {108, 36}, {120, 36}, {132, 36}, {144, 36}, {156, 36}, {168, 36}, //15
{0, 48}, {12, 48}, {24, 48}, {36, 48}, {48, 48}, {60, 48}, {72, 48}, {84, 48}, {96, 48}, {108, 48}, {120, 48}, {132, 48}, {144, 48}, {156, 48}, {168, 48}, {180, 48}, {192, 48}, //17
{0, 60}, {12, 60}, {24, 60}, {36, 60}, {48, 60}, {60, 60}, {72, 60}, {84, 60}, {96, 60}, {108, 60}, {120, 60}, {132, 60}, {144, 60} //13
}, {
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, 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,
}
};
const is31fl3741_led_t g_is31_indicator_leds[3] = {
{0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */

100
keyboards/melgeek/mach80/rev2/keyboard.json
View file

@ -13,5 +13,103 @@
"cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"],
"rows": ["F0", "F1", "F4", "F5", "F6", "E6"]
},
"diode_direction": "ROW2COL"
"diode_direction": "ROW2COL",
"rgb_matrix": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 12, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 24, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 36, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 48, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 60, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 72, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 84, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 96, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 108, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 120, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 132, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 144, "y": 0, "flags": 4},
{"matrix": [0, 14], "x": 156, "y": 0, "flags": 4},
{"matrix": [0, 15], "x": 168, "y": 0, "flags": 4},
{"matrix": [3, 13], "x": 180, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 12, "flags": 4},
{"matrix": [1, 1], "x": 12, "y": 12, "flags": 4},
{"matrix": [1, 2], "x": 24, "y": 12, "flags": 4},
{"matrix": [1, 3], "x": 36, "y": 12, "flags": 4},
{"matrix": [1, 4], "x": 48, "y": 12, "flags": 4},
{"matrix": [1, 5], "x": 60, "y": 12, "flags": 4},
{"matrix": [1, 6], "x": 72, "y": 12, "flags": 4},
{"matrix": [1, 7], "x": 84, "y": 12, "flags": 4},
{"matrix": [1, 8], "x": 96, "y": 12, "flags": 4},
{"matrix": [1, 9], "x": 108, "y": 12, "flags": 4},
{"matrix": [1, 10], "x": 120, "y": 12, "flags": 4},
{"matrix": [1, 11], "x": 132, "y": 12, "flags": 4},
{"matrix": [1, 12], "x": 144, "y": 12, "flags": 4},
{"x": 156, "y": 12, "flags": 4},
{"matrix": [1, 13], "x": 168, "y": 12, "flags": 4},
{"x": 180, "y": 12, "flags": 4},
{"matrix": [1, 14], "x": 192, "y": 12, "flags": 4},
{"matrix": [1, 15], "x": 204, "y": 12, "flags": 4},
{"matrix": [3, 14], "x": 216, "y": 12, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 24, "flags": 4},
{"matrix": [2, 1], "x": 12, "y": 24, "flags": 4},
{"matrix": [2, 2], "x": 24, "y": 24, "flags": 4},
{"matrix": [2, 3], "x": 36, "y": 24, "flags": 4},
{"matrix": [2, 4], "x": 48, "y": 24, "flags": 4},
{"matrix": [2, 5], "x": 60, "y": 24, "flags": 4},
{"matrix": [2, 6], "x": 72, "y": 24, "flags": 4},
{"matrix": [2, 7], "x": 84, "y": 24, "flags": 4},
{"matrix": [2, 8], "x": 96, "y": 24, "flags": 4},
{"matrix": [2, 9], "x": 108, "y": 24, "flags": 4},
{"matrix": [2, 10], "x": 120, "y": 24, "flags": 4},
{"matrix": [2, 11], "x": 132, "y": 24, "flags": 4},
{"matrix": [2, 12], "x": 144, "y": 24, "flags": 4},
{"matrix": [2, 13], "x": 156, "y": 24, "flags": 4},
{"matrix": [2, 14], "x": 168, "y": 24, "flags": 4},
{"matrix": [2, 15], "x": 180, "y": 24, "flags": 4},
{"matrix": [3, 15], "x": 192, "y": 24, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 36, "flags": 4},
{"matrix": [3, 1], "x": 12, "y": 36, "flags": 4},
{"matrix": [3, 2], "x": 24, "y": 36, "flags": 4},
{"matrix": [3, 3], "x": 36, "y": 36, "flags": 4},
{"matrix": [3, 4], "x": 48, "y": 36, "flags": 4},
{"matrix": [3, 5], "x": 60, "y": 36, "flags": 4},
{"matrix": [3, 6], "x": 72, "y": 36, "flags": 4},
{"matrix": [3, 7], "x": 84, "y": 36, "flags": 4},
{"matrix": [3, 8], "x": 96, "y": 36, "flags": 4},
{"matrix": [3, 9], "x": 108, "y": 36, "flags": 4},
{"matrix": [3, 10], "x": 120, "y": 36, "flags": 4},
{"matrix": [3, 11], "x": 132, "y": 36, "flags": 4},
{"x": 144, "y": 36, "flags": 4},
{"matrix": [3, 12], "x": 156, "y": 36, "flags": 4},
{"x": 168, "y": 36, "flags": 4},
{"x": 0, "y": 48, "flags": 4},
{"matrix": [4, 0], "x": 12, "y": 48, "flags": 4},
{"x": 24, "y": 48, "flags": 4},
{"matrix": [4, 1], "x": 36, "y": 48, "flags": 4},
{"matrix": [4, 2], "x": 48, "y": 48, "flags": 4},
{"matrix": [4, 3], "x": 60, "y": 48, "flags": 4},
{"matrix": [4, 4], "x": 72, "y": 48, "flags": 4},
{"matrix": [4, 5], "x": 84, "y": 48, "flags": 4},
{"matrix": [4, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [4, 7], "x": 108, "y": 48, "flags": 4},
{"matrix": [4, 8], "x": 120, "y": 48, "flags": 4},
{"matrix": [4, 9], "x": 132, "y": 48, "flags": 4},
{"matrix": [4, 10], "x": 144, "y": 48, "flags": 4},
{"x": 156, "y": 48, "flags": 4},
{"matrix": [4, 11], "x": 168, "y": 48, "flags": 4},
{"x": 180, "y": 48, "flags": 4},
{"matrix": [4, 14], "x": 192, "y": 48, "flags": 4},
{"matrix": [5, 0], "x": 0, "y": 60, "flags": 4},
{"matrix": [5, 2], "x": 12, "y": 60, "flags": 4},
{"x": 24, "y": 60, "flags": 4},
{"matrix": [5, 5], "x": 36, "y": 60, "flags": 4},
{"x": 48, "y": 60, "flags": 4},
{"matrix": [5, 9], "x": 60, "y": 60, "flags": 4},
{"matrix": [5, 12], "x": 72, "y": 60, "flags": 4},
{"matrix": [5, 13], "x": 84, "y": 60, "flags": 4},
{"matrix": [5, 14], "x": 96, "y": 60, "flags": 4},
{"matrix": [5, 15], "x": 108, "y": 60, "flags": 4}
],
}
}

26
keyboards/melgeek/mach80/rev2/rev2.c
View file

@ -115,32 +115,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
{0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */
{ 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, 32, 33 }, /* R1 */
{ 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50 }, /* R2 */
{ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 65, 15, 34, 51 }, /* R3 */
{ 68, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, NO_LED, NO_LED, 83, NO_LED }, /* R4 */
{ 84, NO_LED, 85, NO_LED, NO_LED, 87, NO_LED, NO_LED, NO_LED, 89, NO_LED, NO_LED, 90, 91, 92, 93 } /* R5 */
}, {
{0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, {180, 0}, //16
{0, 12}, {12, 12}, {24, 12}, {36, 12}, {48, 12}, {60, 12}, {72, 12}, {84, 12}, {96, 12}, {108, 12}, {120, 12}, {132, 12}, {144, 12}, {156, 12}, {168, 12}, {180, 12}, {192, 12}, {204, 12}, {216, 12}, //19
{0, 24}, {12, 24}, {24, 24}, {36, 24}, {48, 24}, {60, 24}, {72, 24}, {84, 24}, {96, 24}, {108, 24}, {120, 24}, {132, 24}, {144, 24}, {156, 24}, {168, 24}, {180, 24}, {192, 24}, //17
{0, 36}, {12, 36}, {24, 36}, {36, 36}, {48, 36}, {60, 36}, {72, 36}, {84, 36}, {96, 36}, {108, 36}, {120, 36}, {132, 36}, {144, 36}, {156, 36}, {168, 36}, //15
{0, 48}, {12, 48}, {24, 48}, {36, 48}, {48, 48}, {60, 48}, {72, 48}, {84, 48}, {96, 48}, {108, 48}, {120, 48}, {132, 48}, {144, 48}, {156, 48}, {168, 48}, {180, 48}, {192, 48}, //17
{0, 60}, {12, 60}, {24, 60}, {36, 60}, {48, 60}, {60, 60}, {72, 60}, {84, 60}, {96, 60}, {108, 60}
//10
}, {
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, 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,
}
};
const is31fl3741_led_t g_is31_indicator_leds[3] = {
{0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */

69
keyboards/melgeek/mj61/rev1/keyboard.json
View file

@ -10,5 +10,72 @@
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
},
"diode_direction": "COL2ROW"
"diode_direction": "COL2ROW",
"rgb_matrix": {
"layout": [
{"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": [1, 13], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 208, "y": 16, "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, 12], "x": 192, "y": 32, "flags": 4},
{"matrix": [3, 12], "x": 0, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 176, "y": 48, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 3], "x": 32, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 64, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 80, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 4], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 6], "x": 144, "y": 64, "flags": 4}
],
}
}

24
keyboards/melgeek/mj61/rev1/rev1.c
View file

@ -82,28 +82,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
{0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */
{ 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */
{ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED,}, /* R2 */
{ 52, NO_LED, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED }, /* R3 */
{ 53, 54, NO_LED, 55, 61, 56, 62, NO_LED, NO_LED, 57, 58, 59, 60, NO_LED }, /* R4 */
}, {
{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},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 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,
}
};
#endif

77
keyboards/melgeek/mj61/rev2/keyboard.json
View file

@ -10,5 +10,80 @@
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
},
"diode_direction": "COL2ROW"
"diode_direction": "COL2ROW",
"rgb_matrix": {
"layout": [
{"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},
{"x": 208, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 224, "y": 0, "flags": 4},
{"x": 240, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 208, "y": 16, "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},
{"x": 192, "y": 32, "flags": 4},
{"matrix": [2, 12], "x": 208, "y": 32, "flags": 4},
{"x": 224, "y": 32, "flags": 4},
{"x": 0, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 16, "y": 48, "flags": 4},
{"x": 32, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 192, "y": 48, "flags": 4},
{"x": 208, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 224, "y": 48, "flags": 4},
{"x": 240, "y": 48, "flags": 4},
{"matrix": [4, 0], "x": 0, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 3], "x": 32, "y": 64, "flags": 4},
{"x": 48, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 64, "y": 64, "flags": 4},
{"x": 80, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 13], "x": 144, "y": 64, "flags": 4}
]
}
}

24
keyboards/melgeek/mj61/rev2/rev2.c
View file

@ -92,28 +92,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
{0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */
{ 46, NO_LED, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, NO_LED }, /* R3 */
{ 61, 62, NO_LED, 63, NO_LED, 65, NO_LED, NO_LED, NO_LED, 67, 68, 69, NO_LED, 70 }, /* R4 */
}, {
{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}, {240, 0},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48}, {240, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 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, 4, 4,
}
};
#endif

71
keyboards/melgeek/mj63/rev1/keyboard.json
View file

@ -10,5 +10,74 @@
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
},
"diode_direction": "COL2ROW"
"diode_direction": "COL2ROW",
"rgb_matrix": {
"layout": [
{"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": [1, 13], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 208, "y": 16, "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, 12], "x": 192, "y": 32, "flags": 4},
{"matrix": [3, 13], "x": 0, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 192, "y": 48, "flags": 4},
{"matrix": [4, 13], "x": 0, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 32, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 64, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 80, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 6], "x": 144, "y": 64, "flags": 4},
{"matrix": [4, 4], "x": 160, "y": 64, "flags": 4}
]
}
}

24
keyboards/melgeek/mj63/rev1/rev1.c
View file

@ -86,28 +86,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
{0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */
{ 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */
{ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED }, /* R2 */
{ 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, NO_LED, 43, 42, 41 }, /* R3 */
{ 61, 60, 59, NO_LED, 64, 62, 63, NO_LED, NO_LED, 58, 57, 56, 55, 54 }, /* R4 */
}, {
{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},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 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,
}
};
#endif

77
keyboards/melgeek/mj63/rev2/keyboard.json
View file

@ -10,5 +10,80 @@
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
},
"diode_direction": "COL2ROW"
"diode_direction": "COL2ROW",
"rgb_matrix": {
"layout": [
{"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},
{"x": 208, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 224, "y": 0, "flags": 4},
{"x": 240, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 208, "y": 16, "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},
{"x": 192, "y": 32, "flags": 4},
{"matrix": [2, 12], "x": 208, "y": 32, "flags": 4},
{"x": 224, "y": 32, "flags": 4},
{"x": 0, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 16, "y": 48, "flags": 4},
{"x": 32, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 208, "y": 48, "flags": 4},
{"matrix": [3, 13], "x": 224, "y": 48, "flags": 4},
{"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": 64, "y": 64, "flags": 4},
{"x": 80, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 144, "y": 64, "flags": 4},
{"matrix": [4, 13], "x": 160, "y": 64, "flags": 4}
],
}
}

24
keyboards/melgeek/mj63/rev2/rev2.c
View file

@ -92,28 +92,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
{0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */
{ 46, 48, 49, 50, 51, 52, 53, 54, 55, 56, NO_LED, 57, 58, 59 }, /* R3 */
{ 60, 61, 62, NO_LED, NO_LED, 64, NO_LED, NO_LED, NO_LED, 66, 67, 68, 69, 70 }, /* R4 */
}, {
{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}, {240, 0},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 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, 4, 4,
}
};
#endif

70
keyboards/melgeek/mj64/rev1/keyboard.json
View file

@ -10,5 +10,73 @@
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
},
"diode_direction": "COL2ROW"
"diode_direction": "COL2ROW",
"rgb_matrix": {
"layout": [
{"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": [1, 13], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 208, "y": 16, "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, 12], "x": 192, "y": 32, "flags": 4},
{"matrix": [3, 13], "x": 0, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 208, "y": 48, "flags": 4},
{"matrix": [4, 13], "x": 0, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 32, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 64, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 144, "y": 64, "flags": 4}
]
}
}

23
keyboards/melgeek/mj64/rev1/rev1.c
View file

@ -84,27 +84,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
{0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
};
led_config_t g_led_config = {
{
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 },
{ 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 },
{ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED },
{ 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41 },
{ 62, 61, 60, NO_LED, NO_LED, 63, NO_LED, NO_LED, NO_LED, 59, 58, 57, 56, 55 }
}, {
{ 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 },
{ 0, 16 }, { 16, 16 }, { 32, 16 }, { 48, 16 }, { 64, 16 }, { 80, 16 }, { 96, 16 }, { 112, 16 }, { 128, 16 }, { 144, 16 }, { 160, 16 }, { 176, 16 }, { 192, 16 }, { 208, 16 },
{ 0, 32 }, { 16, 32 }, { 32, 32 }, { 48, 32 }, { 64, 32 }, { 80, 32 }, { 96, 32 }, { 112, 32 }, { 128, 32 }, { 144, 32 }, { 160, 32 }, { 176, 32 }, { 192, 32 },
{ 0, 48 }, { 16, 48 }, { 32, 48 }, { 48, 48 }, { 64, 48 }, { 80, 48 }, { 96, 48 }, { 112, 48 }, { 128, 48 }, { 144, 48 }, { 160, 48 }, { 176, 48 }, { 192, 48 }, { 208, 48 },
{ 0, 64 }, { 16, 64 }, { 32, 64 }, { 48, 64 }, { 64, 64 }, { 96, 64 }, { 112, 64 }, { 128, 64 }, { 144, 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
}
};
#endif

72
keyboards/melgeek/mj64/rev2/keyboard.json
View file

@ -10,5 +10,75 @@
"cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
},
"diode_direction": "COL2ROW"
"diode_direction": "COL2ROW",
"rgb_matrix": {
"layout": [
{"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": [1, 13], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 208, "y": 16, "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, 12], "x": 192, "y": 32, "flags": 4},
{"matrix": [3, 13], "x": 0, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 208, "y": 48, "flags": 4},
{"matrix": [4, 13], "x": 0, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 32, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 64, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 80, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 4], "x": 144, "y": 64, "flags": 4},
{"matrix": [4, 6], "x": 160, "y": 64, "flags": 4}
]
}
}

24
keyboards/melgeek/mj64/rev2/rev2.c
View file

@ -86,28 +86,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
{0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */
{ 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */
{ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED }, /* R2 */
{ 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41 }, /* R3 */
{ 62, 61, 60, NO_LED, 64, 63, 65, NO_LED, NO_LED, 59, 58, 57, 56, 55 }, /* R4 */
}, {
{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},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 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,
}
};
#endif

78
keyboards/melgeek/mj64/rev3/keyboard.json
View file

@ -10,5 +10,81 @@
"cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"],
"rows": ["B12", "B11", "B10", "B1", "A3"]
},
"diode_direction": "COL2ROW"
"diode_direction": "COL2ROW",
"rgb_matrix": {
"layout": [
{"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},
{"x": 208, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 224, "y": 0, "flags": 4},
{"x": 240, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 208, "y": 16, "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},
{"x": 192, "y": 32, "flags": 4},
{"matrix": [2, 12], "x": 208, "y": 32, "flags": 4},
{"x": 224, "y": 32, "flags": 4},
{"x": 0, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 16, "y": 48, "flags": 4},
{"x": 32, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 208, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 224, "y": 48, "flags": 4},
{"matrix": [3, 13], "x": 240, "y": 48, "flags": 4},
{"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": 64, "y": 64, "flags": 4},
{"x": 80, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 144, "y": 64, "flags": 4},
{"matrix": [4, 13], "x": 160, "y": 64, "flags": 4}
]
}
}

24
keyboards/melgeek/mj64/rev3/rev3.c
View file

@ -92,28 +92,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
{0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */
{ 46, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60 }, /* R3 */
{ 61, 62, 63, NO_LED, NO_LED, 65, NO_LED, NO_LED, NO_LED, 67, 68, 69, 70, 71 }, /* R4 */
}, {
{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}, {240, 0},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48}, {240, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 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, 4, 4, 4,
}
};
#endif

78
keyboards/melgeek/mj65/rev3/keyboard.json
View file

@ -61,6 +61,84 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
"layout": [
{"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},
{"x": 208, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 224, "y": 0, "flags": 4},
{"x": 240, "y": 0, "flags": 4},
{"matrix": [0, 14], "x": 255, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 208, "y": 16, "flags": 4},
{"matrix": [1, 14], "x": 224, "y": 16, "flags": 4},
{"matrix": [2, 0], "x": 240, "y": 16, "flags": 4},
{"matrix": [2, 1], "x": 255, "y": 16, "flags": 4},
{"matrix": [2, 2], "x": 0, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 16, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 32, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 48, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 64, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 80, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 96, "y": 32, "flags": 4},
{"matrix": [2, 9], "x": 112, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 128, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 144, "y": 32, "flags": 4},
{"x": 160, "y": 32, "flags": 4},
{"matrix": [2, 12], "x": 176, "y": 32, "flags": 4},
{"x": 192, "y": 32, "flags": 4},
{"matrix": [2, 14], "x": 208, "y": 32, "flags": 4},
{"x": 0, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 16, "y": 48, "flags": 4},
{"x": 32, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 208, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 0, "y": 64, "flags": 4},
{"matrix": [3, 14], "x": 16, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 32, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 64, "y": 64, "flags": 4},
{"x": 80, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 96, "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, 11], "x": 176, "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}
],
"led_flush_limit": 26,
"led_process_limit": 4,
"sleep": true

24
keyboards/melgeek/mj65/rev3/rev3.c
View file

@ -96,28 +96,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB75 */
{0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB76 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16 }, /* R0 */
{ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 }, /* R1 */
{ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, NO_LED, 47 }, /* R2 */
{ 49, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, NO_LED, 63 }, /* R3 */
{ 64, 65, 66, NO_LED, NO_LED, 68, NO_LED, NO_LED, NO_LED, 70, 71, 72, 73, 74, 75 }, /* R4 */
}, {
{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}, {240, 0}, {255, 0},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, {224, 16}, {240, 16}, {255, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {144, 64}, {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 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, 4, 4, 4, 4, 4, 4, 4,
}
};
#endif

70
keyboards/melgeek/mojo68/rev1/keyboard.json
View file

@ -56,6 +56,76 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
"layout": [
{"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},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 208, "y": 16, "flags": 4},
{"matrix": [1, 14], "x": 224, "y": 16, "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, 12], "x": 192, "y": 32, "flags": 4},
{"matrix": [2, 14], "x": 208, "y": 32, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 192, "y": 48, "flags": 4},
{"matrix": [3, 14], "x": 208, "y": 48, "flags": 4},
{"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, 5], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 64, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 80, "y": 64, "flags": 4},
{"matrix": [4, 11], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 13], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 14], "x": 144, "y": 64, "flags": 4}
],
"led_flush_limit": 26,
"led_process_limit": 4,
"sleep": true

23
keyboards/melgeek/mojo68/rev1/rev1.c
View file

@ -89,29 +89,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14*/
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43 }, /* R2 */
{ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, NO_LED, 57 }, /* R3 */
{ 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 }, /* R4 */
}, {
{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},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, {224, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 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,
}
};
const is31fl3741_led_t g_is31_indicator_leds[3] = {
{0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB124 */
{0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB125 */

94
keyboards/melgeek/mojo75/rev1/keyboard.json
View file

@ -61,6 +61,100 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
"layout": [
{"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},
{"matrix": [0, 15], "x": 240, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 192, "y": 16, "flags": 4},
{"x": 208, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 224, "y": 16, "flags": 4},
{"x": 240, "y": 16, "flags": 4},
{"matrix": [1, 15], "x": 255, "y": 16, "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, 12], "x": 192, "y": 32, "flags": 4},
{"matrix": [2, 13], "x": 208, "y": 32, "flags": 4},
{"matrix": [2, 15], "x": 224, "y": 32, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 16, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 11], "x": 176, "y": 48, "flags": 4},
{"x": 192, "y": 48, "flags": 4},
{"matrix": [3, 13], "x": 208, "y": 48, "flags": 4},
{"x": 224, "y": 48, "flags": 4},
{"matrix": [3, 15], "x": 240, "y": 48, "flags": 4},
{"x": 0, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 16, "y": 64, "flags": 4},
{"x": 32, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 48, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 64, "y": 64, "flags": 4},
{"matrix": [4, 3], "x": 80, "y": 64, "flags": 4},
{"matrix": [4, 4], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 5], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 6], "x": 128, "y": 64, "flags": 4},
{"matrix": [4, 7], "x": 144, "y": 64, "flags": 4},
{"matrix": [4, 8], "x": 160, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 176, "y": 64, "flags": 4},
{"matrix": [4, 10], "x": 192, "y": 64, "flags": 4},
{"matrix": [4, 12], "x": 208, "y": 64, "flags": 4},
{"matrix": [4, 14], "x": 224, "y": 64, "flags": 4},
{"matrix": [4, 15], "x": 240, "y": 64, "flags": 4},
{"matrix": [5, 0], "x": 0, "y": 80, "flags": 4},
{"matrix": [5, 1], "x": 16, "y": 80, "flags": 4},
{"matrix": [5, 2], "x": 32, "y": 80, "flags": 4},
{"x": 48, "y": 80, "flags": 4},
{"matrix": [5, 5], "x": 64, "y": 80, "flags": 4},
{"x": 80, "y": 80, "flags": 4},
{"matrix": [5, 9], "x": 96, "y": 80, "flags": 4},
{"matrix": [5, 10], "x": 112, "y": 80, "flags": 4},
{"matrix": [5, 12], "x": 128, "y": 80, "flags": 4},
{"matrix": [5, 13], "x": 144, "y": 80, "flags": 4},
{"matrix": [5, 14], "x": 160, "y": 80, "flags": 4},
{"matrix": [5, 15], "x": 176, "y": 80, "flags": 4}
],
"led_flush_limit": 26,
"led_process_limit": 4,
"sleep": true

27
keyboards/melgeek/mojo75/rev1/rev1.c
View file

@ -112,31 +112,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB92 */
{0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB90 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, /* R0 */
{ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, NO_LED, 32 }, /* R1 */
{ 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, NO_LED, 47 }, /* R2 */
{ 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, NO_LED, 61, NO_LED, 63 }, /* R3 */
{ 65, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, NO_LED, 77, NO_LED, 78, 79 }, /* R4 */
{ 80, 81, 82, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 86, 87, NO_LED, 88, 89, 90, 91 }, /* R5 */
}, {
{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}, {240, 0},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16}, {224, 16}, {240, 16}, {255, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32}, {208, 32}, {224, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, {192, 48}, {208, 48}, {224, 48}, {240, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, {176, 64}, {192, 64}, {208, 64}, {224, 64}, {240, 64},
{0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, {128, 80}, {144, 80}, {160, 80}, {176, 80},
}, {
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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
}
};
#endif

93
keyboards/melgeek/tegic/rev1/keyboard.json
View file

@ -67,6 +67,99 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 12, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 24, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 36, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 48, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 60, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 72, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 84, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 96, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 108, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 120, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 132, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 144, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 156, "y": 0, "flags": 4},
{"matrix": [0, 14], "x": 168, "y": 0, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 12, "flags": 4},
{"matrix": [1, 1], "x": 12, "y": 12, "flags": 4},
{"matrix": [1, 2], "x": 24, "y": 12, "flags": 4},
{"matrix": [1, 3], "x": 36, "y": 12, "flags": 4},
{"matrix": [1, 4], "x": 48, "y": 12, "flags": 4},
{"matrix": [1, 5], "x": 60, "y": 12, "flags": 4},
{"matrix": [1, 6], "x": 72, "y": 12, "flags": 4},
{"matrix": [1, 7], "x": 84, "y": 12, "flags": 4},
{"matrix": [1, 8], "x": 96, "y": 12, "flags": 4},
{"matrix": [1, 9], "x": 108, "y": 12, "flags": 4},
{"matrix": [1, 10], "x": 120, "y": 12, "flags": 4},
{"matrix": [1, 11], "x": 132, "y": 12, "flags": 4},
{"matrix": [1, 12], "x": 144, "y": 12, "flags": 4},
{"x": 156, "y": 12, "flags": 4},
{"matrix": [1, 13], "x": 168, "y": 12, "flags": 4},
{"x": 180, "y": 12, "flags": 4},
{"matrix": [1, 14], "x": 192, "y": 12, "flags": 4},
{"matrix": [2, 0], "x": 0, "y": 24, "flags": 4},
{"matrix": [2, 1], "x": 12, "y": 24, "flags": 4},
{"matrix": [2, 2], "x": 24, "y": 24, "flags": 4},
{"matrix": [2, 3], "x": 36, "y": 24, "flags": 4},
{"matrix": [2, 4], "x": 48, "y": 24, "flags": 4},
{"matrix": [2, 5], "x": 60, "y": 24, "flags": 4},
{"matrix": [2, 6], "x": 72, "y": 24, "flags": 4},
{"matrix": [2, 7], "x": 84, "y": 24, "flags": 4},
{"matrix": [2, 8], "x": 96, "y": 24, "flags": 4},
{"matrix": [2, 9], "x": 108, "y": 24, "flags": 4},
{"matrix": [2, 10], "x": 120, "y": 24, "flags": 4},
{"matrix": [2, 11], "x": 132, "y": 24, "flags": 4},
{"matrix": [2, 12], "x": 144, "y": 24, "flags": 4},
{"matrix": [2, 13], "x": 156, "y": 24, "flags": 4},
{"matrix": [2, 14], "x": 168, "y": 24, "flags": 4},
{"matrix": [3, 0], "x": 0, "y": 36, "flags": 4},
{"matrix": [3, 1], "x": 12, "y": 36, "flags": 4},
{"matrix": [3, 2], "x": 24, "y": 36, "flags": 4},
{"matrix": [3, 3], "x": 36, "y": 36, "flags": 4},
{"matrix": [3, 4], "x": 48, "y": 36, "flags": 4},
{"matrix": [3, 5], "x": 60, "y": 36, "flags": 4},
{"matrix": [3, 6], "x": 72, "y": 36, "flags": 4},
{"matrix": [3, 7], "x": 84, "y": 36, "flags": 4},
{"matrix": [3, 8], "x": 96, "y": 36, "flags": 4},
{"matrix": [3, 9], "x": 108, "y": 36, "flags": 4},
{"matrix": [3, 10], "x": 120, "y": 36, "flags": 4},
{"matrix": [3, 11], "x": 132, "y": 36, "flags": 4},
{"x": 144, "y": 36, "flags": 4},
{"matrix": [3, 12], "x": 156, "y": 36, "flags": 4},
{"x": 168, "y": 36, "flags": 4},
{"x": 0, "y": 48, "flags": 4},
{"matrix": [4, 0], "x": 12, "y": 48, "flags": 4},
{"x": 24, "y": 48, "flags": 4},
{"matrix": [4, 1], "x": 36, "y": 48, "flags": 4},
{"matrix": [4, 2], "x": 48, "y": 48, "flags": 4},
{"matrix": [4, 3], "x": 60, "y": 48, "flags": 4},
{"matrix": [4, 4], "x": 72, "y": 48, "flags": 4},
{"matrix": [4, 5], "x": 84, "y": 48, "flags": 4},
{"matrix": [4, 6], "x": 96, "y": 48, "flags": 4},
{"matrix": [4, 7], "x": 108, "y": 48, "flags": 4},
{"matrix": [4, 8], "x": 120, "y": 48, "flags": 4},
{"matrix": [4, 9], "x": 132, "y": 48, "flags": 4},
{"matrix": [4, 10], "x": 144, "y": 48, "flags": 4},
{"x": 156, "y": 48, "flags": 4},
{"matrix": [4, 11], "x": 168, "y": 48, "flags": 4},
{"x": 180, "y": 48, "flags": 4},
{"matrix": [4, 13], "x": 192, "y": 48, "flags": 4},
{"matrix": [5, 0], "x": 0, "y": 60, "flags": 4},
{"matrix": [5, 1], "x": 12, "y": 60, "flags": 4},
{"matrix": [5, 2], "x": 24, "y": 60, "flags": 4},
{"x": 36, "y": 60, "flags": 4},
{"matrix": [5, 5], "x": 48, "y": 60, "flags": 4},
{"x": 60, "y": 60, "flags": 4},
{"matrix": [5, 9], "x": 72, "y": 60, "flags": 4},
{"matrix": [5, 10], "x": 84, "y": 60, "flags": 4},
{"matrix": [5, 11], "x": 96, "y": 60, "flags": 4},
{"matrix": [5, 12], "x": 108, "y": 60, "flags": 4},
{"matrix": [5, 13], "x": 120, "y": 60, "flags": 4},
{"matrix": [5, 14], "x": 132, "y": 60, "flags": 4}
],
"led_flush_limit": 26,
"led_process_limit": 4,
"sleep": true

25
keyboards/melgeek/tegic/rev1/rev1.c
View file

@ -117,29 +117,4 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB143 */
{0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB149 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 31 }, /* R1 */
{ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46 }, /* R2 */
{ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 60, NO_LED, NO_LED }, /* R3 */
{ 63, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 76, NO_LED, 78, NO_LED }, /* R4 */
{ 79, 80, 81, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, 85, 86, 87, 88, 89, 90 }, /* R5 */
}, {
{0, 0}, {12, 0}, {24, 0}, {36, 0}, {48, 0}, {60, 0}, {72, 0}, {84, 0}, {96, 0}, {108, 0}, {120, 0}, {132, 0}, {144, 0}, {156, 0}, {168, 0}, //15
{0, 12}, {12, 12}, {24, 12}, {36, 12}, {48, 12}, {60, 12}, {72, 12}, {84, 12}, {96, 12}, {108, 12}, {120, 12}, {132, 12}, {144, 12}, {156, 12}, {168, 12}, {180, 12}, {192, 12}, //17
{0, 24}, {12, 24}, {24, 24}, {36, 24}, {48, 24}, {60, 24}, {72, 24}, {84, 24}, {96, 24}, {108, 24}, {120, 24}, {132, 24}, {144, 24}, {156, 24}, {168, 24}, //15
{0, 36}, {12, 36}, {24, 36}, {36, 36}, {48, 36}, {60, 36}, {72, 36}, {84, 36}, {96, 36}, {108, 36}, {120, 36}, {132, 36}, {144, 36}, {156, 36}, {168, 36}, //15
{0, 48}, {12, 48}, {24, 48}, {36, 48}, {48, 48}, {60, 48}, {72, 48}, {84, 48}, {96, 48}, {108, 48}, {120, 48}, {132, 48}, {144, 48}, {156, 48}, {168, 48}, {180, 48}, {192, 48}, //17
{0, 60}, {12, 60}, {24, 60}, {36, 60}, {48, 60}, {60, 60}, {72, 60}, {84, 60}, {96, 60}, {108, 60}, {120, 60}, {132, 60}, //12
}, {
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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
}
};
#endif

71
keyboards/melgeek/z70ultra/rev1/keyboard.json
View file

@ -61,6 +61,77 @@
"animation": "cycle_all"
},
"driver": "is31fl3741",
"layout": [
{"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": [5, 6], "x": 0, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 16, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 32, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 48, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 64, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 80, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 96, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 128, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 144, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 160, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 176, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 192, "y": 16, "flags": 4},
{"matrix": [1, 12], "x": 208, "y": 16, "flags": 4},
{"matrix": [1, 13], "x": 0, "y": 32, "flags": 4},
{"matrix": [5, 7], "x": 16, "y": 32, "flags": 4},
{"matrix": [2, 0], "x": 32, "y": 32, "flags": 4},
{"matrix": [2, 1], "x": 48, "y": 32, "flags": 4},
{"matrix": [2, 2], "x": 64, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 80, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 96, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 112, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 128, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 144, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 160, "y": 32, "flags": 4},
{"matrix": [2, 9], "x": 176, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 192, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 0, "y": 48, "flags": 4},
{"matrix": [2, 13], "x": 16, "y": 48, "flags": 4},
{"matrix": [5, 9], "x": 32, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 48, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 64, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 80, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 96, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 112, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 128, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 144, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 160, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 176, "y": 48, "flags": 4},
{"matrix": [3, 10], "x": 0, "y": 64, "flags": 4},
{"matrix": [3, 11], "x": 16, "y": 64, "flags": 4},
{"matrix": [3, 12], "x": 32, "y": 64, "flags": 4},
{"matrix": [5, 8], "x": 48, "y": 64, "flags": 4},
{"matrix": [5, 10], "x": 64, "y": 64, "flags": 4},
{"matrix": [4, 0], "x": 80, "y": 64, "flags": 4},
{"matrix": [4, 1], "x": 96, "y": 64, "flags": 4},
{"matrix": [4, 2], "x": 112, "y": 64, "flags": 4},
{"matrix": [4, 4], "x": 0, "y": 80, "flags": 4},
{"matrix": [4, 5], "x": 16, "y": 80, "flags": 4},
{"matrix": [4, 6], "x": 32, "y": 80, "flags": 4},
{"matrix": [4, 9], "x": 48, "y": 80, "flags": 4},
{"matrix": [4, 10], "x": 64, "y": 80, "flags": 4},
{"matrix": [5, 11], "x": 80, "y": 80, "flags": 4},
{"matrix": [5, 12], "x": 96, "y": 80, "flags": 4},
{"matrix": [5, 13], "x": 112, "y": 80, "flags": 4}
],
"led_flush_limit": 26,
"led_process_limit": 4,
"sleep": true

25
keyboards/melgeek/z70ultra/rev1/rev1.c
View file

@ -91,31 +91,6 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
{0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */
{0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */
};
led_config_t g_led_config = {
{
/* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, }, /* R0 */
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, }, /* R1 */
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, }, /* R2 */
{ 44, NO_LED, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, }, /* R3 */
{ 58, 59, 60, NO_LED, 61, 62, 63, NO_LED, NO_LED, 64, 65, NO_LED, NO_LED, NO_LED, }, /* R4 */
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 14, 29, 56, 43, 57, 66, 67, 68, }, /* R5 */
}, {
{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},
{0, 16}, {16, 16}, {32, 16}, {48, 16}, {64, 16}, {80, 16}, {96, 16}, {112, 16}, {128, 16}, {144, 16}, {160, 16}, {176, 16}, {192, 16}, {208, 16},
{0, 32}, {16, 32}, {32, 32}, {48, 32}, {64, 32}, {80, 32}, {96, 32}, {112, 32}, {128, 32}, {144, 32}, {160, 32}, {176, 32}, {192, 32},
{0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48},
{0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64},
{0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80},
}, {
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,
}
};
const is31fl3741_led_t g_is31_indicator_leds[6] = {
{0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */