1
0
Fork 0

Fixup rgb matrix config for KBD67 mkII boards (#13931)

This commit is contained in:
Drashna Jaelre 2021-08-09 11:26:02 -07:00 committed by GitHub
parent 8d19f4f187
commit 2617ac6041
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 198 additions and 340 deletions

View file

@ -13,123 +13,5 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "mkiirgb.h" #include "mkiirgb.h"
#ifdef RGB_MATRIX_ENABLE
const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C8_8, C7_8, C6_8}, // LA17
{0, C9_8, C7_7, C6_7}, // LA16
{0, C9_7, C8_7, C6_6}, // LA15
{0, C9_6, C8_6, C7_6}, // LA14
{0, C9_5, C8_5, C7_5}, // LA13
{0, C9_4, C8_4, C7_4}, // LA12
{0, C9_3, C8_3, C7_3}, // LA11
{0, C9_2, C8_2, C7_2}, // LA10
{0, C9_1, C8_1, C7_1}, // LA9
{0, C2_9, C3_9, C4_9}, // LB0
{0, C1_9, C3_10, C4_10}, // LB1
{0, C1_10, C2_10, C4_11}, // LB2
{0, C1_11, C2_11, C3_11}, // LB3
{0, C1_13, C2_13, C3_13}, // LB5
{0, C1_14, C2_14, C3_14}, // LB6
{0, C1_7, C2_7, C3_7}, // LA7
{0, C1_6, C2_6, C3_6}, // LA6
{0, C1_5, C2_5, C3_5}, // LA5
{0, C1_4, C2_4, C3_4}, // LA4
{0, C1_3, C2_3, C3_3}, // LA3
{0, C1_2, C2_2, C4_3}, // LA2
{0, C1_1, C3_2, C4_2}, // LA1
{0, C2_1, C3_1, C4_1}, // LA0
{0, C9_9, C8_9, C7_9}, // LB9
{0, C9_10, C8_10, C7_10}, // LB10
{0, C9_11, C8_11, C7_11}, // LB11
{0, C9_12, C8_12, C7_12}, // LB12
{0, C9_13, C8_13, C7_13}, // LB13
{0, C9_14, C8_14, C7_14}, // LB14
{0, C1_15, C2_15, C3_15}, // LB7
{0, C1_8, C2_8, C3_8}, // LA8
{1, C9_6, C8_6, C7_6}, // LC14
{1, C9_5, C8_5, C7_5}, // LC13
{1, C9_4, C8_4, C7_4}, // LC12
{1, C9_3, C8_3, C7_3}, // LC11
{1, C9_2, C8_2, C7_2}, // LC10
{1, C9_1, C8_1, C7_1}, // LC9
{1, C2_9, C3_9, C4_9}, // LD0
{1, C1_9, C3_10, C4_10}, // LD1
{1, C1_10, C2_10, C4_11}, // LD2
{1, C1_11, C2_11, C3_11}, // LD3
{1, C1_12, C2_12, C3_12}, // LD4
{1, C1_13, C2_13, C3_13}, // LD5
{0, C1_16, C2_16, C3_16}, // LB8
{1, C9_8, C7_7, C6_7}, // LC16
{1, C1_5, C2_5, C3_5}, // LC5
{1, C1_4, C2_4, C3_4}, // LC4
{1, C1_3, C2_3, C3_3}, // LC3
{1, C1_2, C2_2, C4_3}, // LC2
{1, C1_1, C3_2, C4_2}, // LC1
{1, C9_9, C8_9, C7_9}, // LD9
{1, C9_10, C8_10, C7_10}, // LD10
{1, C9_11, C8_11, C7_11}, // LD11
{1, C9_12, C8_12, C7_12}, // LD12
{1, C1_14, C2_14, C3_14}, // LD6
{1, C1_15, C2_15, C3_15}, // LD7
{1, C1_16, C2_16, C3_16}, // LD8
{0, C9_15, C8_15, C6_14}, // LB15
{1, C8_8, C7_8, C6_8}, // LC17
{1, C1_8, C2_8, C3_8}, // LC8
{1, C1_7, C2_7, C3_7}, // LC7
{1, C2_1, C3_1, C4_1}, // LC0
{1, C9_14, C8_14, C7_14}, // LD14
{1, C9_15, C8_15, C6_14}, // LD15
{1, C8_16, C7_16, C6_16}, // LD17
{0, C8_16, C7_16, C6_16}, // LB17
{0, C9_16, C7_15, C6_15}, // LB16
};
led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 },
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
{ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED,56, 57 },
{ 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
}, {
{0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
{4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
{6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
{9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
{2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
}, {
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1
} };
void suspend_power_down_kb(void)
{
rgb_matrix_set_suspend_state(true);
suspend_power_down_user();
}
void suspend_wakeup_init_kb(void)
{
rgb_matrix_set_suspend_state(false);
suspend_wakeup_init_user();
}
__attribute__ ((weak))
void rgb_matrix_indicators_user(void)
{
if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK))
{
rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
}
}
#endif

View file

@ -16,108 +16,88 @@
#include "v1.h" #include "v1.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C8_8, C7_8, C6_8}, // LA17
{0, C9_8, C7_7, C6_7}, // LA16
{0, C9_7, C8_7, C6_6}, // LA15
{0, C9_6, C8_6, C7_6}, // LA14
{0, C9_5, C8_5, C7_5}, // LA13
{0, C9_4, C8_4, C7_4}, // LA12
{0, C9_3, C8_3, C7_3}, // LA11
{0, C9_2, C8_2, C7_2}, // LA10
{0, C9_1, C8_1, C7_1}, // LA9
{0, C2_9, C3_9, C4_9}, // LB0
{0, C1_9, C3_10, C4_10}, // LB1
{0, C1_10, C2_10, C4_11}, // LB2
{0, C1_11, C2_11, C3_11}, // LB3
{0, C1_13, C2_13, C3_13}, // LB5
{0, C1_14, C2_14, C3_14}, // LB6
{0, C1_7, C2_7, C3_7}, // LA7
{0, C1_6, C2_6, C3_6}, // LA6
{0, C1_5, C2_5, C3_5}, // LA5
{0, C1_4, C2_4, C3_4}, // LA4
{0, C1_3, C2_3, C3_3}, // LA3
{0, C1_2, C2_2, C4_3}, // LA2
{0, C1_1, C3_2, C4_2}, // LA1
{0, C2_1, C3_1, C4_1}, // LA0
{0, C9_9, C8_9, C7_9}, // LB9
{0, C9_10, C8_10, C7_10}, // LB10
{0, C9_11, C8_11, C7_11}, // LB11
{0, C9_12, C8_12, C7_12}, // LB12
{0, C9_13, C8_13, C7_13}, // LB13
{0, C9_14, C8_14, C7_14}, // LB14
{0, C1_15, C2_15, C3_15}, // LB7
{0, C1_8, C2_8, C3_8}, // LA8 {0, C8_8, C7_8, C6_8}, // LA17
{1, C9_6, C8_6, C7_6}, // LC14 {0, C9_8, C7_7, C6_7}, // LA16
{1, C9_5, C8_5, C7_5}, // LC13 {0, C9_7, C8_7, C6_6}, // LA15
{1, C9_4, C8_4, C7_4}, // LC12 {0, C9_6, C8_6, C7_6}, // LA14
{1, C9_3, C8_3, C7_3}, // LC11 {0, C9_5, C8_5, C7_5}, // LA13
{1, C9_2, C8_2, C7_2}, // LC10 {0, C9_4, C8_4, C7_4}, // LA12
{1, C9_1, C8_1, C7_1}, // LC9 {0, C9_3, C8_3, C7_3}, // LA11
{1, C2_9, C3_9, C4_9}, // LD0 {0, C9_2, C8_2, C7_2}, // LA10
{1, C1_9, C3_10, C4_10}, // LD1 {0, C9_1, C8_1, C7_1}, // LA9
{1, C1_10, C2_10, C4_11}, // LD2 {0, C2_9, C3_9, C4_9}, // LB0
{1, C1_11, C2_11, C3_11}, // LD3 {0, C1_9, C3_10, C4_10}, // LB1
{1, C1_12, C2_12, C3_12}, // LD4 {0, C1_10, C2_10, C4_11}, // LB2
{1, C1_13, C2_13, C3_13}, // LD5 {0, C1_11, C2_11, C3_11}, // LB3
{0, C1_16, C2_16, C3_16}, // LB8 {0, C1_13, C2_13, C3_13}, // LB5
{0, C1_14, C2_14, C3_14}, // LB6
{1, C9_8, C7_7, C6_7}, // LC16 {0, C1_7, C2_7, C3_7}, // LA7
{1, C1_5, C2_5, C3_5}, // LC5 {0, C1_6, C2_6, C3_6}, // LA6
{1, C1_4, C2_4, C3_4}, // LC4 {0, C1_5, C2_5, C3_5}, // LA5
{1, C1_3, C2_3, C3_3}, // LC3 {0, C1_4, C2_4, C3_4}, // LA4
{1, C1_2, C2_2, C4_3}, // LC2 {0, C1_3, C2_3, C3_3}, // LA3
{1, C1_1, C3_2, C4_2}, // LC1 {0, C1_2, C2_2, C4_3}, // LA2
{1, C9_9, C8_9, C7_9}, // LD9 {0, C1_1, C3_2, C4_2}, // LA1
{1, C9_10, C8_10, C7_10}, // LD10 {0, C2_1, C3_1, C4_1}, // LA0
{1, C9_11, C8_11, C7_11}, // LD11 {0, C9_9, C8_9, C7_9}, // LB9
{1, C9_12, C8_12, C7_12}, // LD12 {0, C9_10, C8_10, C7_10}, // LB10
{1, C1_14, C2_14, C3_14}, // LD6 {0, C9_11, C8_11, C7_11}, // LB11
{1, C1_15, C2_15, C3_15}, // LD7 {0, C9_12, C8_12, C7_12}, // LB12
{1, C1_16, C2_16, C3_16}, // LD8 {0, C9_13, C8_13, C7_13}, // LB13
{0, C9_15, C8_15, C6_14}, // LB15 {0, C9_14, C8_14, C7_14}, // LB14
{0, C1_15, C2_15, C3_15}, // LB7
{1, C8_8, C7_8, C6_8}, // LC17 {0, C1_8, C2_8, C3_8}, // LA8
{1, C1_8, C2_8, C3_8}, // LC8 {1, C9_6, C8_6, C7_6}, // LC14
{1, C1_7, C2_7, C3_7}, // LC7 {1, C9_5, C8_5, C7_5}, // LC13
{1, C2_1, C3_1, C4_1}, // LC0 {1, C9_4, C8_4, C7_4}, // LC12
{1, C9_14, C8_14, C7_14}, // LD14 {1, C9_3, C8_3, C7_3}, // LC11
{1, C9_15, C8_15, C6_14}, // LD15 {1, C9_2, C8_2, C7_2}, // LC10
{1, C8_16, C7_16, C6_16}, // LD17 {1, C9_1, C8_1, C7_1}, // LC9
{0, C8_16, C7_16, C6_16}, // LB17 {1, C2_9, C3_9, C4_9}, // LD0
{0, C9_16, C7_15, C6_15}, // LB16 {1, C1_9, C3_10, C4_10}, // LD1
{1, C1_10, C2_10, C4_11}, // LD2
{1, C1_11, C2_11, C3_11}, // LD3
{1, C1_12, C2_12, C3_12}, // LD4
{1, C1_13, C2_13, C3_13}, // LD5
{0, C1_16, C2_16, C3_16}, // LB8
{1, C9_8, C7_7, C6_7}, // LC16
{1, C1_5, C2_5, C3_5}, // LC5
{1, C1_4, C2_4, C3_4}, // LC4
{1, C1_3, C2_3, C3_3}, // LC3
{1, C1_2, C2_2, C4_3}, // LC2
{1, C1_1, C3_2, C4_2}, // LC1
{1, C9_9, C8_9, C7_9}, // LD9
{1, C9_10, C8_10, C7_10}, // LD10
{1, C9_11, C8_11, C7_11}, // LD11
{1, C9_12, C8_12, C7_12}, // LD12
{1, C1_14, C2_14, C3_14}, // LD6
{1, C1_15, C2_15, C3_15}, // LD7
{1, C1_16, C2_16, C3_16}, // LD8
{0, C9_15, C8_15, C6_14}, // LB15
{1, C8_8, C7_8, C6_8}, // LC17
{1, C1_8, C2_8, C3_8}, // LC8
{1, C1_7, C2_7, C3_7}, // LC7
{1, C2_1, C3_1, C4_1}, // LC0
{1, C9_14, C8_14, C7_14}, // LD14
{1, C9_15, C8_15, C6_14}, // LD15
{1, C8_16, C7_16, C6_16}, // LD17
{0, C8_16, C7_16, C6_16}, // LB17
{0, C9_16, C7_15, C6_15}, // LB16
}; };
led_config_t g_led_config = { { led_config_t g_led_config = {{{0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14}, {15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29}, {30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED, 42, 43}, {44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED, 56, 57}, {58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66}},
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, {{0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, {90, 0}, {105, 0}, {120, 0}, {135, 0}, {150, 0}, {165, 0}, {180, 0}, {203, 0}, {224, 0}, {4, 16}, {23, 16}, {38, 16}, {53, 16}, {68, 16}, {83, 16}, {98, 16}, {113, 16}, {128, 16}, {143, 16}, {158, 16}, {173, 16}, {188, 16}, {206, 16}, {224, 16}, {6, 32}, {26, 32}, {41, 32}, {56, 32}, {71, 32}, {86, 32}, {101, 32}, {116, 32}, {131, 32}, {146, 32}, {161, 32}, {176, 32}, {201, 32}, {224, 32}, {9, 48}, {34, 48}, {49, 48}, {64, 48}, {79, 48}, {94, 48}, {109, 48}, {124, 48}, {139, 48}, {154, 48}, {169, 48}, {189, 48}, {210, 48}, {224, 48}, {2, 64}, {21, 64}, {39, 64}, {96, 64}, {152, 64}, {171, 64}, {195, 64}, {210, 64}, {224, 64}},
{ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }, {1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 4, 1, 1, 1, 1, 1}};
{ 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, NO_LED,42, 43 },
{ 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, NO_LED,56, 57 },
{ 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
}, {
{0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
{4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
{6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
{9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
{2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
}, {
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1
} };
__attribute__((weak)) void rgb_matrix_indicators_user(void) {
__attribute__ ((weak)) if (host_keyboard_led_state().caps_lock) {
void rgb_matrix_indicators_user(void)
{
if (host_keyboard_led_state().caps_lock)
{
rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
} }
} }

View file

@ -16,79 +16,79 @@
#include "v2.h" #include "v2.h"
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
{0, C8_8, C7_8, C6_8}, // LA17 {0, C8_8, C7_8, C6_8}, // LA17
{0, C9_8, C7_7, C6_7}, // LA16 {0, C9_8, C7_7, C6_7}, // LA16
{0, C9_7, C8_7, C6_6}, // LA15 {0, C9_7, C8_7, C6_6}, // LA15
{0, C9_6, C8_6, C7_6}, // LA14 {0, C9_6, C8_6, C7_6}, // LA14
{0, C9_5, C8_5, C7_5}, // LA13 {0, C9_5, C8_5, C7_5}, // LA13
{0, C9_4, C8_4, C7_4}, // LA12 {0, C9_4, C8_4, C7_4}, // LA12
{0, C9_3, C8_3, C7_3}, // LA11 {0, C9_3, C8_3, C7_3}, // LA11
{0, C9_2, C8_2, C7_2}, // LA10 {0, C9_2, C8_2, C7_2}, // LA10
{0, C9_1, C8_1, C7_1}, // LA9 {0, C9_1, C8_1, C7_1}, // LA9
{0, C2_9, C3_9, C4_9}, // LB0 {0, C2_9, C3_9, C4_9}, // LB0
{0, C1_9, C3_10, C4_10}, // LB1 {0, C1_9, C3_10, C4_10}, // LB1
{0, C1_10, C2_10, C4_11}, // LB2 {0, C1_10, C2_10, C4_11}, // LB2
{0, C1_11, C2_11, C3_11}, // LB3 {0, C1_11, C2_11, C3_11}, // LB3
{0, C1_13, C2_13, C3_13}, // LB5 {0, C1_13, C2_13, C3_13}, // LB5
{0, C1_14, C2_14, C3_14}, // LB6 {0, C1_14, C2_14, C3_14}, // LB6
{0, C1_7, C2_7, C3_7}, // LA7 {0, C1_7, C2_7, C3_7}, // LA7
{0, C1_6, C2_6, C3_6}, // LA6 {0, C1_6, C2_6, C3_6}, // LA6
{0, C1_5, C2_5, C3_5}, // LA5 {0, C1_5, C2_5, C3_5}, // LA5
{0, C1_4, C2_4, C3_4}, // LA4 {0, C1_4, C2_4, C3_4}, // LA4
{0, C1_3, C2_3, C3_3}, // LA3 {0, C1_3, C2_3, C3_3}, // LA3
{0, C1_2, C2_2, C4_3}, // LA2 {0, C1_2, C2_2, C4_3}, // LA2
{0, C1_1, C3_2, C4_2}, // LA1 {0, C1_1, C3_2, C4_2}, // LA1
{0, C2_1, C3_1, C4_1}, // LA0 {0, C2_1, C3_1, C4_1}, // LA0
{0, C9_9, C8_9, C7_9}, // LB9 {0, C9_9, C8_9, C7_9}, // LB9
{0, C9_10, C8_10, C7_10}, // LB10 {0, C9_10, C8_10, C7_10}, // LB10
{0, C9_11, C8_11, C7_11}, // LB11 {0, C9_11, C8_11, C7_11}, // LB11
{0, C9_12, C8_12, C7_12}, // LB12 {0, C9_12, C8_12, C7_12}, // LB12
{0, C9_13, C8_13, C7_13}, // LB13 {0, C9_13, C8_13, C7_13}, // LB13
{0, C9_14, C8_14, C7_14}, // LB14 {0, C9_14, C8_14, C7_14}, // LB14
{0, C1_15, C2_15, C3_15}, // LB7 {0, C1_15, C2_15, C3_15}, // LB7
{0, C1_8, C2_8, C3_8}, // LA8 {0, C1_8, C2_8, C3_8}, // LA8
{1, C9_6, C8_6, C7_6}, // LC14 {1, C9_6, C8_6, C7_6}, // LC14
{1, C9_5, C8_5, C7_5}, // LC13 {1, C9_5, C8_5, C7_5}, // LC13
{1, C9_4, C8_4, C7_4}, // LC12 {1, C9_4, C8_4, C7_4}, // LC12
{1, C9_3, C8_3, C7_3}, // LC11 {1, C9_3, C8_3, C7_3}, // LC11
{1, C9_2, C8_2, C7_2}, // LC10 {1, C9_2, C8_2, C7_2}, // LC10
{1, C9_1, C8_1, C7_1}, // LC9 {1, C9_1, C8_1, C7_1}, // LC9
{1, C2_9, C3_9, C4_9}, // LD0 {1, C2_9, C3_9, C4_9}, // LD0
{1, C1_9, C3_10, C4_10}, // LD1 {1, C1_9, C3_10, C4_10}, // LD1
{1, C1_10, C2_10, C4_11}, // LD2 {1, C1_10, C2_10, C4_11}, // LD2
{1, C1_11, C2_11, C3_11}, // LD3 {1, C1_11, C2_11, C3_11}, // LD3
{1, C1_12, C2_12, C3_12}, // LD4 {1, C1_12, C2_12, C3_12}, // LD4
{1, C1_13, C2_13, C3_13}, // LD5 {1, C1_13, C2_13, C3_13}, // LD5
{0, C1_16, C2_16, C3_16}, // LB8 {0, C1_16, C2_16, C3_16}, // LB8
{1, C9_8, C7_7, C6_7}, // LC16 {1, C9_8, C7_7, C6_7}, // LC16
{1, C1_5, C2_5, C3_5}, // LC5 {1, C1_5, C2_5, C3_5}, // LC5
{1, C1_4, C2_4, C3_4}, // LC4 {1, C1_4, C2_4, C3_4}, // LC4
{1, C1_3, C2_3, C3_3}, // LC3 {1, C1_3, C2_3, C3_3}, // LC3
{1, C1_2, C2_2, C4_3}, // LC2 {1, C1_2, C2_2, C4_3}, // LC2
{1, C1_1, C3_2, C4_2}, // LC1 {1, C1_1, C3_2, C4_2}, // LC1
{1, C9_9, C8_9, C7_9}, // LD9 {1, C9_9, C8_9, C7_9}, // LD9
{1, C9_10, C8_10, C7_10}, // LD10 {1, C9_10, C8_10, C7_10}, // LD10
{1, C9_11, C8_11, C7_11}, // LD11 {1, C9_11, C8_11, C7_11}, // LD11
{1, C9_12, C8_12, C7_12}, // LD12 {1, C9_12, C8_12, C7_12}, // LD12
{1, C1_14, C2_14, C3_14}, // LD6 {1, C1_14, C2_14, C3_14}, // LD6
{1, C1_15, C2_15, C3_15}, // LD7 {1, C1_15, C2_15, C3_15}, // LD7
{1, C1_16, C2_16, C3_16}, // LD8 {1, C1_16, C2_16, C3_16}, // LD8
{0, C9_15, C8_15, C6_14}, // LB15 {0, C9_15, C8_15, C6_14}, // LB15
{1, C8_8, C7_8, C6_8}, // LC17 {1, C8_8, C7_8, C6_8}, // LC17
{1, C1_8, C2_8, C3_8}, // LC8 {1, C1_8, C2_8, C3_8}, // LC8
{1, C1_7, C2_7, C3_7}, // LC7 {1, C1_7, C2_7, C3_7}, // LC7
{1, C2_1, C3_1, C4_1}, // LC0 {1, C2_1, C3_1, C4_1}, // LC0
{1, C9_14, C8_14, C7_14}, // LD14 {1, C9_14, C8_14, C7_14}, // LD14
{1, C9_15, C8_15, C6_14}, // LD15 {1, C9_15, C8_15, C6_14}, // LD15
{1, C8_16, C7_16, C6_16}, // LD17 {1, C8_16, C7_16, C6_16}, // LD17
{0, C8_16, C7_16, C6_16}, // LB17 {0, C8_16, C7_16, C6_16}, // LB17
{0, C9_16, C7_15, C6_15}, // LB16 {0, C9_16, C7_15, C6_15}, // LB16
}; };
@ -100,24 +100,22 @@ led_config_t g_led_config = { {
{ 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 } { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, NO_LED, 63, 64, NO_LED, 65, 66 }
}, { }, {
{0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0}, {0,0},{15,0},{30,0},{45,0},{60,0},{75,0},{90,0},{105,0},{120,0},{135,0},{150,0},{165,0},{180,0},{203,0},{224,0},
{4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16}, {4,16},{23,16},{38,16},{53,16},{68,16},{83,16},{98,16},{113,16},{128,16},{143,16},{158,16},{173,16},{188,16},{206,16},{224,16},
{6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32}, {6,32},{26,32},{41,32},{56,32},{71,32},{86,32},{101,32},{116,32},{131,32},{146,32},{161,32},{176,32},{201,32},{224,32},
{9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48}, {9,48},{34,48},{49,48},{64,48},{79,48},{94,48},{109,48},{124,48},{139,48},{154,48},{169,48},{189,48},{210,48},{224,48},
{2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64} {2,64},{21,64},{39,64},{96,64},{152,64},{171,64},{195,64},{210,64},{224,64}
}, { }, {
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1 1, 1, 1, 4, 1, 1, 1, 1, 1
} }; } };
__attribute__ ((weak)) __attribute__ ((weak))
void rgb_matrix_indicators_user(void) void rgb_matrix_indicators_user(void) {
{ if (host_keyboard_led_state().caps_lock) {
if (host_keyboard_led_state().caps_lock)
{
rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
} }
} }

View file

@ -18,80 +18,80 @@
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led __flash g_is31_leds[DRIVER_LED_TOTAL] = {
{0, CS21_SW1, CS20_SW1, CS19_SW1}, {0, CS21_SW1, CS20_SW1, CS19_SW1},
{0, CS21_SW2, CS20_SW2, CS19_SW2}, {0, CS21_SW2, CS20_SW2, CS19_SW2},
{0, CS21_SW3, CS20_SW3, CS19_SW3}, {0, CS21_SW3, CS20_SW3, CS19_SW3},
{0, CS21_SW4, CS20_SW4, CS19_SW4}, {0, CS21_SW4, CS20_SW4, CS19_SW4},
{0, CS21_SW5, CS20_SW5, CS19_SW5}, {0, CS21_SW5, CS20_SW5, CS19_SW5},
{0, CS21_SW6, CS20_SW6, CS19_SW6}, {0, CS21_SW6, CS20_SW6, CS19_SW6},
{0, CS21_SW7, CS20_SW7, CS19_SW7}, {0, CS21_SW7, CS20_SW7, CS19_SW7},
{0, CS21_SW8, CS20_SW8, CS19_SW8}, {0, CS21_SW8, CS20_SW8, CS19_SW8},
{0, CS24_SW1, CS23_SW1, CS22_SW1}, {0, CS24_SW1, CS23_SW1, CS22_SW1},
{0, CS24_SW2, CS23_SW2, CS22_SW2}, {0, CS24_SW2, CS23_SW2, CS22_SW2},
{0, CS24_SW3, CS23_SW3, CS22_SW3}, {0, CS24_SW3, CS23_SW3, CS22_SW3},
{0, CS24_SW4, CS23_SW4, CS22_SW4}, {0, CS24_SW4, CS23_SW4, CS22_SW4},
{0, CS24_SW5, CS23_SW5, CS22_SW5}, {0, CS24_SW5, CS23_SW5, CS22_SW5},
{0, CS24_SW6, CS23_SW6, CS22_SW6}, {0, CS24_SW6, CS23_SW6, CS22_SW6},
{0, CS24_SW7, CS23_SW7, CS22_SW7}, {0, CS24_SW7, CS23_SW7, CS22_SW7},
{0, CS15_SW1, CS14_SW1, CS13_SW1}, {0, CS15_SW1, CS14_SW1, CS13_SW1},
{0, CS15_SW2, CS14_SW2, CS13_SW2}, {0, CS15_SW2, CS14_SW2, CS13_SW2},
{0, CS15_SW3, CS14_SW3, CS13_SW3}, {0, CS15_SW3, CS14_SW3, CS13_SW3},
{0, CS15_SW4, CS14_SW4, CS13_SW4}, {0, CS15_SW4, CS14_SW4, CS13_SW4},
{0, CS15_SW5, CS14_SW5, CS13_SW5}, {0, CS15_SW5, CS14_SW5, CS13_SW5},
{0, CS15_SW6, CS14_SW6, CS13_SW6}, {0, CS15_SW6, CS14_SW6, CS13_SW6},
{0, CS15_SW7, CS14_SW7, CS13_SW7}, {0, CS15_SW7, CS14_SW7, CS13_SW7},
{0, CS15_SW8, CS14_SW8, CS13_SW8}, {0, CS15_SW8, CS14_SW8, CS13_SW8},
{0, CS30_SW1, CS29_SW1, CS28_SW1}, {0, CS30_SW1, CS29_SW1, CS28_SW1},
{0, CS30_SW2, CS29_SW2, CS28_SW2}, {0, CS30_SW2, CS29_SW2, CS28_SW2},
{0, CS30_SW3, CS29_SW3, CS28_SW3}, {0, CS30_SW3, CS29_SW3, CS28_SW3},
{0, CS30_SW4, CS29_SW4, CS28_SW4}, {0, CS30_SW4, CS29_SW4, CS28_SW4},
{0, CS30_SW5, CS29_SW5, CS28_SW5}, {0, CS30_SW5, CS29_SW5, CS28_SW5},
{0, CS30_SW6, CS29_SW6, CS28_SW6}, {0, CS30_SW6, CS29_SW6, CS28_SW6},
{0, CS30_SW7, CS29_SW7, CS28_SW7}, {0, CS30_SW7, CS29_SW7, CS28_SW7},
{0, CS12_SW1, CS11_SW1, CS10_SW1}, {0, CS12_SW1, CS11_SW1, CS10_SW1},
{0, CS12_SW2, CS11_SW2, CS10_SW2}, {0, CS12_SW2, CS11_SW2, CS10_SW2},
{0, CS12_SW3, CS11_SW3, CS10_SW3}, {0, CS12_SW3, CS11_SW3, CS10_SW3},
{0, CS12_SW4, CS11_SW4, CS10_SW4}, {0, CS12_SW4, CS11_SW4, CS10_SW4},
{0, CS12_SW5, CS11_SW5, CS10_SW5}, {0, CS12_SW5, CS11_SW5, CS10_SW5},
{0, CS12_SW6, CS11_SW6, CS10_SW6}, {0, CS12_SW6, CS11_SW6, CS10_SW6},
{0, CS12_SW7, CS11_SW7, CS10_SW7}, {0, CS12_SW7, CS11_SW7, CS10_SW7},
{0, CS12_SW8, CS11_SW8, CS10_SW8}, {0, CS12_SW8, CS11_SW8, CS10_SW8},
{0, CS33_SW1, CS32_SW1, CS31_SW1}, {0, CS33_SW1, CS32_SW1, CS31_SW1},
{0, CS33_SW2, CS32_SW2, CS31_SW2}, {0, CS33_SW2, CS32_SW2, CS31_SW2},
{0, CS33_SW3, CS32_SW3, CS31_SW3}, {0, CS33_SW3, CS32_SW3, CS31_SW3},
{0, CS33_SW4, CS32_SW4, CS31_SW4}, {0, CS33_SW4, CS32_SW4, CS31_SW4},
{0, CS33_SW5, CS32_SW5, CS31_SW5}, {0, CS33_SW5, CS32_SW5, CS31_SW5},
{0, CS33_SW7, CS32_SW7, CS31_SW7}, {0, CS33_SW7, CS32_SW7, CS31_SW7},
{0, CS9_SW1, CS8_SW1, CS7_SW1}, {0, CS9_SW1, CS8_SW1, CS7_SW1},
{0, CS9_SW2, CS8_SW2, CS7_SW2}, {0, CS9_SW2, CS8_SW2, CS7_SW2},
{0, CS9_SW3, CS8_SW3, CS7_SW3}, {0, CS9_SW3, CS8_SW3, CS7_SW3},
{0, CS9_SW4, CS8_SW4, CS7_SW4}, {0, CS9_SW4, CS8_SW4, CS7_SW4},
{0, CS9_SW5, CS8_SW5, CS7_SW5}, {0, CS9_SW5, CS8_SW5, CS7_SW5},
{0, CS9_SW6, CS8_SW6, CS7_SW6}, {0, CS9_SW6, CS8_SW6, CS7_SW6},
{0, CS9_SW7, CS8_SW7, CS7_SW7}, {0, CS9_SW7, CS8_SW7, CS7_SW7},
{0, CS9_SW8, CS8_SW8, CS7_SW8}, {0, CS9_SW8, CS8_SW8, CS7_SW8},
{0, CS36_SW1, CS35_SW1, CS34_SW1}, {0, CS36_SW1, CS35_SW1, CS34_SW1},
{0, CS36_SW2, CS35_SW2, CS34_SW2}, {0, CS36_SW2, CS35_SW2, CS34_SW2},
{0, CS36_SW3, CS35_SW3, CS34_SW3}, {0, CS36_SW3, CS35_SW3, CS34_SW3},
{0, CS36_SW4, CS35_SW4, CS34_SW4}, {0, CS36_SW4, CS35_SW4, CS34_SW4},
{0, CS36_SW5, CS35_SW5, CS34_SW5}, {0, CS36_SW5, CS35_SW5, CS34_SW5},
{0, CS36_SW7, CS35_SW7, CS34_SW7}, {0, CS36_SW7, CS35_SW7, CS34_SW7},
{0, CS3_SW1, CS2_SW1, CS1_SW1}, {0, CS3_SW1, CS2_SW1, CS1_SW1},
{0, CS3_SW2, CS2_SW2, CS1_SW2}, {0, CS3_SW2, CS2_SW2, CS1_SW2},
{0, CS3_SW3, CS2_SW3, CS1_SW3}, {0, CS3_SW3, CS2_SW3, CS1_SW3},
{0, CS3_SW6, CS2_SW6, CS1_SW6}, {0, CS3_SW6, CS2_SW6, CS1_SW6},
// {0, CS39_SW1, CS38_SW1, CS37_SW1}, // {0, CS39_SW1, CS38_SW1, CS37_SW1},
{0, CS39_SW2, CS38_SW2, CS37_SW2}, {0, CS39_SW2, CS38_SW2, CS37_SW2},
{0, CS39_SW3, CS38_SW3, CS37_SW3}, {0, CS39_SW3, CS38_SW3, CS37_SW3},
{0, CS39_SW4, CS38_SW4, CS37_SW4}, {0, CS39_SW4, CS38_SW4, CS37_SW4},
{0, CS39_SW5, CS38_SW5, CS37_SW5}, {0, CS39_SW5, CS38_SW5, CS37_SW5},
{0, CS39_SW7, CS38_SW7, CS37_SW7} {0, CS39_SW7, CS38_SW7, CS37_SW7}
}; };
led_config_t g_led_config = { { led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 }, { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
@ -109,17 +109,15 @@ led_config_t g_led_config = { {
}, { }, {
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1
} }; } };
__attribute__ ((weak)) __attribute__ ((weak))
void rgb_matrix_indicators_user(void) void rgb_matrix_indicators_user(void) {
{ if (host_keyboard_led_state().caps_lock) {
if (host_keyboard_led_state().caps_lock)
{
rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF); rgb_matrix_set_color(30, 0xFF, 0xFF, 0xFF);
} }
} }