keyboard stuff
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Migrate `g_led_config` to DD (M2) (#25619)

authored by

Jack Sangdahl and committed by
GitHub
04978d49 7186a631

+1115 -352
+102 -1
keyboards/melgeek/mach80/rev1/keyboard.json
··· 13 13 "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], 14 14 "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] 15 15 }, 16 - "diode_direction": "ROW2COL" 16 + "diode_direction": "ROW2COL", 17 + "rgb_matrix": { 18 + "layout": [ 19 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 20 + {"matrix": [0, 2], "x": 12, "y": 0, "flags": 4}, 21 + {"matrix": [0, 3], "x": 24, "y": 0, "flags": 4}, 22 + {"matrix": [0, 4], "x": 36, "y": 0, "flags": 4}, 23 + {"matrix": [0, 5], "x": 48, "y": 0, "flags": 4}, 24 + {"matrix": [0, 6], "x": 60, "y": 0, "flags": 4}, 25 + {"matrix": [0, 7], "x": 72, "y": 0, "flags": 4}, 26 + {"matrix": [0, 8], "x": 84, "y": 0, "flags": 4}, 27 + {"matrix": [0, 9], "x": 96, "y": 0, "flags": 4}, 28 + {"matrix": [0, 10], "x": 108, "y": 0, "flags": 4}, 29 + {"matrix": [0, 11], "x": 120, "y": 0, "flags": 4}, 30 + {"matrix": [0, 12], "x": 132, "y": 0, "flags": 4}, 31 + {"matrix": [0, 13], "x": 144, "y": 0, "flags": 4}, 32 + {"matrix": [0, 14], "x": 156, "y": 0, "flags": 4}, 33 + {"matrix": [0, 15], "x": 168, "y": 0, "flags": 4}, 34 + {"matrix": [3, 13], "x": 180, "y": 0, "flags": 4}, 35 + {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, 36 + {"matrix": [1, 1], "x": 12, "y": 12, "flags": 4}, 37 + {"matrix": [1, 2], "x": 24, "y": 12, "flags": 4}, 38 + {"matrix": [1, 3], "x": 36, "y": 12, "flags": 4}, 39 + {"matrix": [1, 4], "x": 48, "y": 12, "flags": 4}, 40 + {"matrix": [1, 5], "x": 60, "y": 12, "flags": 4}, 41 + {"matrix": [1, 6], "x": 72, "y": 12, "flags": 4}, 42 + {"matrix": [1, 7], "x": 84, "y": 12, "flags": 4}, 43 + {"matrix": [1, 8], "x": 96, "y": 12, "flags": 4}, 44 + {"matrix": [1, 9], "x": 108, "y": 12, "flags": 4}, 45 + {"matrix": [1, 10], "x": 120, "y": 12, "flags": 4}, 46 + {"matrix": [1, 11], "x": 132, "y": 12, "flags": 4}, 47 + {"matrix": [1, 12], "x": 144, "y": 12, "flags": 4}, 48 + {"x": 156, "y": 12, "flags": 4}, 49 + {"matrix": [1, 13], "x": 168, "y": 12, "flags": 4}, 50 + {"x": 180, "y": 12, "flags": 4}, 51 + {"matrix": [1, 14], "x": 192, "y": 12, "flags": 4}, 52 + {"matrix": [1, 15], "x": 204, "y": 12, "flags": 4}, 53 + {"matrix": [3, 14], "x": 216, "y": 12, "flags": 4}, 54 + {"matrix": [2, 0], "x": 0, "y": 24, "flags": 4}, 55 + {"matrix": [2, 1], "x": 12, "y": 24, "flags": 4}, 56 + {"matrix": [2, 2], "x": 24, "y": 24, "flags": 4}, 57 + {"matrix": [2, 3], "x": 36, "y": 24, "flags": 4}, 58 + {"matrix": [2, 4], "x": 48, "y": 24, "flags": 4}, 59 + {"matrix": [2, 5], "x": 60, "y": 24, "flags": 4}, 60 + {"matrix": [2, 6], "x": 72, "y": 24, "flags": 4}, 61 + {"matrix": [2, 7], "x": 84, "y": 24, "flags": 4}, 62 + {"matrix": [2, 8], "x": 96, "y": 24, "flags": 4}, 63 + {"matrix": [2, 9], "x": 108, "y": 24, "flags": 4}, 64 + {"matrix": [2, 10], "x": 120, "y": 24, "flags": 4}, 65 + {"matrix": [2, 11], "x": 132, "y": 24, "flags": 4}, 66 + {"matrix": [2, 12], "x": 144, "y": 24, "flags": 4}, 67 + {"matrix": [2, 13], "x": 156, "y": 24, "flags": 4}, 68 + {"matrix": [2, 14], "x": 168, "y": 24, "flags": 4}, 69 + {"matrix": [2, 15], "x": 180, "y": 24, "flags": 4}, 70 + {"matrix": [3, 15], "x": 192, "y": 24, "flags": 4}, 71 + {"matrix": [3, 0], "x": 0, "y": 36, "flags": 4}, 72 + {"matrix": [3, 1], "x": 12, "y": 36, "flags": 4}, 73 + {"matrix": [3, 2], "x": 24, "y": 36, "flags": 4}, 74 + {"matrix": [3, 3], "x": 36, "y": 36, "flags": 4}, 75 + {"matrix": [3, 4], "x": 48, "y": 36, "flags": 4}, 76 + {"matrix": [3, 5], "x": 60, "y": 36, "flags": 4}, 77 + {"matrix": [3, 6], "x": 72, "y": 36, "flags": 4}, 78 + {"matrix": [3, 7], "x": 84, "y": 36, "flags": 4}, 79 + {"matrix": [3, 8], "x": 96, "y": 36, "flags": 4}, 80 + {"matrix": [3, 9], "x": 108, "y": 36, "flags": 4}, 81 + {"matrix": [3, 10], "x": 120, "y": 36, "flags": 4}, 82 + {"matrix": [3, 11], "x": 132, "y": 36, "flags": 4}, 83 + {"x": 144, "y": 36, "flags": 4}, 84 + {"matrix": [3, 12], "x": 156, "y": 36, "flags": 4}, 85 + {"x": 168, "y": 36, "flags": 4}, 86 + {"x": 0, "y": 48, "flags": 4}, 87 + {"matrix": [4, 0], "x": 12, "y": 48, "flags": 4}, 88 + {"x": 24, "y": 48, "flags": 4}, 89 + {"matrix": [4, 1], "x": 36, "y": 48, "flags": 4}, 90 + {"matrix": [4, 2], "x": 48, "y": 48, "flags": 4}, 91 + {"matrix": [4, 3], "x": 60, "y": 48, "flags": 4}, 92 + {"matrix": [4, 4], "x": 72, "y": 48, "flags": 4}, 93 + {"matrix": [4, 5], "x": 84, "y": 48, "flags": 4}, 94 + {"matrix": [4, 6], "x": 96, "y": 48, "flags": 4}, 95 + {"matrix": [4, 7], "x": 108, "y": 48, "flags": 4}, 96 + {"matrix": [4, 8], "x": 120, "y": 48, "flags": 4}, 97 + {"matrix": [4, 9], "x": 132, "y": 48, "flags": 4}, 98 + {"matrix": [4, 10], "x": 144, "y": 48, "flags": 4}, 99 + {"x": 156, "y": 48, "flags": 4}, 100 + {"matrix": [4, 11], "x": 168, "y": 48, "flags": 4}, 101 + {"x": 180, "y": 48, "flags": 4}, 102 + {"matrix": [4, 14], "x": 192, "y": 48, "flags": 4}, 103 + {"matrix": [5, 0], "x": 0, "y": 60, "flags": 4}, 104 + {"matrix": [5, 1], "x": 12, "y": 60, "flags": 4}, 105 + {"matrix": [5, 2], "x": 24, "y": 60, "flags": 4}, 106 + {"x": 36, "y": 60, "flags": 4}, 107 + {"matrix": [5, 5], "x": 48, "y": 60, "flags": 4}, 108 + {"x": 60, "y": 60, "flags": 4}, 109 + {"matrix": [5, 9], "x": 72, "y": 60, "flags": 4}, 110 + {"matrix": [5, 10], "x": 84, "y": 60, "flags": 4}, 111 + {"matrix": [5, 11], "x": 96, "y": 60, "flags": 4}, 112 + {"matrix": [5, 12], "x": 108, "y": 60, "flags": 4}, 113 + {"matrix": [5, 13], "x": 120, "y": 60, "flags": 4}, 114 + {"matrix": [5, 14], "x": 132, "y": 60, "flags": 4}, 115 + {"matrix": [5, 15], "x": 144, "y": 60, "flags": 4} 116 + ], 117 + } 17 118 }
-25
keyboards/melgeek/mach80/rev1/rev1.c
··· 118 118 {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB111 */ 119 119 {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB112 */ 120 120 }; 121 - led_config_t g_led_config = { 122 - { 123 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */ 124 - { 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */ 125 - { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, 32, 33 }, /* R1 */ 126 - { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50 }, /* R2 */ 127 - { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 65, 15, 34, 51 }, /* R3 */ 128 - { 68, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, NO_LED, NO_LED, 83, NO_LED }, /* R4 */ 129 - { 84, 85, 86, NO_LED, NO_LED, 88, NO_LED, NO_LED, NO_LED, 90, 91, 92, 93, 94, 95, 96 } /* R5 */ 130 - }, { 131 - {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 132 - {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 133 - {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 134 - {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 135 - {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 136 - {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 137 - }, { 138 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 139 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 140 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 141 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 142 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 143 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 144 - } 145 - }; 146 121 147 122 const is31fl3741_led_t g_is31_indicator_leds[3] = { 148 123 {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+99 -1
keyboards/melgeek/mach80/rev2/keyboard.json
··· 13 13 "cols": ["B0", "B1", "B2", "B3", "D2", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "D3"], 14 14 "rows": ["F0", "F1", "F4", "F5", "F6", "E6"] 15 15 }, 16 - "diode_direction": "ROW2COL" 16 + "diode_direction": "ROW2COL", 17 + "rgb_matrix": { 18 + "layout": [ 19 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 20 + {"matrix": [0, 2], "x": 12, "y": 0, "flags": 4}, 21 + {"matrix": [0, 3], "x": 24, "y": 0, "flags": 4}, 22 + {"matrix": [0, 4], "x": 36, "y": 0, "flags": 4}, 23 + {"matrix": [0, 5], "x": 48, "y": 0, "flags": 4}, 24 + {"matrix": [0, 6], "x": 60, "y": 0, "flags": 4}, 25 + {"matrix": [0, 7], "x": 72, "y": 0, "flags": 4}, 26 + {"matrix": [0, 8], "x": 84, "y": 0, "flags": 4}, 27 + {"matrix": [0, 9], "x": 96, "y": 0, "flags": 4}, 28 + {"matrix": [0, 10], "x": 108, "y": 0, "flags": 4}, 29 + {"matrix": [0, 11], "x": 120, "y": 0, "flags": 4}, 30 + {"matrix": [0, 12], "x": 132, "y": 0, "flags": 4}, 31 + {"matrix": [0, 13], "x": 144, "y": 0, "flags": 4}, 32 + {"matrix": [0, 14], "x": 156, "y": 0, "flags": 4}, 33 + {"matrix": [0, 15], "x": 168, "y": 0, "flags": 4}, 34 + {"matrix": [3, 13], "x": 180, "y": 0, "flags": 4}, 35 + {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, 36 + {"matrix": [1, 1], "x": 12, "y": 12, "flags": 4}, 37 + {"matrix": [1, 2], "x": 24, "y": 12, "flags": 4}, 38 + {"matrix": [1, 3], "x": 36, "y": 12, "flags": 4}, 39 + {"matrix": [1, 4], "x": 48, "y": 12, "flags": 4}, 40 + {"matrix": [1, 5], "x": 60, "y": 12, "flags": 4}, 41 + {"matrix": [1, 6], "x": 72, "y": 12, "flags": 4}, 42 + {"matrix": [1, 7], "x": 84, "y": 12, "flags": 4}, 43 + {"matrix": [1, 8], "x": 96, "y": 12, "flags": 4}, 44 + {"matrix": [1, 9], "x": 108, "y": 12, "flags": 4}, 45 + {"matrix": [1, 10], "x": 120, "y": 12, "flags": 4}, 46 + {"matrix": [1, 11], "x": 132, "y": 12, "flags": 4}, 47 + {"matrix": [1, 12], "x": 144, "y": 12, "flags": 4}, 48 + {"x": 156, "y": 12, "flags": 4}, 49 + {"matrix": [1, 13], "x": 168, "y": 12, "flags": 4}, 50 + {"x": 180, "y": 12, "flags": 4}, 51 + {"matrix": [1, 14], "x": 192, "y": 12, "flags": 4}, 52 + {"matrix": [1, 15], "x": 204, "y": 12, "flags": 4}, 53 + {"matrix": [3, 14], "x": 216, "y": 12, "flags": 4}, 54 + {"matrix": [2, 0], "x": 0, "y": 24, "flags": 4}, 55 + {"matrix": [2, 1], "x": 12, "y": 24, "flags": 4}, 56 + {"matrix": [2, 2], "x": 24, "y": 24, "flags": 4}, 57 + {"matrix": [2, 3], "x": 36, "y": 24, "flags": 4}, 58 + {"matrix": [2, 4], "x": 48, "y": 24, "flags": 4}, 59 + {"matrix": [2, 5], "x": 60, "y": 24, "flags": 4}, 60 + {"matrix": [2, 6], "x": 72, "y": 24, "flags": 4}, 61 + {"matrix": [2, 7], "x": 84, "y": 24, "flags": 4}, 62 + {"matrix": [2, 8], "x": 96, "y": 24, "flags": 4}, 63 + {"matrix": [2, 9], "x": 108, "y": 24, "flags": 4}, 64 + {"matrix": [2, 10], "x": 120, "y": 24, "flags": 4}, 65 + {"matrix": [2, 11], "x": 132, "y": 24, "flags": 4}, 66 + {"matrix": [2, 12], "x": 144, "y": 24, "flags": 4}, 67 + {"matrix": [2, 13], "x": 156, "y": 24, "flags": 4}, 68 + {"matrix": [2, 14], "x": 168, "y": 24, "flags": 4}, 69 + {"matrix": [2, 15], "x": 180, "y": 24, "flags": 4}, 70 + {"matrix": [3, 15], "x": 192, "y": 24, "flags": 4}, 71 + {"matrix": [3, 0], "x": 0, "y": 36, "flags": 4}, 72 + {"matrix": [3, 1], "x": 12, "y": 36, "flags": 4}, 73 + {"matrix": [3, 2], "x": 24, "y": 36, "flags": 4}, 74 + {"matrix": [3, 3], "x": 36, "y": 36, "flags": 4}, 75 + {"matrix": [3, 4], "x": 48, "y": 36, "flags": 4}, 76 + {"matrix": [3, 5], "x": 60, "y": 36, "flags": 4}, 77 + {"matrix": [3, 6], "x": 72, "y": 36, "flags": 4}, 78 + {"matrix": [3, 7], "x": 84, "y": 36, "flags": 4}, 79 + {"matrix": [3, 8], "x": 96, "y": 36, "flags": 4}, 80 + {"matrix": [3, 9], "x": 108, "y": 36, "flags": 4}, 81 + {"matrix": [3, 10], "x": 120, "y": 36, "flags": 4}, 82 + {"matrix": [3, 11], "x": 132, "y": 36, "flags": 4}, 83 + {"x": 144, "y": 36, "flags": 4}, 84 + {"matrix": [3, 12], "x": 156, "y": 36, "flags": 4}, 85 + {"x": 168, "y": 36, "flags": 4}, 86 + {"x": 0, "y": 48, "flags": 4}, 87 + {"matrix": [4, 0], "x": 12, "y": 48, "flags": 4}, 88 + {"x": 24, "y": 48, "flags": 4}, 89 + {"matrix": [4, 1], "x": 36, "y": 48, "flags": 4}, 90 + {"matrix": [4, 2], "x": 48, "y": 48, "flags": 4}, 91 + {"matrix": [4, 3], "x": 60, "y": 48, "flags": 4}, 92 + {"matrix": [4, 4], "x": 72, "y": 48, "flags": 4}, 93 + {"matrix": [4, 5], "x": 84, "y": 48, "flags": 4}, 94 + {"matrix": [4, 6], "x": 96, "y": 48, "flags": 4}, 95 + {"matrix": [4, 7], "x": 108, "y": 48, "flags": 4}, 96 + {"matrix": [4, 8], "x": 120, "y": 48, "flags": 4}, 97 + {"matrix": [4, 9], "x": 132, "y": 48, "flags": 4}, 98 + {"matrix": [4, 10], "x": 144, "y": 48, "flags": 4}, 99 + {"x": 156, "y": 48, "flags": 4}, 100 + {"matrix": [4, 11], "x": 168, "y": 48, "flags": 4}, 101 + {"x": 180, "y": 48, "flags": 4}, 102 + {"matrix": [4, 14], "x": 192, "y": 48, "flags": 4}, 103 + {"matrix": [5, 0], "x": 0, "y": 60, "flags": 4}, 104 + {"matrix": [5, 2], "x": 12, "y": 60, "flags": 4}, 105 + {"x": 24, "y": 60, "flags": 4}, 106 + {"matrix": [5, 5], "x": 36, "y": 60, "flags": 4}, 107 + {"x": 48, "y": 60, "flags": 4}, 108 + {"matrix": [5, 9], "x": 60, "y": 60, "flags": 4}, 109 + {"matrix": [5, 12], "x": 72, "y": 60, "flags": 4}, 110 + {"matrix": [5, 13], "x": 84, "y": 60, "flags": 4}, 111 + {"matrix": [5, 14], "x": 96, "y": 60, "flags": 4}, 112 + {"matrix": [5, 15], "x": 108, "y": 60, "flags": 4} 113 + ], 114 + } 17 115 }
-26
keyboards/melgeek/mach80/rev2/rev2.c
··· 115 115 {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */ 116 116 {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */ 117 117 }; 118 - led_config_t g_led_config = { 119 - { 120 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */ 121 - { 0, NO_LED, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */ 122 - { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, 32, 33 }, /* R1 */ 123 - { 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50 }, /* R2 */ 124 - { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 65, 15, 34, 51 }, /* R3 */ 125 - { 68, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 81, NO_LED, NO_LED, 83, NO_LED }, /* R4 */ 126 - { 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 */ 127 - }, { 128 - {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 129 - {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 130 - {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 131 - {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 132 - {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 133 - {0, 60}, {12, 60}, {24, 60}, {36, 60}, {48, 60}, {60, 60}, {72, 60}, {84, 60}, {96, 60}, {108, 60} 134 - //10 135 - }, { 136 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 137 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 138 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 139 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 140 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 141 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 142 - } 143 - }; 144 118 145 119 const is31fl3741_led_t g_is31_indicator_leds[3] = { 146 120 {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+68 -1
keyboards/melgeek/mj61/rev1/keyboard.json
··· 10 10 "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], 11 11 "rows": ["B12", "B11", "B10", "B1", "A3"] 12 12 }, 13 - "diode_direction": "COL2ROW" 13 + "diode_direction": "COL2ROW", 14 + "rgb_matrix": { 15 + "layout": [ 16 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 17 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 18 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 19 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 20 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 21 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 22 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 23 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 24 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 25 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 26 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 27 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 28 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 29 + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, 30 + {"matrix": [1, 13], "x": 0, "y": 16, "flags": 4}, 31 + {"matrix": [1, 12], "x": 16, "y": 16, "flags": 4}, 32 + {"matrix": [1, 11], "x": 32, "y": 16, "flags": 4}, 33 + {"matrix": [1, 10], "x": 48, "y": 16, "flags": 4}, 34 + {"matrix": [1, 9], "x": 64, "y": 16, "flags": 4}, 35 + {"matrix": [1, 8], "x": 80, "y": 16, "flags": 4}, 36 + {"matrix": [1, 7], "x": 96, "y": 16, "flags": 4}, 37 + {"matrix": [1, 6], "x": 112, "y": 16, "flags": 4}, 38 + {"matrix": [1, 5], "x": 128, "y": 16, "flags": 4}, 39 + {"matrix": [1, 4], "x": 144, "y": 16, "flags": 4}, 40 + {"matrix": [1, 3], "x": 160, "y": 16, "flags": 4}, 41 + {"matrix": [1, 2], "x": 176, "y": 16, "flags": 4}, 42 + {"matrix": [1, 1], "x": 192, "y": 16, "flags": 4}, 43 + {"matrix": [1, 0], "x": 208, "y": 16, "flags": 4}, 44 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 45 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 46 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 47 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 48 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 49 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 50 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 51 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 52 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 53 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 54 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 55 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 56 + {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4}, 57 + {"matrix": [3, 12], "x": 0, "y": 48, "flags": 4}, 58 + {"matrix": [3, 11], "x": 16, "y": 48, "flags": 4}, 59 + {"matrix": [3, 10], "x": 32, "y": 48, "flags": 4}, 60 + {"matrix": [3, 9], "x": 48, "y": 48, "flags": 4}, 61 + {"matrix": [3, 8], "x": 64, "y": 48, "flags": 4}, 62 + {"matrix": [3, 7], "x": 80, "y": 48, "flags": 4}, 63 + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, 64 + {"matrix": [3, 5], "x": 112, "y": 48, "flags": 4}, 65 + {"matrix": [3, 4], "x": 128, "y": 48, "flags": 4}, 66 + {"matrix": [3, 3], "x": 144, "y": 48, "flags": 4}, 67 + {"matrix": [3, 2], "x": 160, "y": 48, "flags": 4}, 68 + {"matrix": [3, 0], "x": 176, "y": 48, "flags": 4}, 69 + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, 70 + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, 71 + {"matrix": [4, 3], "x": 32, "y": 64, "flags": 4}, 72 + {"matrix": [4, 5], "x": 48, "y": 64, "flags": 4}, 73 + {"matrix": [4, 9], "x": 64, "y": 64, "flags": 4}, 74 + {"matrix": [4, 10], "x": 80, "y": 64, "flags": 4}, 75 + {"matrix": [4, 11], "x": 96, "y": 64, "flags": 4}, 76 + {"matrix": [4, 12], "x": 112, "y": 64, "flags": 4}, 77 + {"matrix": [4, 4], "x": 128, "y": 64, "flags": 4}, 78 + {"matrix": [4, 6], "x": 144, "y": 64, "flags": 4} 79 + ], 80 + } 14 81 }
-24
keyboards/melgeek/mj61/rev1/rev1.c
··· 82 82 {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */ 83 83 {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */ 84 84 }; 85 - 86 - led_config_t g_led_config = { 87 - { 88 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ 89 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */ 90 - { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */ 91 - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED,}, /* R2 */ 92 - { 52, NO_LED, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, NO_LED }, /* R3 */ 93 - { 53, 54, NO_LED, 55, 61, 56, 62, NO_LED, NO_LED, 57, 58, 59, 60, NO_LED }, /* R4 */ 94 - }, { 95 - {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}, 96 - {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}, 97 - {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}, 98 - {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, 99 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, 100 - }, { 101 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 102 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 103 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 104 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 105 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 106 - } 107 - }; 108 - 109 85 #endif
+76 -1
keyboards/melgeek/mj61/rev2/keyboard.json
··· 10 10 "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], 11 11 "rows": ["B12", "B11", "B10", "B1", "A3"] 12 12 }, 13 - "diode_direction": "COL2ROW" 13 + "diode_direction": "COL2ROW", 14 + "rgb_matrix": { 15 + "layout": [ 16 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 17 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 18 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 19 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 20 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 21 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 22 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 23 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 24 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 25 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 26 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 27 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 28 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 29 + {"x": 208, "y": 0, "flags": 4}, 30 + {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}, 31 + {"x": 240, "y": 0, "flags": 4}, 32 + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, 33 + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, 34 + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, 35 + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, 36 + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, 37 + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, 38 + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, 39 + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, 40 + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, 41 + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, 42 + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, 43 + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, 44 + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, 45 + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, 46 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 47 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 48 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 49 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 50 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 51 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 52 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 53 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 54 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 55 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 56 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 57 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 58 + {"x": 192, "y": 32, "flags": 4}, 59 + {"matrix": [2, 12], "x": 208, "y": 32, "flags": 4}, 60 + {"x": 224, "y": 32, "flags": 4}, 61 + {"x": 0, "y": 48, "flags": 4}, 62 + {"matrix": [3, 0], "x": 16, "y": 48, "flags": 4}, 63 + {"x": 32, "y": 48, "flags": 4}, 64 + {"matrix": [3, 2], "x": 48, "y": 48, "flags": 4}, 65 + {"matrix": [3, 3], "x": 64, "y": 48, "flags": 4}, 66 + {"matrix": [3, 4], "x": 80, "y": 48, "flags": 4}, 67 + {"matrix": [3, 5], "x": 96, "y": 48, "flags": 4}, 68 + {"matrix": [3, 6], "x": 112, "y": 48, "flags": 4}, 69 + {"matrix": [3, 7], "x": 128, "y": 48, "flags": 4}, 70 + {"matrix": [3, 8], "x": 144, "y": 48, "flags": 4}, 71 + {"matrix": [3, 9], "x": 160, "y": 48, "flags": 4}, 72 + {"matrix": [3, 10], "x": 176, "y": 48, "flags": 4}, 73 + {"matrix": [3, 11], "x": 192, "y": 48, "flags": 4}, 74 + {"x": 208, "y": 48, "flags": 4}, 75 + {"matrix": [3, 12], "x": 224, "y": 48, "flags": 4}, 76 + {"x": 240, "y": 48, "flags": 4}, 77 + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, 78 + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, 79 + {"matrix": [4, 3], "x": 32, "y": 64, "flags": 4}, 80 + {"x": 48, "y": 64, "flags": 4}, 81 + {"matrix": [4, 5], "x": 64, "y": 64, "flags": 4}, 82 + {"x": 80, "y": 64, "flags": 4}, 83 + {"matrix": [4, 9], "x": 96, "y": 64, "flags": 4}, 84 + {"matrix": [4, 10], "x": 112, "y": 64, "flags": 4}, 85 + {"matrix": [4, 11], "x": 128, "y": 64, "flags": 4}, 86 + {"matrix": [4, 13], "x": 144, "y": 64, "flags": 4} 87 + ] 88 + } 14 89 }
-24
keyboards/melgeek/mj61/rev2/rev2.c
··· 92 92 {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */ 93 93 {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */ 94 94 }; 95 - 96 - led_config_t g_led_config = { 97 - { 98 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ 99 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */ 100 - { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */ 101 - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */ 102 - { 46, NO_LED, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 59, NO_LED }, /* R3 */ 103 - { 61, 62, NO_LED, 63, NO_LED, 65, NO_LED, NO_LED, NO_LED, 67, 68, 69, NO_LED, 70 }, /* R4 */ 104 - }, { 105 - {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}, 106 - {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}, 107 - {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}, 108 - {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}, 109 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, 110 - }, { 111 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 112 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 113 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 114 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 115 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 116 - } 117 - }; 118 - 119 95 #endif
+70 -1
keyboards/melgeek/mj63/rev1/keyboard.json
··· 10 10 "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], 11 11 "rows": ["B12", "B11", "B10", "B1", "A3"] 12 12 }, 13 - "diode_direction": "COL2ROW" 13 + "diode_direction": "COL2ROW", 14 + "rgb_matrix": { 15 + "layout": [ 16 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 17 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 18 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 19 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 20 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 21 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 22 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 23 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 24 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 25 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 26 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 27 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 28 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 29 + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, 30 + {"matrix": [1, 13], "x": 0, "y": 16, "flags": 4}, 31 + {"matrix": [1, 12], "x": 16, "y": 16, "flags": 4}, 32 + {"matrix": [1, 11], "x": 32, "y": 16, "flags": 4}, 33 + {"matrix": [1, 10], "x": 48, "y": 16, "flags": 4}, 34 + {"matrix": [1, 9], "x": 64, "y": 16, "flags": 4}, 35 + {"matrix": [1, 8], "x": 80, "y": 16, "flags": 4}, 36 + {"matrix": [1, 7], "x": 96, "y": 16, "flags": 4}, 37 + {"matrix": [1, 6], "x": 112, "y": 16, "flags": 4}, 38 + {"matrix": [1, 5], "x": 128, "y": 16, "flags": 4}, 39 + {"matrix": [1, 4], "x": 144, "y": 16, "flags": 4}, 40 + {"matrix": [1, 3], "x": 160, "y": 16, "flags": 4}, 41 + {"matrix": [1, 2], "x": 176, "y": 16, "flags": 4}, 42 + {"matrix": [1, 1], "x": 192, "y": 16, "flags": 4}, 43 + {"matrix": [1, 0], "x": 208, "y": 16, "flags": 4}, 44 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 45 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 46 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 47 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 48 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 49 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 50 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 51 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 52 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 53 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 54 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 55 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 56 + {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4}, 57 + {"matrix": [3, 13], "x": 0, "y": 48, "flags": 4}, 58 + {"matrix": [3, 12], "x": 16, "y": 48, "flags": 4}, 59 + {"matrix": [3, 11], "x": 32, "y": 48, "flags": 4}, 60 + {"matrix": [3, 9], "x": 48, "y": 48, "flags": 4}, 61 + {"matrix": [3, 8], "x": 64, "y": 48, "flags": 4}, 62 + {"matrix": [3, 7], "x": 80, "y": 48, "flags": 4}, 63 + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, 64 + {"matrix": [3, 5], "x": 112, "y": 48, "flags": 4}, 65 + {"matrix": [3, 4], "x": 128, "y": 48, "flags": 4}, 66 + {"matrix": [3, 3], "x": 144, "y": 48, "flags": 4}, 67 + {"matrix": [3, 2], "x": 160, "y": 48, "flags": 4}, 68 + {"matrix": [3, 1], "x": 176, "y": 48, "flags": 4}, 69 + {"matrix": [3, 0], "x": 192, "y": 48, "flags": 4}, 70 + {"matrix": [4, 13], "x": 0, "y": 64, "flags": 4}, 71 + {"matrix": [4, 12], "x": 16, "y": 64, "flags": 4}, 72 + {"matrix": [4, 11], "x": 32, "y": 64, "flags": 4}, 73 + {"matrix": [4, 10], "x": 48, "y": 64, "flags": 4}, 74 + {"matrix": [4, 9], "x": 64, "y": 64, "flags": 4}, 75 + {"matrix": [4, 2], "x": 80, "y": 64, "flags": 4}, 76 + {"matrix": [4, 1], "x": 96, "y": 64, "flags": 4}, 77 + {"matrix": [4, 0], "x": 112, "y": 64, "flags": 4}, 78 + {"matrix": [4, 5], "x": 128, "y": 64, "flags": 4}, 79 + {"matrix": [4, 6], "x": 144, "y": 64, "flags": 4}, 80 + {"matrix": [4, 4], "x": 160, "y": 64, "flags": 4} 81 + ] 82 + } 14 83 }
-24
keyboards/melgeek/mj63/rev1/rev1.c
··· 86 86 {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */ 87 87 {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */ 88 88 }; 89 - 90 - led_config_t g_led_config = { 91 - { 92 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ 93 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */ 94 - { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */ 95 - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED }, /* R2 */ 96 - { 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, NO_LED, 43, 42, 41 }, /* R3 */ 97 - { 61, 60, 59, NO_LED, 64, 62, 63, NO_LED, NO_LED, 58, 57, 56, 55, 54 }, /* R4 */ 98 - }, { 99 - {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}, 100 - {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}, 101 - {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}, 102 - {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}, 103 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, 104 - }, { 105 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 106 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 107 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 108 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 109 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 110 - } 111 - }; 112 - 113 89 #endif
+76 -1
keyboards/melgeek/mj63/rev2/keyboard.json
··· 10 10 "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], 11 11 "rows": ["B12", "B11", "B10", "B1", "A3"] 12 12 }, 13 - "diode_direction": "COL2ROW" 13 + "diode_direction": "COL2ROW", 14 + "rgb_matrix": { 15 + "layout": [ 16 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 17 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 18 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 19 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 20 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 21 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 22 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 23 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 24 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 25 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 26 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 27 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 28 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 29 + {"x": 208, "y": 0, "flags": 4}, 30 + {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}, 31 + {"x": 240, "y": 0, "flags": 4}, 32 + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, 33 + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, 34 + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, 35 + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, 36 + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, 37 + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, 38 + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, 39 + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, 40 + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, 41 + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, 42 + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, 43 + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, 44 + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, 45 + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, 46 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 47 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 48 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 49 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 50 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 51 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 52 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 53 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 54 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 55 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 56 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 57 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 58 + {"x": 192, "y": 32, "flags": 4}, 59 + {"matrix": [2, 12], "x": 208, "y": 32, "flags": 4}, 60 + {"x": 224, "y": 32, "flags": 4}, 61 + {"x": 0, "y": 48, "flags": 4}, 62 + {"matrix": [3, 0], "x": 16, "y": 48, "flags": 4}, 63 + {"x": 32, "y": 48, "flags": 4}, 64 + {"matrix": [3, 1], "x": 48, "y": 48, "flags": 4}, 65 + {"matrix": [3, 2], "x": 64, "y": 48, "flags": 4}, 66 + {"matrix": [3, 3], "x": 80, "y": 48, "flags": 4}, 67 + {"matrix": [3, 4], "x": 96, "y": 48, "flags": 4}, 68 + {"matrix": [3, 5], "x": 112, "y": 48, "flags": 4}, 69 + {"matrix": [3, 6], "x": 128, "y": 48, "flags": 4}, 70 + {"matrix": [3, 7], "x": 144, "y": 48, "flags": 4}, 71 + {"matrix": [3, 8], "x": 160, "y": 48, "flags": 4}, 72 + {"matrix": [3, 9], "x": 176, "y": 48, "flags": 4}, 73 + {"matrix": [3, 11], "x": 192, "y": 48, "flags": 4}, 74 + {"matrix": [3, 12], "x": 208, "y": 48, "flags": 4}, 75 + {"matrix": [3, 13], "x": 224, "y": 48, "flags": 4}, 76 + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, 77 + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, 78 + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, 79 + {"x": 48, "y": 64, "flags": 4}, 80 + {"matrix": [4, 5], "x": 64, "y": 64, "flags": 4}, 81 + {"x": 80, "y": 64, "flags": 4}, 82 + {"matrix": [4, 9], "x": 96, "y": 64, "flags": 4}, 83 + {"matrix": [4, 10], "x": 112, "y": 64, "flags": 4}, 84 + {"matrix": [4, 11], "x": 128, "y": 64, "flags": 4}, 85 + {"matrix": [4, 12], "x": 144, "y": 64, "flags": 4}, 86 + {"matrix": [4, 13], "x": 160, "y": 64, "flags": 4} 87 + ], 88 + } 14 89 }
-24
keyboards/melgeek/mj63/rev2/rev2.c
··· 92 92 {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */ 93 93 {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */ 94 94 }; 95 - 96 - led_config_t g_led_config = { 97 - { 98 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ 99 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */ 100 - { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */ 101 - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */ 102 - { 46, 48, 49, 50, 51, 52, 53, 54, 55, 56, NO_LED, 57, 58, 59 }, /* R3 */ 103 - { 60, 61, 62, NO_LED, NO_LED, 64, NO_LED, NO_LED, NO_LED, 66, 67, 68, 69, 70 }, /* R4 */ 104 - }, { 105 - {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}, 106 - {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}, 107 - {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}, 108 - {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}, 109 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, 110 - }, { 111 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 112 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 113 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 114 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 115 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 116 - } 117 - }; 118 - 119 95 #endif
+69 -1
keyboards/melgeek/mj64/rev1/keyboard.json
··· 10 10 "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], 11 11 "rows": ["B12", "B11", "B10", "B1", "A3"] 12 12 }, 13 - "diode_direction": "COL2ROW" 13 + "diode_direction": "COL2ROW", 14 + "rgb_matrix": { 15 + "layout": [ 16 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 17 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 18 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 19 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 20 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 21 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 22 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 23 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 24 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 25 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 26 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 27 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 28 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 29 + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, 30 + {"matrix": [1, 13], "x": 0, "y": 16, "flags": 4}, 31 + {"matrix": [1, 12], "x": 16, "y": 16, "flags": 4}, 32 + {"matrix": [1, 11], "x": 32, "y": 16, "flags": 4}, 33 + {"matrix": [1, 10], "x": 48, "y": 16, "flags": 4}, 34 + {"matrix": [1, 9], "x": 64, "y": 16, "flags": 4}, 35 + {"matrix": [1, 8], "x": 80, "y": 16, "flags": 4}, 36 + {"matrix": [1, 7], "x": 96, "y": 16, "flags": 4}, 37 + {"matrix": [1, 6], "x": 112, "y": 16, "flags": 4}, 38 + {"matrix": [1, 5], "x": 128, "y": 16, "flags": 4}, 39 + {"matrix": [1, 4], "x": 144, "y": 16, "flags": 4}, 40 + {"matrix": [1, 3], "x": 160, "y": 16, "flags": 4}, 41 + {"matrix": [1, 2], "x": 176, "y": 16, "flags": 4}, 42 + {"matrix": [1, 1], "x": 192, "y": 16, "flags": 4}, 43 + {"matrix": [1, 0], "x": 208, "y": 16, "flags": 4}, 44 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 45 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 46 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 47 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 48 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 49 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 50 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 51 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 52 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 53 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 54 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 55 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 56 + {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4}, 57 + {"matrix": [3, 13], "x": 0, "y": 48, "flags": 4}, 58 + {"matrix": [3, 12], "x": 16, "y": 48, "flags": 4}, 59 + {"matrix": [3, 11], "x": 32, "y": 48, "flags": 4}, 60 + {"matrix": [3, 10], "x": 48, "y": 48, "flags": 4}, 61 + {"matrix": [3, 9], "x": 64, "y": 48, "flags": 4}, 62 + {"matrix": [3, 8], "x": 80, "y": 48, "flags": 4}, 63 + {"matrix": [3, 7], "x": 96, "y": 48, "flags": 4}, 64 + {"matrix": [3, 6], "x": 112, "y": 48, "flags": 4}, 65 + {"matrix": [3, 5], "x": 128, "y": 48, "flags": 4}, 66 + {"matrix": [3, 4], "x": 144, "y": 48, "flags": 4}, 67 + {"matrix": [3, 3], "x": 160, "y": 48, "flags": 4}, 68 + {"matrix": [3, 2], "x": 176, "y": 48, "flags": 4}, 69 + {"matrix": [3, 1], "x": 192, "y": 48, "flags": 4}, 70 + {"matrix": [3, 0], "x": 208, "y": 48, "flags": 4}, 71 + {"matrix": [4, 13], "x": 0, "y": 64, "flags": 4}, 72 + {"matrix": [4, 12], "x": 16, "y": 64, "flags": 4}, 73 + {"matrix": [4, 11], "x": 32, "y": 64, "flags": 4}, 74 + {"matrix": [4, 10], "x": 48, "y": 64, "flags": 4}, 75 + {"matrix": [4, 9], "x": 64, "y": 64, "flags": 4}, 76 + {"matrix": [4, 2], "x": 96, "y": 64, "flags": 4}, 77 + {"matrix": [4, 1], "x": 112, "y": 64, "flags": 4}, 78 + {"matrix": [4, 0], "x": 128, "y": 64, "flags": 4}, 79 + {"matrix": [4, 5], "x": 144, "y": 64, "flags": 4} 80 + ] 81 + } 14 82 }
-23
keyboards/melgeek/mj64/rev1/rev1.c
··· 84 84 {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */ 85 85 {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */ 86 86 }; 87 - 88 - led_config_t g_led_config = { 89 - { 90 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, 91 - { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, 92 - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED }, 93 - { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41 }, 94 - { 62, 61, 60, NO_LED, NO_LED, 63, NO_LED, NO_LED, NO_LED, 59, 58, 57, 56, 55 } 95 - }, { 96 - { 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 }, 97 - { 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 }, 98 - { 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 }, 99 - { 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 }, 100 - { 0, 64 }, { 16, 64 }, { 32, 64 }, { 48, 64 }, { 64, 64 }, { 96, 64 }, { 112, 64 }, { 128, 64 }, { 144, 64 } 101 - }, { 102 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 103 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 104 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 105 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 106 - 4, 4, 4, 4, 4, 4, 4, 4, 4 107 - } 108 - }; 109 - 110 87 #endif
+71 -1
keyboards/melgeek/mj64/rev2/keyboard.json
··· 10 10 "cols": ["B15", "A8", "A10", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], 11 11 "rows": ["B12", "B11", "B10", "B1", "A3"] 12 12 }, 13 - "diode_direction": "COL2ROW" 13 + "diode_direction": "COL2ROW", 14 + "rgb_matrix": { 15 + "layout": [ 16 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 17 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 18 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 19 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 20 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 21 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 22 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 23 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 24 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 25 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 26 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 27 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 28 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 29 + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, 30 + {"matrix": [1, 13], "x": 0, "y": 16, "flags": 4}, 31 + {"matrix": [1, 12], "x": 16, "y": 16, "flags": 4}, 32 + {"matrix": [1, 11], "x": 32, "y": 16, "flags": 4}, 33 + {"matrix": [1, 10], "x": 48, "y": 16, "flags": 4}, 34 + {"matrix": [1, 9], "x": 64, "y": 16, "flags": 4}, 35 + {"matrix": [1, 8], "x": 80, "y": 16, "flags": 4}, 36 + {"matrix": [1, 7], "x": 96, "y": 16, "flags": 4}, 37 + {"matrix": [1, 6], "x": 112, "y": 16, "flags": 4}, 38 + {"matrix": [1, 5], "x": 128, "y": 16, "flags": 4}, 39 + {"matrix": [1, 4], "x": 144, "y": 16, "flags": 4}, 40 + {"matrix": [1, 3], "x": 160, "y": 16, "flags": 4}, 41 + {"matrix": [1, 2], "x": 176, "y": 16, "flags": 4}, 42 + {"matrix": [1, 1], "x": 192, "y": 16, "flags": 4}, 43 + {"matrix": [1, 0], "x": 208, "y": 16, "flags": 4}, 44 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 45 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 46 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 47 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 48 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 49 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 50 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 51 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 52 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 53 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 54 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 55 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 56 + {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4}, 57 + {"matrix": [3, 13], "x": 0, "y": 48, "flags": 4}, 58 + {"matrix": [3, 12], "x": 16, "y": 48, "flags": 4}, 59 + {"matrix": [3, 11], "x": 32, "y": 48, "flags": 4}, 60 + {"matrix": [3, 10], "x": 48, "y": 48, "flags": 4}, 61 + {"matrix": [3, 9], "x": 64, "y": 48, "flags": 4}, 62 + {"matrix": [3, 8], "x": 80, "y": 48, "flags": 4}, 63 + {"matrix": [3, 7], "x": 96, "y": 48, "flags": 4}, 64 + {"matrix": [3, 6], "x": 112, "y": 48, "flags": 4}, 65 + {"matrix": [3, 5], "x": 128, "y": 48, "flags": 4}, 66 + {"matrix": [3, 4], "x": 144, "y": 48, "flags": 4}, 67 + {"matrix": [3, 3], "x": 160, "y": 48, "flags": 4}, 68 + {"matrix": [3, 2], "x": 176, "y": 48, "flags": 4}, 69 + {"matrix": [3, 1], "x": 192, "y": 48, "flags": 4}, 70 + {"matrix": [3, 0], "x": 208, "y": 48, "flags": 4}, 71 + {"matrix": [4, 13], "x": 0, "y": 64, "flags": 4}, 72 + {"matrix": [4, 12], "x": 16, "y": 64, "flags": 4}, 73 + {"matrix": [4, 11], "x": 32, "y": 64, "flags": 4}, 74 + {"matrix": [4, 10], "x": 48, "y": 64, "flags": 4}, 75 + {"matrix": [4, 9], "x": 64, "y": 64, "flags": 4}, 76 + {"matrix": [4, 2], "x": 80, "y": 64, "flags": 4}, 77 + {"matrix": [4, 1], "x": 96, "y": 64, "flags": 4}, 78 + {"matrix": [4, 0], "x": 112, "y": 64, "flags": 4}, 79 + {"matrix": [4, 5], "x": 128, "y": 64, "flags": 4}, 80 + {"matrix": [4, 4], "x": 144, "y": 64, "flags": 4}, 81 + {"matrix": [4, 6], "x": 160, "y": 64, "flags": 4} 82 + ] 83 + } 14 84 }
-24
keyboards/melgeek/mj64/rev2/rev2.c
··· 86 86 {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */ 87 87 {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */ 88 88 }; 89 - 90 - led_config_t g_led_config = { 91 - { 92 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ 93 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* R0 */ 94 - { 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14 }, /* R1 */ 95 - { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, NO_LED }, /* R2 */ 96 - { 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41 }, /* R3 */ 97 - { 62, 61, 60, NO_LED, 64, 63, 65, NO_LED, NO_LED, 59, 58, 57, 56, 55 }, /* R4 */ 98 - }, { 99 - {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}, 100 - {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}, 101 - {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}, 102 - {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}, 103 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, 104 - }, { 105 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 106 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 107 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 108 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 109 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 110 - } 111 - }; 112 - 113 89 #endif
+77 -1
keyboards/melgeek/mj64/rev3/keyboard.json
··· 10 10 "cols": ["B15", "A8", "B13", "A15", "B3", "B4", "B5", "B8", "B9", "C13", "C14", "C15", "A0", "A1"], 11 11 "rows": ["B12", "B11", "B10", "B1", "A3"] 12 12 }, 13 - "diode_direction": "COL2ROW" 13 + "diode_direction": "COL2ROW", 14 + "rgb_matrix": { 15 + "layout": [ 16 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 17 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 18 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 19 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 20 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 21 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 22 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 23 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 24 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 25 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 26 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 27 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 28 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 29 + {"x": 208, "y": 0, "flags": 4}, 30 + {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}, 31 + {"x": 240, "y": 0, "flags": 4}, 32 + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, 33 + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, 34 + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, 35 + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, 36 + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, 37 + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, 38 + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, 39 + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, 40 + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, 41 + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, 42 + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, 43 + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, 44 + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, 45 + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, 46 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 47 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 48 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 49 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 50 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 51 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 52 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 53 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 54 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 55 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 56 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 57 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 58 + {"x": 192, "y": 32, "flags": 4}, 59 + {"matrix": [2, 12], "x": 208, "y": 32, "flags": 4}, 60 + {"x": 224, "y": 32, "flags": 4}, 61 + {"x": 0, "y": 48, "flags": 4}, 62 + {"matrix": [3, 0], "x": 16, "y": 48, "flags": 4}, 63 + {"x": 32, "y": 48, "flags": 4}, 64 + {"matrix": [3, 1], "x": 48, "y": 48, "flags": 4}, 65 + {"matrix": [3, 2], "x": 64, "y": 48, "flags": 4}, 66 + {"matrix": [3, 3], "x": 80, "y": 48, "flags": 4}, 67 + {"matrix": [3, 4], "x": 96, "y": 48, "flags": 4}, 68 + {"matrix": [3, 5], "x": 112, "y": 48, "flags": 4}, 69 + {"matrix": [3, 6], "x": 128, "y": 48, "flags": 4}, 70 + {"matrix": [3, 7], "x": 144, "y": 48, "flags": 4}, 71 + {"matrix": [3, 8], "x": 160, "y": 48, "flags": 4}, 72 + {"matrix": [3, 9], "x": 176, "y": 48, "flags": 4}, 73 + {"matrix": [3, 10], "x": 192, "y": 48, "flags": 4}, 74 + {"matrix": [3, 11], "x": 208, "y": 48, "flags": 4}, 75 + {"matrix": [3, 12], "x": 224, "y": 48, "flags": 4}, 76 + {"matrix": [3, 13], "x": 240, "y": 48, "flags": 4}, 77 + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, 78 + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, 79 + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, 80 + {"x": 48, "y": 64, "flags": 4}, 81 + {"matrix": [4, 5], "x": 64, "y": 64, "flags": 4}, 82 + {"x": 80, "y": 64, "flags": 4}, 83 + {"matrix": [4, 9], "x": 96, "y": 64, "flags": 4}, 84 + {"matrix": [4, 10], "x": 112, "y": 64, "flags": 4}, 85 + {"matrix": [4, 11], "x": 128, "y": 64, "flags": 4}, 86 + {"matrix": [4, 12], "x": 144, "y": 64, "flags": 4}, 87 + {"matrix": [4, 13], "x": 160, "y": 64, "flags": 4} 88 + ] 89 + } 14 90 }
-24
keyboards/melgeek/mj64/rev3/rev3.c
··· 92 92 {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */ 93 93 {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */ 94 94 }; 95 - 96 - led_config_t g_led_config = { 97 - { 98 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ 99 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 }, /* R0 */ 100 - { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */ 101 - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 43, NO_LED }, /* R2 */ 102 - { 46, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60 }, /* R3 */ 103 - { 61, 62, 63, NO_LED, NO_LED, 65, NO_LED, NO_LED, NO_LED, 67, 68, 69, 70, 71 }, /* R4 */ 104 - }, { 105 - {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}, 106 - {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}, 107 - {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}, 108 - {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}, 109 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, {160, 64}, 110 - }, { 111 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 112 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 113 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 114 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 115 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 116 - } 117 - }; 118 - 119 95 #endif
+78
keyboards/melgeek/mj65/rev3/keyboard.json
··· 61 61 "animation": "cycle_all" 62 62 }, 63 63 "driver": "is31fl3741", 64 + "layout": [ 65 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 66 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 67 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 68 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 69 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 70 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 71 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 72 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 73 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 74 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 75 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 76 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 77 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 78 + {"x": 208, "y": 0, "flags": 4}, 79 + {"matrix": [0, 13], "x": 224, "y": 0, "flags": 4}, 80 + {"x": 240, "y": 0, "flags": 4}, 81 + {"matrix": [0, 14], "x": 255, "y": 0, "flags": 4}, 82 + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, 83 + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, 84 + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, 85 + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, 86 + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, 87 + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, 88 + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, 89 + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, 90 + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, 91 + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, 92 + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, 93 + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, 94 + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, 95 + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, 96 + {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4}, 97 + {"matrix": [2, 0], "x": 240, "y": 16, "flags": 4}, 98 + {"matrix": [2, 1], "x": 255, "y": 16, "flags": 4}, 99 + {"matrix": [2, 2], "x": 0, "y": 32, "flags": 4}, 100 + {"matrix": [2, 3], "x": 16, "y": 32, "flags": 4}, 101 + {"matrix": [2, 4], "x": 32, "y": 32, "flags": 4}, 102 + {"matrix": [2, 5], "x": 48, "y": 32, "flags": 4}, 103 + {"matrix": [2, 6], "x": 64, "y": 32, "flags": 4}, 104 + {"matrix": [2, 7], "x": 80, "y": 32, "flags": 4}, 105 + {"matrix": [2, 8], "x": 96, "y": 32, "flags": 4}, 106 + {"matrix": [2, 9], "x": 112, "y": 32, "flags": 4}, 107 + {"matrix": [2, 10], "x": 128, "y": 32, "flags": 4}, 108 + {"matrix": [2, 11], "x": 144, "y": 32, "flags": 4}, 109 + {"x": 160, "y": 32, "flags": 4}, 110 + {"matrix": [2, 12], "x": 176, "y": 32, "flags": 4}, 111 + {"x": 192, "y": 32, "flags": 4}, 112 + {"matrix": [2, 14], "x": 208, "y": 32, "flags": 4}, 113 + {"x": 0, "y": 48, "flags": 4}, 114 + {"matrix": [3, 0], "x": 16, "y": 48, "flags": 4}, 115 + {"x": 32, "y": 48, "flags": 4}, 116 + {"matrix": [3, 1], "x": 48, "y": 48, "flags": 4}, 117 + {"matrix": [3, 2], "x": 64, "y": 48, "flags": 4}, 118 + {"matrix": [3, 3], "x": 80, "y": 48, "flags": 4}, 119 + {"matrix": [3, 4], "x": 96, "y": 48, "flags": 4}, 120 + {"matrix": [3, 5], "x": 112, "y": 48, "flags": 4}, 121 + {"matrix": [3, 6], "x": 128, "y": 48, "flags": 4}, 122 + {"matrix": [3, 7], "x": 144, "y": 48, "flags": 4}, 123 + {"matrix": [3, 8], "x": 160, "y": 48, "flags": 4}, 124 + {"matrix": [3, 9], "x": 176, "y": 48, "flags": 4}, 125 + {"matrix": [3, 10], "x": 192, "y": 48, "flags": 4}, 126 + {"matrix": [3, 11], "x": 208, "y": 48, "flags": 4}, 127 + {"matrix": [3, 12], "x": 0, "y": 64, "flags": 4}, 128 + {"matrix": [3, 14], "x": 16, "y": 64, "flags": 4}, 129 + {"matrix": [4, 0], "x": 32, "y": 64, "flags": 4}, 130 + {"matrix": [4, 1], "x": 48, "y": 64, "flags": 4}, 131 + {"matrix": [4, 2], "x": 64, "y": 64, "flags": 4}, 132 + {"x": 80, "y": 64, "flags": 4}, 133 + {"matrix": [4, 5], "x": 96, "y": 64, "flags": 4}, 134 + {"x": 112, "y": 64, "flags": 4}, 135 + {"matrix": [4, 9], "x": 144, "y": 64, "flags": 4}, 136 + {"matrix": [4, 10], "x": 160, "y": 64, "flags": 4}, 137 + {"matrix": [4, 11], "x": 176, "y": 64, "flags": 4}, 138 + {"matrix": [4, 12], "x": 192, "y": 64, "flags": 4}, 139 + {"matrix": [4, 13], "x": 208, "y": 64, "flags": 4}, 140 + {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4} 141 + ], 64 142 "led_flush_limit": 26, 65 143 "led_process_limit": 4, 66 144 "sleep": true
+1 -25
keyboards/melgeek/mj65/rev3/rev3.c
··· 96 96 {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB75 */ 97 97 {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB76 */ 98 98 }; 99 - 100 - led_config_t g_led_config = { 101 - { 102 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 */ 103 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16 }, /* R0 */ 104 - { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31 }, /* R1 */ 105 - { 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 45, NO_LED, 47 }, /* R2 */ 106 - { 49, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, NO_LED, 63 }, /* R3 */ 107 - { 64, 65, 66, NO_LED, NO_LED, 68, NO_LED, NO_LED, NO_LED, 70, 71, 72, 73, 74, 75 }, /* R4 */ 108 - }, { 109 - {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}, 110 - {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}, 111 - {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}, 112 - {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}, 113 - {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}, 114 - }, { 115 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 116 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 117 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 118 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 119 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 120 - } 121 - }; 122 - 123 - #endif 99 + #endif
+70
keyboards/melgeek/mojo68/rev1/keyboard.json
··· 56 56 "animation": "cycle_all" 57 57 }, 58 58 "driver": "is31fl3741", 59 + "layout": [ 60 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 61 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 62 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 63 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 64 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 65 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 66 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 67 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 68 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 69 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 70 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 71 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 72 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 73 + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, 74 + {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4}, 75 + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, 76 + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, 77 + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, 78 + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, 79 + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, 80 + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, 81 + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, 82 + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, 83 + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, 84 + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, 85 + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, 86 + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, 87 + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, 88 + {"matrix": [1, 13], "x": 208, "y": 16, "flags": 4}, 89 + {"matrix": [1, 14], "x": 224, "y": 16, "flags": 4}, 90 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 91 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 92 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 93 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 94 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 95 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 96 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 97 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 98 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 99 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 100 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 101 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 102 + {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4}, 103 + {"matrix": [2, 14], "x": 208, "y": 32, "flags": 4}, 104 + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, 105 + {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, 106 + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, 107 + {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, 108 + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, 109 + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, 110 + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, 111 + {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4}, 112 + {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4}, 113 + {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4}, 114 + {"matrix": [3, 10], "x": 160, "y": 48, "flags": 4}, 115 + {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4}, 116 + {"matrix": [3, 12], "x": 192, "y": 48, "flags": 4}, 117 + {"matrix": [3, 14], "x": 208, "y": 48, "flags": 4}, 118 + {"matrix": [4, 0], "x": 0, "y": 64, "flags": 4}, 119 + {"matrix": [4, 1], "x": 16, "y": 64, "flags": 4}, 120 + {"matrix": [4, 2], "x": 32, "y": 64, "flags": 4}, 121 + {"matrix": [4, 5], "x": 48, "y": 64, "flags": 4}, 122 + {"matrix": [4, 9], "x": 64, "y": 64, "flags": 4}, 123 + {"matrix": [4, 10], "x": 80, "y": 64, "flags": 4}, 124 + {"matrix": [4, 11], "x": 96, "y": 64, "flags": 4}, 125 + {"matrix": [4, 12], "x": 112, "y": 64, "flags": 4}, 126 + {"matrix": [4, 13], "x": 128, "y": 64, "flags": 4}, 127 + {"matrix": [4, 14], "x": 144, "y": 64, "flags": 4} 128 + ], 59 129 "led_flush_limit": 26, 60 130 "led_process_limit": 4, 61 131 "sleep": true
-23
keyboards/melgeek/mojo68/rev1/rev1.c
··· 89 89 {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */ 90 90 }; 91 91 92 - led_config_t g_led_config = { 93 - { 94 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14*/ 95 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */ 96 - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, /* R1 */ 97 - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, NO_LED, 43 }, /* R2 */ 98 - { 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, NO_LED, 57 }, /* R3 */ 99 - { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, NO_LED, 62, 63, 64, 65, 66, 67 }, /* R4 */ 100 - }, { 101 - {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}, 102 - {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}, 103 - {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}, 104 - {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}, 105 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, {128, 64}, {144, 64}, 106 - }, { 107 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 108 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 109 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 110 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 111 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 112 - } 113 - }; 114 - 115 92 const is31fl3741_led_t g_is31_indicator_leds[3] = { 116 93 {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB124 */ 117 94 {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB125 */
+94
keyboards/melgeek/mojo75/rev1/keyboard.json
··· 61 61 "animation": "cycle_all" 62 62 }, 63 63 "driver": "is31fl3741", 64 + "layout": [ 65 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 66 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 67 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 68 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 69 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 70 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 71 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 72 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 73 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 74 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 75 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 76 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 77 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 78 + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, 79 + {"matrix": [0, 14], "x": 224, "y": 0, "flags": 4}, 80 + {"matrix": [0, 15], "x": 240, "y": 0, "flags": 4}, 81 + {"matrix": [1, 0], "x": 0, "y": 16, "flags": 4}, 82 + {"matrix": [1, 1], "x": 16, "y": 16, "flags": 4}, 83 + {"matrix": [1, 2], "x": 32, "y": 16, "flags": 4}, 84 + {"matrix": [1, 3], "x": 48, "y": 16, "flags": 4}, 85 + {"matrix": [1, 4], "x": 64, "y": 16, "flags": 4}, 86 + {"matrix": [1, 5], "x": 80, "y": 16, "flags": 4}, 87 + {"matrix": [1, 6], "x": 96, "y": 16, "flags": 4}, 88 + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 4}, 89 + {"matrix": [1, 8], "x": 128, "y": 16, "flags": 4}, 90 + {"matrix": [1, 9], "x": 144, "y": 16, "flags": 4}, 91 + {"matrix": [1, 10], "x": 160, "y": 16, "flags": 4}, 92 + {"matrix": [1, 11], "x": 176, "y": 16, "flags": 4}, 93 + {"matrix": [1, 12], "x": 192, "y": 16, "flags": 4}, 94 + {"x": 208, "y": 16, "flags": 4}, 95 + {"matrix": [1, 13], "x": 224, "y": 16, "flags": 4}, 96 + {"x": 240, "y": 16, "flags": 4}, 97 + {"matrix": [1, 15], "x": 255, "y": 16, "flags": 4}, 98 + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 4}, 99 + {"matrix": [2, 1], "x": 16, "y": 32, "flags": 4}, 100 + {"matrix": [2, 2], "x": 32, "y": 32, "flags": 4}, 101 + {"matrix": [2, 3], "x": 48, "y": 32, "flags": 4}, 102 + {"matrix": [2, 4], "x": 64, "y": 32, "flags": 4}, 103 + {"matrix": [2, 5], "x": 80, "y": 32, "flags": 4}, 104 + {"matrix": [2, 6], "x": 96, "y": 32, "flags": 4}, 105 + {"matrix": [2, 7], "x": 112, "y": 32, "flags": 4}, 106 + {"matrix": [2, 8], "x": 128, "y": 32, "flags": 4}, 107 + {"matrix": [2, 9], "x": 144, "y": 32, "flags": 4}, 108 + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 4}, 109 + {"matrix": [2, 11], "x": 176, "y": 32, "flags": 4}, 110 + {"matrix": [2, 12], "x": 192, "y": 32, "flags": 4}, 111 + {"matrix": [2, 13], "x": 208, "y": 32, "flags": 4}, 112 + {"matrix": [2, 15], "x": 224, "y": 32, "flags": 4}, 113 + {"matrix": [3, 0], "x": 0, "y": 48, "flags": 4}, 114 + {"matrix": [3, 1], "x": 16, "y": 48, "flags": 4}, 115 + {"matrix": [3, 2], "x": 32, "y": 48, "flags": 4}, 116 + {"matrix": [3, 3], "x": 48, "y": 48, "flags": 4}, 117 + {"matrix": [3, 4], "x": 64, "y": 48, "flags": 4}, 118 + {"matrix": [3, 5], "x": 80, "y": 48, "flags": 4}, 119 + {"matrix": [3, 6], "x": 96, "y": 48, "flags": 4}, 120 + {"matrix": [3, 7], "x": 112, "y": 48, "flags": 4}, 121 + {"matrix": [3, 8], "x": 128, "y": 48, "flags": 4}, 122 + {"matrix": [3, 9], "x": 144, "y": 48, "flags": 4}, 123 + {"matrix": [3, 10], "x": 160, "y": 48, "flags": 4}, 124 + {"matrix": [3, 11], "x": 176, "y": 48, "flags": 4}, 125 + {"x": 192, "y": 48, "flags": 4}, 126 + {"matrix": [3, 13], "x": 208, "y": 48, "flags": 4}, 127 + {"x": 224, "y": 48, "flags": 4}, 128 + {"matrix": [3, 15], "x": 240, "y": 48, "flags": 4}, 129 + {"x": 0, "y": 64, "flags": 4}, 130 + {"matrix": [4, 0], "x": 16, "y": 64, "flags": 4}, 131 + {"x": 32, "y": 64, "flags": 4}, 132 + {"matrix": [4, 1], "x": 48, "y": 64, "flags": 4}, 133 + {"matrix": [4, 2], "x": 64, "y": 64, "flags": 4}, 134 + {"matrix": [4, 3], "x": 80, "y": 64, "flags": 4}, 135 + {"matrix": [4, 4], "x": 96, "y": 64, "flags": 4}, 136 + {"matrix": [4, 5], "x": 112, "y": 64, "flags": 4}, 137 + {"matrix": [4, 6], "x": 128, "y": 64, "flags": 4}, 138 + {"matrix": [4, 7], "x": 144, "y": 64, "flags": 4}, 139 + {"matrix": [4, 8], "x": 160, "y": 64, "flags": 4}, 140 + {"matrix": [4, 9], "x": 176, "y": 64, "flags": 4}, 141 + {"matrix": [4, 10], "x": 192, "y": 64, "flags": 4}, 142 + {"matrix": [4, 12], "x": 208, "y": 64, "flags": 4}, 143 + {"matrix": [4, 14], "x": 224, "y": 64, "flags": 4}, 144 + {"matrix": [4, 15], "x": 240, "y": 64, "flags": 4}, 145 + {"matrix": [5, 0], "x": 0, "y": 80, "flags": 4}, 146 + {"matrix": [5, 1], "x": 16, "y": 80, "flags": 4}, 147 + {"matrix": [5, 2], "x": 32, "y": 80, "flags": 4}, 148 + {"x": 48, "y": 80, "flags": 4}, 149 + {"matrix": [5, 5], "x": 64, "y": 80, "flags": 4}, 150 + {"x": 80, "y": 80, "flags": 4}, 151 + {"matrix": [5, 9], "x": 96, "y": 80, "flags": 4}, 152 + {"matrix": [5, 10], "x": 112, "y": 80, "flags": 4}, 153 + {"matrix": [5, 12], "x": 128, "y": 80, "flags": 4}, 154 + {"matrix": [5, 13], "x": 144, "y": 80, "flags": 4}, 155 + {"matrix": [5, 14], "x": 160, "y": 80, "flags": 4}, 156 + {"matrix": [5, 15], "x": 176, "y": 80, "flags": 4} 157 + ], 64 158 "led_flush_limit": 26, 65 159 "led_process_limit": 4, 66 160 "sleep": true
-27
keyboards/melgeek/mojo75/rev1/rev1.c
··· 112 112 {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB92 */ 113 113 {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB90 */ 114 114 }; 115 - 116 - led_config_t g_led_config = { 117 - { 118 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 C15 */ 119 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }, /* R0 */ 120 - { 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 30, NO_LED, 32 }, /* R1 */ 121 - { 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, NO_LED, 47 }, /* R2 */ 122 - { 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, NO_LED, 61, NO_LED, 63 }, /* R3 */ 123 - { 65, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, NO_LED, 77, NO_LED, 78, 79 }, /* R4 */ 124 - { 80, 81, 82, NO_LED, NO_LED, 84, NO_LED, NO_LED, NO_LED, 86, 87, NO_LED, 88, 89, 90, 91 }, /* R5 */ 125 - }, { 126 - {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}, 127 - {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}, 128 - {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}, 129 - {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}, 130 - {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}, 131 - {0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, {128, 80}, {144, 80}, {160, 80}, {176, 80}, 132 - }, { 133 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 134 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 135 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 136 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 137 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 138 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 139 - } 140 - }; 141 - 142 115 #endif
+93
keyboards/melgeek/tegic/rev1/keyboard.json
··· 67 67 "animation": "cycle_all" 68 68 }, 69 69 "driver": "is31fl3741", 70 + "layout": [ 71 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 72 + {"matrix": [0, 1], "x": 12, "y": 0, "flags": 4}, 73 + {"matrix": [0, 2], "x": 24, "y": 0, "flags": 4}, 74 + {"matrix": [0, 3], "x": 36, "y": 0, "flags": 4}, 75 + {"matrix": [0, 4], "x": 48, "y": 0, "flags": 4}, 76 + {"matrix": [0, 5], "x": 60, "y": 0, "flags": 4}, 77 + {"matrix": [0, 6], "x": 72, "y": 0, "flags": 4}, 78 + {"matrix": [0, 7], "x": 84, "y": 0, "flags": 4}, 79 + {"matrix": [0, 8], "x": 96, "y": 0, "flags": 4}, 80 + {"matrix": [0, 9], "x": 108, "y": 0, "flags": 4}, 81 + {"matrix": [0, 10], "x": 120, "y": 0, "flags": 4}, 82 + {"matrix": [0, 11], "x": 132, "y": 0, "flags": 4}, 83 + {"matrix": [0, 12], "x": 144, "y": 0, "flags": 4}, 84 + {"matrix": [0, 13], "x": 156, "y": 0, "flags": 4}, 85 + {"matrix": [0, 14], "x": 168, "y": 0, "flags": 4}, 86 + {"matrix": [1, 0], "x": 0, "y": 12, "flags": 4}, 87 + {"matrix": [1, 1], "x": 12, "y": 12, "flags": 4}, 88 + {"matrix": [1, 2], "x": 24, "y": 12, "flags": 4}, 89 + {"matrix": [1, 3], "x": 36, "y": 12, "flags": 4}, 90 + {"matrix": [1, 4], "x": 48, "y": 12, "flags": 4}, 91 + {"matrix": [1, 5], "x": 60, "y": 12, "flags": 4}, 92 + {"matrix": [1, 6], "x": 72, "y": 12, "flags": 4}, 93 + {"matrix": [1, 7], "x": 84, "y": 12, "flags": 4}, 94 + {"matrix": [1, 8], "x": 96, "y": 12, "flags": 4}, 95 + {"matrix": [1, 9], "x": 108, "y": 12, "flags": 4}, 96 + {"matrix": [1, 10], "x": 120, "y": 12, "flags": 4}, 97 + {"matrix": [1, 11], "x": 132, "y": 12, "flags": 4}, 98 + {"matrix": [1, 12], "x": 144, "y": 12, "flags": 4}, 99 + {"x": 156, "y": 12, "flags": 4}, 100 + {"matrix": [1, 13], "x": 168, "y": 12, "flags": 4}, 101 + {"x": 180, "y": 12, "flags": 4}, 102 + {"matrix": [1, 14], "x": 192, "y": 12, "flags": 4}, 103 + {"matrix": [2, 0], "x": 0, "y": 24, "flags": 4}, 104 + {"matrix": [2, 1], "x": 12, "y": 24, "flags": 4}, 105 + {"matrix": [2, 2], "x": 24, "y": 24, "flags": 4}, 106 + {"matrix": [2, 3], "x": 36, "y": 24, "flags": 4}, 107 + {"matrix": [2, 4], "x": 48, "y": 24, "flags": 4}, 108 + {"matrix": [2, 5], "x": 60, "y": 24, "flags": 4}, 109 + {"matrix": [2, 6], "x": 72, "y": 24, "flags": 4}, 110 + {"matrix": [2, 7], "x": 84, "y": 24, "flags": 4}, 111 + {"matrix": [2, 8], "x": 96, "y": 24, "flags": 4}, 112 + {"matrix": [2, 9], "x": 108, "y": 24, "flags": 4}, 113 + {"matrix": [2, 10], "x": 120, "y": 24, "flags": 4}, 114 + {"matrix": [2, 11], "x": 132, "y": 24, "flags": 4}, 115 + {"matrix": [2, 12], "x": 144, "y": 24, "flags": 4}, 116 + {"matrix": [2, 13], "x": 156, "y": 24, "flags": 4}, 117 + {"matrix": [2, 14], "x": 168, "y": 24, "flags": 4}, 118 + {"matrix": [3, 0], "x": 0, "y": 36, "flags": 4}, 119 + {"matrix": [3, 1], "x": 12, "y": 36, "flags": 4}, 120 + {"matrix": [3, 2], "x": 24, "y": 36, "flags": 4}, 121 + {"matrix": [3, 3], "x": 36, "y": 36, "flags": 4}, 122 + {"matrix": [3, 4], "x": 48, "y": 36, "flags": 4}, 123 + {"matrix": [3, 5], "x": 60, "y": 36, "flags": 4}, 124 + {"matrix": [3, 6], "x": 72, "y": 36, "flags": 4}, 125 + {"matrix": [3, 7], "x": 84, "y": 36, "flags": 4}, 126 + {"matrix": [3, 8], "x": 96, "y": 36, "flags": 4}, 127 + {"matrix": [3, 9], "x": 108, "y": 36, "flags": 4}, 128 + {"matrix": [3, 10], "x": 120, "y": 36, "flags": 4}, 129 + {"matrix": [3, 11], "x": 132, "y": 36, "flags": 4}, 130 + {"x": 144, "y": 36, "flags": 4}, 131 + {"matrix": [3, 12], "x": 156, "y": 36, "flags": 4}, 132 + {"x": 168, "y": 36, "flags": 4}, 133 + {"x": 0, "y": 48, "flags": 4}, 134 + {"matrix": [4, 0], "x": 12, "y": 48, "flags": 4}, 135 + {"x": 24, "y": 48, "flags": 4}, 136 + {"matrix": [4, 1], "x": 36, "y": 48, "flags": 4}, 137 + {"matrix": [4, 2], "x": 48, "y": 48, "flags": 4}, 138 + {"matrix": [4, 3], "x": 60, "y": 48, "flags": 4}, 139 + {"matrix": [4, 4], "x": 72, "y": 48, "flags": 4}, 140 + {"matrix": [4, 5], "x": 84, "y": 48, "flags": 4}, 141 + {"matrix": [4, 6], "x": 96, "y": 48, "flags": 4}, 142 + {"matrix": [4, 7], "x": 108, "y": 48, "flags": 4}, 143 + {"matrix": [4, 8], "x": 120, "y": 48, "flags": 4}, 144 + {"matrix": [4, 9], "x": 132, "y": 48, "flags": 4}, 145 + {"matrix": [4, 10], "x": 144, "y": 48, "flags": 4}, 146 + {"x": 156, "y": 48, "flags": 4}, 147 + {"matrix": [4, 11], "x": 168, "y": 48, "flags": 4}, 148 + {"x": 180, "y": 48, "flags": 4}, 149 + {"matrix": [4, 13], "x": 192, "y": 48, "flags": 4}, 150 + {"matrix": [5, 0], "x": 0, "y": 60, "flags": 4}, 151 + {"matrix": [5, 1], "x": 12, "y": 60, "flags": 4}, 152 + {"matrix": [5, 2], "x": 24, "y": 60, "flags": 4}, 153 + {"x": 36, "y": 60, "flags": 4}, 154 + {"matrix": [5, 5], "x": 48, "y": 60, "flags": 4}, 155 + {"x": 60, "y": 60, "flags": 4}, 156 + {"matrix": [5, 9], "x": 72, "y": 60, "flags": 4}, 157 + {"matrix": [5, 10], "x": 84, "y": 60, "flags": 4}, 158 + {"matrix": [5, 11], "x": 96, "y": 60, "flags": 4}, 159 + {"matrix": [5, 12], "x": 108, "y": 60, "flags": 4}, 160 + {"matrix": [5, 13], "x": 120, "y": 60, "flags": 4}, 161 + {"matrix": [5, 14], "x": 132, "y": 60, "flags": 4} 162 + ], 70 163 "led_flush_limit": 26, 71 164 "led_process_limit": 4, 72 165 "sleep": true
-25
keyboards/melgeek/tegic/rev1/rev1.c
··· 117 117 {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB143 */ 118 118 {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB149 */ 119 119 }; 120 - led_config_t g_led_config = { 121 - { 122 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 C14 */ 123 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, /* R0 */ 124 - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 29, 31 }, /* R1 */ 125 - { 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46 }, /* R2 */ 126 - { 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 60, NO_LED, NO_LED }, /* R3 */ 127 - { 63, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 76, NO_LED, 78, NO_LED }, /* R4 */ 128 - { 79, 80, 81, NO_LED, NO_LED, 83, NO_LED, NO_LED, NO_LED, 85, 86, 87, 88, 89, 90 }, /* R5 */ 129 - }, { 130 - {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 131 - {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 132 - {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 133 - {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 134 - {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 135 - {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 136 - }, { 137 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 138 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 139 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 140 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 141 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 142 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 143 - } 144 - }; 145 120 #endif
+71
keyboards/melgeek/z70ultra/rev1/keyboard.json
··· 61 61 "animation": "cycle_all" 62 62 }, 63 63 "driver": "is31fl3741", 64 + "layout": [ 65 + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 4}, 66 + {"matrix": [0, 1], "x": 16, "y": 0, "flags": 4}, 67 + {"matrix": [0, 2], "x": 32, "y": 0, "flags": 4}, 68 + {"matrix": [0, 3], "x": 48, "y": 0, "flags": 4}, 69 + {"matrix": [0, 4], "x": 64, "y": 0, "flags": 4}, 70 + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, 71 + {"matrix": [0, 6], "x": 96, "y": 0, "flags": 4}, 72 + {"matrix": [0, 7], "x": 112, "y": 0, "flags": 4}, 73 + {"matrix": [0, 8], "x": 128, "y": 0, "flags": 4}, 74 + {"matrix": [0, 9], "x": 144, "y": 0, "flags": 4}, 75 + {"matrix": [0, 10], "x": 160, "y": 0, "flags": 4}, 76 + {"matrix": [0, 11], "x": 176, "y": 0, "flags": 4}, 77 + {"matrix": [0, 12], "x": 192, "y": 0, "flags": 4}, 78 + {"matrix": [0, 13], "x": 208, "y": 0, "flags": 4}, 79 + {"matrix": [5, 6], "x": 0, "y": 16, "flags": 4}, 80 + {"matrix": [1, 0], "x": 16, "y": 16, "flags": 4}, 81 + {"matrix": [1, 1], "x": 32, "y": 16, "flags": 4}, 82 + {"matrix": [1, 2], "x": 48, "y": 16, "flags": 4}, 83 + {"matrix": [1, 3], "x": 64, "y": 16, "flags": 4}, 84 + {"matrix": [1, 4], "x": 80, "y": 16, "flags": 4}, 85 + {"matrix": [1, 5], "x": 96, "y": 16, "flags": 4}, 86 + {"matrix": [1, 6], "x": 112, "y": 16, "flags": 4}, 87 + {"matrix": [1, 7], "x": 128, "y": 16, "flags": 4}, 88 + {"matrix": [1, 8], "x": 144, "y": 16, "flags": 4}, 89 + {"matrix": [1, 9], "x": 160, "y": 16, "flags": 4}, 90 + {"matrix": [1, 10], "x": 176, "y": 16, "flags": 4}, 91 + {"matrix": [1, 11], "x": 192, "y": 16, "flags": 4}, 92 + {"matrix": [1, 12], "x": 208, "y": 16, "flags": 4}, 93 + {"matrix": [1, 13], "x": 0, "y": 32, "flags": 4}, 94 + {"matrix": [5, 7], "x": 16, "y": 32, "flags": 4}, 95 + {"matrix": [2, 0], "x": 32, "y": 32, "flags": 4}, 96 + {"matrix": [2, 1], "x": 48, "y": 32, "flags": 4}, 97 + {"matrix": [2, 2], "x": 64, "y": 32, "flags": 4}, 98 + {"matrix": [2, 3], "x": 80, "y": 32, "flags": 4}, 99 + {"matrix": [2, 4], "x": 96, "y": 32, "flags": 4}, 100 + {"matrix": [2, 5], "x": 112, "y": 32, "flags": 4}, 101 + {"matrix": [2, 6], "x": 128, "y": 32, "flags": 4}, 102 + {"matrix": [2, 7], "x": 144, "y": 32, "flags": 4}, 103 + {"matrix": [2, 8], "x": 160, "y": 32, "flags": 4}, 104 + {"matrix": [2, 9], "x": 176, "y": 32, "flags": 4}, 105 + {"matrix": [2, 10], "x": 192, "y": 32, "flags": 4}, 106 + {"matrix": [2, 11], "x": 0, "y": 48, "flags": 4}, 107 + {"matrix": [2, 13], "x": 16, "y": 48, "flags": 4}, 108 + {"matrix": [5, 9], "x": 32, "y": 48, "flags": 4}, 109 + {"matrix": [3, 0], "x": 48, "y": 48, "flags": 4}, 110 + {"matrix": [3, 2], "x": 64, "y": 48, "flags": 4}, 111 + {"matrix": [3, 3], "x": 80, "y": 48, "flags": 4}, 112 + {"matrix": [3, 4], "x": 96, "y": 48, "flags": 4}, 113 + {"matrix": [3, 5], "x": 112, "y": 48, "flags": 4}, 114 + {"matrix": [3, 6], "x": 128, "y": 48, "flags": 4}, 115 + {"matrix": [3, 7], "x": 144, "y": 48, "flags": 4}, 116 + {"matrix": [3, 8], "x": 160, "y": 48, "flags": 4}, 117 + {"matrix": [3, 9], "x": 176, "y": 48, "flags": 4}, 118 + {"matrix": [3, 10], "x": 0, "y": 64, "flags": 4}, 119 + {"matrix": [3, 11], "x": 16, "y": 64, "flags": 4}, 120 + {"matrix": [3, 12], "x": 32, "y": 64, "flags": 4}, 121 + {"matrix": [5, 8], "x": 48, "y": 64, "flags": 4}, 122 + {"matrix": [5, 10], "x": 64, "y": 64, "flags": 4}, 123 + {"matrix": [4, 0], "x": 80, "y": 64, "flags": 4}, 124 + {"matrix": [4, 1], "x": 96, "y": 64, "flags": 4}, 125 + {"matrix": [4, 2], "x": 112, "y": 64, "flags": 4}, 126 + {"matrix": [4, 4], "x": 0, "y": 80, "flags": 4}, 127 + {"matrix": [4, 5], "x": 16, "y": 80, "flags": 4}, 128 + {"matrix": [4, 6], "x": 32, "y": 80, "flags": 4}, 129 + {"matrix": [4, 9], "x": 48, "y": 80, "flags": 4}, 130 + {"matrix": [4, 10], "x": 64, "y": 80, "flags": 4}, 131 + {"matrix": [5, 11], "x": 80, "y": 80, "flags": 4}, 132 + {"matrix": [5, 12], "x": 96, "y": 80, "flags": 4}, 133 + {"matrix": [5, 13], "x": 112, "y": 80, "flags": 4} 134 + ], 64 135 "led_flush_limit": 26, 65 136 "led_process_limit": 4, 66 137 "sleep": true
-25
keyboards/melgeek/z70ultra/rev1/rev1.c
··· 91 91 {0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */ 92 92 {0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */ 93 93 }; 94 - led_config_t g_led_config = { 95 - { 96 - /* C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 C10 C11 C12 C13 */ 97 - { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, }, /* R0 */ 98 - { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, }, /* R1 */ 99 - { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, }, /* R2 */ 100 - { 44, NO_LED, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, }, /* R3 */ 101 - { 58, 59, 60, NO_LED, 61, 62, 63, NO_LED, NO_LED, 64, 65, NO_LED, NO_LED, NO_LED, }, /* R4 */ 102 - { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, 14, 29, 56, 43, 57, 66, 67, 68, }, /* R5 */ 103 - }, { 104 - {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}, 105 - {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}, 106 - {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}, 107 - {0, 48}, {16, 48}, {32, 48}, {48, 48}, {64, 48}, {80, 48}, {96, 48}, {112, 48}, {128, 48}, {144, 48}, {160, 48}, {176, 48}, 108 - {0, 64}, {16, 64}, {32, 64}, {48, 64}, {64, 64}, {80, 64}, {96, 64}, {112, 64}, 109 - {0, 80}, {16, 80}, {32, 80}, {48, 80}, {64, 80}, {80, 80}, {96, 80}, {112, 80}, 110 - }, { 111 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 112 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 113 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 114 - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 115 - 4, 4, 4, 4, 4, 4, 4, 4, 116 - 4, 4, 4, 4, 4, 4, 4, 4, 117 - } 118 - }; 119 94 120 95 const is31fl3741_led_t g_is31_indicator_leds[6] = { 121 96 {0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */