diff --git a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
index 3baf8c720b1..2de3acc60d7 100644
--- a/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
+++ b/keyboards/4pplet/perk60_iso/rev_a/rev_a.c
@@ -18,68 +18,68 @@ along with this program. If not, see .
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, K_2, J_2, L_2 }, //D402
- { 0, K_3, J_3, L_3 }, //D403
- { 0, K_4, J_4, L_4 }, //D404
- { 0, K_5, J_5, L_5 }, //D405
- { 0, K_6, J_6, L_6 }, //D406
- { 0, K_7, J_7, L_7 }, //D407
- { 0, K_8, J_8, L_8 }, //D408
- { 0, K_9, J_9, L_9 }, //D409
- { 0, K_10, J_10, L_10 }, //D410
- { 0, K_11, J_11, L_11 }, //D411
- { 0, K_12, J_12, L_12 }, //D412
- { 0, K_13, J_13, L_13 }, //D413
- { 0, K_14, J_14, L_14 }, //D414
- { 0, K_15, J_15, L_15 }, //D415
- { 0, K_1, J_1, L_1 }, //D401
- { 0, H_4, G_4, I_4 }, //D420
- { 0, H_5, G_5, I_5 }, //D421
- { 0, H_6, G_6, I_6 }, //D422
- { 0, H_7, G_7, I_7 }, //D423
- { 0, H_8, G_8, I_8 }, //D424
- { 0, H_9, G_9, I_9 }, //D425
- { 0, H_10, G_10, I_10 }, //D426
- { 0, H_11, G_11, I_11 }, //D427
- { 0, H_12, G_12, I_12 }, //D428
- { 0, H_13, G_13, I_13 }, //D429
- { 0, H_14, G_14, I_14 }, //D430
- { 0, H_15, G_15, I_15 }, //D431
- { 0, K_16, J_16, L_16 }, //D416
- { 0, H_2, G_2, I_2 }, //D418
- { 0, H_3, G_3, I_3 }, //D419
- { 0, E_5, D_5, F_5 }, //D437
- { 0, E_6, D_6, F_6 }, //D438
- { 0, E_7, D_7, F_7 }, //D439
- { 0, E_8, D_8, F_8 }, //D440
- { 0, E_9, D_9, F_9 }, //D441
- { 0, E_10, D_10, F_10 }, //D442
- { 0, E_11, D_11, F_11 }, //D443
- { 0, E_12, D_12, F_12 }, //D444
- { 0, E_13, D_13, F_13 }, //D445
- { 0, E_14, D_14, F_14 }, //D446
- { 0, H_16, G_16, I_16 }, //D432
- { 0, H_1, G_1, I_1 }, //D417
- { 0, E_3, D_3, F_3 }, //D435
- { 0, E_4, D_4, F_4 }, //D436
- { 0, B_2, A_2, C_2 }, //D450
- { 0, B_3, A_3, C_3 }, //D451
- { 0, B_4, A_4, C_4 }, //D452
- { 0, B_6, A_6, C_6 }, //D454
- { 0, B_8, A_8, C_8 }, //D456
- { 0, B_9, A_9, C_9 }, //D457
- { 0, B_10, A_10, C_10 }, //D458
- { 0, B_12, A_12, C_12 }, //D460
- { 0, B_13, A_13, C_13 }, //D461
- { 0, E_15, D_15, F_15 }, //D447
- { 0, E_1, D_1, F_1 }, //D433
- { 0, E_2, D_2, F_2 }, //D434
- { 0, B_1, A_1, C_1 }, //D449
- { 0, B_7, A_7, C_7 }, //D455
- { 0, B_11, A_11, C_11 }, //D459
- { 0, B_14, A_14, C_14 }, //D462
- { 0, B_15, A_15, C_15 }, //D463
- { 0, B_16, A_16, C_16 } //D464
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 }, //D402
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 }, //D403
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 }, //D404
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 }, //D405
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 }, //D406
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 }, //D407
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 }, //D408
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 }, //D409
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //D410
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //D411
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //D412
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //D413
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //D414
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //D415
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 }, //D401
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 }, //D420
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 }, //D421
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 }, //D422
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 }, //D423
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 }, //D424
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 }, //D425
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //D426
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //D427
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //D428
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //D429
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //D430
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //D431
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }, //D416
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 }, //D418
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 }, //D419
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 }, //D437
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 }, //D438
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 }, //D439
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 }, //D440
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 }, //D441
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //D442
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //D443
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //D444
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //D445
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //D446
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 }, //D432
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 }, //D417
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 }, //D435
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 }, //D436
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 }, //D450
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 }, //D451
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 }, //D452
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 }, //D454
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 }, //D456
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 }, //D457
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //D458
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //D460
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //D461
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //D447
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 }, //D433
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 }, //D434
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 }, //D449
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 }, //D455
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //D459
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //D462
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 }, //D463
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 } //D464
};
#define XXX NO_LED
diff --git a/keyboards/abko/ak84bt/ak84bt.c b/keyboards/abko/ak84bt/ak84bt.c
index 86f28a1bb29..6b87e9bab35 100644
--- a/keyboards/abko/ak84bt/ak84bt.c
+++ b/keyboards/abko/ak84bt/ak84bt.c
@@ -17,94 +17,94 @@
#include QMK_KEYBOARD_H
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- {0, G_1, I_1, H_1},
- {0, G_3, I_3, H_3},
- {0, G_4, I_4, H_4},
- {0, G_5, I_5, H_5},
- {0, G_6, I_6, H_6},
- {0, G_7, I_7, H_7},
- {0, G_8, I_8, H_8},
- {0, G_9, I_9, H_9},
- {0, G_10, I_10, H_10},
- {0, G_11, I_11, H_11},
- {0, G_12, I_12, H_12},
- {0, G_13, I_13, H_13},
- {0, G_14, I_14, H_14},
- {0, G_15, I_15, H_15},
- {0, D_1, F_1, E_1},
- {0, D_2, F_2, E_2},
- {0, D_3, F_3, E_3},
- {0, D_4, F_4, E_4},
- {0, D_5, F_5, E_5},
- {0, D_6, F_6, E_6},
- {0, D_7, F_7, E_7},
- {0, D_8, F_8, E_8},
- {0, D_9, F_9, E_9},
- {0, D_10, F_10, E_10},
- {0, D_11, F_11, E_11},
- {0, D_12, F_12, E_12},
- {0, D_13, F_13, E_13},
- {0, D_14, F_14, E_14},
- {0, D_15, F_15, E_15},
- {0, A_1, C_1, B_1},
- {0, A_2, C_2, B_2},
- {0, A_3, C_3, B_3},
- {0, A_4, C_4, B_4},
- {0, A_5, C_5, B_5},
- {0, A_6, C_6, B_6},
- {0, A_7, C_7, B_7},
- {0, A_8, C_8, B_8},
- {0, A_9, C_9, B_9},
- {0, A_10, C_10, B_10},
- {0, A_11, C_11, B_11},
- {0, A_12, C_12, B_12},
- {0, A_13, C_13, B_13},
- {0, A_14, C_14, B_14},
- {0, A_15, C_15, B_15},
- {1, G_1, I_1, H_1},
- {1, G_2, I_2, H_2},
- {1, G_3, I_3, H_3},
- {1, G_4, I_4, H_4},
- {1, G_5, I_5, H_5},
- {1, G_6, I_6, H_6},
- {1, G_7, I_7, H_7},
- {1, G_8, I_8, H_8},
- {1, G_9, I_9, H_9},
- {1, G_10, I_10, H_10},
- {1, G_11, I_11, H_11},
- {1, G_12, I_12, H_12},
- {1, G_13, I_13, H_13},
- {1, G_14, I_14, H_14},
- {1, G_15, I_15, H_15},
- {1, D_1, F_1, E_1},
- {1, D_2, F_2, E_2},
- {1, D_3, F_3, E_3},
- {1, D_4, F_4, E_4},
- {1, D_5, F_5, E_5},
- {1, D_6, F_6, E_6},
- {1, D_7, F_7, E_7},
- {1, D_8, F_8, E_8},
- {1, D_9, F_9, E_9},
- {1, D_10, F_10, E_10},
- {1, D_11, F_11, E_11},
- {1, D_12, F_12, E_12},
- {1, D_13, F_13, E_13},
- {1, D_14, F_14, E_14},
- {1, D_15, F_15, E_15},
- {1, A_1, C_1, B_1},
- {1, A_2, C_2, B_2},
- {1, A_3, C_3, B_3},
- {1, A_5, C_5, B_5},
- {1, A_6, C_6, B_6},
- {1, A_7, C_7, B_7},
- {1, A_8, C_8, B_8},
- {1, A_9, C_9, B_9},
- {1, A_10, C_10, B_10},
- {1, A_11, C_11, B_11},
- {1, A_12, C_12, B_12},
- {1, A_13, C_13, B_13},
- {1, A_14, C_14, B_14},
- {1, A_15, C_15, B_15},
- {0, G_2, I_2, H_2},
- {1, A_4, C_4, B_4}
+ {0, SW7_CS1, SW9_CS1, SW8_CS1},
+ {0, SW7_CS3, SW9_CS3, SW8_CS3},
+ {0, SW7_CS4, SW9_CS4, SW8_CS4},
+ {0, SW7_CS5, SW9_CS5, SW8_CS5},
+ {0, SW7_CS6, SW9_CS6, SW8_CS6},
+ {0, SW7_CS7, SW9_CS7, SW8_CS7},
+ {0, SW7_CS8, SW9_CS8, SW8_CS8},
+ {0, SW7_CS9, SW9_CS9, SW8_CS9},
+ {0, SW7_CS10, SW9_CS10, SW8_CS10},
+ {0, SW7_CS11, SW9_CS11, SW8_CS11},
+ {0, SW7_CS12, SW9_CS12, SW8_CS12},
+ {0, SW7_CS13, SW9_CS13, SW8_CS13},
+ {0, SW7_CS14, SW9_CS14, SW8_CS14},
+ {0, SW7_CS15, SW9_CS15, SW8_CS15},
+ {0, SW4_CS1, SW6_CS1, SW5_CS1},
+ {0, SW4_CS2, SW6_CS2, SW5_CS2},
+ {0, SW4_CS3, SW6_CS3, SW5_CS3},
+ {0, SW4_CS4, SW6_CS4, SW5_CS4},
+ {0, SW4_CS5, SW6_CS5, SW5_CS5},
+ {0, SW4_CS6, SW6_CS6, SW5_CS6},
+ {0, SW4_CS7, SW6_CS7, SW5_CS7},
+ {0, SW4_CS8, SW6_CS8, SW5_CS8},
+ {0, SW4_CS9, SW6_CS9, SW5_CS9},
+ {0, SW4_CS10, SW6_CS10, SW5_CS10},
+ {0, SW4_CS11, SW6_CS11, SW5_CS11},
+ {0, SW4_CS12, SW6_CS12, SW5_CS12},
+ {0, SW4_CS13, SW6_CS13, SW5_CS13},
+ {0, SW4_CS14, SW6_CS14, SW5_CS14},
+ {0, SW4_CS15, SW6_CS15, SW5_CS15},
+ {0, SW1_CS1, SW3_CS1, SW2_CS1},
+ {0, SW1_CS2, SW3_CS2, SW2_CS2},
+ {0, SW1_CS3, SW3_CS3, SW2_CS3},
+ {0, SW1_CS4, SW3_CS4, SW2_CS4},
+ {0, SW1_CS5, SW3_CS5, SW2_CS5},
+ {0, SW1_CS6, SW3_CS6, SW2_CS6},
+ {0, SW1_CS7, SW3_CS7, SW2_CS7},
+ {0, SW1_CS8, SW3_CS8, SW2_CS8},
+ {0, SW1_CS9, SW3_CS9, SW2_CS9},
+ {0, SW1_CS10, SW3_CS10, SW2_CS10},
+ {0, SW1_CS11, SW3_CS11, SW2_CS11},
+ {0, SW1_CS12, SW3_CS12, SW2_CS12},
+ {0, SW1_CS13, SW3_CS13, SW2_CS13},
+ {0, SW1_CS14, SW3_CS14, SW2_CS14},
+ {0, SW1_CS15, SW3_CS15, SW2_CS15},
+ {1, SW7_CS1, SW9_CS1, SW8_CS1},
+ {1, SW7_CS2, SW9_CS2, SW8_CS2},
+ {1, SW7_CS3, SW9_CS3, SW8_CS3},
+ {1, SW7_CS4, SW9_CS4, SW8_CS4},
+ {1, SW7_CS5, SW9_CS5, SW8_CS5},
+ {1, SW7_CS6, SW9_CS6, SW8_CS6},
+ {1, SW7_CS7, SW9_CS7, SW8_CS7},
+ {1, SW7_CS8, SW9_CS8, SW8_CS8},
+ {1, SW7_CS9, SW9_CS9, SW8_CS9},
+ {1, SW7_CS10, SW9_CS10, SW8_CS10},
+ {1, SW7_CS11, SW9_CS11, SW8_CS11},
+ {1, SW7_CS12, SW9_CS12, SW8_CS12},
+ {1, SW7_CS13, SW9_CS13, SW8_CS13},
+ {1, SW7_CS14, SW9_CS14, SW8_CS14},
+ {1, SW7_CS15, SW9_CS15, SW8_CS15},
+ {1, SW4_CS1, SW6_CS1, SW5_CS1},
+ {1, SW4_CS2, SW6_CS2, SW5_CS2},
+ {1, SW4_CS3, SW6_CS3, SW5_CS3},
+ {1, SW4_CS4, SW6_CS4, SW5_CS4},
+ {1, SW4_CS5, SW6_CS5, SW5_CS5},
+ {1, SW4_CS6, SW6_CS6, SW5_CS6},
+ {1, SW4_CS7, SW6_CS7, SW5_CS7},
+ {1, SW4_CS8, SW6_CS8, SW5_CS8},
+ {1, SW4_CS9, SW6_CS9, SW5_CS9},
+ {1, SW4_CS10, SW6_CS10, SW5_CS10},
+ {1, SW4_CS11, SW6_CS11, SW5_CS11},
+ {1, SW4_CS12, SW6_CS12, SW5_CS12},
+ {1, SW4_CS13, SW6_CS13, SW5_CS13},
+ {1, SW4_CS14, SW6_CS14, SW5_CS14},
+ {1, SW4_CS15, SW6_CS15, SW5_CS15},
+ {1, SW1_CS1, SW3_CS1, SW2_CS1},
+ {1, SW1_CS2, SW3_CS2, SW2_CS2},
+ {1, SW1_CS3, SW3_CS3, SW2_CS3},
+ {1, SW1_CS5, SW3_CS5, SW2_CS5},
+ {1, SW1_CS6, SW3_CS6, SW2_CS6},
+ {1, SW1_CS7, SW3_CS7, SW2_CS7},
+ {1, SW1_CS8, SW3_CS8, SW2_CS8},
+ {1, SW1_CS9, SW3_CS9, SW2_CS9},
+ {1, SW1_CS10, SW3_CS10, SW2_CS10},
+ {1, SW1_CS11, SW3_CS11, SW2_CS11},
+ {1, SW1_CS12, SW3_CS12, SW2_CS12},
+ {1, SW1_CS13, SW3_CS13, SW2_CS13},
+ {1, SW1_CS14, SW3_CS14, SW2_CS14},
+ {1, SW1_CS15, SW3_CS15, SW2_CS15},
+ {0, SW7_CS2, SW9_CS2, SW8_CS2},
+ {1, SW1_CS4, SW3_CS4, SW2_CS4}
};
diff --git a/keyboards/acheron/apollo/87h/gamma/gamma.c b/keyboards/acheron/apollo/87h/gamma/gamma.c
index 43802bb4ad8..f047db0feaa 100644
--- a/keyboards/acheron/apollo/87h/gamma/gamma.c
+++ b/keyboards/acheron/apollo/87h/gamma/gamma.c
@@ -26,98 +26,98 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
* | | | B location
* | | | | */
// First row
- {0, CS7_SW9 , CS9_SW9 , CS8_SW9 }, //ESC 0
- {0, CS7_SW8 , CS9_SW8 , CS8_SW8 }, //F1 1
- {0, CS7_SW7 , CS9_SW7 , CS8_SW7 }, //F2 2
- {0, CS7_SW6 , CS9_SW6 , CS8_SW6 }, //F3 3
- {0, CS7_SW5 , CS9_SW5 , CS8_SW5 }, //F4 4
- {0, CS7_SW4 , CS9_SW4 , CS8_SW4 }, //F5 5
- {0, CS7_SW3 , CS9_SW3 , CS8_SW3 }, //F6 6
- {0, CS7_SW2 , CS9_SW2 , CS8_SW2 }, //F7 7
- {0, CS7_SW1 , CS9_SW1 , CS8_SW1 }, //F8 8
- {0, CS18_SW2, CS16_SW2, CS17_SW2 }, //F9 9
- {0, CS18_SW3, CS16_SW3, CS17_SW3 }, //F10 10
- {0, CS18_SW4, CS16_SW4, CS17_SW4 }, //F11 11
- {0, CS18_SW6, CS16_SW6, CS17_SW6 }, //F12 12
- {0, CS18_SW7, CS16_SW7, CS17_SW7 }, //PRI 13
- {0, CS18_SW8, CS16_SW8, CS17_SW8 }, //SCR 14
- {0, CS18_SW9, CS16_SW9, CS17_SW9 }, //PAUS 15
+ {0, SW9_CS7 , SW9_CS9 , SW9_CS8 }, //ESC 0
+ {0, SW8_CS7 , SW8_CS9 , SW8_CS8 }, //F1 1
+ {0, SW7_CS7 , SW7_CS9 , SW7_CS8 }, //F2 2
+ {0, SW6_CS7 , SW6_CS9 , SW6_CS8 }, //F3 3
+ {0, SW5_CS7 , SW5_CS9 , SW5_CS8 }, //F4 4
+ {0, SW4_CS7 , SW4_CS9 , SW4_CS8 }, //F5 5
+ {0, SW3_CS7 , SW3_CS9 , SW3_CS8 }, //F6 6
+ {0, SW2_CS7 , SW2_CS9 , SW2_CS8 }, //F7 7
+ {0, SW1_CS7 , SW1_CS9 , SW1_CS8 }, //F8 8
+ {0, SW2_CS18, SW2_CS16, SW2_CS17 }, //F9 9
+ {0, SW3_CS18, SW3_CS16, SW3_CS17 }, //F10 10
+ {0, SW4_CS18, SW4_CS16, SW4_CS17 }, //F11 11
+ {0, SW6_CS18, SW6_CS16, SW6_CS17 }, //F12 12
+ {0, SW7_CS18, SW7_CS16, SW7_CS17 }, //PRI 13
+ {0, SW8_CS18, SW8_CS16, SW8_CS17 }, //SCR 14
+ {0, SW9_CS18, SW9_CS16, SW9_CS17 }, //PAUS 15
//Second row
- {0, CS12_SW9, CS11_SW9, CS10_SW9 }, //GRAVE 16
- {0, CS12_SW8, CS11_SW8, CS10_SW8 }, //1 17
- {0, CS12_SW7, CS11_SW7, CS10_SW7 }, //2 18
- {0, CS12_SW6, CS11_SW6, CS10_SW6 }, //3 19
- {0, CS12_SW5, CS11_SW5, CS10_SW5 }, //4 20
- {0, CS12_SW4, CS11_SW4, CS10_SW4 }, //5 21
- {0, CS12_SW3, CS11_SW3, CS10_SW3 }, //6 22
- {0, CS12_SW2, CS11_SW2, CS10_SW2 }, //7 23
- {0, CS12_SW1, CS11_SW1, CS10_SW1 }, //8 24
- {0, CS15_SW1, CS13_SW1, CS14_SW1 }, //9 25
- {0, CS15_SW2, CS13_SW2, CS14_SW2 }, //0 26
- {0, CS15_SW3, CS13_SW3, CS14_SW3 }, //MINUS 27
- {0, CS15_SW4, CS13_SW4, CS14_SW4 }, //PLUS 28
- {0, CS15_SW5, CS13_SW5, CS14_SW5 }, //BKSP 29
- {0, CS15_SW7, CS13_SW7, CS14_SW7 }, //INS 30
- {0, CS15_SW8, CS13_SW8, CS14_SW8 }, //HOME 31
- {0, CS15_SW9, CS13_SW9, CS14_SW9 }, //PGUP 32
+ {0, SW9_CS12, SW9_CS11, SW9_CS10 }, //GRAVE 16
+ {0, SW8_CS12, SW8_CS11, SW8_CS10 }, //1 17
+ {0, SW7_CS12, SW7_CS11, SW7_CS10 }, //2 18
+ {0, SW6_CS12, SW6_CS11, SW6_CS10 }, //3 19
+ {0, SW5_CS12, SW5_CS11, SW5_CS10 }, //4 20
+ {0, SW4_CS12, SW4_CS11, SW4_CS10 }, //5 21
+ {0, SW3_CS12, SW3_CS11, SW3_CS10 }, //6 22
+ {0, SW2_CS12, SW2_CS11, SW2_CS10 }, //7 23
+ {0, SW1_CS12, SW1_CS11, SW1_CS10 }, //8 24
+ {0, SW1_CS15, SW1_CS13, SW1_CS14 }, //9 25
+ {0, SW2_CS15, SW2_CS13, SW2_CS14 }, //0 26
+ {0, SW3_CS15, SW3_CS13, SW3_CS14 }, //MINUS 27
+ {0, SW4_CS15, SW4_CS13, SW4_CS14 }, //PLUS 28
+ {0, SW5_CS15, SW5_CS13, SW5_CS14 }, //BKSP 29
+ {0, SW7_CS15, SW7_CS13, SW7_CS14 }, //INS 30
+ {0, SW8_CS15, SW8_CS13, SW8_CS14 }, //HOME 31
+ {0, SW9_CS15, SW9_CS13, SW9_CS14 }, //PGUP 32
//Third row
- {0, CS4_SW9 , CS6_SW9 , CS5_SW9 }, //TAB 33
- {0, CS4_SW8 , CS6_SW8 , CS5_SW8 }, //Q 34
- {0, CS4_SW7 , CS6_SW7 , CS5_SW7 }, //W 35
- {0, CS4_SW6 , CS6_SW6 , CS5_SW6 }, //E 36
- {0, CS4_SW5 , CS6_SW5 , CS5_SW5 }, //R 37
- {0, CS4_SW4 , CS6_SW4 , CS5_SW4 }, //T 38
- {0, CS4_SW3 , CS6_SW3 , CS5_SW3 }, //Y 39
- {0, CS4_SW2 , CS6_SW2 , CS5_SW2 }, //U 40
- {0, CS4_SW1 , CS6_SW1 , CS5_SW1 }, //I 41
- {0, CS3_SW2 , CS1_SW2 , CS2_SW2 }, //O 42
- {0, CS3_SW3 , CS1_SW3 , CS2_SW3 }, //P 43
- {0, CS3_SW4 , CS1_SW4 , CS2_SW4 }, //LBRKT 44
- {0, CS3_SW5 , CS1_SW5 , CS2_SW5 }, //RBRKT 45
- {0, CS3_SW6 , CS1_SW6 , CS2_SW6 }, //BSLS 46
- {0, CS3_SW7 , CS1_SW7 , CS2_SW7 }, //DEL 47
- {0, CS3_SW8 , CS1_SW8 , CS2_SW8 }, //END 48
- {0, CS3_SW9 , CS1_SW9 , CS2_SW9 }, //PGDN 49
+ {0, SW9_CS4 , SW9_CS6 , SW9_CS5 }, //TAB 33
+ {0, SW8_CS4 , SW8_CS6 , SW8_CS5 }, //Q 34
+ {0, SW7_CS4 , SW7_CS6 , SW7_CS5 }, //W 35
+ {0, SW6_CS4 , SW6_CS6 , SW6_CS5 }, //E 36
+ {0, SW5_CS4 , SW5_CS6 , SW5_CS5 }, //R 37
+ {0, SW4_CS4 , SW4_CS6 , SW4_CS5 }, //T 38
+ {0, SW3_CS4 , SW3_CS6 , SW3_CS5 }, //Y 39
+ {0, SW2_CS4 , SW2_CS6 , SW2_CS5 }, //U 40
+ {0, SW1_CS4 , SW1_CS6 , SW1_CS5 }, //I 41
+ {0, SW2_CS3 , SW2_CS1 , SW2_CS2 }, //O 42
+ {0, SW3_CS3 , SW3_CS1 , SW3_CS2 }, //P 43
+ {0, SW4_CS3 , SW4_CS1 , SW4_CS2 }, //LBRKT 44
+ {0, SW5_CS3 , SW5_CS1 , SW5_CS2 }, //RBRKT 45
+ {0, SW6_CS3 , SW6_CS1 , SW6_CS2 }, //BSLS 46
+ {0, SW7_CS3 , SW7_CS1 , SW7_CS2 }, //DEL 47
+ {0, SW8_CS3 , SW8_CS1 , SW8_CS2 }, //END 48
+ {0, SW9_CS3 , SW9_CS1 , SW9_CS2 }, //PGDN 49
//Fourth row
- {0, CS33_SW9, CS32_SW9, CS31_SW9 }, //CAPS 50
- {0, CS33_SW8, CS32_SW8, CS31_SW8 }, //A 51
- {0, CS33_SW7, CS32_SW7, CS31_SW7 }, //S 52
- {0, CS33_SW6, CS32_SW6, CS31_SW6 }, //D 53
- {0, CS33_SW5, CS32_SW5, CS31_SW5 }, //F 54
- {0, CS33_SW4, CS32_SW4, CS31_SW4 }, //G 55
- {0, CS33_SW3, CS32_SW3, CS31_SW3 }, //H 56
- {0, CS33_SW2, CS32_SW2, CS31_SW2 }, //J 57
- {0, CS33_SW1, CS32_SW1, CS31_SW1 }, //K 58
- {0, CS39_SW2, CS38_SW2, CS37_SW2 }, //L 59
- {0, CS39_SW3, CS38_SW3, CS37_SW3 }, //COLON 60
- {0, CS39_SW4, CS38_SW4, CS37_SW4 }, //QUOTE 61
- {0, CS39_SW6, CS38_SW6, CS37_SW6 }, //ENTER 62
+ {0, SW9_CS33, SW9_CS32, SW9_CS31 }, //CAPS 50
+ {0, SW8_CS33, SW8_CS32, SW8_CS31 }, //A 51
+ {0, SW7_CS33, SW7_CS32, SW7_CS31 }, //S 52
+ {0, SW6_CS33, SW6_CS32, SW6_CS31 }, //D 53
+ {0, SW5_CS33, SW5_CS32, SW5_CS31 }, //F 54
+ {0, SW4_CS33, SW4_CS32, SW4_CS31 }, //G 55
+ {0, SW3_CS33, SW3_CS32, SW3_CS31 }, //H 56
+ {0, SW2_CS33, SW2_CS32, SW2_CS31 }, //J 57
+ {0, SW1_CS33, SW1_CS32, SW1_CS31 }, //K 58
+ {0, SW2_CS39, SW2_CS38, SW2_CS37 }, //L 59
+ {0, SW3_CS39, SW3_CS38, SW3_CS37 }, //COLON 60
+ {0, SW4_CS39, SW4_CS38, SW4_CS37 }, //QUOTE 61
+ {0, SW6_CS39, SW6_CS38, SW6_CS37 }, //ENTER 62
//Fifth row
- {0, CS30_SW9, CS28_SW9, CS29_SW9 }, //LSFT 63
- {0, CS30_SW7, CS28_SW7, CS29_SW7 }, //Z 64
- {0, CS30_SW6, CS28_SW6, CS29_SW6 }, //X 65
- {0, CS30_SW5, CS28_SW5, CS29_SW5 }, //C 66
- {0, CS30_SW4, CS28_SW4, CS29_SW4 }, //V 67
- {0, CS30_SW3, CS28_SW3, CS29_SW3 }, //B 68
- {0, CS30_SW2, CS28_SW2, CS29_SW2 }, //N 69
- {0, CS30_SW1, CS28_SW1, CS29_SW1 }, //M 70
- {0, CS36_SW1, CS35_SW1, CS34_SW1 }, //COMMA 71
- {0, CS36_SW3, CS35_SW3, CS34_SW3 }, //DOT 72
- {0, CS36_SW4, CS35_SW4, CS34_SW4 }, //SLASH 73
- {0, CS36_SW6, CS35_SW6, CS34_SW6 }, //RSFT 74
- {0, CS36_SW7, CS35_SW7, CS34_SW7 }, //UP 75
+ {0, SW9_CS30, SW9_CS28, SW9_CS29 }, //LSFT 63
+ {0, SW7_CS30, SW7_CS28, SW7_CS29 }, //Z 64
+ {0, SW6_CS30, SW6_CS28, SW6_CS29 }, //X 65
+ {0, SW5_CS30, SW5_CS28, SW5_CS29 }, //C 66
+ {0, SW4_CS30, SW4_CS28, SW4_CS29 }, //V 67
+ {0, SW3_CS30, SW3_CS28, SW3_CS29 }, //B 68
+ {0, SW2_CS30, SW2_CS28, SW2_CS29 }, //N 69
+ {0, SW1_CS30, SW1_CS28, SW1_CS29 }, //M 70
+ {0, SW1_CS36, SW1_CS35, SW1_CS34 }, //COMMA 71
+ {0, SW3_CS36, SW3_CS35, SW3_CS34 }, //DOT 72
+ {0, SW4_CS36, SW4_CS35, SW4_CS34 }, //SLASH 73
+ {0, SW6_CS36, SW6_CS35, SW6_CS34 }, //RSFT 74
+ {0, SW7_CS36, SW7_CS35, SW7_CS34 }, //UP 75
//Sixth row
- {0, CS27_SW9, CS25_SW9, CS26_SW9 }, //LCTRL 76
- {0, CS27_SW7, CS25_SW7, CS26_SW7 }, //LWIN 77
- {0, CS27_SW6, CS25_SW6, CS26_SW6 }, //LALT 78
- {0, CS27_SW5, CS25_SW5, CS26_SW5 }, //SPACE 79
- {0, CS27_SW3, CS25_SW3, CS26_SW3 }, //RALT 80
- {0, CS24_SW4, CS23_SW4, CS22_SW4 }, //RGUI 81
- {0, CS24_SW5, CS23_SW5, CS22_SW5 }, //MENU 82
- {0, CS24_SW6, CS23_SW6, CS22_SW6 }, //RCTRL 83
- {0, CS24_SW1, CS23_SW1, CS22_SW1 }, //LEFT 84
- {0, CS24_SW2, CS23_SW2, CS22_SW2 }, //DOWN 85
- {0, CS24_SW3, CS23_SW3, CS22_SW3 }, //RIGHT 86
+ {0, SW9_CS27, SW9_CS25, SW9_CS26 }, //LCTRL 76
+ {0, SW7_CS27, SW7_CS25, SW7_CS26 }, //LWIN 77
+ {0, SW6_CS27, SW6_CS25, SW6_CS26 }, //LALT 78
+ {0, SW5_CS27, SW5_CS25, SW5_CS26 }, //SPACE 79
+ {0, SW3_CS27, SW3_CS25, SW3_CS26 }, //RALT 80
+ {0, SW4_CS24, SW4_CS23, SW4_CS22 }, //RGUI 81
+ {0, SW5_CS24, SW5_CS23, SW5_CS22 }, //MENU 82
+ {0, SW6_CS24, SW6_CS23, SW6_CS22 }, //RCTRL 83
+ {0, SW1_CS24, SW1_CS23, SW1_CS22 }, //LEFT 84
+ {0, SW2_CS24, SW2_CS23, SW2_CS22 }, //DOWN 85
+ {0, SW3_CS24, SW3_CS23, SW3_CS22 }, //RIGHT 86
};
diff --git a/keyboards/akko/5087/5087.c b/keyboards/akko/5087/5087.c
index 6374adc301e..7dd614b4565 100644
--- a/keyboards/akko/5087/5087.c
+++ b/keyboards/akko/5087/5087.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | | B location
* | | | | */
/*row0*/
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
- {1, A_15, B_15, C_15},
- {1, A_16, B_16, C_16},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB1_CA15, CB2_CA15, CB3_CA15},
+ {1, CB1_CA16, CB2_CA16, CB3_CA16},
/*row1*/
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
- {1, D_2, E_2, F_2},
- {1, D_3, E_3, F_3},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
/*row2*/
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
/*row3*/
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, G_13, H_13, I_13},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
/*row4*/
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, J_4, K_4, L_4},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
/*row5*/
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
- {0, D_15, E_15, F_15},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/akko/5108/5108.c b/keyboards/akko/5108/5108.c
index 0fd71834d19..91526289b67 100644
--- a/keyboards/akko/5108/5108.c
+++ b/keyboards/akko/5108/5108.c
@@ -25,124 +25,124 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | | B location
* | | | | */
/*row0*/
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
- {1, A_15, B_15, C_15},
- {1, A_16, B_16, C_16},
- {1, D_11, E_11, F_11},
- {1, D_12, E_12, F_12},
- {1, D_13, E_13, F_13},
- {1, D_14, E_14, F_14},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB1_CA15, CB2_CA15, CB3_CA15},
+ {1, CB1_CA16, CB2_CA16, CB3_CA16},
+ {1, CB4_CA11, CB5_CA11, CB6_CA11},
+ {1, CB4_CA12, CB5_CA12, CB6_CA12},
+ {1, CB4_CA13, CB5_CA13, CB6_CA13},
+ {1, CB4_CA14, CB5_CA14, CB6_CA14},
/*row1*/
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1 },
- {1, D_2, E_2, F_2},
- {1, D_3, E_3, F_3},
- {1, D_4, E_4, F_4},
- {1, D_5, E_5, F_5},
- {1, D_6, E_6, F_6},
- {1, D_7, E_7, F_7},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1 },
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
+ {1, CB4_CA4, CB5_CA4, CB6_CA4},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
/*row2*/
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
- {1, D_8, E_8, F_8},
- {1, D_9, E_9, F_9},
- {1, D_10, E_10, F_10},
- {1, G_7, H_7, I_7},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
+ {1, CB4_CA8, CB5_CA8, CB6_CA8},
+ {1, CB4_CA9, CB5_CA9, CB6_CA9},
+ {1, CB4_CA10, CB5_CA10, CB6_CA10},
+ {1, CB7_CA7, CB8_CA7, CB9_CA7},
/*row3*/
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, G_13, H_13, I_13},
- {1, G_4, H_4, I_4},
- {1, G_5, H_5, I_5},
- {1, G_6, H_6, I_6},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
+ {1, CB7_CA6, CB8_CA6, CB9_CA6},
/*row4*/
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, J_4, K_4, L_4},
- {1, J_7, K_7, L_7},
- {1, J_8, K_8, L_8},
- {1, J_9, K_9, L_9},
- {1, J_10, K_10, L_10},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA7, CB11_CA7, CB12_CA7},
+ {1, CB10_CA8, CB11_CA8, CB12_CA8},
+ {1, CB10_CA9, CB11_CA9, CB12_CA9},
+ {1, CB10_CA10, CB11_CA10, CB12_CA10},
/*row5*/
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
- {0, D_15, E_15, F_15},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
- {1, J_5, K_5, L_5},
- {1, J_6, K_6, L_6},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
+ {1, CB10_CA6, CB11_CA6, CB12_CA6},
};
#endif
diff --git a/keyboards/akko/acr87/acr87.c b/keyboards/akko/acr87/acr87.c
index 3e7f6034741..e2ed06a0e89 100644
--- a/keyboards/akko/acr87/acr87.c
+++ b/keyboards/akko/acr87/acr87.c
@@ -25,160 +25,160 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | | B location
* | | | | */
/*row0*/
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
- {1, A_15, B_15, C_15},
- {1, A_16, B_16, C_16},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB1_CA15, CB2_CA15, CB3_CA15},
+ {1, CB1_CA16, CB2_CA16, CB3_CA16},
/*row1*/
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
- {1, D_2, E_2, F_2},
- {1, D_3, E_3, F_3},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
/*row2*/
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
/*row3*/
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, G_13, H_13, I_13},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
/*row4*/
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, J_4, K_4, L_4},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
/*row5*/
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
- {0, D_15, E_15, F_15},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
- {2, J_12, K_12, L_12},
- {2, J_11, K_11, L_11},
- {2, J_10, K_10, L_10},
- {2, J_9, K_9, L_9},
- {2, J_8, K_8, L_8},
- {2, J_7, K_7, L_7},
- {2, J_6, K_6, L_6},
- {2, J_5, K_5, L_5},
- {2, J_4, K_4, L_4},
- {2, J_3, K_3, L_3},
- {2, J_2, K_2, L_2},
- {2, J_1, K_1, L_1},
- {2, G_12, H_12, I_12},
- {2, G_11, H_11, I_11},
- {2, G_10, H_10, I_10},
- {2, G_9, H_9, I_9},
+ {2, CB10_CA12, CB11_CA12, CB12_CA12},
+ {2, CB10_CA11, CB11_CA11, CB12_CA11},
+ {2, CB10_CA10, CB11_CA10, CB12_CA10},
+ {2, CB10_CA9, CB11_CA9, CB12_CA9},
+ {2, CB10_CA8, CB11_CA8, CB12_CA8},
+ {2, CB10_CA7, CB11_CA7, CB12_CA7},
+ {2, CB10_CA6, CB11_CA6, CB12_CA6},
+ {2, CB10_CA5, CB11_CA5, CB12_CA5},
+ {2, CB10_CA4, CB11_CA4, CB12_CA4},
+ {2, CB10_CA3, CB11_CA3, CB12_CA3},
+ {2, CB10_CA2, CB11_CA2, CB12_CA2},
+ {2, CB10_CA1, CB11_CA1, CB12_CA1},
+ {2, CB7_CA12, CB8_CA12, CB9_CA12},
+ {2, CB7_CA11, CB8_CA11, CB9_CA11},
+ {2, CB7_CA10, CB8_CA10, CB9_CA10},
+ {2, CB7_CA9, CB8_CA9, CB9_CA9},
- {2, A_1, B_1, C_1},
- {2, G_8, H_8, I_8},
+ {2, CB1_CA1, CB2_CA1, CB3_CA1},
+ {2, CB7_CA8, CB8_CA8, CB9_CA8},
- {2, A_2, B_2, C_2},
- {2, G_7, H_7, I_7},
+ {2, CB1_CA2, CB2_CA2, CB3_CA2},
+ {2, CB7_CA7, CB8_CA7, CB9_CA7},
- {2, A_3, B_3, C_3},
- {2, G_6, H_6, I_6},
+ {2, CB1_CA3, CB2_CA3, CB3_CA3},
+ {2, CB7_CA6, CB8_CA6, CB9_CA6},
- {2, A_4, B_4, C_4},
- {2, G_5, H_5, I_5},
+ {2, CB1_CA4, CB2_CA4, CB3_CA4},
+ {2, CB7_CA5, CB8_CA5, CB9_CA5},
- {2, A_5, B_5, C_5},
- {2, G_4, H_4, I_4},
+ {2, CB1_CA5, CB2_CA5, CB3_CA5},
+ {2, CB7_CA4, CB8_CA4, CB9_CA4},
- {2, A_6, B_6, C_6},
- {2, G_3, H_3, I_3},
+ {2, CB1_CA6, CB2_CA6, CB3_CA6},
+ {2, CB7_CA3, CB8_CA3, CB9_CA3},
- {2, A_7, B_7, C_7},
- {2, G_2, H_2, I_2},
+ {2, CB1_CA7, CB2_CA7, CB3_CA7},
+ {2, CB7_CA2, CB8_CA2, CB9_CA2},
- {2, A_8, B_8, C_8},
- {2, A_9, B_9, C_9},
- {2, A_10, B_10, C_10},
- {2, A_11, B_11, C_11},
- {2, A_12, B_12, C_12},
- {2, D_1, E_1, F_1},
- {2, D_2, E_2, F_2},
- {2, D_3, E_3, F_3},
- {2, D_4, E_4, F_4},
- {2, D_5, E_5, F_5},
- {2, D_6, E_6, F_6},
- {2, D_7, E_7, F_7},
- {2, D_8, E_8, F_8},
- {2, D_9, E_9, F_9},
- {2, D_10, E_10, F_10},
- {2, D_11, E_11, F_11},
- {2, D_12, E_12, F_12},
- {2, G_1, H_1, I_1},
+ {2, CB1_CA8, CB2_CA8, CB3_CA8},
+ {2, CB1_CA9, CB2_CA9, CB3_CA9},
+ {2, CB1_CA10, CB2_CA10, CB3_CA10},
+ {2, CB1_CA11, CB2_CA11, CB3_CA11},
+ {2, CB1_CA12, CB2_CA12, CB3_CA12},
+ {2, CB4_CA1, CB5_CA1, CB6_CA1},
+ {2, CB4_CA2, CB5_CA2, CB6_CA2},
+ {2, CB4_CA3, CB5_CA3, CB6_CA3},
+ {2, CB4_CA4, CB5_CA4, CB6_CA4},
+ {2, CB4_CA5, CB5_CA5, CB6_CA5},
+ {2, CB4_CA6, CB5_CA6, CB6_CA6},
+ {2, CB4_CA7, CB5_CA7, CB6_CA7},
+ {2, CB4_CA8, CB5_CA8, CB6_CA8},
+ {2, CB4_CA9, CB5_CA9, CB6_CA9},
+ {2, CB4_CA10, CB5_CA10, CB6_CA10},
+ {2, CB4_CA11, CB5_CA11, CB6_CA11},
+ {2, CB4_CA12, CB5_CA12, CB6_CA12},
+ {2, CB7_CA1, CB8_CA1, CB9_CA1},
};
// clang-format on
diff --git a/keyboards/akko/top40/top40.c b/keyboards/akko/top40/top40.c
index 2d75b774972..565dfb77c63 100644
--- a/keyboards/akko/top40/top40.c
+++ b/keyboards/akko/top40/top40.c
@@ -24,90 +24,90 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_5, K_5, L_5},
- {0, J_7, K_7, L_7},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, J_7, K_7, L_7},
- {1, J_6, K_6, L_6},
- {1, J_5, K_5, L_5},
- {1, J_4, K_4, L_4},
- {1, J_3, K_3, L_3},
- {1, J_2, K_2, L_2},
- {1, J_1, K_1, L_1},
- {1, G_8, H_8, I_8},
- {1, G_7, H_7, I_7},
- {1, G_6, H_6, I_6},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB10_CA7, CB11_CA7, CB12_CA7},
+ {1, CB10_CA6, CB11_CA6, CB12_CA6},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB7_CA8, CB8_CA8, CB9_CA8},
+ {1, CB7_CA7, CB8_CA7, CB9_CA7},
+ {1, CB7_CA6, CB8_CA6, CB9_CA6},
- {1, A_4, B_4, C_4},
- {1, G_5, H_5, I_5},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
- {1, A_5, B_5, C_5},
- {1, G_4, H_4, I_4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
- {1, A_6, B_6, C_6},
- {1, G_3, H_3, I_3},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, D_1, E_1, F_1},
- {1, D_2, E_2, F_2},
- {1, D_3, E_3, F_3},
- {1, D_4, E_4, F_4},
- {1, D_5, E_5, F_5},
- {1, D_6, E_6, F_6},
- {1, D_7, E_7, F_7},
- {1, D_8, E_8, F_8},
- {1, G_2, H_2, I_2},
- {1, G_1, H_1, I_1},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
+ {1, CB4_CA4, CB5_CA4, CB6_CA4},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
+ {1, CB4_CA8, CB5_CA8, CB6_CA8},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
};
diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c
index dd65a16a80a..df64c809532 100644
--- a/keyboards/axolstudio/yeti/hotswap/hotswap.c
+++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c
@@ -18,74 +18,74 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
- { 0, B_15, A_15, C_15 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
- { 0, E_15, D_15, F_15 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_13, G_13, I_13 },
- { 0, H_14, G_14, I_14 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_11, J_11, L_11 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
- { 0, K_1, J_1, L_1 },
- { 0, K_16, J_16, L_16 },
- { 0, H_16, G_16, I_16 },
- { 0, E_16, D_16, F_16 },
- { 0, B_16, A_16, C_16 },
- { 0, H_15, G_15, I_15 },
- { 0, K_15, J_15, L_15 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
};
led_config_t g_led_config = {
diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c
index 55569f50492..b14878ff22d 100644
--- a/keyboards/canary/canary60rgb/canary60rgb.c
+++ b/keyboards/canary/canary60rgb/canary60rgb.c
@@ -17,73 +17,73 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, J_14, K_14, L_14 },
- { 0, J_13, K_13, L_13 },
- { 0, J_12, K_12, L_12 },
- { 0, J_11, K_11, L_11 },
- { 0, J_10, K_10, L_10 },
- { 0, J_9, K_9, L_9 },
- { 0, J_8, K_8, L_8 },
- { 0, J_7, K_7, L_7 },
- { 0, J_6, K_6, L_6 },
- { 0, J_5, K_5, L_5 },
- { 0, J_4, K_4, L_4 },
- { 0, J_3, K_3, L_3 },
- { 0, J_2, K_2, L_2 },
- { 0, J_1, K_1, L_1 },
+ { 0, SW10_CS14, SW11_CS14, SW12_CS14 },
+ { 0, SW10_CS13, SW11_CS13, SW12_CS13 },
+ { 0, SW10_CS12, SW11_CS12, SW12_CS12 },
+ { 0, SW10_CS11, SW11_CS11, SW12_CS11 },
+ { 0, SW10_CS10, SW11_CS10, SW12_CS10 },
+ { 0, SW10_CS9, SW11_CS9, SW12_CS9 },
+ { 0, SW10_CS8, SW11_CS8, SW12_CS8 },
+ { 0, SW10_CS7, SW11_CS7, SW12_CS7 },
+ { 0, SW10_CS6, SW11_CS6, SW12_CS6 },
+ { 0, SW10_CS5, SW11_CS5, SW12_CS5 },
+ { 0, SW10_CS4, SW11_CS4, SW12_CS4 },
+ { 0, SW10_CS3, SW11_CS3, SW12_CS3 },
+ { 0, SW10_CS2, SW11_CS2, SW12_CS2 },
+ { 0, SW10_CS1, SW11_CS1, SW12_CS1 },
- { 0, G_14, H_14, I_14 },
- { 0, G_13, H_13, I_13 },
- { 0, G_12, H_12, I_12 },
- { 0, G_11, H_11, I_11 },
- { 0, G_10, H_10, I_10 },
- { 0, G_9, H_9, I_9 },
- { 0, G_8, H_8, I_8 },
- { 0, G_7, H_7, I_7 },
- { 0, G_6, H_6, I_6 },
- { 0, G_5, H_5, I_5 },
- { 0, G_4, H_4, I_4 },
- { 0, G_3, H_3, I_3 },
- { 0, G_2, H_2, I_2 },
- { 0, G_1, H_1, I_1 },
+ { 0, SW7_CS14, SW8_CS14, SW9_CS14 },
+ { 0, SW7_CS13, SW8_CS13, SW9_CS13 },
+ { 0, SW7_CS12, SW8_CS12, SW9_CS12 },
+ { 0, SW7_CS11, SW8_CS11, SW9_CS11 },
+ { 0, SW7_CS10, SW8_CS10, SW9_CS10 },
+ { 0, SW7_CS9, SW8_CS9, SW9_CS9 },
+ { 0, SW7_CS8, SW8_CS8, SW9_CS8 },
+ { 0, SW7_CS7, SW8_CS7, SW9_CS7 },
+ { 0, SW7_CS6, SW8_CS6, SW9_CS6 },
+ { 0, SW7_CS5, SW8_CS5, SW9_CS5 },
+ { 0, SW7_CS4, SW8_CS4, SW9_CS4 },
+ { 0, SW7_CS3, SW8_CS3, SW9_CS3 },
+ { 0, SW7_CS2, SW8_CS2, SW9_CS2 },
+ { 0, SW7_CS1, SW8_CS1, SW9_CS1 },
- { 0, D_14, E_14, F_14 },
- { 0, D_12, E_12, F_12 },
- { 0, D_11, E_11, F_11 },
- { 0, D_10, E_10, F_10 },
- { 0, D_9, E_9, F_9 },
- { 0, D_8, E_8, F_8 },
- { 0, D_7, E_7, F_7 },
- { 0, D_6, E_6, F_6 },
- { 0, D_5, E_5, F_5 },
- { 0, D_4, E_4, F_4 },
- { 0, D_3, E_3, F_3 },
- { 0, D_2, E_2, F_2 },
- { 0, D_1, E_1, F_1 },
+ { 0, SW4_CS14, SW5_CS14, SW6_CS14 },
+ { 0, SW4_CS12, SW5_CS12, SW6_CS12 },
+ { 0, SW4_CS11, SW5_CS11, SW6_CS11 },
+ { 0, SW4_CS10, SW5_CS10, SW6_CS10 },
+ { 0, SW4_CS9, SW5_CS9, SW6_CS9 },
+ { 0, SW4_CS8, SW5_CS8, SW6_CS8 },
+ { 0, SW4_CS7, SW5_CS7, SW6_CS7 },
+ { 0, SW4_CS6, SW5_CS6, SW6_CS6 },
+ { 0, SW4_CS5, SW5_CS5, SW6_CS5 },
+ { 0, SW4_CS4, SW5_CS4, SW6_CS4 },
+ { 0, SW4_CS3, SW5_CS3, SW6_CS3 },
+ { 0, SW4_CS2, SW5_CS2, SW6_CS2 },
+ { 0, SW4_CS1, SW5_CS1, SW6_CS1 },
- { 0, A_14, B_14, C_14 },
- { 0, A_13, B_13, C_13 },
- { 0, A_11, B_11, C_11 },
- { 0, A_10, B_10, C_10 },
- { 0, A_9, B_9, C_9 },
- { 0, A_8, B_8, C_8 },
- { 0, A_7, B_7, C_7 },
- { 0, A_6, B_6, C_6 },
- { 0, A_5, B_5, C_5 },
- { 0, A_4, B_4, C_4 },
- { 0, A_3, B_3, C_3 },
- { 0, A_2, B_2, C_2 },
- { 0, A_1, B_1, C_1 },
+ { 0, SW1_CS14, SW2_CS14, SW3_CS14 },
+ { 0, SW1_CS13, SW2_CS13, SW3_CS13 },
+ { 0, SW1_CS11, SW2_CS11, SW3_CS11 },
+ { 0, SW1_CS10, SW2_CS10, SW3_CS10 },
+ { 0, SW1_CS9, SW2_CS9, SW3_CS9 },
+ { 0, SW1_CS8, SW2_CS8, SW3_CS8 },
+ { 0, SW1_CS7, SW2_CS7, SW3_CS7 },
+ { 0, SW1_CS6, SW2_CS6, SW3_CS6 },
+ { 0, SW1_CS5, SW2_CS5, SW3_CS5 },
+ { 0, SW1_CS4, SW2_CS4, SW3_CS4 },
+ { 0, SW1_CS3, SW2_CS3, SW3_CS3 },
+ { 0, SW1_CS2, SW2_CS2, SW3_CS2 },
+ { 0, SW1_CS1, SW2_CS1, SW3_CS1 },
- { 0, A_15, B_15, C_15 },
- { 0, D_13, E_13, F_13 },
- { 0, A_12, B_12, C_12 },
- { 0, D_15, E_15, F_15 },
- { 0, G_15, H_15, I_15 },
- { 0, A_16, B_16, C_16 },
- { 0, D_16, E_16, F_16 },
- { 0, G_16, H_16, I_16 },
- { 0, J_16, K_16, L_16 }
+ { 0, SW1_CS15, SW2_CS15, SW3_CS15 },
+ { 0, SW4_CS13, SW5_CS13, SW6_CS13 },
+ { 0, SW1_CS12, SW2_CS12, SW3_CS12 },
+ { 0, SW4_CS15, SW5_CS15, SW6_CS15 },
+ { 0, SW7_CS15, SW8_CS15, SW9_CS15 },
+ { 0, SW1_CS16, SW2_CS16, SW3_CS16 },
+ { 0, SW4_CS16, SW5_CS16, SW6_CS16 },
+ { 0, SW7_CS16, SW8_CS16, SW9_CS16 },
+ { 0, SW10_CS16, SW11_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/chosfox/cf81/cf81.c b/keyboards/chosfox/cf81/cf81.c
index b864a56bc65..2e014dbe724 100644
--- a/keyboards/chosfox/cf81/cf81.c
+++ b/keyboards/chosfox/cf81/cf81.c
@@ -25,122 +25,122 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, D_2, E_2, F_2},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, A_15, B_15, C_15},
- {0, G_13, H_13, I_13},
- {1, D_3, E_3, F_3},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB1_CA15, CB2_CA15, CB3_CA15},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
- {0, J_1, K_1, L_1},
- {0, A_16, B_16, C_16},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, D_7, E_7, F_7},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB1_CA16, CB2_CA16, CB3_CA16},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
- {0, D_15, E_15, F_15},
- {1, D_6, E_6, F_6},
- {1, D_5, E_5, F_5},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
- {1, G_4, H_4, I_4},
- {1, G_5, H_5, I_5},
- {1, G_6, H_6, I_6},
- {1, G_7, H_7, I_7},
- {1, G_8, H_8, I_8},
- {1, G_9, H_9, I_9},
- {1, G_10, H_10, I_10},
- {1, G_11, H_11, I_11},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
+ {1, CB7_CA6, CB8_CA6, CB9_CA6},
+ {1, CB7_CA7, CB8_CA7, CB9_CA7},
+ {1, CB7_CA8, CB8_CA8, CB9_CA8},
+ {1, CB7_CA9, CB8_CA9, CB9_CA9},
+ {1, CB7_CA10, CB8_CA10, CB9_CA10},
+ {1, CB7_CA11, CB8_CA11, CB9_CA11},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
- {1, J_4, K_4, L_4},
- {1, J_5, K_5, L_5},
- {1, J_6, K_6, L_6},
- {1, J_7, K_7, L_7},
- {1, J_8, K_8, L_8},
- {1, J_9, K_9, L_9},
- {1, J_10, K_10, L_10},
- {1, J_11, K_11, L_11},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
+ {1, CB10_CA6, CB11_CA6, CB12_CA6},
+ {1, CB10_CA7, CB11_CA7, CB12_CA7},
+ {1, CB10_CA8, CB11_CA8, CB12_CA8},
+ {1, CB10_CA9, CB11_CA9, CB12_CA9},
+ {1, CB10_CA10, CB11_CA10, CB12_CA10},
+ {1, CB10_CA11, CB11_CA11, CB12_CA11},
};
// clang-format on
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
diff --git a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
index 550520e790a..f21aeeb38d3 100644
--- a/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
+++ b/keyboards/darkproject/kd83a_bfg_edition/kd83a_bfg_edition.c
@@ -25,99 +25,99 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- //{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, k00, Esc
+ //{0, SW4_CS1, SW4_CS2, SW4_CS3}, // 0, k00, Esc
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 1, k13, Esc
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 2, k26, F1
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 3, k36, F2
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 4, k31, F3
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 5, k33, F4
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 6, k07, F5
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 7, k63, F6
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 8, k71, F7
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 9, k76, F8
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 10, ka6, F9
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 11, ka7, F10
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 12, ka3, F11
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 13, ka5, F12
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 14, k97, Printscreen
- {1, CS4_SW5, CS5_SW5, CS6_SW5}, // 15, k02, Del
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 1, k13, Esc
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 2, k26, F1
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 3, k36, F2
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 4, k31, F3
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 5, k33, F4
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 6, k07, F5
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 7, k63, F6
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 8, k71, F7
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 9, k76, F8
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 10, ka6, F9
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 11, ka7, F10
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 12, ka3, F11
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 13, ka5, F12
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 14, k97, Printscreen
+ {1, SW5_CS4, SW5_CS5, SW5_CS6}, // 15, k02, Del
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 16, k16, `
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 17, k17, 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 18, k27, 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 19, k37, 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 20, k47, 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 21, k46, 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 22, k56, 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 23, k57, 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 24, k67, 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 25, k77, 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 26, k87, 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 27, k86, -
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 28, k66, =
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 29, ka1, Backspace
- {1, CS1_SW2, CS2_SW2, CS3_SW2}, // 30, kc6, Home
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 16, k16, `
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 17, k17, 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 18, k27, 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 19, k37, 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 20, k47, 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 21, k46, 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 22, k56, 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 23, k57, 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 24, k67, 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 25, k77, 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 26, k87, 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 27, k86, -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 28, k66, =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 29, ka1, Backspace
+ {1, SW2_CS1, SW2_CS2, SW2_CS3}, // 30, kc6, Home
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 31, k11, Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 32, k10, Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 33, k20, W
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 34, k30, E
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 35, k40, R
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 36, k41, T
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 37, k51, Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 38, k50, U
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 39, k60, I
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 40, k70, O
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 41, k80, P
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 42, k81, [
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 43, k61, ]
- {1, CS1_SW9, CS2_SW9, CS3_SW9}, // 44, ka2, "\\"
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 45, k65, End
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 31, k11, Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 32, k10, Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 33, k20, W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 34, k30, E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 35, k40, R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 36, k41, T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 37, k51, Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 38, k50, U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 39, k60, I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 40, k70, O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 41, k80, P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 42, k81, [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 43, k61, ]
+ {1, SW9_CS1, SW9_CS2, SW9_CS3}, // 44, ka2, "\\"
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 45, k65, End
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 46, k21, Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 47, k12, A
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 48, k22, S
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 49, k32, D
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 50, k42, F
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 51, k43, G
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 52, k53, H
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 53, k52, J
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 54, k62, K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 55, k72, L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 56, k82, ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 57, k83, '
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 58, ka4, Enter
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 59, k15, PgUp
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 46, k21, Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 47, k12, A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 48, k22, S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 49, k32, D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 50, k42, F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 51, k43, G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 52, k53, H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 53, k52, J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 54, k62, K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 55, k72, L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 56, k82, ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 57, k83, '
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 58, ka4, Enter
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 59, k15, PgUp
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 60, k00, Shift_L
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 61, k14, Z
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 62, k24, X
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 63, k34, C
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 64, k44, V
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 65, k45, B
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 66, k55, N
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 67, k54, M
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 68, k64, ,
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 69, k74, .
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 70, k85, /
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 71, k91, Shift_R
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 72, k35, Up
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 73, k25, PgDn
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 60, k00, Shift_L
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 61, k14, Z
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 62, k24, X
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 63, k34, C
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 64, k44, V
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 65, k45, B
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 66, k55, N
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 67, k54, M
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 68, k64, ,
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 69, k74, .
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 70, k85, /
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 71, k91, Shift_R
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 72, k35, Up
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 73, k25, PgDn
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 74, k06, Ctrl_L
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 75, k90, Win_L
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 76, k93, Alt_L
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 77, k94, Space
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 78, k95, Alt_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 79, k92, FN
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 80, k04, Ctrl_R
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 81, k03, Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 82, k73, Down
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 83, k05, Right
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 74, k06, Ctrl_L
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 75, k90, Win_L
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 76, k93, Alt_L
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 77, k94, Space
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 78, k95, Alt_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 79, k92, FN
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 80, k04, Ctrl_R
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 81, k03, Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 82, k73, Down
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 83, k05, Right
- {1, CS10_SW10, CS11_SW10, CS12_SW10}, // 84, kb0, Z1
- {1, CS10_SW11, CS11_SW11, CS12_SW11}, // 85, kb1, Z2
+ {1, SW10_CS10, SW10_CS11, SW10_CS12}, // 84, kb0, Z1
+ {1, SW11_CS10, SW11_CS11, SW11_CS12}, // 85, kb1, Z2
};
#endif
diff --git a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
index 22d10488d2d..20a46e343ea 100644
--- a/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
+++ b/keyboards/darkproject/kd87a_bfg_edition/kd87a_bfg_edition.c
@@ -25,100 +25,100 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- //{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, Esc
+ //{0, SW4_CS1, SW4_CS2, SW4_CS3}, // 0, Esc
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 1, Esc
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 2, F1
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 3, F2
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 4, F3
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 5, F4
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 6, F5
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 7, F6
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 8, F7
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 9, F8
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 10, F9
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 11, F10
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 12, F11
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 13, F12
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 14, Printscreen
- {1, CS1_SW3, CS2_SW3, CS3_SW3}, // 15, Scroll Lock
- {1, CS1_SW4, CS2_SW4, CS3_SW4}, // 16, Pause Break
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 1, Esc
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 2, F1
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 3, F2
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 4, F3
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 5, F4
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 6, F5
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 7, F6
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 8, F7
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 9, F8
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 10, F9
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 11, F10
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 12, F11
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 13, F12
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 14, Printscreen
+ {1, SW3_CS1, SW3_CS2, SW3_CS3}, // 15, Scroll Lock
+ {1, SW4_CS1, SW4_CS2, SW4_CS3}, // 16, Pause Break
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 17, `
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 18, 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 19, 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 20, 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 21, 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 22, 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 23, 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 24, 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 25, 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 26, 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 27, 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 28, -
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 29, =
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 30, Backspace
- {1, CS1_SW2, CS2_SW2, CS3_SW2}, // 31, Insert
- {1, CS4_SW5, CS5_SW5, CS6_SW5}, // 32, Home
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 33, Page Up
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 17, `
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 18, 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 19, 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 20, 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 21, 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 22, 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 23, 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 24, 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 25, 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 26, 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 27, 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 28, -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 29, =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 30, Backspace
+ {1, SW2_CS1, SW2_CS2, SW2_CS3}, // 31, Insert
+ {1, SW5_CS4, SW5_CS5, SW5_CS6}, // 32, Home
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 33, Page Up
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 34, Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 35, Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 36, W
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 37, E
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 38, R
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 39, T
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 40, Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 41, U
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 42, I
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 43, O
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 44, P
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 45, [
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 46, ]
- {1, CS1_SW9, CS2_SW9, CS3_SW9}, // 47, "\\"
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 48, Delete
- {1, CS4_SW6, CS5_SW6, CS6_SW6}, // 49, END
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 50, Page down
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 34, Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 35, Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 36, W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 37, E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 38, R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 39, T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 40, Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 41, U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 42, I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 43, O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 44, P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 45, [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 46, ]
+ {1, SW9_CS1, SW9_CS2, SW9_CS3}, // 47, "\\"
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 48, Delete
+ {1, SW6_CS4, SW6_CS5, SW6_CS6}, // 49, END
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 50, Page down
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 51, Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 52, A
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 53, S
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 54, D
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 55, F
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 56, G
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 57, H
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 58, J
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 59, K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 60, L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 61, ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 62, '
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 63, Enter
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 51, Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 52, A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 53, S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 54, D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 55, F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 56, G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 57, H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 58, J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 59, K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 60, L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 61, ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 62, '
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 63, Enter
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 64, Shift_L
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 65, Z
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 66, X
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 67, C
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 68, V
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 69, B
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 70, N
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 71, M
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 72, ,
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 73, .
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 74, /
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 75, Shift_R
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 76, Up
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 64, Shift_L
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 65, Z
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 66, X
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 67, C
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 68, V
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 69, B
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 70, N
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 71, M
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 72, ,
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 73, .
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 74, /
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 75, Shift_R
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 76, Up
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 77, Ctrl_L
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 78, Win_L
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 79, Alt_L
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 80, Space
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 81, Alt_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 82, FN
- {0, CS16_SW11, CS17_SW11, CS18_SW11}, // 83, APP
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 84, Ctrl_R
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 85, Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 86, Down
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 87, Right
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 77, Ctrl_L
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 78, Win_L
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 79, Alt_L
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 80, Space
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 81, Alt_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 82, FN
+ {0, SW11_CS16, SW11_CS17, SW11_CS18}, // 83, APP
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 84, Ctrl_R
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 85, Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 86, Down
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 87, Right
};
#endif
diff --git a/keyboards/drop/alt/v2/v2.c b/keyboards/drop/alt/v2/v2.c
index d3bb78fd12c..49ed4bfc998 100644
--- a/keyboards/drop/alt/v2/v2.c
+++ b/keyboards/drop/alt/v2/v2.c
@@ -4,111 +4,111 @@
# include "rgb_matrix.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 1, B_2, A_2, C_2 },
- { 1, E_3, D_3, F_3 },
- { 1, E_4, D_4, F_4 },
- { 1, E_5, D_5, F_5 },
- { 1, E_6, D_6, F_6 },
- { 1, E_7, D_7, F_7 },
- { 1, E_8, D_8, F_8 },
- { 1, B_13, A_13, C_13 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, B_7, A_7, C_7 },
- { 1, E_2, D_2, F_2 },
- { 1, H_3, G_3, I_3 },
- { 1, H_4, G_4, I_4 },
- { 1, H_5, G_5, I_5 },
- { 1, H_6, G_6, I_6 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, K_11, J_11, L_11 },
- { 0, H_6, G_6, I_6 },
- { 0, E_7, D_7, F_7 },
- { 1, H_2, G_2, I_2 },
- { 1, K_3, J_3, L_3 },
- { 1, K_4, J_4, L_4 },
- { 1, K_5, J_5, L_5 },
- { 1, K_6, J_6, L_6 },
- { 1, K_7, J_7, L_7 },
- { 1, K_8, J_8, L_8 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, H_7, G_7, I_7 },
- { 1, K_2, J_2, L_2 },
- { 1, E_9, D_9, F_9 },
- { 1, B_9, A_9, C_9 },
- { 1, K_9, J_9, L_9 },
- { 1, H_9, G_9, I_9 },
- { 1, K_12, J_12, L_12 },
- { 1, K_13, J_13, L_13 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, B_11, A_11, C_11 },
- { 0, E_11, D_11, F_11 },
- { 0, K_7, J_7, L_7 },
- { 1, H_10, G_10, I_10 },
- { 1, E_10, D_10, F_10 },
- { 1, B_10, A_10, C_10 },
- { 1, H_12, G_12, I_12 },
- { 0, E_10, D_10, F_10 },
- { 0, B_10, A_10, C_10 },
- { 0, B_12, A_12, C_12 },
- { 0, H_12, G_12, I_12 },
- { 0, E_12, D_12, F_12 },
- { 1, K_11, J_11, L_11 },
- { 1, H_11, G_11, I_11 },
- { 1, E_11, D_11, F_11 },
- { 1, B_11, A_11, C_11 },
- { 1, B_12, A_12, C_12 },
- { 1, E_12, D_12, F_12 },
- { 1, E_13, D_13, F_13 },
- { 1, H_13, G_13, I_13 },
- { 0, H_9, G_9, I_9 },
- { 0, E_9, D_9, F_9 },
- { 0, B_9, A_9, C_9 },
- { 0, B_13, A_13, C_13 },
- { 0, H_13, G_13, I_13 },
- { 0, E_13, D_13, F_13 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_8, J_8, L_8 },
- { 0, H_8, G_8, I_8 },
- { 0, E_8, D_8, F_8 },
- { 0, B_8, A_8, C_8 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
- { 0, B_14, A_14, C_14 },
- { 1, B_8, A_8, C_8 },
- { 1, B_7, A_7, C_7 },
- { 1, B_6, A_6, C_6 },
- { 1, B_5, A_5, C_5 },
- { 1, B_4, A_4, C_4 },
- { 1, B_3, A_3, C_3 },
- { 1, B_1, A_1, C_1 },
- { 1, E_1, D_1, F_1 },
- { 1, H_1, G_1, I_1 },
- { 1, K_1, J_1, L_1 },
- { 1, K_10, J_10, L_10 },
+ { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
};
#endif
diff --git a/keyboards/drop/cstm65/cstm65.c b/keyboards/drop/cstm65/cstm65.c
index 1c8e6bb0bbc..dff7008f593 100644
--- a/keyboards/drop/cstm65/cstm65.c
+++ b/keyboards/drop/cstm65/cstm65.c
@@ -4,76 +4,76 @@
# include "rgb_matrix.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
- { 0, B_15, A_15, C_15 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
- { 0, E_15, D_15, F_15 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
- { 1, B_1, A_1, C_1 },
- { 1, B_2, A_2, C_2 },
- { 1, B_3, A_3, C_3 },
- { 1, B_4, A_4, C_4 },
- { 1, B_5, A_5, C_5 },
- { 1, B_6, A_6, C_6 },
- { 1, B_7, A_7, C_7 },
- { 1, B_8, A_8, C_8 },
- { 1, B_9, A_9, C_9 },
- { 1, B_10, A_10, C_10 },
- { 1, B_11, A_11, C_11 },
- { 1, B_12, A_12, C_12 },
- { 1, B_13, A_13, C_13 },
- { 1, B_14, A_14, C_14 },
+ { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
- { 1, E_1, D_1, F_1 },
- { 1, E_2, D_2, F_2 },
- { 1, E_3, D_3, F_3 },
- { 1, E_4, D_4, F_4 },
- { 1, E_5, D_5, F_5 },
- { 1, E_6, D_6, F_6 },
- { 1, E_7, D_7, F_7 },
- { 1, E_8, D_8, F_8 },
- { 1, E_9, D_9, F_9 },
- { 1, E_10, D_10, F_10 },
- { 1, E_11, D_11, F_11 },
- { 1, E_12, D_12, F_12 },
- { 1, E_13, D_13, F_13 },
- { 1, E_14, D_14, F_14 },
+ { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
- { 1, H_4, G_4, I_4 },
- { 1, H_5, G_5, I_5 },
- { 1, H_8, G_8, I_8 },
- { 1, H_9, G_9, I_9 },
- { 1, H_10, G_10, I_10 },
- { 1, H_11, G_11, I_11 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
};
#endif
diff --git a/keyboards/drop/cstm80/cstm80.c b/keyboards/drop/cstm80/cstm80.c
index e99c7801e58..6350f3a32d6 100644
--- a/keyboards/drop/cstm80/cstm80.c
+++ b/keyboards/drop/cstm80/cstm80.c
@@ -4,93 +4,93 @@
# include "rgb_matrix.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
- { 0, E_15, D_15, F_15 },
- { 0, E_16, D_16, F_16 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_13, G_13, I_13 },
- { 0, H_14, G_14, I_14 },
- { 0, H_15, G_15, I_15 },
- { 0, H_16, G_16, I_16 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_11, J_11, L_11 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
- { 0, K_15, J_15, L_15 },
- { 0, K_16, J_16, L_16 },
- { 1, B_1, A_1, C_1 },
- { 1, B_2, A_2, C_2 },
- { 1, B_3, A_3, C_3 },
- { 1, B_4, A_4, C_4 },
- { 1, B_5, A_5, C_5 },
- { 1, B_6, A_6, C_6 },
- { 1, B_7, A_7, C_7 },
- { 1, B_8, A_8, C_8 },
- { 1, B_9, A_9, C_9 },
- { 1, B_10, A_10, C_10 },
- { 1, B_11, A_11, C_11 },
- { 1, B_12, A_12, C_12 },
- { 1, B_13, A_13, C_13 },
- { 1, B_14, A_14, C_14 },
- { 1, B_15, A_15, C_15 },
- { 1, B_16, A_16, C_16 },
- { 1, E_1, D_1, F_1 },
- { 1, E_2, D_2, F_2 },
- { 1, E_3, D_3, F_3 },
- { 1, E_4, D_4, F_4 },
- { 1, E_5, D_5, F_5 },
- { 1, E_6, D_6, F_6 },
- { 1, E_7, D_7, F_7 },
- { 1, E_8, D_8, F_8 },
- { 1, E_9, D_9, F_9 },
- { 1, E_10, D_10, F_10 },
- { 1, E_11, D_11, F_11 },
- { 1, E_12, D_12, F_12 },
- { 1, E_13, D_13, F_13 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
- { 1, H_4, G_4, I_4 },
- { 1, H_5, G_5, I_5 },
- { 1, H_6, G_6, I_6 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
- { 1, H_9, G_9, I_9 },
- { 1, H_10, G_10, I_10 },
- { 1, H_11, G_11, I_11 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
};
#endif
diff --git a/keyboards/drop/ctrl/v2/v2.c b/keyboards/drop/ctrl/v2/v2.c
index 0c1d8210c63..81689dc78af 100644
--- a/keyboards/drop/ctrl/v2/v2.c
+++ b/keyboards/drop/ctrl/v2/v2.c
@@ -4,125 +4,125 @@
# include "rgb_matrix.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 1, B_2, A_2, C_2 },
- { 1, E_3, D_3, F_3 },
- { 1, E_4, D_4, F_4 },
- { 1, E_5, D_5, F_5 },
- { 1, B_6, A_6, C_6 },
- { 1, E_7, D_7, F_7 },
- { 1, E_8, D_8, F_8 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
- { 1, H_4, G_4, I_4 },
- { 1, H_5, G_5, I_5 },
- { 1, H_6, G_6, I_6 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 1, K_1, J_1, L_1 },
- { 1, K_2, J_2, L_2 },
- { 1, K_3, J_3, L_3 },
- { 1, K_4, J_4, L_4 },
- { 1, K_5, J_5, L_5 },
- { 1, K_6, J_6, L_6 },
- { 1, K_7, J_7, L_7 },
- { 1, K_8, J_8, L_8 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 1, E_1, D_1, F_1 },
- { 1, E_2, D_2, F_2 },
- { 1, K_13, J_13, L_13 },
- { 1, K_12, J_12, L_12 },
- { 1, K_11, J_11, L_11 },
- { 1, E_6, D_6, F_6 },
- { 1, K_10, J_10, L_10 },
- { 1, K_9, J_9, L_9 },
- { 0, K_16, J_16, L_16 },
- { 0, K_15, J_15, L_15 },
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 1, E_14, D_14, F_14 },
- { 1, E_13, D_13, F_13 },
- { 1, H_12, G_12, I_12 },
- { 1, E_12, D_12, F_12 },
- { 1, E_11, D_11, F_11 },
- { 1, E_10, D_10, F_10 },
- { 1, E_9, D_9, F_9 },
- { 1, H_9, G_9, I_9 },
- { 0, H_16, G_16, I_16 },
- { 0, H_15, G_15, I_15 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_11, G_11, I_11 },
- { 1, K_14, J_14, L_14 },
- { 1, H_14, G_14, I_14 },
- { 1, H_13, G_13, I_13 },
- { 1, H_10, G_10, I_10 },
- { 0, E_16, D_16, F_16 },
- { 0, E_15, D_15, F_15 },
- { 0, E_14, D_14, F_14 },
- { 0, E_13, D_13, F_13 },
- { 0, H_12, G_12, I_12 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
- { 0, B_15, A_15, C_15 },
- { 0, B_16, A_16, C_16 },
- { 1, B_9, A_9, C_9 },
- { 1, B_10, A_10, C_10 },
- { 1, B_11, A_11, C_11 },
- { 1, B_12, A_12, C_12 },
- { 1, B_13, A_13, C_13 },
- { 1, B_14, A_14, C_14 },
- { 1, B_15, A_15, C_15 },
- { 1, K_15, J_15, L_15 },
- { 1, E_15, D_15, F_15 },
- { 1, H_15, G_15, I_15 },
- { 1, B_1, A_1, C_1 },
- { 1, B_3, A_3, C_3 },
- { 1, B_4, A_4, C_4 },
- { 1, B_5, A_5, C_5 },
- { 1, B_7, A_7, C_7 },
- { 1, B_8, A_8, C_8 },
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_8, A_8, C_8 },
- { 0, B_10, A_10, C_10 },
- { 0, H_10, G_10, I_10 },
- { 0, K_10, J_10, L_10 },
- { 0, E_10, D_10, F_10 },
+ { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 1, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
};
#endif
diff --git a/keyboards/drop/sense75/sense75.c b/keyboards/drop/sense75/sense75.c
index bbe5a3aa471..1130cf12790 100644
--- a/keyboards/drop/sense75/sense75.c
+++ b/keyboards/drop/sense75/sense75.c
@@ -5,131 +5,131 @@
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
// top underglow sd2-sd17
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
- { 0, B_16, A_16, C_16 },
- { 1, B_12, A_12, C_12 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
// sd1 + function + sd18
- { 0, B_1, A_1, C_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
- { 0, E_15, D_15, F_15 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
//
- { 1, B_13, A_13, C_13 },
+ { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
// sd45 + num + sd20
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_13, G_13, I_13 },
- { 0, H_14, G_14, I_14 },
- { 0, H_15, G_15, I_15 },
- { 0, H_16, G_16, I_16 },
- { 1, B_15, A_15, C_15 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
// 44+ qwer 21
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_11, J_11, L_11 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
- { 0, K_15, J_15, L_15 },
- { 0, K_16, J_16, L_16 },
- { 1, B_16, A_16, C_16 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
// asdf
- { 1, B_2, A_2, C_2 },
- { 1, B_3, A_3, C_3 },
- { 1, B_4, A_4, C_4 },
- { 1, B_5, A_5, C_5 },
- { 1, B_6, A_6, C_6 },
- { 1, B_7, A_7, C_7 },
- { 1, B_8, A_8, C_8 },
- { 1, B_9, A_9, C_9 },
- { 1, B_10, A_10, C_10 },
- { 1, B_11, A_11, C_11 },
- { 1, E_12, D_12, F_12 },
- { 1, E_13, D_13, F_13 },
- { 1, E_14, D_14, F_14 },
- { 1, H_15, G_15, I_15 },
+ { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
// 43 + zxcv + 22
- { 1, B_1, A_1, C_1 },
- { 1, E_2, D_2, F_2 },
- { 1, E_3, D_3, F_3 },
- { 1, E_4, D_4, F_4 },
- { 1, E_5, D_5, F_5 },
- { 1, E_6, D_6, F_6 },
- { 1, E_7, D_7, F_7 },
- { 1, E_8, D_8, F_8 },
- { 1, E_9, D_9, F_9 },
- { 1, E_10, D_10, F_10 },
- { 1, E_11, D_11, F_11 },
- { 1, H_12, G_12, I_12 },
- { 1, H_13, G_13, I_13 },
- { 1, H_14, G_14, I_14 },
- { 1, E_15, D_15, F_15 },
+ { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
// 41 + mods + 23
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
- { 1, H_4, G_4, I_4 },
- { 1, H_5, G_5, I_5 },
- { 1, H_6, G_6, I_6 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
- { 1, H_9, G_9, I_9 },
- { 1, H_10, G_10, I_10 },
- { 1, H_11, G_11, I_11 },
- { 1, E_16, D_16, F_16 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
// bottom underglow 24 - 39
- { 1, K_2, J_2, L_2 },
- { 1, K_3, J_3, L_3 },
- { 1, K_4, J_4, L_4 },
- { 1, K_6, J_6, L_6 },
- { 1, K_10, J_10, L_10 },
- { 1, K_13, J_13, L_13 },
- { 1, K_15, J_15, L_15 },
- { 1, H_16, G_16, I_16 }
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 1, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 1, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 1, SW8_CS16, SW7_CS16, SW9_CS16 }
};
#endif
diff --git a/keyboards/drop/shift/v2/v2.c b/keyboards/drop/shift/v2/v2.c
index cbfbeda4294..4715d7b81b5 100644
--- a/keyboards/drop/shift/v2/v2.c
+++ b/keyboards/drop/shift/v2/v2.c
@@ -5,172 +5,172 @@
# include "rgb_matrix.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, K_1, J_1, L_1 },// LED1
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },// LED9
- { 1, K_1, J_1, L_1 },// LED10
- { 1, K_2, J_2, L_2 },// LED11
- { 1, K_3, J_3, L_3 },// LED12
- { 1, K_4, J_4, L_4 },// LED13
- { 1, K_9, J_9, L_9 },// LED18
- { 1, K_5, J_5, L_5 },// LED15
- { 1, K_6, J_6, L_6 },// LED19
- { 1, K_7, J_7, L_7 },// LED16
- { 1, K_8, J_8, L_8 },// LED20
- { 0, H_1, G_1, I_1 },//start2
- { 0, H_11, G_11, I_11 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 1, E_1, D_1, F_1 },
- { 1, E_2, D_2, F_2 },
- { 1, E_4, D_4, F_4 },
- { 1, E_5, D_5, F_5 },
- { 1, E_6, D_6, F_6 },
- { 1, E_7, D_7, F_7 },
- { 1, E_8, D_8, F_8 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 1, B_1, A_1, C_1 },
- { 1, B_2, A_2, C_2 },
- { 1, B_3, A_3, C_3 },
- { 1, B_4, A_4, C_4 },
- { 1, B_5, A_5, C_5 },
- { 1, B_6, A_6, C_6 },
- { 1, B_7, A_7, C_7 },
- { 1, B_8, A_8, C_8 },
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 1, B_9, A_9, C_9 },
- { 1, B_10, A_10, C_10 },
- { 1, B_11, A_11, C_11 },
- { 1, B_13, A_13, C_13 },
- { 1, B_14, A_14, C_14 },
- { 1, B_15, A_15, C_15 },
- { 1, B_16, A_16, C_16 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, H_13, G_13, I_13 },
- { 0, H_14, G_14, I_14 },
- { 0, B_14, A_14, C_14 },
- { 0, E_15, D_15, F_15 },
- { 0, B_15, A_15, C_15 },
- { 0, B_16, A_16, C_16 },
- { 1, E_9, D_9, F_9 },
- { 1, E_10, D_10, F_10 },
- { 1, E_11, D_11, F_11 },
- { 1, E_12, D_12, F_12 },
- { 1, E_13, D_13, F_13 },
- { 1, E_14, D_14, F_14 },
- { 1, E_15, D_15, F_15 },
- { 1, H_16, G_16, I_16 },
- { 0, E_11, D_11, F_11 },//start6
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
- { 1, H_9, G_9, I_9 },
- { 1, H_10, G_10, I_10 },
- { 1, H_11, G_11, I_11 },
- { 1, H_12, G_12, I_12 },
- { 1, H_13, G_13, I_13 },
- { 1, H_14, G_14, I_14 },
- { 1, H_15, G_15, I_15 },
- { 2, H_1, G_1, I_1 },//start underglow
- { 2, K_1, J_1, L_1 },
- { 2, B_1, A_1, C_1 },
- { 2, E_1, D_1, F_1 },
- { 2, E_2, D_2, F_2 },
- { 2, B_2, A_2, C_2 },
- { 2, B_3, A_3, C_3 },
- { 2, E_3, D_3, F_3 },
- { 2, E_4, D_4, F_4 },
- { 2, B_4, A_4, C_4 },
- { 2, B_5, A_5, C_5 },
- { 2, E_5, D_5, F_5 },
- { 2, E_6, D_6, F_6 },
- { 2, B_6, A_6, C_6 },
- { 2, B_7, A_7, C_7 },
- { 2, E_7, D_7, F_7 },
- { 2, E_8, D_8, F_8 },
- { 2, B_8, A_8, C_8 },
- { 2, B_9, A_9, C_9 },
- { 2, E_9, D_9, F_9 },
- { 2, E_10, D_10, F_10 },
- { 2, B_10, A_10, C_10 },
- { 2, B_11, A_11, C_11 },//125
- { 2, E_11, D_11, F_11 },
- { 2, E_12, D_12, F_12 },
- { 2, B_12, A_12, C_12 },
- { 2, B_13, A_13, C_13 },
- { 2, E_13, D_13, F_13 },
- { 2, E_14, D_14, F_14 },
- { 2, B_14, A_14, C_14 },
- { 2, B_15, A_15, C_15 },
- { 2, E_15, D_15, F_15 },
- { 2, E_16, D_16, F_16 },
- { 2, B_16, A_16, C_16 },
- { 2, H_16, G_16, I_16 },
- { 2, K_16, J_16, L_16 },
- { 2, K_15, J_15, L_15 },
- { 2, H_15, G_15, I_15 },
- { 2, H_14, G_14, I_14 },
- { 2, K_14, J_14, L_14 },
- { 2, K_13, J_13, L_13 },
- { 2, H_13, G_13, I_13 },
- { 2, H_12, G_12, I_12 },
- { 2, K_12, J_12, L_12 },
- { 2, K_11, J_11, L_11 },
- { 2, H_11, G_11, I_11 },
- { 2, H_10, G_10, I_10 },
- { 2, K_10, J_10, L_10 },
- { 2, K_9, J_9, L_9 },
- { 2, H_9, G_9, I_9 },
- { 2, H_8, G_8, I_8 },
- { 2, K_8, J_8, L_8 },
- { 2, K_7, J_7, L_7 },
- { 2, H_7, G_7, I_7 },
- { 2, H_6, G_6, I_6 },
- { 2, K_6, J_6, L_6 },
- { 2, K_5, J_5, L_5 },
- { 2, H_5, G_5, I_5 },
- { 2, H_4, G_4, I_4 },
- { 2, K_4, J_4, L_4 },
- { 2, K_3, J_3, L_3 },
- { 2, H_3, G_3, I_3 },
- { 2, H_2, G_2, I_2 },
- { 2, K_2, J_2, L_2 },
- { 1, K_10, J_10, L_10 },
- { 1, K_11, J_11, L_11 },
- { 1, E_3, D_3, F_3 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },// LED1
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },// LED9
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },// LED10
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },// LED11
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },// LED12
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },// LED13
+ { 1, SW11_CS9, SW10_CS9, SW12_CS9 },// LED18
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },// LED15
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },// LED19
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 },// LED16
+ { 1, SW11_CS8, SW10_CS8, SW12_CS8 },// LED20
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },//start2
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 1, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },//start6
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 2, SW8_CS1, SW7_CS1, SW9_CS1 },//start underglow
+ { 2, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 2, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 2, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 2, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 2, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 2, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 2, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 2, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 2, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 2, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 2, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 2, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 2, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 2, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 2, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 2, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 2, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 2, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 2, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 2, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 2, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 2, SW2_CS11, SW1_CS11, SW3_CS11 },//125
+ { 2, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 2, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 2, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 2, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 2, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 2, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 2, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 2, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 2, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 2, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 2, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 2, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 2, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 2, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 2, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 2, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 2, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 2, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 2, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 2, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 2, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 2, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 2, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 2, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 2, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 2, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 2, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 2, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 2, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 2, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 2, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 2, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 2, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 2, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 2, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 2, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 2, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 2, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 2, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 2, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 2, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
};
bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/durgod/dgk6x/galaxy/galaxy.c b/keyboards/durgod/dgk6x/galaxy/galaxy.c
index cd1f10c4f99..1cf2d712558 100644
--- a/keyboards/durgod/dgk6x/galaxy/galaxy.c
+++ b/keyboards/durgod/dgk6x/galaxy/galaxy.c
@@ -26,95 +26,95 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | | B location
* | | | | */
- {0, C_1, B_1, A_1}, // Esc
- {0, C_2, B_2, A_2}, // F1
- {0, C_3, B_3, A_3}, // F2
- {0, C_4, B_4, A_4}, // F3
- {0, C_5, B_5, A_5}, // F4
- {0, C_6, B_6, A_6}, // F5
- {0, C_7, B_7, A_7}, // F6
- {0, C_8, B_8, A_8}, // F7
- {0, C_9, B_9, A_9}, // F8
- {0, C_10, B_10, A_10}, // F9
- {0, C_11, B_11, A_11}, // F10
- {0, C_12, B_12, A_12}, // F11
- {0, C_13, B_13, A_13}, // F12
- {0, C_14, B_14, A_14}, // PrtSc
- {0, C_15, B_15, A_15}, // Pause
- {0, C_16, B_16, A_16}, // Del
+ {0, SW3_CS1, SW2_CS1, SW1_CS1}, // Esc
+ {0, SW3_CS2, SW2_CS2, SW1_CS2}, // F1
+ {0, SW3_CS3, SW2_CS3, SW1_CS3}, // F2
+ {0, SW3_CS4, SW2_CS4, SW1_CS4}, // F3
+ {0, SW3_CS5, SW2_CS5, SW1_CS5}, // F4
+ {0, SW3_CS6, SW2_CS6, SW1_CS6}, // F5
+ {0, SW3_CS7, SW2_CS7, SW1_CS7}, // F6
+ {0, SW3_CS8, SW2_CS8, SW1_CS8}, // F7
+ {0, SW3_CS9, SW2_CS9, SW1_CS9}, // F8
+ {0, SW3_CS10, SW2_CS10, SW1_CS10}, // F9
+ {0, SW3_CS11, SW2_CS11, SW1_CS11}, // F10
+ {0, SW3_CS12, SW2_CS12, SW1_CS12}, // F11
+ {0, SW3_CS13, SW2_CS13, SW1_CS13}, // F12
+ {0, SW3_CS14, SW2_CS14, SW1_CS14}, // PrtSc
+ {0, SW3_CS15, SW2_CS15, SW1_CS15}, // Pause
+ {0, SW3_CS16, SW2_CS16, SW1_CS16}, // Del
- {0, F_1, E_1, D_1}, // `
- {0, F_2, E_2, D_2}, // 1
- {0, F_3, E_3, D_3}, // 2
- {0, F_4, E_4, D_4}, // 3
- {0, F_5, E_5, D_5}, // 4
- {0, F_6, E_6, D_6}, // 5
- {0, F_7, E_7, D_7}, // 6
- {0, F_8, E_8, D_8}, // 7
- {0, F_9, E_9, D_9}, // 8
- {0, F_10, E_10, D_10}, // 9
- {0, F_11, E_11, D_11}, // 0
- {0, F_12, E_12, D_12}, // -
- {0, F_13, E_13, D_13}, // =
- {0, F_14, E_14, D_14}, // Bksp
- {0, F_15, E_15, D_15}, // Home
+ {0, SW6_CS1, SW5_CS1, SW4_CS1}, // `
+ {0, SW6_CS2, SW5_CS2, SW4_CS2}, // 1
+ {0, SW6_CS3, SW5_CS3, SW4_CS3}, // 2
+ {0, SW6_CS4, SW5_CS4, SW4_CS4}, // 3
+ {0, SW6_CS5, SW5_CS5, SW4_CS5}, // 4
+ {0, SW6_CS6, SW5_CS6, SW4_CS6}, // 5
+ {0, SW6_CS7, SW5_CS7, SW4_CS7}, // 6
+ {0, SW6_CS8, SW5_CS8, SW4_CS8}, // 7
+ {0, SW6_CS9, SW5_CS9, SW4_CS9}, // 8
+ {0, SW6_CS10, SW5_CS10, SW4_CS10}, // 9
+ {0, SW6_CS11, SW5_CS11, SW4_CS11}, // 0
+ {0, SW6_CS12, SW5_CS12, SW4_CS12}, // -
+ {0, SW6_CS13, SW5_CS13, SW4_CS13}, // =
+ {0, SW6_CS14, SW5_CS14, SW4_CS14}, // Bksp
+ {0, SW6_CS15, SW5_CS15, SW4_CS15}, // Home
- {0, I_1, H_1, G_1}, // Tab
- {0, I_2, H_2, G_2}, // Q
- {0, I_3, H_3, G_3}, // W
- {0, I_4, H_4, G_4}, // E
- {0, I_5, H_5, G_5}, // R
- {0, I_6, H_6, G_6}, // T
- {0, I_7, H_7, G_7}, // Y
- {0, I_8, H_8, G_8}, // U
- {0, I_9, H_9, G_9}, // I
- {0, I_10, H_10, G_10}, // O
- {0, I_11, H_11, G_11}, // P
- {0, I_12, H_12, G_12}, // [
- {0, I_13, H_13, G_13}, // ]
- {0, I_14, H_14, G_14}, // Pipe
- {0, I_15, H_15, G_15}, // End
+ {0, SW9_CS1, SW8_CS1, SW7_CS1}, // Tab
+ {0, SW9_CS2, SW8_CS2, SW7_CS2}, // Q
+ {0, SW9_CS3, SW8_CS3, SW7_CS3}, // W
+ {0, SW9_CS4, SW8_CS4, SW7_CS4}, // E
+ {0, SW9_CS5, SW8_CS5, SW7_CS5}, // R
+ {0, SW9_CS6, SW8_CS6, SW7_CS6}, // T
+ {0, SW9_CS7, SW8_CS7, SW7_CS7}, // Y
+ {0, SW9_CS8, SW8_CS8, SW7_CS8}, // U
+ {0, SW9_CS9, SW8_CS9, SW7_CS9}, // I
+ {0, SW9_CS10, SW8_CS10, SW7_CS10}, // O
+ {0, SW9_CS11, SW8_CS11, SW7_CS11}, // P
+ {0, SW9_CS12, SW8_CS12, SW7_CS12}, // [
+ {0, SW9_CS13, SW8_CS13, SW7_CS13}, // ]
+ {0, SW9_CS14, SW8_CS14, SW7_CS14}, // Pipe
+ {0, SW9_CS15, SW8_CS15, SW7_CS15}, // End
- {0, L_1, K_1, J_1}, // Caps
- {0, L_2, K_2, J_2}, // A
- {0, L_3, K_3, J_3}, // S
- {0, L_4, K_4, J_4}, // D
- {0, L_5, K_5, J_5}, // F
- {0, L_6, K_6, J_6}, // G
- {0, L_7, K_7, J_7}, // H
- {0, L_8, K_8, J_8}, // J
- {0, L_9, K_9, J_9}, // K
- {0, L_10, K_10, J_10}, // L
- {0, L_11, K_11, J_11}, // :
- {0, L_12, K_12, J_12}, // '
- {0, L_14, K_14, J_14}, // Enter
- {0, L_15, K_15, J_15}, // PgUp
+ {0, SW12_CS1, SW11_CS1, SW10_CS1}, // Caps
+ {0, SW12_CS2, SW11_CS2, SW10_CS2}, // A
+ {0, SW12_CS3, SW11_CS3, SW10_CS3}, // S
+ {0, SW12_CS4, SW11_CS4, SW10_CS4}, // D
+ {0, SW12_CS5, SW11_CS5, SW10_CS5}, // F
+ {0, SW12_CS6, SW11_CS6, SW10_CS6}, // G
+ {0, SW12_CS7, SW11_CS7, SW10_CS7}, // H
+ {0, SW12_CS8, SW11_CS8, SW10_CS8}, // J
+ {0, SW12_CS9, SW11_CS9, SW10_CS9}, // K
+ {0, SW12_CS10, SW11_CS10, SW10_CS10}, // L
+ {0, SW12_CS11, SW11_CS11, SW10_CS11}, // :
+ {0, SW12_CS12, SW11_CS12, SW10_CS12}, // '
+ {0, SW12_CS14, SW11_CS14, SW10_CS14}, // Enter
+ {0, SW12_CS15, SW11_CS15, SW10_CS15}, // PgUp
- {1, C_1, B_1, A_1}, // LShift
- {1, C_3, B_3, A_3}, // Z
- {1, C_4, B_4, A_4}, // X
- {1, C_5, B_5, A_5}, // C
- {1, C_6, B_6, A_6}, // V
- {1, C_7, B_7, A_7}, // B
- {1, C_8, B_8, A_8}, // N
- {1, C_9, B_9, A_9}, // M
- {1, C_10, B_10, A_10}, // <
- {1, C_11, B_11, A_11}, // >
- {1, C_12, B_12, A_12}, // ?
- {1, C_13, B_13, A_13}, // RShift
- {1, C_14, B_14, A_14}, // Up
- {1, C_15, B_15, A_15}, // PgDn
+ {1, SW3_CS1, SW2_CS1, SW1_CS1}, // LShift
+ {1, SW3_CS3, SW2_CS3, SW1_CS3}, // Z
+ {1, SW3_CS4, SW2_CS4, SW1_CS4}, // X
+ {1, SW3_CS5, SW2_CS5, SW1_CS5}, // C
+ {1, SW3_CS6, SW2_CS6, SW1_CS6}, // V
+ {1, SW3_CS7, SW2_CS7, SW1_CS7}, // B
+ {1, SW3_CS8, SW2_CS8, SW1_CS8}, // N
+ {1, SW3_CS9, SW2_CS9, SW1_CS9}, // M
+ {1, SW3_CS10, SW2_CS10, SW1_CS10}, // <
+ {1, SW3_CS11, SW2_CS11, SW1_CS11}, // >
+ {1, SW3_CS12, SW2_CS12, SW1_CS12}, // ?
+ {1, SW3_CS13, SW2_CS13, SW1_CS13}, // RShift
+ {1, SW3_CS14, SW2_CS14, SW1_CS14}, // Up
+ {1, SW3_CS15, SW2_CS15, SW1_CS15}, // PgDn
- {1, F_1, E_1, D_1}, // LCtrl
- {1, F_2, E_2, D_2}, // LAlt
- {1, F_3, E_3, D_3}, // LGUI
- {1, F_7, E_7, D_7}, // Space
- {1, F_10, E_10, D_10}, // RAlt
- {1, F_11, E_11, D_11}, // Fn1
- {1, F_12, E_12, D_12}, // Fn2
- {1, F_13, E_13, D_13}, // Left
- {1, F_14, E_14, D_14}, // Down
- {1, F_15, E_15, D_15} // Right
+ {1, SW6_CS1, SW5_CS1, SW4_CS1}, // LCtrl
+ {1, SW6_CS2, SW5_CS2, SW4_CS2}, // LAlt
+ {1, SW6_CS3, SW5_CS3, SW4_CS3}, // LGUI
+ {1, SW6_CS7, SW5_CS7, SW4_CS7}, // Space
+ {1, SW6_CS10, SW5_CS10, SW4_CS10}, // RAlt
+ {1, SW6_CS11, SW5_CS11, SW4_CS11}, // Fn1
+ {1, SW6_CS12, SW5_CS12, SW4_CS12}, // Fn2
+ {1, SW6_CS13, SW5_CS13, SW4_CS13}, // Left
+ {1, SW6_CS14, SW5_CS14, SW4_CS14}, // Down
+ {1, SW6_CS15, SW5_CS15, SW4_CS15} // Right
};
led_config_t g_led_config = {{
diff --git a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
index 225a7c13ddf..e984c36d911 100644
--- a/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
+++ b/keyboards/durgod/dgk6x/hades_ansi/hades_ansi.c
@@ -27,78 +27,78 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | | B location
* | | | | */
- {0, C_1, B_1, A_1}, // Esc
- {0, C_2, B_2, A_2}, // 1
- {0, C_3, B_3, A_3}, // 2
- {0, C_4, B_4, A_4}, // 3
- {0, C_5, B_5, A_5}, // 4
- {0, C_6, B_6, A_6}, // 5
- {0, C_7, B_7, A_7}, // 6
- {0, C_8, B_8, A_8}, // 7
- {0, C_9, B_9, A_9}, // 8
- {0, C_10, B_10, A_10}, // 9
- {0, C_11, B_11, A_11}, // 0
- {0, C_12, B_12, A_12}, // -
- {0, C_13, B_13, A_13}, // =
- {0, C_14, B_14, A_14}, // Bksp
- {0, C_15, B_15, A_15}, // Del
+ {0, SW3_CS1, SW2_CS1, SW1_CS1}, // Esc
+ {0, SW3_CS2, SW2_CS2, SW1_CS2}, // 1
+ {0, SW3_CS3, SW2_CS3, SW1_CS3}, // 2
+ {0, SW3_CS4, SW2_CS4, SW1_CS4}, // 3
+ {0, SW3_CS5, SW2_CS5, SW1_CS5}, // 4
+ {0, SW3_CS6, SW2_CS6, SW1_CS6}, // 5
+ {0, SW3_CS7, SW2_CS7, SW1_CS7}, // 6
+ {0, SW3_CS8, SW2_CS8, SW1_CS8}, // 7
+ {0, SW3_CS9, SW2_CS9, SW1_CS9}, // 8
+ {0, SW3_CS10, SW2_CS10, SW1_CS10}, // 9
+ {0, SW3_CS11, SW2_CS11, SW1_CS11}, // 0
+ {0, SW3_CS12, SW2_CS12, SW1_CS12}, // -
+ {0, SW3_CS13, SW2_CS13, SW1_CS13}, // =
+ {0, SW3_CS14, SW2_CS14, SW1_CS14}, // Bksp
+ {0, SW3_CS15, SW2_CS15, SW1_CS15}, // Del
- {0, F_1, E_1, D_1}, // Tab
- {0, F_2, E_2, D_2}, // Q
- {0, F_3, E_3, D_3}, // W
- {0, F_4, E_4, D_4}, // E
- {0, F_5, E_5, D_5}, // R
- {0, F_6, E_6, D_6}, // T
- {0, F_7, E_7, D_7}, // Y
- {0, F_8, E_8, D_8}, // U
- {0, F_9, E_9, D_9}, // I
- {0, F_10, E_10, D_10}, // O
- {0, F_11, E_11, D_11}, // P
- {0, F_12, E_12, D_12}, // [
- {0, F_13, E_13, D_13}, // ]
- {0, F_14, E_14, D_14}, // Pipe
- {0, F_15, E_15, D_15}, // Home
+ {0, SW6_CS1, SW5_CS1, SW4_CS1}, // Tab
+ {0, SW6_CS2, SW5_CS2, SW4_CS2}, // Q
+ {0, SW6_CS3, SW5_CS3, SW4_CS3}, // W
+ {0, SW6_CS4, SW5_CS4, SW4_CS4}, // E
+ {0, SW6_CS5, SW5_CS5, SW4_CS5}, // R
+ {0, SW6_CS6, SW5_CS6, SW4_CS6}, // T
+ {0, SW6_CS7, SW5_CS7, SW4_CS7}, // Y
+ {0, SW6_CS8, SW5_CS8, SW4_CS8}, // U
+ {0, SW6_CS9, SW5_CS9, SW4_CS9}, // I
+ {0, SW6_CS10, SW5_CS10, SW4_CS10}, // O
+ {0, SW6_CS11, SW5_CS11, SW4_CS11}, // P
+ {0, SW6_CS12, SW5_CS12, SW4_CS12}, // [
+ {0, SW6_CS13, SW5_CS13, SW4_CS13}, // ]
+ {0, SW6_CS14, SW5_CS14, SW4_CS14}, // Pipe
+ {0, SW6_CS15, SW5_CS15, SW4_CS15}, // Home
- {0, I_1, H_1, G_1}, // Caps
- {0, I_2, H_2, G_2}, // A
- {0, I_3, H_3, G_3}, // S
- {0, I_4, H_4, G_4}, // D
- {0, I_5, H_5, G_5}, // F
- {0, I_6, H_6, G_6}, // G
- {0, I_7, H_7, G_7}, // H
- {0, I_8, H_8, G_8}, // J
- {0, I_9, H_9, G_9}, // K
- {0, I_10, H_10, G_10}, // L
- {0, I_11, H_11, G_11}, // :
- {0, I_12, H_12, G_12}, // '
- {0, I_14, H_14, G_14}, // Enter
- {0, I_15, H_15, G_15}, // PgUp
+ {0, SW9_CS1, SW8_CS1, SW7_CS1}, // Caps
+ {0, SW9_CS2, SW8_CS2, SW7_CS2}, // A
+ {0, SW9_CS3, SW8_CS3, SW7_CS3}, // S
+ {0, SW9_CS4, SW8_CS4, SW7_CS4}, // D
+ {0, SW9_CS5, SW8_CS5, SW7_CS5}, // F
+ {0, SW9_CS6, SW8_CS6, SW7_CS6}, // G
+ {0, SW9_CS7, SW8_CS7, SW7_CS7}, // H
+ {0, SW9_CS8, SW8_CS8, SW7_CS8}, // J
+ {0, SW9_CS9, SW8_CS9, SW7_CS9}, // K
+ {0, SW9_CS10, SW8_CS10, SW7_CS10}, // L
+ {0, SW9_CS11, SW8_CS11, SW7_CS11}, // :
+ {0, SW9_CS12, SW8_CS12, SW7_CS12}, // '
+ {0, SW9_CS14, SW8_CS14, SW7_CS14}, // Enter
+ {0, SW9_CS15, SW8_CS15, SW7_CS15}, // PgUp
- {0, L_1, K_1, J_1}, // LShift
- {0, L_2, K_2, J_2}, // Z
- {0, L_3, K_3, J_3}, // X
- {0, L_4, K_4, J_4}, // C
- {0, L_5, K_5, J_5}, // V
- {0, L_6, K_6, J_6}, // B
- {0, L_7, K_7, J_7}, // N
- {0, L_8, K_8, J_8}, // M
- {0, L_9, K_9, J_9}, // <
- {0, L_10, K_10, J_10}, // >
- {0, L_11, K_11, J_11}, // ?
- {0, L_12, K_12, J_12}, // RShift
- {0, L_14, K_14, J_14}, // Up
- {0, L_15, K_15, J_15}, // PgOn
+ {0, SW12_CS1, SW11_CS1, SW10_CS1}, // LShift
+ {0, SW12_CS2, SW11_CS2, SW10_CS2}, // Z
+ {0, SW12_CS3, SW11_CS3, SW10_CS3}, // X
+ {0, SW12_CS4, SW11_CS4, SW10_CS4}, // C
+ {0, SW12_CS5, SW11_CS5, SW10_CS5}, // V
+ {0, SW12_CS6, SW11_CS6, SW10_CS6}, // B
+ {0, SW12_CS7, SW11_CS7, SW10_CS7}, // N
+ {0, SW12_CS8, SW11_CS8, SW10_CS8}, // M
+ {0, SW12_CS9, SW11_CS9, SW10_CS9}, // <
+ {0, SW12_CS10, SW11_CS10, SW10_CS10}, // >
+ {0, SW12_CS11, SW11_CS11, SW10_CS11}, // ?
+ {0, SW12_CS12, SW11_CS12, SW10_CS12}, // RShift
+ {0, SW12_CS14, SW11_CS14, SW10_CS14}, // Up
+ {0, SW12_CS15, SW11_CS15, SW10_CS15}, // PgOn
- {1, C_1, B_1, A_1}, // LCtrl
- {1, C_2, B_2, A_2}, // LAlt
- {1, C_3, B_3, A_3}, // Windows
- {1, C_6, B_6, A_6}, // Space
- {1, C_10, B_10, A_10}, // Fn1/RAlt hades/venus
- {1, C_11, B_11, A_11}, // Fn2/Fn1
- {1, C_12, B_12, A_12}, // RCtrl/Fn2
- {1, C_13, B_13, A_13}, // LEFT/RCtrl
- {1, C_14, B_14, A_14}, // DOWN
- {1, C_15, B_15, A_15} // RIGHT
+ {1, SW3_CS1, SW2_CS1, SW1_CS1}, // LCtrl
+ {1, SW3_CS2, SW2_CS2, SW1_CS2}, // LAlt
+ {1, SW3_CS3, SW2_CS3, SW1_CS3}, // Windows
+ {1, SW3_CS6, SW2_CS6, SW1_CS6}, // Space
+ {1, SW3_CS10, SW2_CS10, SW1_CS10}, // Fn1/RAlt hades/venus
+ {1, SW3_CS11, SW2_CS11, SW1_CS11}, // Fn2/Fn1
+ {1, SW3_CS12, SW2_CS12, SW1_CS12}, // RCtrl/Fn2
+ {1, SW3_CS13, SW2_CS13, SW1_CS13}, // LEFT/RCtrl
+ {1, SW3_CS14, SW2_CS14, SW1_CS14}, // DOWN
+ {1, SW3_CS15, SW2_CS15, SW1_CS15} // RIGHT
};
led_config_t g_led_config = {{
diff --git a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
index 6dd732c454b..5ccc60e841e 100644
--- a/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
+++ b/keyboards/durgod/dgk6x/hades_iso/hades_iso.c
@@ -27,79 +27,79 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | | B location
* | | | | */
- {0, C_1, B_1, A_1}, // Esc
- {0, C_2, B_2, A_2}, // 1
- {0, C_3, B_3, A_3}, // 2
- {0, C_4, B_4, A_4}, // 3
- {0, C_5, B_5, A_5}, // 4
- {0, C_6, B_6, A_6}, // 5
- {0, C_7, B_7, A_7}, // 6
- {0, C_8, B_8, A_8}, // 7
- {0, C_9, B_9, A_9}, // 8
- {0, C_10, B_10, A_10}, // 9
- {0, C_11, B_11, A_11}, // 0
- {0, C_12, B_12, A_12}, // -
- {0, C_13, B_13, A_13}, // =
- {0, C_14, B_14, A_14}, // Bksp
- {0, C_15, B_15, A_15}, // Del
+ {0, SW3_CS1, SW2_CS1, SW1_CS1}, // Esc
+ {0, SW3_CS2, SW2_CS2, SW1_CS2}, // 1
+ {0, SW3_CS3, SW2_CS3, SW1_CS3}, // 2
+ {0, SW3_CS4, SW2_CS4, SW1_CS4}, // 3
+ {0, SW3_CS5, SW2_CS5, SW1_CS5}, // 4
+ {0, SW3_CS6, SW2_CS6, SW1_CS6}, // 5
+ {0, SW3_CS7, SW2_CS7, SW1_CS7}, // 6
+ {0, SW3_CS8, SW2_CS8, SW1_CS8}, // 7
+ {0, SW3_CS9, SW2_CS9, SW1_CS9}, // 8
+ {0, SW3_CS10, SW2_CS10, SW1_CS10}, // 9
+ {0, SW3_CS11, SW2_CS11, SW1_CS11}, // 0
+ {0, SW3_CS12, SW2_CS12, SW1_CS12}, // -
+ {0, SW3_CS13, SW2_CS13, SW1_CS13}, // =
+ {0, SW3_CS14, SW2_CS14, SW1_CS14}, // Bksp
+ {0, SW3_CS15, SW2_CS15, SW1_CS15}, // Del
- {0, F_1, E_1, D_1}, // Tab
- {0, F_2, E_2, D_2}, // Q
- {0, F_3, E_3, D_3}, // W
- {0, F_4, E_4, D_4}, // E
- {0, F_5, E_5, D_5}, // R
- {0, F_6, E_6, D_6}, // T
- {0, F_7, E_7, D_7}, // Y
- {0, F_8, E_8, D_8}, // U
- {0, F_9, E_9, D_9}, // I
- {0, F_10, E_10, D_10}, // O
- {0, F_11, E_11, D_11}, // P
- {0, F_12, E_12, D_12}, // [
- {0, F_13, E_13, D_13}, // ]
- {0, F_15, E_15, D_15}, // Home
+ {0, SW6_CS1, SW5_CS1, SW4_CS1}, // Tab
+ {0, SW6_CS2, SW5_CS2, SW4_CS2}, // Q
+ {0, SW6_CS3, SW5_CS3, SW4_CS3}, // W
+ {0, SW6_CS4, SW5_CS4, SW4_CS4}, // E
+ {0, SW6_CS5, SW5_CS5, SW4_CS5}, // R
+ {0, SW6_CS6, SW5_CS6, SW4_CS6}, // T
+ {0, SW6_CS7, SW5_CS7, SW4_CS7}, // Y
+ {0, SW6_CS8, SW5_CS8, SW4_CS8}, // U
+ {0, SW6_CS9, SW5_CS9, SW4_CS9}, // I
+ {0, SW6_CS10, SW5_CS10, SW4_CS10}, // O
+ {0, SW6_CS11, SW5_CS11, SW4_CS11}, // P
+ {0, SW6_CS12, SW5_CS12, SW4_CS12}, // [
+ {0, SW6_CS13, SW5_CS13, SW4_CS13}, // ]
+ {0, SW6_CS15, SW5_CS15, SW4_CS15}, // Home
- {0, I_1, H_1, G_1}, // Caps
- {0, I_2, H_2, G_2}, // A
- {0, I_3, H_3, G_3}, // S
- {0, I_4, H_4, G_4}, // D
- {0, I_5, H_5, G_5}, // F
- {0, I_6, H_6, G_6}, // G
- {0, I_7, H_7, G_7}, // H
- {0, I_8, H_8, G_8}, // J
- {0, I_9, H_9, G_9}, // K
- {0, I_10, H_10, G_10}, // L
- {0, I_11, H_11, G_11}, // :
- {0, I_12, H_12, G_12}, // '
- {0, I_13, H_13, G_13}, // NUHS
- {0, I_14, H_14, G_14}, // Enter
- {0, I_15, H_15, G_15}, // PgUp
+ {0, SW9_CS1, SW8_CS1, SW7_CS1}, // Caps
+ {0, SW9_CS2, SW8_CS2, SW7_CS2}, // A
+ {0, SW9_CS3, SW8_CS3, SW7_CS3}, // S
+ {0, SW9_CS4, SW8_CS4, SW7_CS4}, // D
+ {0, SW9_CS5, SW8_CS5, SW7_CS5}, // F
+ {0, SW9_CS6, SW8_CS6, SW7_CS6}, // G
+ {0, SW9_CS7, SW8_CS7, SW7_CS7}, // H
+ {0, SW9_CS8, SW8_CS8, SW7_CS8}, // J
+ {0, SW9_CS9, SW8_CS9, SW7_CS9}, // K
+ {0, SW9_CS10, SW8_CS10, SW7_CS10}, // L
+ {0, SW9_CS11, SW8_CS11, SW7_CS11}, // :
+ {0, SW9_CS12, SW8_CS12, SW7_CS12}, // '
+ {0, SW9_CS13, SW8_CS13, SW7_CS13}, // NUHS
+ {0, SW9_CS14, SW8_CS14, SW7_CS14}, // Enter
+ {0, SW9_CS15, SW8_CS15, SW7_CS15}, // PgUp
- {0, L_1, K_1, J_1}, // LShift
- {0, L_2, K_2, J_2}, // NUBS
- {0, L_3, K_3, J_3}, // Z
- {0, L_4, K_4, J_4}, // X
- {0, L_5, K_5, J_5}, // C
- {0, L_6, K_6, J_6}, // V
- {0, L_7, K_7, J_7}, // B
- {0, L_8, K_8, J_8}, // N
- {0, L_9, K_9, J_9}, // M
- {0, L_10, K_10, J_10}, // <
- {0, L_11, K_11, J_11}, // >
- {0, L_12, K_12, J_12}, // ?
- {0, L_13, K_13, J_13}, // RShift
- {0, L_14, K_14, J_14}, // Up
- {0, L_15, K_15, J_15}, // PgOn
+ {0, SW12_CS1, SW11_CS1, SW10_CS1}, // LShift
+ {0, SW12_CS2, SW11_CS2, SW10_CS2}, // NUBS
+ {0, SW12_CS3, SW11_CS3, SW10_CS3}, // Z
+ {0, SW12_CS4, SW11_CS4, SW10_CS4}, // X
+ {0, SW12_CS5, SW11_CS5, SW10_CS5}, // C
+ {0, SW12_CS6, SW11_CS6, SW10_CS6}, // V
+ {0, SW12_CS7, SW11_CS7, SW10_CS7}, // B
+ {0, SW12_CS8, SW11_CS8, SW10_CS8}, // N
+ {0, SW12_CS9, SW11_CS9, SW10_CS9}, // M
+ {0, SW12_CS10, SW11_CS10, SW10_CS10}, // <
+ {0, SW12_CS11, SW11_CS11, SW10_CS11}, // >
+ {0, SW12_CS12, SW11_CS12, SW10_CS12}, // ?
+ {0, SW12_CS13, SW11_CS13, SW10_CS13}, // RShift
+ {0, SW12_CS14, SW11_CS14, SW10_CS14}, // Up
+ {0, SW12_CS15, SW11_CS15, SW10_CS15}, // PgOn
- {1, C_1, B_1, A_1}, // LCtrl
- {1, C_2, B_2, A_2}, // LAlt
- {1, C_3, B_3, A_3}, // Windows
- {1, C_6, B_6, A_6}, // Space
- {1, C_10, B_10, A_10}, // Fn1/RAlt hades/venus
- {1, C_11, B_11, A_11}, // Fn2/Fn1
- {1, C_12, B_12, A_12}, // RCtrl/Fn2
- {1, C_13, B_13, A_13}, // LEFT/RCtrl
- {1, C_14, B_14, A_14}, // DOWN
- {1, C_15, B_15, A_15} // RIGHT
+ {1, SW3_CS1, SW2_CS1, SW1_CS1}, // LCtrl
+ {1, SW3_CS2, SW2_CS2, SW1_CS2}, // LAlt
+ {1, SW3_CS3, SW2_CS3, SW1_CS3}, // Windows
+ {1, SW3_CS6, SW2_CS6, SW1_CS6}, // Space
+ {1, SW3_CS10, SW2_CS10, SW1_CS10}, // Fn1/RAlt hades/venus
+ {1, SW3_CS11, SW2_CS11, SW1_CS11}, // Fn2/Fn1
+ {1, SW3_CS12, SW2_CS12, SW1_CS12}, // RCtrl/Fn2
+ {1, SW3_CS13, SW2_CS13, SW1_CS13}, // LEFT/RCtrl
+ {1, SW3_CS14, SW2_CS14, SW1_CS14}, // DOWN
+ {1, SW3_CS15, SW2_CS15, SW1_CS15} // RIGHT
};
#endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/durgod/dgk6x/venus/venus.c b/keyboards/durgod/dgk6x/venus/venus.c
index 9de5f2e63d5..9bde901374b 100644
--- a/keyboards/durgod/dgk6x/venus/venus.c
+++ b/keyboards/durgod/dgk6x/venus/venus.c
@@ -26,71 +26,71 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | | B location
* | | | | */
- {0, C_1, B_1, A_1}, // Esc
- {0, C_2, B_2, A_2}, // 1
- {0, C_3, B_3, A_3}, // 2
- {0, C_4, B_4, A_4}, // 3
- {0, C_5, B_5, A_5}, // 4
- {0, C_6, B_6, A_6}, // 5
- {0, C_7, B_7, A_7}, // 6
- {0, C_8, B_8, A_8}, // 7
- {0, C_9, B_9, A_9}, // 8
- {0, C_10, B_10, A_10}, // 9
- {0, C_11, B_11, A_11}, // 0
- {0, C_12, B_12, A_12}, // -
- {0, C_13, B_13, A_13}, // =
- {0, C_14, B_14, A_14}, // Bksp
+ {0, SW3_CS1, SW2_CS1, SW1_CS1}, // Esc
+ {0, SW3_CS2, SW2_CS2, SW1_CS2}, // 1
+ {0, SW3_CS3, SW2_CS3, SW1_CS3}, // 2
+ {0, SW3_CS4, SW2_CS4, SW1_CS4}, // 3
+ {0, SW3_CS5, SW2_CS5, SW1_CS5}, // 4
+ {0, SW3_CS6, SW2_CS6, SW1_CS6}, // 5
+ {0, SW3_CS7, SW2_CS7, SW1_CS7}, // 6
+ {0, SW3_CS8, SW2_CS8, SW1_CS8}, // 7
+ {0, SW3_CS9, SW2_CS9, SW1_CS9}, // 8
+ {0, SW3_CS10, SW2_CS10, SW1_CS10}, // 9
+ {0, SW3_CS11, SW2_CS11, SW1_CS11}, // 0
+ {0, SW3_CS12, SW2_CS12, SW1_CS12}, // -
+ {0, SW3_CS13, SW2_CS13, SW1_CS13}, // =
+ {0, SW3_CS14, SW2_CS14, SW1_CS14}, // Bksp
- {0, F_1, E_1, D_1}, // Tab
- {0, F_2, E_2, D_2}, // Q
- {0, F_3, E_3, D_3}, // W
- {0, F_4, E_4, D_4}, // E
- {0, F_5, E_5, D_5}, // R
- {0, F_6, E_6, D_6}, // T
- {0, F_7, E_7, D_7}, // Y
- {0, F_8, E_8, D_8}, // U
- {0, F_9, E_9, D_9}, // I
- {0, F_10, E_10, D_10}, // O
- {0, F_11, E_11, D_11}, // P
- {0, F_12, E_12, D_12}, // [
- {0, F_13, E_13, D_13}, // ]
- {0, F_14, E_14, D_14}, // Pipe
+ {0, SW6_CS1, SW5_CS1, SW4_CS1}, // Tab
+ {0, SW6_CS2, SW5_CS2, SW4_CS2}, // Q
+ {0, SW6_CS3, SW5_CS3, SW4_CS3}, // W
+ {0, SW6_CS4, SW5_CS4, SW4_CS4}, // E
+ {0, SW6_CS5, SW5_CS5, SW4_CS5}, // R
+ {0, SW6_CS6, SW5_CS6, SW4_CS6}, // T
+ {0, SW6_CS7, SW5_CS7, SW4_CS7}, // Y
+ {0, SW6_CS8, SW5_CS8, SW4_CS8}, // U
+ {0, SW6_CS9, SW5_CS9, SW4_CS9}, // I
+ {0, SW6_CS10, SW5_CS10, SW4_CS10}, // O
+ {0, SW6_CS11, SW5_CS11, SW4_CS11}, // P
+ {0, SW6_CS12, SW5_CS12, SW4_CS12}, // [
+ {0, SW6_CS13, SW5_CS13, SW4_CS13}, // ]
+ {0, SW6_CS14, SW5_CS14, SW4_CS14}, // Pipe
- {0, I_1, H_1, G_1}, // Caps
- {0, I_2, H_2, G_2}, // A
- {0, I_3, H_3, G_3}, // S
- {0, I_4, H_4, G_4}, // D
- {0, I_5, H_5, G_5}, // F
- {0, I_6, H_6, G_6}, // G
- {0, I_7, H_7, G_7}, // H
- {0, I_8, H_8, G_8}, // J
- {0, I_9, H_9, G_9}, // K
- {0, I_10, H_10, G_10}, // L
- {0, I_11, H_11, G_11}, // :
- {0, I_12, H_12, G_12}, // '
- {0, I_14, H_14, G_14}, // Enter
+ {0, SW9_CS1, SW8_CS1, SW7_CS1}, // Caps
+ {0, SW9_CS2, SW8_CS2, SW7_CS2}, // A
+ {0, SW9_CS3, SW8_CS3, SW7_CS3}, // S
+ {0, SW9_CS4, SW8_CS4, SW7_CS4}, // D
+ {0, SW9_CS5, SW8_CS5, SW7_CS5}, // F
+ {0, SW9_CS6, SW8_CS6, SW7_CS6}, // G
+ {0, SW9_CS7, SW8_CS7, SW7_CS7}, // H
+ {0, SW9_CS8, SW8_CS8, SW7_CS8}, // J
+ {0, SW9_CS9, SW8_CS9, SW7_CS9}, // K
+ {0, SW9_CS10, SW8_CS10, SW7_CS10}, // L
+ {0, SW9_CS11, SW8_CS11, SW7_CS11}, // :
+ {0, SW9_CS12, SW8_CS12, SW7_CS12}, // '
+ {0, SW9_CS14, SW8_CS14, SW7_CS14}, // Enter
- {0, L_1, K_1, J_1}, // LShift
- {0, L_2, K_2, J_2}, // Z
- {0, L_3, K_3, J_3}, // X
- {0, L_4, K_4, J_4}, // C
- {0, L_5, K_5, J_5}, // V
- {0, L_6, K_6, J_6}, // B
- {0, L_7, K_7, J_7}, // N
- {0, L_8, K_8, J_8}, // M
- {0, L_9, K_9, J_9}, // <
- {0, L_10, K_10, J_10}, // >
- {0, L_11, K_11, J_11}, // ?
- {0, L_12, K_12, J_12}, // RShift
+ {0, SW12_CS1, SW11_CS1, SW10_CS1}, // LShift
+ {0, SW12_CS2, SW11_CS2, SW10_CS2}, // Z
+ {0, SW12_CS3, SW11_CS3, SW10_CS3}, // X
+ {0, SW12_CS4, SW11_CS4, SW10_CS4}, // C
+ {0, SW12_CS5, SW11_CS5, SW10_CS5}, // V
+ {0, SW12_CS6, SW11_CS6, SW10_CS6}, // B
+ {0, SW12_CS7, SW11_CS7, SW10_CS7}, // N
+ {0, SW12_CS8, SW11_CS8, SW10_CS8}, // M
+ {0, SW12_CS9, SW11_CS9, SW10_CS9}, // <
+ {0, SW12_CS10, SW11_CS10, SW10_CS10}, // >
+ {0, SW12_CS11, SW11_CS11, SW10_CS11}, // ?
+ {0, SW12_CS12, SW11_CS12, SW10_CS12}, // RShift
- {1, C_1, B_1, A_1}, // LCtrl
- {1, C_2, B_2, A_2}, // LAlt
- {1, C_3, B_3, A_3}, // Windows
- {1, C_6, B_6, A_6}, // Space
- {1, C_10, B_10, A_10}, // Fn1/RAlt hades/venus
- {1, C_11, B_11, A_11}, // Fn2/Fn1
- {1, C_12, B_12, A_12}, // RCtrl/Fn2
- {1, C_13, B_13, A_13}, // LEFT/RCtrl
+ {1, SW3_CS1, SW2_CS1, SW1_CS1}, // LCtrl
+ {1, SW3_CS2, SW2_CS2, SW1_CS2}, // LAlt
+ {1, SW3_CS3, SW2_CS3, SW1_CS3}, // Windows
+ {1, SW3_CS6, SW2_CS6, SW1_CS6}, // Space
+ {1, SW3_CS10, SW2_CS10, SW1_CS10}, // Fn1/RAlt hades/venus
+ {1, SW3_CS11, SW2_CS11, SW1_CS11}, // Fn2/Fn1
+ {1, SW3_CS12, SW2_CS12, SW1_CS12}, // RCtrl/Fn2
+ {1, SW3_CS13, SW2_CS13, SW1_CS13}, // LEFT/RCtrl
};
led_config_t g_led_config = { {
diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c
index 593b2d96ff3..207fccd4f97 100644
--- a/keyboards/dztech/dz60rgb/dz60rgb.c
+++ b/keyboards/dztech/dz60rgb/dz60rgb.c
@@ -2,73 +2,73 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_14, A_14, C_14 },
- { 0, B_13, A_13, C_13 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, B_12, A_12, C_12 },
- { 0, E_15, D_15, F_15 },
- { 0, H_15, G_15, I_15 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
index a4cfd2551ec..cdc5148e115 100644
--- a/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
+++ b/keyboards/dztech/dz60rgb_ansi/dz60rgb_ansi.c
@@ -2,71 +2,71 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_13, A_13, C_13 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, B_12, A_12, C_12 },
- { 0, E_15, D_15, F_15 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
index 4326b6f9afd..b5af34be38e 100644
--- a/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
+++ b/keyboards/dztech/dz60rgb_wkl/dz60rgb_wkl.c
@@ -2,72 +2,72 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, H_15, G_15, I_15 },
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_14, A_14, C_14 },
- { 0, B_13, A_13, C_13 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, B_12, A_12, C_12 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz64rgb/dz64rgb.c b/keyboards/dztech/dz64rgb/dz64rgb.c
index 09a535ab474..e2512c72a57 100644
--- a/keyboards/dztech/dz64rgb/dz64rgb.c
+++ b/keyboards/dztech/dz64rgb/dz64rgb.c
@@ -18,74 +18,74 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, K_14, J_14, L_14 },
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_14, D_14, F_14 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_14, A_14, C_14 },
- { 0, B_13, A_13, C_13 },
- { 0, B_12, A_12, C_12 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
- { 0, B_15, A_15, C_15 },
- { 0, E_13, D_13, F_13 },
- { 0, K_15, J_15, L_15 },
- { 0, E_15, D_15, F_15 },
- { 0, H_15, G_15, I_15 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 },
- { 0, H_16, G_16, I_16 },
- { 0, K_16, J_16, L_16 }
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/dztech/dz65rgb/v3/v3.c b/keyboards/dztech/dz65rgb/v3/v3.c
index 2055e6e3c2f..bf54a8cdfc5 100755
--- a/keyboards/dztech/dz65rgb/v3/v3.c
+++ b/keyboards/dztech/dz65rgb/v3/v3.c
@@ -19,78 +19,78 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
- {0, CS24_SW1, CS23_SW1, CS22_SW1},
- {0, CS24_SW2, CS23_SW2, CS22_SW2},
- {0, CS24_SW3, CS23_SW3, CS22_SW3},
- {0, CS24_SW4, CS23_SW4, CS22_SW4},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
- {0, CS24_SW6, CS23_SW6, CS22_SW6},
- {0, CS24_SW7, CS23_SW7, CS22_SW7},
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
+ {0, SW1_CS24, SW1_CS23, SW1_CS22},
+ {0, SW2_CS24, SW2_CS23, SW2_CS22},
+ {0, SW3_CS24, SW3_CS23, SW3_CS22},
+ {0, SW4_CS24, SW4_CS23, SW4_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
+ {0, SW6_CS24, SW6_CS23, SW6_CS22},
+ {0, SW7_CS24, SW7_CS23, SW7_CS22},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
- {0, CS30_SW5, CS29_SW5, CS28_SW5},
- {0, CS30_SW6, CS29_SW6, CS28_SW6},
- {0, CS30_SW7, CS29_SW7, CS28_SW7},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
+ {0, SW5_CS30, SW5_CS29, SW5_CS28},
+ {0, SW6_CS30, SW6_CS29, SW6_CS28},
+ {0, SW7_CS30, SW7_CS29, SW7_CS28},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
- {0, CS33_SW5, CS32_SW5, CS31_SW5},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
+ {0, SW5_CS33, SW5_CS32, SW5_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS36_SW1, CS35_SW1, CS34_SW1},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW1_CS36, SW1_CS35, SW1_CS34},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS39_SW1, CS38_SW1, CS37_SW1},
- {0, CS39_SW2, CS38_SW2, CS37_SW2},
- {0, CS39_SW3, CS38_SW3, CS37_SW3},
- {0, CS39_SW4, CS38_SW4, CS37_SW4},
- {0, CS39_SW5, CS38_SW5, CS37_SW5},
- {0, CS39_SW7, CS38_SW7, CS37_SW7}
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW1_CS39, SW1_CS38, SW1_CS37},
+ {0, SW2_CS39, SW2_CS38, SW2_CS37},
+ {0, SW3_CS39, SW3_CS38, SW3_CS37},
+ {0, SW4_CS39, SW4_CS38, SW4_CS37},
+ {0, SW5_CS39, SW5_CS38, SW5_CS37},
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}
};
led_config_t g_led_config = { {
diff --git a/keyboards/dztech/tofu/ii/v1/v1.c b/keyboards/dztech/tofu/ii/v1/v1.c
index dd18f86bf89..15589096df5 100644
--- a/keyboards/dztech/tofu/ii/v1/v1.c
+++ b/keyboards/dztech/tofu/ii/v1/v1.c
@@ -18,76 +18,76 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
- { 1, K_12, J_12, L_12 },
- { 1, K_11, J_11, L_11 },
- { 1, K_10, J_10, L_10 },
- { 1, K_9, J_9, L_9 },
- { 1, K_8, J_8, L_8 },
- { 1, K_7, J_7, L_7 },
- { 1, K_6, J_6, L_6 },
- { 1, K_5, J_5, L_5 },
- { 1, K_4, J_4, L_4 },
- { 1, K_3, J_3, L_3 },
- { 1, K_2, J_2, L_2 },
- { 1, K_1, J_1, L_1 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
+ { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
- { 0, B_12, A_12, C_12 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
- { 1, H_6, G_6, I_6 },
- { 1, H_5, G_5, I_5 },
- { 1, H_4, G_4, I_4 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
- { 0, K_9, J_9, L_9 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_7, J_7, L_7 },
- { 0, K_4, J_4, L_4 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
};
bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/dztech/tofu/jr/v1/v1.c b/keyboards/dztech/tofu/jr/v1/v1.c
index 46b16317ac7..046c46458eb 100644
--- a/keyboards/dztech/tofu/jr/v1/v1.c
+++ b/keyboards/dztech/tofu/jr/v1/v1.c
@@ -19,78 +19,78 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
- { 1, K_12, J_12, L_12 },
- { 1, K_11, J_11, L_11 },
- { 1, K_10, J_10, L_10 },
- { 1, K_9, J_9, L_9 },
- { 1, K_8, J_8, L_8 },
- { 1, K_7, J_7, L_7 },
- { 1, K_6, J_6, L_6 },
- { 1, K_5, J_5, L_5 },
- { 1, K_4, J_4, L_4 },
- { 1, K_3, J_3, L_3 },
- { 1, K_2, J_2, L_2 },
- { 1, K_1, J_1, L_1 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
+ { 1, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 1, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 1, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 1, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 1, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
- { 0, B_12, A_12, C_12 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 },
- { 1, H_6, G_6, I_6 },
- { 1, H_5, G_5, I_5 },
- { 1, H_4, G_4, I_4 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_7, J_7, L_7 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
};
bool rgb_matrix_indicators_kb(void) {
diff --git a/keyboards/evyd13/atom47/rev5/rev5.c b/keyboards/evyd13/atom47/rev5/rev5.c
index 6dad8466142..b8ea0688cd9 100644
--- a/keyboards/evyd13/atom47/rev5/rev5.c
+++ b/keyboards/evyd13/atom47/rev5/rev5.c
@@ -24,57 +24,57 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, B_1, C_1, A_1},
- {0, B_2, C_2, A_2},
- {0, B_3, C_3, A_3},
- {0, B_4, C_4, A_4},
- {0, B_5, C_5, A_5},
- {0, B_6, C_6, A_6},
- {0, B_7, C_7, A_7},
- {0, B_8, C_8, A_8},
- {0, B_9, C_9, A_9},
- {0, B_10, C_10, A_10},
- {0, B_11, C_11, A_11},
- {0, B_12, C_12, A_12},
- {0, B_13, C_13, A_13},
+ {0, SW2_CS1, SW3_CS1, SW1_CS1},
+ {0, SW2_CS2, SW3_CS2, SW1_CS2},
+ {0, SW2_CS3, SW3_CS3, SW1_CS3},
+ {0, SW2_CS4, SW3_CS4, SW1_CS4},
+ {0, SW2_CS5, SW3_CS5, SW1_CS5},
+ {0, SW2_CS6, SW3_CS6, SW1_CS6},
+ {0, SW2_CS7, SW3_CS7, SW1_CS7},
+ {0, SW2_CS8, SW3_CS8, SW1_CS8},
+ {0, SW2_CS9, SW3_CS9, SW1_CS9},
+ {0, SW2_CS10, SW3_CS10, SW1_CS10},
+ {0, SW2_CS11, SW3_CS11, SW1_CS11},
+ {0, SW2_CS12, SW3_CS12, SW1_CS12},
+ {0, SW2_CS13, SW3_CS13, SW1_CS13},
- {0, E_1, F_1, D_1},
- {0, E_2, F_2, D_2},
- {0, E_3, F_3, D_3},
- {0, E_4, F_4, D_4},
- {0, E_5, F_5, D_5},
- {0, E_6, F_6, D_6},
- {0, E_7, F_7, D_7},
- {0, E_8, F_8, D_8},
- {0, E_9, F_9, D_9},
- {0, E_10, F_10, D_10},
- {0, E_11, F_11, D_11},
- {0, E_13, F_13, D_13},
+ {0, SW5_CS1, SW6_CS1, SW4_CS1},
+ {0, SW5_CS2, SW6_CS2, SW4_CS2},
+ {0, SW5_CS3, SW6_CS3, SW4_CS3},
+ {0, SW5_CS4, SW6_CS4, SW4_CS4},
+ {0, SW5_CS5, SW6_CS5, SW4_CS5},
+ {0, SW5_CS6, SW6_CS6, SW4_CS6},
+ {0, SW5_CS7, SW6_CS7, SW4_CS7},
+ {0, SW5_CS8, SW6_CS8, SW4_CS8},
+ {0, SW5_CS9, SW6_CS9, SW4_CS9},
+ {0, SW5_CS10, SW6_CS10, SW4_CS10},
+ {0, SW5_CS11, SW6_CS11, SW4_CS11},
+ {0, SW5_CS13, SW6_CS13, SW4_CS13},
- {0, H_1, I_1, G_1},
- {0, H_2, I_2, G_2},
- {0, H_3, I_3, G_3},
- {0, H_4, I_4, G_4},
- {0, H_5, I_5, G_5},
- {0, H_6, I_6, G_6},
- {0, H_7, I_7, G_7},
- {0, H_8, I_8, G_8},
- {0, H_9, I_9, G_9},
- {0, H_10, I_10, G_10},
- {0, H_11, I_11, G_11},
- {0, H_12, I_12, G_12},
- {0, H_13, I_13, G_13},
+ {0, SW8_CS1, SW9_CS1, SW7_CS1},
+ {0, SW8_CS2, SW9_CS2, SW7_CS2},
+ {0, SW8_CS3, SW9_CS3, SW7_CS3},
+ {0, SW8_CS4, SW9_CS4, SW7_CS4},
+ {0, SW8_CS5, SW9_CS5, SW7_CS5},
+ {0, SW8_CS6, SW9_CS6, SW7_CS6},
+ {0, SW8_CS7, SW9_CS7, SW7_CS7},
+ {0, SW8_CS8, SW9_CS8, SW7_CS8},
+ {0, SW8_CS9, SW9_CS9, SW7_CS9},
+ {0, SW8_CS10, SW9_CS10, SW7_CS10},
+ {0, SW8_CS11, SW9_CS11, SW7_CS11},
+ {0, SW8_CS12, SW9_CS12, SW7_CS12},
+ {0, SW8_CS13, SW9_CS13, SW7_CS13},
- {0, K_1, L_1, J_1},
- {0, K_2, L_2, J_2},
- {0, K_3, L_3, J_3},
- {0, K_4, L_4, J_4},
- {0, K_6, L_6, J_6},
- {0, K_8, L_8, J_8},
- {0, K_10, L_10, J_10},
- {0, K_11, L_11, J_11},
- {0, K_12, L_12, J_12},
- {0, K_13, L_13, J_13}
+ {0, SW11_CS1, SW12_CS1, SW10_CS1},
+ {0, SW11_CS2, SW12_CS2, SW10_CS2},
+ {0, SW11_CS3, SW12_CS3, SW10_CS3},
+ {0, SW11_CS4, SW12_CS4, SW10_CS4},
+ {0, SW11_CS6, SW12_CS6, SW10_CS6},
+ {0, SW11_CS8, SW12_CS8, SW10_CS8},
+ {0, SW11_CS10, SW12_CS10, SW10_CS10},
+ {0, SW11_CS11, SW12_CS11, SW10_CS11},
+ {0, SW11_CS12, SW12_CS12, SW10_CS12},
+ {0, SW11_CS13, SW12_CS13, SW10_CS13}
};
led_config_t g_led_config = { {
diff --git a/keyboards/exclusive/e6_rgb/e6_rgb.c b/keyboards/exclusive/e6_rgb/e6_rgb.c
index 203e96d64ee..19dd96a073d 100644
--- a/keyboards/exclusive/e6_rgb/e6_rgb.c
+++ b/keyboards/exclusive/e6_rgb/e6_rgb.c
@@ -9,86 +9,86 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | | B location
* | | | | */
//cs1
- {0, K_1, J_1, L_1},
- {0, H_1, G_1, I_1},
- {0, E_1, D_1, F_1},
- {0, B_1, A_1, C_1},
+ {0, SW11_CS1, SW10_CS1, SW12_CS1},
+ {0, SW8_CS1, SW7_CS1, SW9_CS1},
+ {0, SW5_CS1, SW4_CS1, SW6_CS1},
+ {0, SW2_CS1, SW1_CS1, SW3_CS1},
//cs2
- {0, K_2, J_2, L_2},
- {0, H_2, G_2, I_2},
- {0, E_2, D_2, F_2},
- {0, B_2, A_2, C_2},
+ {0, SW11_CS2, SW10_CS2, SW12_CS2},
+ {0, SW8_CS2, SW7_CS2, SW9_CS2},
+ {0, SW5_CS2, SW4_CS2, SW6_CS2},
+ {0, SW2_CS2, SW1_CS2, SW3_CS2},
//cs3
- {0, K_3, J_3, L_3},
- {0, H_3, G_3, I_3},
- {0, E_3, D_3, F_3},
- {0, B_3, A_3, C_3},
+ {0, SW11_CS3, SW10_CS3, SW12_CS3},
+ {0, SW8_CS3, SW7_CS3, SW9_CS3},
+ {0, SW5_CS3, SW4_CS3, SW6_CS3},
+ {0, SW2_CS3, SW1_CS3, SW3_CS3},
//cs4
- {0, K_4, J_4, L_4},
- {0, H_4, G_4, I_4},
- {0, E_4, D_4, F_4},
- {0, B_4, A_4, C_4},
+ {0, SW11_CS4, SW10_CS4, SW12_CS4},
+ {0, SW8_CS4, SW7_CS4, SW9_CS4},
+ {0, SW5_CS4, SW4_CS4, SW6_CS4},
+ {0, SW2_CS4, SW1_CS4, SW3_CS4},
//cs5
- {0, K_5, J_5, L_5},
- {0, H_5, G_5, I_5},
- {0, E_5, D_5, F_5},
- {0, B_5, A_5, C_5},
+ {0, SW11_CS5, SW10_CS5, SW12_CS5},
+ {0, SW8_CS5, SW7_CS5, SW9_CS5},
+ {0, SW5_CS5, SW4_CS5, SW6_CS5},
+ {0, SW2_CS5, SW1_CS5, SW3_CS5},
//cs6
- {0, K_6, J_6, L_6},
- {0, H_6, G_6, I_6},
- {0, E_6, D_6, F_6},
- {0, B_6, A_6, C_6},
+ {0, SW11_CS6, SW10_CS6, SW12_CS6},
+ {0, SW8_CS6, SW7_CS6, SW9_CS6},
+ {0, SW5_CS6, SW4_CS6, SW6_CS6},
+ {0, SW2_CS6, SW1_CS6, SW3_CS6},
//cs7
- {0, K_7, J_7, L_7},
- {0, H_7, G_7, I_7},
- {0, E_7, D_7, F_7},
- {0, B_7, A_7, C_7},
+ {0, SW11_CS7, SW10_CS7, SW12_CS7},
+ {0, SW8_CS7, SW7_CS7, SW9_CS7},
+ {0, SW5_CS7, SW4_CS7, SW6_CS7},
+ {0, SW2_CS7, SW1_CS7, SW3_CS7},
//cs8
- {0, K_8, J_8, L_8},
- {0, H_8, G_8, I_8},
- {0, E_8, D_8, F_8},
- {0, B_8, A_8, C_8},
+ {0, SW11_CS8, SW10_CS8, SW12_CS8},
+ {0, SW8_CS8, SW7_CS8, SW9_CS8},
+ {0, SW5_CS8, SW4_CS8, SW6_CS8},
+ {0, SW2_CS8, SW1_CS8, SW3_CS8},
//cs9
- {0, K_9, J_9, L_9},
- {0, H_9, G_9, I_9},
- {0, E_9, D_9, F_9},
- {0, B_9, A_9, C_9},
+ {0, SW11_CS9, SW10_CS9, SW12_CS9},
+ {0, SW8_CS9, SW7_CS9, SW9_CS9},
+ {0, SW5_CS9, SW4_CS9, SW6_CS9},
+ {0, SW2_CS9, SW1_CS9, SW3_CS9},
//cs10
- {0, K_10, J_10, L_10},
- {0, H_10, G_10, I_10},
- {0, E_10, D_10, F_10},
- {0, B_10, A_10, C_10},
+ {0, SW11_CS10, SW10_CS10, SW12_CS10},
+ {0, SW8_CS10, SW7_CS10, SW9_CS10},
+ {0, SW5_CS10, SW4_CS10, SW6_CS10},
+ {0, SW2_CS10, SW1_CS10, SW3_CS10},
//cs11
- {0, K_11, J_11, L_11},
- {0, H_11, G_11, I_11},
- {0, E_11, D_11, F_11},
- {0, B_11, A_11, C_11},
+ {0, SW11_CS11, SW10_CS11, SW12_CS11},
+ {0, SW8_CS11, SW7_CS11, SW9_CS11},
+ {0, SW5_CS11, SW4_CS11, SW6_CS11},
+ {0, SW2_CS11, SW1_CS11, SW3_CS11},
//cs12
- {0, K_12, J_12, L_12},
- {0, H_12, G_12, I_12},
- {0, E_12, D_12, F_12},
- {0, B_12, A_12, C_12},
+ {0, SW11_CS12, SW10_CS12, SW12_CS12},
+ {0, SW8_CS12, SW7_CS12, SW9_CS12},
+ {0, SW5_CS12, SW4_CS12, SW6_CS12},
+ {0, SW2_CS12, SW1_CS12, SW3_CS12},
//cs13
- {0, K_13, J_13, L_13},
- {0, H_13, G_13, I_13},
- {0, E_13, D_13, F_13},
- {0, B_13, A_13, C_13},
+ {0, SW11_CS13, SW10_CS13, SW12_CS13},
+ {0, SW8_CS13, SW7_CS13, SW9_CS13},
+ {0, SW5_CS13, SW4_CS13, SW6_CS13},
+ {0, SW2_CS13, SW1_CS13, SW3_CS13},
//cs14
- {0, K_14, J_14, L_14},
- {0, H_14, G_14, I_14},
- {0, E_14, D_14, F_14},
- {0, B_14, A_14, C_14},
+ {0, SW11_CS14, SW10_CS14, SW12_CS14},
+ {0, SW8_CS14, SW7_CS14, SW9_CS14},
+ {0, SW5_CS14, SW4_CS14, SW6_CS14},
+ {0, SW2_CS14, SW1_CS14, SW3_CS14},
//cs15
- {0, K_15, J_15, L_15},
+ {0, SW11_CS15, SW10_CS15, SW12_CS15},
- {0, E_15, D_15, F_15},
- {0, B_15, A_15, C_15},
+ {0, SW5_CS15, SW4_CS15, SW6_CS15},
+ {0, SW2_CS15, SW1_CS15, SW3_CS15},
//cs16
- {0, K_16, J_16, L_16},
- {0, H_16, G_16, I_16},
- {0, E_16, D_16, F_16},
- {0, B_16, A_16, C_16},
+ {0, SW11_CS16, SW10_CS16, SW12_CS16},
+ {0, SW8_CS16, SW7_CS16, SW9_CS16},
+ {0, SW5_CS16, SW4_CS16, SW6_CS16},
+ {0, SW2_CS16, SW1_CS16, SW3_CS16},
};
led_config_t g_led_config = { {
diff --git a/keyboards/feker/ik75/ik75.c b/keyboards/feker/ik75/ik75.c
index e6424491bd1..c4da77a8448 100644
--- a/keyboards/feker/ik75/ik75.c
+++ b/keyboards/feker/ik75/ik75.c
@@ -25,141 +25,141 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | B location
* | | | R location
* | | | | */
- {0, A_1, C_1, B_1}, // 0, `~, K10
- {0, A_2, C_2, B_2}, // 1, 1!, K11
- {0, A_3, C_3, B_3}, // 2, 2@, K12
- {0, A_4, C_4, B_4}, // 3, 3#, K13
- {0, A_5, C_5, B_5}, // 4, 4$, K14
- {0, A_6, C_6, B_6}, // 5, 5%, K15
- {0, A_7, C_7, B_7}, // 6, 6^, K16
- {0, A_8, C_8, B_8}, // 7, 7&, K17
- {0, A_9, C_9, B_9}, // 8, 8*, K18
- {0, A_10, C_10, B_10}, // 9, 9(, K19
- {0, A_11, C_11, B_11}, // 10, 0), K1A
- {0, A_12, C_12, B_12}, // 11, -_, K1B
- {0, A_13, C_13, B_13}, // 12, =+, K1C
- {0, A_14, C_14, B_14}, // 13, Backspace, K1D
- {0, A_15, C_15, B_15}, // 14, Left Alt, K52
- {0, A_16, C_16, B_16}, // 15, Space, K56
+ {0, SW1_CS1, SW3_CS1, SW2_CS1}, // 0, `~, K10
+ {0, SW1_CS2, SW3_CS2, SW2_CS2}, // 1, 1!, K11
+ {0, SW1_CS3, SW3_CS3, SW2_CS3}, // 2, 2@, K12
+ {0, SW1_CS4, SW3_CS4, SW2_CS4}, // 3, 3#, K13
+ {0, SW1_CS5, SW3_CS5, SW2_CS5}, // 4, 4$, K14
+ {0, SW1_CS6, SW3_CS6, SW2_CS6}, // 5, 5%, K15
+ {0, SW1_CS7, SW3_CS7, SW2_CS7}, // 6, 6^, K16
+ {0, SW1_CS8, SW3_CS8, SW2_CS8}, // 7, 7&, K17
+ {0, SW1_CS9, SW3_CS9, SW2_CS9}, // 8, 8*, K18
+ {0, SW1_CS10, SW3_CS10, SW2_CS10}, // 9, 9(, K19
+ {0, SW1_CS11, SW3_CS11, SW2_CS11}, // 10, 0), K1A
+ {0, SW1_CS12, SW3_CS12, SW2_CS12}, // 11, -_, K1B
+ {0, SW1_CS13, SW3_CS13, SW2_CS13}, // 12, =+, K1C
+ {0, SW1_CS14, SW3_CS14, SW2_CS14}, // 13, Backspace, K1D
+ {0, SW1_CS15, SW3_CS15, SW2_CS15}, // 14, Left Alt, K52
+ {0, SW1_CS16, SW3_CS16, SW2_CS16}, // 15, Space, K56
- {0, D_1, F_1, E_1}, // 16, Tab, K20
- {0, D_2, F_2, E_2}, // 17, Q, K21
- {0, D_3, F_3, E_3}, // 18, W, K22
- {0, D_4, F_4, E_4}, // 19, E, K23
- {0, D_5, F_5, E_5}, // 20, R, K24
- {0, D_6, F_6, E_6}, // 21, T, K25
- {0, D_7, F_7, E_7}, // 22, Y, K26
- {0, D_8, F_8, E_8}, // 23, U, K27
- {0, D_9, F_9, E_9}, // 24, I, K28
- {0, D_10, F_10, E_10}, // 25, O, K29
- {0, D_11, F_11, E_11}, // 26, P, K2A
- {0, D_12, F_12, E_12}, // 27, [{, K2B
- {0, D_13, F_13, E_13}, // 28, ]}, K2C
- {0, D_14, F_14, E_14}, // 29, \|, K2D
- {0, D_15, F_15, E_15}, // 30, Right Ctrl, K5C
- {0, D_16, F_16, E_16}, // 31, Function, K5A
+ {0, SW4_CS1, SW6_CS1, SW5_CS1}, // 16, Tab, K20
+ {0, SW4_CS2, SW6_CS2, SW5_CS2}, // 17, Q, K21
+ {0, SW4_CS3, SW6_CS3, SW5_CS3}, // 18, W, K22
+ {0, SW4_CS4, SW6_CS4, SW5_CS4}, // 19, E, K23
+ {0, SW4_CS5, SW6_CS5, SW5_CS5}, // 20, R, K24
+ {0, SW4_CS6, SW6_CS6, SW5_CS6}, // 21, T, K25
+ {0, SW4_CS7, SW6_CS7, SW5_CS7}, // 22, Y, K26
+ {0, SW4_CS8, SW6_CS8, SW5_CS8}, // 23, U, K27
+ {0, SW4_CS9, SW6_CS9, SW5_CS9}, // 24, I, K28
+ {0, SW4_CS10, SW6_CS10, SW5_CS10}, // 25, O, K29
+ {0, SW4_CS11, SW6_CS11, SW5_CS11}, // 26, P, K2A
+ {0, SW4_CS12, SW6_CS12, SW5_CS12}, // 27, [{, K2B
+ {0, SW4_CS13, SW6_CS13, SW5_CS13}, // 28, ]}, K2C
+ {0, SW4_CS14, SW6_CS14, SW5_CS14}, // 29, \|, K2D
+ {0, SW4_CS15, SW6_CS15, SW5_CS15}, // 30, Right Ctrl, K5C
+ {0, SW4_CS16, SW6_CS16, SW5_CS16}, // 31, Function, K5A
- {0, G_1, I_1, H_1}, // 32, Caps Lock, K30
- {0, G_2, I_2, H_2}, // 33, A, K31
- {0, G_3, I_3, H_3}, // 34, S, K32
- {0, G_4, I_4, H_4}, // 35, D, K33
- {0, G_5, I_5, H_5}, // 36, F, K34
- {0, G_6, I_6, H_6}, // 37, G, K35
- {0, G_7, I_7, H_7}, // 38, H, K36
- {0, G_8, I_8, H_8}, // 39, J, K37
- {0, G_9, I_9, H_9}, // 40, K, K38
- {0, G_10, I_10, H_10}, // 41, L, K39
- {0, G_11, I_11, H_11}, // 42, ;:, K3A
- {0, G_12, I_12, H_12}, // 43, '", K3B
- {0, G_13, I_13, H_13}, // 44, Enter, K3D
- {0, G_14, I_14, H_14}, // 45, Up, K4E
- {0, G_15, I_15, H_15}, // 46, Num Lock LED
- {0, G_16, I_16, H_16}, // 47, Right Alt, K59
+ {0, SW7_CS1, SW9_CS1, SW8_CS1}, // 32, Caps Lock, K30
+ {0, SW7_CS2, SW9_CS2, SW8_CS2}, // 33, A, K31
+ {0, SW7_CS3, SW9_CS3, SW8_CS3}, // 34, S, K32
+ {0, SW7_CS4, SW9_CS4, SW8_CS4}, // 35, D, K33
+ {0, SW7_CS5, SW9_CS5, SW8_CS5}, // 36, F, K34
+ {0, SW7_CS6, SW9_CS6, SW8_CS6}, // 37, G, K35
+ {0, SW7_CS7, SW9_CS7, SW8_CS7}, // 38, H, K36
+ {0, SW7_CS8, SW9_CS8, SW8_CS8}, // 39, J, K37
+ {0, SW7_CS9, SW9_CS9, SW8_CS9}, // 40, K, K38
+ {0, SW7_CS10, SW9_CS10, SW8_CS10}, // 41, L, K39
+ {0, SW7_CS11, SW9_CS11, SW8_CS11}, // 42, ;:, K3A
+ {0, SW7_CS12, SW9_CS12, SW8_CS12}, // 43, '", K3B
+ {0, SW7_CS13, SW9_CS13, SW8_CS13}, // 44, Enter, K3D
+ {0, SW7_CS14, SW9_CS14, SW8_CS14}, // 45, Up, K4E
+ {0, SW7_CS15, SW9_CS15, SW8_CS15}, // 46, Num Lock LED
+ {0, SW7_CS16, SW9_CS16, SW8_CS16}, // 47, Right Alt, K59
- {0, J_1, L_1, K_1}, // 48, Left Shift, K40
-// {0, J_2, L_2, K_2}, // Unused LED
- {0, J_3, L_3, K_3}, // 49, Z, K42
- {0, J_4, L_4, K_4}, // 50, X, K43
- {0, J_5, L_5, K_5}, // 51, C, K44
- {0, J_6, L_6, K_6}, // 52, V, K45
- {0, J_7, L_7, K_7}, // 53, B, K46
- {0, J_8, L_8, K_8}, // 54, N, K47
- {0, J_9, L_9, K_9}, // 55, M, K48
- {0, J_10, L_10, K_10}, // 56, ,<, K49
- {0, J_11, L_11, K_11}, // 57, .>, K4A
- {0, J_12, L_12, K_12}, // 58, /?, K4B
- {0, J_13, L_13, K_13}, // 59, Right Shift, K4D
- {0, J_14, L_14, K_14}, // 60, Left, K5D
- {0, J_15, L_15, K_15}, // 61, Down, K5E
- {0, J_16, L_16, K_16}, // 62, Right, K5F
+ {0, SW10_CS1, SW12_CS1, SW11_CS1}, // 48, Left Shift, K40
+// {0, SW10_CS2, SW12_CS2, SW11_CS2}, // Unused LED
+ {0, SW10_CS3, SW12_CS3, SW11_CS3}, // 49, Z, K42
+ {0, SW10_CS4, SW12_CS4, SW11_CS4}, // 50, X, K43
+ {0, SW10_CS5, SW12_CS5, SW11_CS5}, // 51, C, K44
+ {0, SW10_CS6, SW12_CS6, SW11_CS6}, // 52, V, K45
+ {0, SW10_CS7, SW12_CS7, SW11_CS7}, // 53, B, K46
+ {0, SW10_CS8, SW12_CS8, SW11_CS8}, // 54, N, K47
+ {0, SW10_CS9, SW12_CS9, SW11_CS9}, // 55, M, K48
+ {0, SW10_CS10, SW12_CS10, SW11_CS10}, // 56, ,<, K49
+ {0, SW10_CS11, SW12_CS11, SW11_CS11}, // 57, .>, K4A
+ {0, SW10_CS12, SW12_CS12, SW11_CS12}, // 58, /?, K4B
+ {0, SW10_CS13, SW12_CS13, SW11_CS13}, // 59, Right Shift, K4D
+ {0, SW10_CS14, SW12_CS14, SW11_CS14}, // 60, Left, K5D
+ {0, SW10_CS15, SW12_CS15, SW11_CS15}, // 61, Down, K5E
+ {0, SW10_CS16, SW12_CS16, SW11_CS16}, // 62, Right, K5F
- {1, A_1, C_1, B_1}, // 63, Underglow 20
- {1, A_2, C_2, B_2}, // 64, Underglow 19
- {1, A_3, C_3, B_3}, // 65, Underglow 18
- {1, A_4, C_4, B_4}, // 66, Underglow 17
- {1, A_5, C_5, B_5}, // 67, Underglow 16
- {1, A_6, C_6, B_6}, // 68, Underglow 15
- {1, A_7, C_7, B_7}, // 69, Underglow 14
- {1, A_8, C_8, B_8}, // 70, Underglow 13
- {1, A_9, C_9, B_9}, // 71, Underglow 12
- {1, A_10, C_10, B_10}, // 72, Underglow 11
- {1, A_11, C_11, B_11}, // 73, Underglow 10
- {1, A_12, C_12, B_12}, // 74, Underglow 9
- {1, A_13, C_13, B_13}, // 75, Underglow 8
- {1, A_14, C_14, B_14}, // 76, Underglow 7
- {1, A_15, C_15, B_15}, // 77, Underglow 6
- {1, A_16, C_16, B_16}, // 78, Underglow 5
+ {1, SW1_CS1, SW3_CS1, SW2_CS1}, // 63, Underglow 20
+ {1, SW1_CS2, SW3_CS2, SW2_CS2}, // 64, Underglow 19
+ {1, SW1_CS3, SW3_CS3, SW2_CS3}, // 65, Underglow 18
+ {1, SW1_CS4, SW3_CS4, SW2_CS4}, // 66, Underglow 17
+ {1, SW1_CS5, SW3_CS5, SW2_CS5}, // 67, Underglow 16
+ {1, SW1_CS6, SW3_CS6, SW2_CS6}, // 68, Underglow 15
+ {1, SW1_CS7, SW3_CS7, SW2_CS7}, // 69, Underglow 14
+ {1, SW1_CS8, SW3_CS8, SW2_CS8}, // 70, Underglow 13
+ {1, SW1_CS9, SW3_CS9, SW2_CS9}, // 71, Underglow 12
+ {1, SW1_CS10, SW3_CS10, SW2_CS10}, // 72, Underglow 11
+ {1, SW1_CS11, SW3_CS11, SW2_CS11}, // 73, Underglow 10
+ {1, SW1_CS12, SW3_CS12, SW2_CS12}, // 74, Underglow 9
+ {1, SW1_CS13, SW3_CS13, SW2_CS13}, // 75, Underglow 8
+ {1, SW1_CS14, SW3_CS14, SW2_CS14}, // 76, Underglow 7
+ {1, SW1_CS15, SW3_CS15, SW2_CS15}, // 77, Underglow 6
+ {1, SW1_CS16, SW3_CS16, SW2_CS16}, // 78, Underglow 5
- {1, D_1, F_1, E_1}, // 79, Esc, K00
- {1, D_2, F_2, E_2}, // 80, F1, K01
- {1, D_3, F_3, E_3}, // 81, F2, K02
- {1, D_4, F_4, E_4}, // 82, F3, K03
- {1, D_5, F_5, E_5}, // 83, F4, K04
- {1, D_6, F_6, E_6}, // 84, F5, K05
- {1, D_7, F_7, E_7}, // 85, F6, K06
- {1, D_8, F_8, E_8}, // 86, F7, K07
- {1, D_9, F_9, E_9}, // 87, F8, K08
- {1, D_10, F_10, E_10}, // 88, F9, K09
- {1, D_11, F_11, E_11}, // 89, F10, K0A
- {1, D_12, F_12, E_12}, // 90, F11, K0B
- {1, D_13, F_13, E_13}, // 91, F12, K0C
- {1, D_14, F_14, E_14}, // 92, Delete, K0D
- {1, D_15, F_15, E_15}, // 93, Left Ctrl, K50
- {1, D_16, F_16, E_16}, // 94, Left Windows, K51
+ {1, SW4_CS1, SW6_CS1, SW5_CS1}, // 79, Esc, K00
+ {1, SW4_CS2, SW6_CS2, SW5_CS2}, // 80, F1, K01
+ {1, SW4_CS3, SW6_CS3, SW5_CS3}, // 81, F2, K02
+ {1, SW4_CS4, SW6_CS4, SW5_CS4}, // 82, F3, K03
+ {1, SW4_CS5, SW6_CS5, SW5_CS5}, // 83, F4, K04
+ {1, SW4_CS6, SW6_CS6, SW5_CS6}, // 84, F5, K05
+ {1, SW4_CS7, SW6_CS7, SW5_CS7}, // 85, F6, K06
+ {1, SW4_CS8, SW6_CS8, SW5_CS8}, // 86, F7, K07
+ {1, SW4_CS9, SW6_CS9, SW5_CS9}, // 87, F8, K08
+ {1, SW4_CS10, SW6_CS10, SW5_CS10}, // 88, F9, K09
+ {1, SW4_CS11, SW6_CS11, SW5_CS11}, // 89, F10, K0A
+ {1, SW4_CS12, SW6_CS12, SW5_CS12}, // 90, F11, K0B
+ {1, SW4_CS13, SW6_CS13, SW5_CS13}, // 91, F12, K0C
+ {1, SW4_CS14, SW6_CS14, SW5_CS14}, // 92, Delete, K0D
+ {1, SW4_CS15, SW6_CS15, SW5_CS15}, // 93, Left Ctrl, K50
+ {1, SW4_CS16, SW6_CS16, SW5_CS16}, // 94, Left Windows, K51
- {1, G_1, I_1, H_1}, // 95, Underglow 21
- {1, G_2, I_2, H_2}, // 96, Underglow 22
- {1, G_3, I_3, H_3}, // 97, Underglow 23
- {1, G_4, I_4, H_4}, // 98, Underglow 24
- {1, G_5, I_5, H_5}, // 99, Knob LED 3, K53
- {1, G_6, I_6, H_6}, // 100, Knob LED 2, K54
- {1, G_7, I_7, H_7}, // 101, Knob LED 1, K4F
- {1, G_8, I_8, H_8}, // 102, Insert, K1F
- {1, G_9, I_9, H_9}, // 103, Page Up, K3E
- {1, G_10, I_10, H_10}, // 104, Caps/Win/Scr LED
- {1, G_11, I_11, H_11}, // 105, End, K2F
- {1, G_12, I_12, H_12}, // 106, Page Down, K3F
- {1, G_13, I_13, H_13}, // 107, Underglow 1
- {1, G_14, I_14, H_14}, // 108, Underglow 2
- {1, G_15, I_15, H_15}, // 109, Underglow 3
- {1, G_16, I_16, H_16}, // 110, Underglow 4
+ {1, SW7_CS1, SW9_CS1, SW8_CS1}, // 95, Underglow 21
+ {1, SW7_CS2, SW9_CS2, SW8_CS2}, // 96, Underglow 22
+ {1, SW7_CS3, SW9_CS3, SW8_CS3}, // 97, Underglow 23
+ {1, SW7_CS4, SW9_CS4, SW8_CS4}, // 98, Underglow 24
+ {1, SW7_CS5, SW9_CS5, SW8_CS5}, // 99, Knob LED 3, K53
+ {1, SW7_CS6, SW9_CS6, SW8_CS6}, // 100, Knob LED 2, K54
+ {1, SW7_CS7, SW9_CS7, SW8_CS7}, // 101, Knob LED 1, K4F
+ {1, SW7_CS8, SW9_CS8, SW8_CS8}, // 102, Insert, K1F
+ {1, SW7_CS9, SW9_CS9, SW8_CS9}, // 103, Page Up, K3E
+ {1, SW7_CS10, SW9_CS10, SW8_CS10}, // 104, Caps/Win/Scr LED
+ {1, SW7_CS11, SW9_CS11, SW8_CS11}, // 105, End, K2F
+ {1, SW7_CS12, SW9_CS12, SW8_CS12}, // 106, Page Down, K3F
+ {1, SW7_CS13, SW9_CS13, SW8_CS13}, // 107, Underglow 1
+ {1, SW7_CS14, SW9_CS14, SW8_CS14}, // 108, Underglow 2
+ {1, SW7_CS15, SW9_CS15, SW8_CS15}, // 109, Underglow 3
+ {1, SW7_CS16, SW9_CS16, SW8_CS16}, // 110, Underglow 4
- {1, J_1, L_1, K_1}, // 111, Underglow 25
- {1, J_2, L_2, K_2}, // 112, Underglow 26
- {1, J_3, L_3, K_3}, // 113, Underglow 27
- {1, J_4, L_4, K_4}, // 114, Underglow 28
- {1, J_5, L_5, K_5}, // 115, Underglow 29
- {1, J_6, L_6, K_6}, // 116, Underglow 30
- {1, J_7, L_7, K_7}, // 117, Underglow 31
- {1, J_8, L_8, K_8}, // 118, Underglow 32
- {1, J_9, L_9, K_9}, // 119, Underglow 33
- {1, J_10, L_10, K_10}, // 120, Underglow 34
- {1, J_11, L_11, K_11}, // 121, Underglow 35
- {1, J_12, L_12, K_12}, // 122, Underglow 36
- {1, J_13, L_13, K_13}, // 123, Underglow 37
- {1, J_14, L_14, K_14}, // 124, Underglow 38
- {1, J_15, L_15, K_15}, // 125, Underglow 39
- {1, J_16, L_16, K_16}, // 126, Underglow 40
+ {1, SW10_CS1, SW12_CS1, SW11_CS1}, // 111, Underglow 25
+ {1, SW10_CS2, SW12_CS2, SW11_CS2}, // 112, Underglow 26
+ {1, SW10_CS3, SW12_CS3, SW11_CS3}, // 113, Underglow 27
+ {1, SW10_CS4, SW12_CS4, SW11_CS4}, // 114, Underglow 28
+ {1, SW10_CS5, SW12_CS5, SW11_CS5}, // 115, Underglow 29
+ {1, SW10_CS6, SW12_CS6, SW11_CS6}, // 116, Underglow 30
+ {1, SW10_CS7, SW12_CS7, SW11_CS7}, // 117, Underglow 31
+ {1, SW10_CS8, SW12_CS8, SW11_CS8}, // 118, Underglow 32
+ {1, SW10_CS9, SW12_CS9, SW11_CS9}, // 119, Underglow 33
+ {1, SW10_CS10, SW12_CS10, SW11_CS10}, // 120, Underglow 34
+ {1, SW10_CS11, SW12_CS11, SW11_CS11}, // 121, Underglow 35
+ {1, SW10_CS12, SW12_CS12, SW11_CS12}, // 122, Underglow 36
+ {1, SW10_CS13, SW12_CS13, SW11_CS13}, // 123, Underglow 37
+ {1, SW10_CS14, SW12_CS14, SW11_CS14}, // 124, Underglow 38
+ {1, SW10_CS15, SW12_CS15, SW11_CS15}, // 125, Underglow 39
+ {1, SW10_CS16, SW12_CS16, SW11_CS16}, // 126, Underglow 40
};
led_config_t g_led_config = { {
diff --git a/keyboards/flashquark/horizon_z/horizon_z.c b/keyboards/flashquark/horizon_z/horizon_z.c
index 5ab6e22434d..79bd503ff68 100755
--- a/keyboards/flashquark/horizon_z/horizon_z.c
+++ b/keyboards/flashquark/horizon_z/horizon_z.c
@@ -18,67 +18,67 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- {0, B_1, A_1, C_1},
- {0, B_2, A_2, C_2},
- {0, B_3, A_3, C_3},
- {0, B_4, A_4, C_4},
- {0, B_5, A_5, C_5},
- {0, B_6, A_6, C_6},
- {0, B_7, A_7, C_7},
- {0, B_8, A_8, C_8},
- {0, B_9, A_9, C_9},
- {0, B_10, A_10, C_10},
- {0, B_11, A_11, C_11},
- {0, B_12, A_12, C_12},
- {0, B_13, A_13, C_13},
- {0, B_14, A_14, C_14},
- {0, E_1, D_1, F_1},
- {0, E_2, D_2, F_2},
- {0, E_3, D_3, F_3},
- {0, E_4, D_4, F_4},
- {0, E_5, D_5, F_5},
- {0, E_6, D_6, F_6},
- {0, E_7, D_7, F_7},
- {0, E_8, D_8, F_8},
- {0, E_9, D_9, F_9},
- {0, E_10, D_10, F_10},
- {0, E_11, D_11, F_11},
- {0, E_12, D_12, F_12},
- {0, E_13, D_13, F_13},
- {0, E_14, D_14, F_14},
- {0, H_1, G_1, I_1},
- {0, H_2, G_2, I_2},
- {0, H_3, G_3, I_3},
- {0, H_4, G_4, I_4},
- {0, H_5, G_5, I_5},
- {0, H_6, G_6, I_6},
- {0, H_7, G_7, I_7},
- {0, H_8, G_8, I_8},
- {0, H_9, G_9, I_9},
- {0, H_10, G_10, I_10},
- {0, H_11, G_11, I_11},
- {0, H_12, G_12, I_12},
- {0, H_13, G_13, I_13},
- {0, K_1, J_1, L_1},
- {0, K_2, J_2, L_2},
- {0, K_3, J_3, L_3},
- {0, K_4, J_4, L_4},
- {0, K_5, J_5, L_5},
- {0, K_6, J_6, L_6},
- {0, K_7, J_7, L_7},
- {0, K_8, J_8, L_8},
- {0, K_9, J_9, L_9},
- {0, K_10, J_10, L_10},
- {0, K_11, J_11, L_11},
- {0, K_14, J_14, L_14},
- {0, B_16, A_16, C_16},
- {0, E_16, D_16, F_16},
- {0, H_16, G_16, I_16},
- {0, K_16, J_16, L_16},
- {0, K_15, J_15, L_15},
- {0, K_12, J_12, L_12},
- {0, K_13, J_13, L_13},
- {0, H_14, G_14, I_14},
+ {0, SW2_CS1, SW1_CS1, SW3_CS1},
+ {0, SW2_CS2, SW1_CS2, SW3_CS2},
+ {0, SW2_CS3, SW1_CS3, SW3_CS3},
+ {0, SW2_CS4, SW1_CS4, SW3_CS4},
+ {0, SW2_CS5, SW1_CS5, SW3_CS5},
+ {0, SW2_CS6, SW1_CS6, SW3_CS6},
+ {0, SW2_CS7, SW1_CS7, SW3_CS7},
+ {0, SW2_CS8, SW1_CS8, SW3_CS8},
+ {0, SW2_CS9, SW1_CS9, SW3_CS9},
+ {0, SW2_CS10, SW1_CS10, SW3_CS10},
+ {0, SW2_CS11, SW1_CS11, SW3_CS11},
+ {0, SW2_CS12, SW1_CS12, SW3_CS12},
+ {0, SW2_CS13, SW1_CS13, SW3_CS13},
+ {0, SW2_CS14, SW1_CS14, SW3_CS14},
+ {0, SW5_CS1, SW4_CS1, SW6_CS1},
+ {0, SW5_CS2, SW4_CS2, SW6_CS2},
+ {0, SW5_CS3, SW4_CS3, SW6_CS3},
+ {0, SW5_CS4, SW4_CS4, SW6_CS4},
+ {0, SW5_CS5, SW4_CS5, SW6_CS5},
+ {0, SW5_CS6, SW4_CS6, SW6_CS6},
+ {0, SW5_CS7, SW4_CS7, SW6_CS7},
+ {0, SW5_CS8, SW4_CS8, SW6_CS8},
+ {0, SW5_CS9, SW4_CS9, SW6_CS9},
+ {0, SW5_CS10, SW4_CS10, SW6_CS10},
+ {0, SW5_CS11, SW4_CS11, SW6_CS11},
+ {0, SW5_CS12, SW4_CS12, SW6_CS12},
+ {0, SW5_CS13, SW4_CS13, SW6_CS13},
+ {0, SW5_CS14, SW4_CS14, SW6_CS14},
+ {0, SW8_CS1, SW7_CS1, SW9_CS1},
+ {0, SW8_CS2, SW7_CS2, SW9_CS2},
+ {0, SW8_CS3, SW7_CS3, SW9_CS3},
+ {0, SW8_CS4, SW7_CS4, SW9_CS4},
+ {0, SW8_CS5, SW7_CS5, SW9_CS5},
+ {0, SW8_CS6, SW7_CS6, SW9_CS6},
+ {0, SW8_CS7, SW7_CS7, SW9_CS7},
+ {0, SW8_CS8, SW7_CS8, SW9_CS8},
+ {0, SW8_CS9, SW7_CS9, SW9_CS9},
+ {0, SW8_CS10, SW7_CS10, SW9_CS10},
+ {0, SW8_CS11, SW7_CS11, SW9_CS11},
+ {0, SW8_CS12, SW7_CS12, SW9_CS12},
+ {0, SW8_CS13, SW7_CS13, SW9_CS13},
+ {0, SW11_CS1, SW10_CS1, SW12_CS1},
+ {0, SW11_CS2, SW10_CS2, SW12_CS2},
+ {0, SW11_CS3, SW10_CS3, SW12_CS3},
+ {0, SW11_CS4, SW10_CS4, SW12_CS4},
+ {0, SW11_CS5, SW10_CS5, SW12_CS5},
+ {0, SW11_CS6, SW10_CS6, SW12_CS6},
+ {0, SW11_CS7, SW10_CS7, SW12_CS7},
+ {0, SW11_CS8, SW10_CS8, SW12_CS8},
+ {0, SW11_CS9, SW10_CS9, SW12_CS9},
+ {0, SW11_CS10, SW10_CS10, SW12_CS10},
+ {0, SW11_CS11, SW10_CS11, SW12_CS11},
+ {0, SW11_CS14, SW10_CS14, SW12_CS14},
+ {0, SW2_CS16, SW1_CS16, SW3_CS16},
+ {0, SW5_CS16, SW4_CS16, SW6_CS16},
+ {0, SW8_CS16, SW7_CS16, SW9_CS16},
+ {0, SW11_CS16, SW10_CS16, SW12_CS16},
+ {0, SW11_CS15, SW10_CS15, SW12_CS15},
+ {0, SW11_CS12, SW10_CS12, SW12_CS12},
+ {0, SW11_CS13, SW10_CS13, SW12_CS13},
+ {0, SW8_CS14, SW7_CS14, SW9_CS14},
};
diff --git a/keyboards/frooastboard/walnut/walnut.c b/keyboards/frooastboard/walnut/walnut.c
index e3205e07f3c..0de3467ae46 100644
--- a/keyboards/frooastboard/walnut/walnut.c
+++ b/keyboards/frooastboard/walnut/walnut.c
@@ -12,54 +12,54 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, K_1, J_1, L_1},
- {0, K_2, J_2, L_2},
- {0, K_3, J_3, L_3},
- {0, K_4, J_4, L_4},
- {0, K_5, J_5, L_5},
- {0, K_6, J_6, L_6},
- {0, K_7, J_7, L_7},
- {0, K_8, J_8, L_8},
- {0, K_9, J_9, L_9},
- {0, K_10, J_10, L_10},
- {0, K_11, J_11, L_11},
- {0, K_12, J_12, L_12},
- {0, H_1, G_1, I_1},
- {0, H_2, G_2, I_2},
- {0, H_3, G_3, I_3},
- {0, H_4, G_4, I_4},
- {0, H_5, G_5, I_5},
- {0, H_6, G_6, I_6},
- {0, H_7, G_7, I_7},
- {0, H_8, G_8, I_8},
- {0, H_9, G_9, I_9},
- {0, H_10, G_10, I_10},
- {0, H_11, G_11, I_11},
- {0, H_12, G_12, I_12},
- {0, E_1, D_1, F_1},
- {0, E_2, D_2, F_2},
- {0, E_3, D_3, F_3},
- {0, E_4, D_4, F_4},
- {0, E_5, D_5, F_5},
- {0, E_6, D_6, F_6},
- {0, E_7, D_7, F_7},
- {0, E_8, D_8, F_8},
- {0, E_9, D_9, F_9},
- {0, E_10, D_10, F_10},
- {0, E_11, D_11, F_11},
- {0, E_12, D_12, F_12},
- {0, B_1, A_1, C_1},
- {0, B_2, A_2, C_2},
- {0, B_3, A_3, C_3},
- {0, B_4, A_4, C_4},
- {0, B_5, A_5, C_5},
- {0, B_6, A_6, C_6},
- {0, B_7, A_7, C_7},
- {0, B_8, A_8, C_8},
- {0, B_9, A_9, C_9},
- {0, B_10, A_10, C_10},
- {0, B_11, A_11, C_11},
- {0, B_12, A_12, C_12}
+ {0, SW11_CS1, SW10_CS1, SW12_CS1},
+ {0, SW11_CS2, SW10_CS2, SW12_CS2},
+ {0, SW11_CS3, SW10_CS3, SW12_CS3},
+ {0, SW11_CS4, SW10_CS4, SW12_CS4},
+ {0, SW11_CS5, SW10_CS5, SW12_CS5},
+ {0, SW11_CS6, SW10_CS6, SW12_CS6},
+ {0, SW11_CS7, SW10_CS7, SW12_CS7},
+ {0, SW11_CS8, SW10_CS8, SW12_CS8},
+ {0, SW11_CS9, SW10_CS9, SW12_CS9},
+ {0, SW11_CS10, SW10_CS10, SW12_CS10},
+ {0, SW11_CS11, SW10_CS11, SW12_CS11},
+ {0, SW11_CS12, SW10_CS12, SW12_CS12},
+ {0, SW8_CS1, SW7_CS1, SW9_CS1},
+ {0, SW8_CS2, SW7_CS2, SW9_CS2},
+ {0, SW8_CS3, SW7_CS3, SW9_CS3},
+ {0, SW8_CS4, SW7_CS4, SW9_CS4},
+ {0, SW8_CS5, SW7_CS5, SW9_CS5},
+ {0, SW8_CS6, SW7_CS6, SW9_CS6},
+ {0, SW8_CS7, SW7_CS7, SW9_CS7},
+ {0, SW8_CS8, SW7_CS8, SW9_CS8},
+ {0, SW8_CS9, SW7_CS9, SW9_CS9},
+ {0, SW8_CS10, SW7_CS10, SW9_CS10},
+ {0, SW8_CS11, SW7_CS11, SW9_CS11},
+ {0, SW8_CS12, SW7_CS12, SW9_CS12},
+ {0, SW5_CS1, SW4_CS1, SW6_CS1},
+ {0, SW5_CS2, SW4_CS2, SW6_CS2},
+ {0, SW5_CS3, SW4_CS3, SW6_CS3},
+ {0, SW5_CS4, SW4_CS4, SW6_CS4},
+ {0, SW5_CS5, SW4_CS5, SW6_CS5},
+ {0, SW5_CS6, SW4_CS6, SW6_CS6},
+ {0, SW5_CS7, SW4_CS7, SW6_CS7},
+ {0, SW5_CS8, SW4_CS8, SW6_CS8},
+ {0, SW5_CS9, SW4_CS9, SW6_CS9},
+ {0, SW5_CS10, SW4_CS10, SW6_CS10},
+ {0, SW5_CS11, SW4_CS11, SW6_CS11},
+ {0, SW5_CS12, SW4_CS12, SW6_CS12},
+ {0, SW2_CS1, SW1_CS1, SW3_CS1},
+ {0, SW2_CS2, SW1_CS2, SW3_CS2},
+ {0, SW2_CS3, SW1_CS3, SW3_CS3},
+ {0, SW2_CS4, SW1_CS4, SW3_CS4},
+ {0, SW2_CS5, SW1_CS5, SW3_CS5},
+ {0, SW2_CS6, SW1_CS6, SW3_CS6},
+ {0, SW2_CS7, SW1_CS7, SW3_CS7},
+ {0, SW2_CS8, SW1_CS8, SW3_CS8},
+ {0, SW2_CS9, SW1_CS9, SW3_CS9},
+ {0, SW2_CS10, SW1_CS10, SW3_CS10},
+ {0, SW2_CS11, SW1_CS11, SW3_CS11},
+ {0, SW2_CS12, SW1_CS12, SW3_CS12}
};
led_config_t g_led_config = {
diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
index 7c43f8d5eca..d1f01fc8cb5 100644
--- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p65/ansi/ansi.c
@@ -25,98 +25,98 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS1_SW1, CS2_SW1, CS3_SW1 }, // 0 Esc
- {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 1 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3 }, // 2 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 3 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 4 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 5 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 6 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 7 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 8 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 9 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 10 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 11 -
- {1, CS1_SW5, CS2_SW5, CS3_SW5 }, // 12 =
- {1, CS1_SW7, CS2_SW7, CS3_SW7 }, // 13 Backspace
- {1, CS4_SW4, CS5_SW4, CS6_SW4 }, // 14 Del
+ {0, SW1_CS1, SW1_CS2, SW1_CS3 }, // 0 Esc
+ {0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 1 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6 }, // 2 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 3 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 4 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 5 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 6 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 7 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 8 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6 }, // 9 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6 }, // 10 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6 }, // 11 -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3 }, // 12 =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3 }, // 13 Backspace
+ {1, SW4_CS4, SW4_CS5, SW4_CS6 }, // 14 Del
- {0, CS7_SW1, CS8_SW1, CS9_SW1 }, // 15 Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 16 Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 17 W
- {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 18 E
- {0, CS7_SW5, CS8_SW5, CS9_SW5 }, // 19 R
- {0, CS7_SW6, CS8_SW6, CS9_SW6 }, // 20 T
- {0, CS7_SW7, CS8_SW7, CS9_SW7 }, // 21 Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 22 U
- {0, CS7_SW9, CS8_SW9, CS9_SW9 }, // 23 I
- {0, CS7_SW10, CS8_SW10, CS9_SW10 }, // 24 O
- {0, CS7_SW11, CS8_SW11, CS9_SW11 }, // 25 P
- {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 26 [
- {1, CS1_SW8, CS2_SW8, CS3_SW8 }, // 27 ]
- {1, CS1_SW9, CS2_SW9, CS3_SW9 }, // 28 \|
- {1, CS4_SW7, CS5_SW7, CS6_SW7 }, // 29 PgUp
+ {0, SW1_CS7, SW1_CS8, SW1_CS9 }, // 15 Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 16 Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 17 W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 18 E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9 }, // 19 R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9 }, // 20 T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9 }, // 21 Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 22 U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9 }, // 23 I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9 }, // 24 O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9 }, // 25 P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9 }, // 26 [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3 }, // 27 ]
+ {1, SW9_CS1, SW9_CS2, SW9_CS3 }, // 28 \|
+ {1, SW7_CS4, SW7_CS5, SW7_CS6 }, // 29 PgUp
- {0, CS10_SW1, CS11_SW1, CS12_SW1 }, // 30 Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2 }, // 31 A
- {0, CS10_SW3, CS11_SW3, CS12_SW3 }, // 32 S
- {0, CS10_SW4, CS11_SW4, CS12_SW4 }, // 33 D
- {0, CS10_SW5, CS11_SW5, CS12_SW5 }, // 34 F
- {0, CS10_SW6, CS11_SW6, CS12_SW6 }, // 35 G
- {0, CS10_SW7, CS11_SW7, CS12_SW7 }, // 36 H
- {0, CS10_SW8, CS11_SW8, CS12_SW8 }, // 37 J
- {0, CS10_SW9, CS11_SW9, CS12_SW9 }, // 38 K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 39 L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 40 ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 41 '
- {1, CS1_SW11, CS2_SW11, CS3_SW11 }, // 42 Enter
- {1, CS4_SW5, CS5_SW5, CS6_SW5 }, // 43 PgDn
+ {0, SW1_CS10, SW1_CS11, SW1_CS12 }, // 30 Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12 }, // 31 A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12 }, // 32 S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12 }, // 33 D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12 }, // 34 F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12 }, // 35 G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12 }, // 36 H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12 }, // 37 J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12 }, // 38 K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 39 L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 40 ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 41 '
+ {1, SW11_CS1, SW11_CS2, SW11_CS3 }, // 42 Enter
+ {1, SW5_CS4, SW5_CS5, SW5_CS6 }, // 43 PgDn
- {0, CS13_SW1, CS14_SW1, CS15_SW1 }, // 44 Shift_L
- {0, CS13_SW3, CS14_SW3, CS15_SW3 }, // 45 Z
- {0, CS13_SW4, CS14_SW4, CS15_SW4 }, // 46 X
- {0, CS13_SW5, CS14_SW5, CS15_SW5 }, // 47 C
- {0, CS13_SW6, CS14_SW6, CS15_SW6 }, // 48 V
- {0, CS13_SW7, CS14_SW7, CS15_SW7 }, // 49 B
- {0, CS13_SW8, CS14_SW8, CS15_SW8 }, // 50 N
- {0, CS13_SW9, CS14_SW9, CS15_SW9 }, // 51 M
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 52 ,
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 53 .
- {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 54 /
- {1, CS4_SW8, CS5_SW8, CS6_SW8 }, // 55 Shift_R
- {1, CS4_SW9, CS5_SW9, CS6_SW9 }, // 56 Up
- {1, CS4_SW6, CS5_SW6, CS6_SW6 }, // 57 END
+ {0, SW1_CS13, SW1_CS14, SW1_CS15 }, // 44 Shift_L
+ {0, SW3_CS13, SW3_CS14, SW3_CS15 }, // 45 Z
+ {0, SW4_CS13, SW4_CS14, SW4_CS15 }, // 46 X
+ {0, SW5_CS13, SW5_CS14, SW5_CS15 }, // 47 C
+ {0, SW6_CS13, SW6_CS14, SW6_CS15 }, // 48 V
+ {0, SW7_CS13, SW7_CS14, SW7_CS15 }, // 49 B
+ {0, SW8_CS13, SW8_CS14, SW8_CS15 }, // 50 N
+ {0, SW9_CS13, SW9_CS14, SW9_CS15 }, // 51 M
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 52 ,
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 53 .
+ {0, SW12_CS13, SW12_CS14, SW12_CS15}, // 54 /
+ {1, SW8_CS4, SW8_CS5, SW8_CS6 }, // 55 Shift_R
+ {1, SW9_CS4, SW9_CS5, SW9_CS6 }, // 56 Up
+ {1, SW6_CS4, SW6_CS5, SW6_CS6 }, // 57 END
- {0, CS16_SW1, CS17_SW1, CS18_SW1 }, // 58 Ctrl_L
- {0, CS16_SW2, CS17_SW2, CS18_SW2 }, // 59 Win_L
- {0, CS16_SW3, CS17_SW3, CS18_SW3 }, // 60 Alt_L
- {0, CS16_SW6, CS17_SW6, CS18_SW6 }, // 61 Space
- {0, CS16_SW9, CS17_SW9, CS18_SW9 }, // 62 Alt_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 63 FN
- {1, CS4_SW10, CS5_SW10, CS6_SW10 }, // 64 Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11 }, // 65 Down
- {1, CS4_SW12, CS5_SW12, CS6_SW12 }, // 66 Right
+ {0, SW1_CS16, SW1_CS17, SW1_CS18 }, // 58 Ctrl_L
+ {0, SW2_CS16, SW2_CS17, SW2_CS18 }, // 59 Win_L
+ {0, SW3_CS16, SW3_CS17, SW3_CS18 }, // 60 Alt_L
+ {0, SW6_CS16, SW6_CS17, SW6_CS18 }, // 61 Space
+ {0, SW9_CS16, SW9_CS17, SW9_CS18 }, // 62 Alt_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 63 FN
+ {1, SW10_CS4, SW10_CS5, SW10_CS6 }, // 64 Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6 }, // 65 Down
+ {1, SW12_CS4, SW12_CS5, SW12_CS6 }, // 66 Right
- {1, CS13_SW1, CS14_SW1, CS15_SW1 }, // 69 LED 1
- {1, CS13_SW2, CS14_SW2, CS15_SW2 }, // 70 LED 2
- {1, CS13_SW3, CS14_SW3, CS15_SW3 }, // 71 LED 3
- {1, CS13_SW4, CS14_SW4, CS15_SW4 }, // 72 LED 4
- {1, CS13_SW5, CS14_SW5, CS15_SW5 }, // 73 LED 5
- {1, CS13_SW6, CS14_SW6, CS15_SW6 }, // 74 LED 6
- {1, CS13_SW7, CS14_SW7, CS15_SW7 }, // 75 LED 7
- {1, CS13_SW8, CS14_SW8, CS15_SW8 }, // 76 LED 8
- {1, CS13_SW9, CS14_SW9, CS15_SW9 }, // 77 LED 9
- {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 78 LED 10
- {1, CS16_SW1, CS17_SW1, CS18_SW1 }, // 79 LED 11
- {1, CS16_SW2, CS17_SW2, CS18_SW2 }, // 80 LED 12
- {1, CS16_SW3, CS17_SW3, CS18_SW3 }, // 81 LED 13
- {1, CS16_SW4, CS17_SW4, CS18_SW4 }, // 82 LED 14
- {1, CS16_SW5, CS17_SW5, CS18_SW5 }, // 83 LED 15
- {1, CS16_SW6, CS17_SW6, CS18_SW6 }, // 84 LED 16
- {1, CS16_SW7, CS17_SW7, CS18_SW7 }, // 85 LED 17
- {1, CS16_SW8, CS17_SW8, CS18_SW8 }, // 86 LED 18
- {1, CS16_SW9, CS17_SW9, CS18_SW9 }, // 87 LED 19
- {1, CS16_SW10, CS17_SW10, CS18_SW10} // 88 LED 20
+ {1, SW1_CS13, SW1_CS14, SW1_CS15 }, // 69 LED 1
+ {1, SW2_CS13, SW2_CS14, SW2_CS15 }, // 70 LED 2
+ {1, SW3_CS13, SW3_CS14, SW3_CS15 }, // 71 LED 3
+ {1, SW4_CS13, SW4_CS14, SW4_CS15 }, // 72 LED 4
+ {1, SW5_CS13, SW5_CS14, SW5_CS15 }, // 73 LED 5
+ {1, SW6_CS13, SW6_CS14, SW6_CS15 }, // 74 LED 6
+ {1, SW7_CS13, SW7_CS14, SW7_CS15 }, // 75 LED 7
+ {1, SW8_CS13, SW8_CS14, SW8_CS15 }, // 76 LED 8
+ {1, SW9_CS13, SW9_CS14, SW9_CS15 }, // 77 LED 9
+ {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 78 LED 10
+ {1, SW1_CS16, SW1_CS17, SW1_CS18 }, // 79 LED 11
+ {1, SW2_CS16, SW2_CS17, SW2_CS18 }, // 80 LED 12
+ {1, SW3_CS16, SW3_CS17, SW3_CS18 }, // 81 LED 13
+ {1, SW4_CS16, SW4_CS17, SW4_CS18 }, // 82 LED 14
+ {1, SW5_CS16, SW5_CS17, SW5_CS18 }, // 83 LED 15
+ {1, SW6_CS16, SW6_CS17, SW6_CS18 }, // 84 LED 16
+ {1, SW7_CS16, SW7_CS17, SW7_CS18 }, // 85 LED 17
+ {1, SW8_CS16, SW8_CS17, SW8_CS18 }, // 86 LED 18
+ {1, SW9_CS16, SW9_CS17, SW9_CS18 }, // 87 LED 19
+ {1, SW10_CS16, SW10_CS17, SW10_CS18} // 88 LED 20
};
#define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c
index 9a591cd4ef7..2be52853941 100644
--- a/keyboards/gmmk/gmmk2/p65/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c
@@ -25,99 +25,99 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS1_SW1, CS2_SW1, CS3_SW1 }, // 0 Esc
- {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 1 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3 }, // 2 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 3 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 4 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 5 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 6 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 7 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 8 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 9 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 10 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 11 -
- {1, CS1_SW5, CS2_SW5, CS3_SW5 }, // 12 =
- {1, CS1_SW7, CS2_SW7, CS3_SW7 }, // 13 Backspace
- {1, CS4_SW4, CS5_SW4, CS6_SW4 }, // 14 HOME
+ {0, SW1_CS1, SW1_CS2, SW1_CS3 }, // 0 Esc
+ {0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 1 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6 }, // 2 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 3 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 4 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 5 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 6 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 7 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 8 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6 }, // 9 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6 }, // 10 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6 }, // 11 -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3 }, // 12 =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3 }, // 13 Backspace
+ {1, SW4_CS4, SW4_CS5, SW4_CS6 }, // 14 HOME
- {0, CS7_SW1, CS8_SW1, CS9_SW1 }, // 15 Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 16 Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 17 W
- {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 18 E
- {0, CS7_SW5, CS8_SW5, CS9_SW5 }, // 19 R
- {0, CS7_SW6, CS8_SW6, CS9_SW6 }, // 20 T
- {0, CS7_SW7, CS8_SW7, CS9_SW7 }, // 21 Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 22 U
- {0, CS7_SW9, CS8_SW9, CS9_SW9 }, // 23 I
- {0, CS7_SW10, CS8_SW10, CS9_SW10 }, // 24 O
- {0, CS7_SW11, CS8_SW11, CS9_SW11 }, // 25 P
- {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 26 [
- {1, CS1_SW8, CS2_SW8, CS3_SW8 }, // 27 ]
- {1, CS1_SW11, CS2_SW11, CS3_SW11 }, // 28 ENTER
- {1, CS4_SW7, CS5_SW7, CS6_SW7 }, // 29 PgUp
+ {0, SW1_CS7, SW1_CS8, SW1_CS9 }, // 15 Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 16 Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 17 W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 18 E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9 }, // 19 R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9 }, // 20 T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9 }, // 21 Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 22 U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9 }, // 23 I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9 }, // 24 O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9 }, // 25 P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9 }, // 26 [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3 }, // 27 ]
+ {1, SW11_CS1, SW11_CS2, SW11_CS3 }, // 28 ENTER
+ {1, SW7_CS4, SW7_CS5, SW7_CS6 }, // 29 PgUp
- {0, CS10_SW1, CS11_SW1, CS12_SW1 }, // 30 Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2 }, // 31 A
- {0, CS10_SW3, CS11_SW3, CS12_SW3 }, // 32 S
- {0, CS10_SW4, CS11_SW4, CS12_SW4 }, // 33 D
- {0, CS10_SW5, CS11_SW5, CS12_SW5 }, // 34 F
- {0, CS10_SW6, CS11_SW6, CS12_SW6 }, // 35 G
- {0, CS10_SW7, CS11_SW7, CS12_SW7 }, // 36 H
- {0, CS10_SW8, CS11_SW8, CS12_SW8 }, // 37 J
- {0, CS10_SW9, CS11_SW9, CS12_SW9 }, // 38 K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 39 L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 40 ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 41 '
- {1, CS1_SW10, CS2_SW10, CS3_SW10 }, // 42 k42
- {1, CS4_SW5, CS5_SW5, CS6_SW5 }, // 43 PgDn
+ {0, SW1_CS10, SW1_CS11, SW1_CS12 }, // 30 Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12 }, // 31 A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12 }, // 32 S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12 }, // 33 D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12 }, // 34 F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12 }, // 35 G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12 }, // 36 H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12 }, // 37 J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12 }, // 38 K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 39 L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 40 ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 41 '
+ {1, SW10_CS1, SW10_CS2, SW10_CS3 }, // 42 k42
+ {1, SW5_CS4, SW5_CS5, SW5_CS6 }, // 43 PgDn
- {0, CS13_SW1, CS14_SW1, CS15_SW1 }, // 44 Shift_L
- {0, CS13_SW2, CS14_SW2, CS15_SW2 }, // 45 k45
- {0, CS13_SW3, CS14_SW3, CS15_SW3 }, // 46 Z
- {0, CS13_SW4, CS14_SW4, CS15_SW4 }, // 47 X
- {0, CS13_SW5, CS14_SW5, CS15_SW5 }, // 48 C
- {0, CS13_SW6, CS14_SW6, CS15_SW6 }, // 49 V
- {0, CS13_SW7, CS14_SW7, CS15_SW7 }, // 50 B
- {0, CS13_SW8, CS14_SW8, CS15_SW8 }, // 51 N
- {0, CS13_SW9, CS14_SW9, CS15_SW9 }, // 52 M
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 53 ,
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 54 .
- {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 55 /
- {1, CS4_SW8, CS5_SW8, CS6_SW8 }, // 56 Shift_R
- {1, CS4_SW9, CS5_SW9, CS6_SW9 }, // 57 Up
- {1, CS4_SW6, CS5_SW6, CS6_SW6 }, // 58 END
+ {0, SW1_CS13, SW1_CS14, SW1_CS15 }, // 44 Shift_L
+ {0, SW2_CS13, SW2_CS14, SW2_CS15 }, // 45 k45
+ {0, SW3_CS13, SW3_CS14, SW3_CS15 }, // 46 Z
+ {0, SW4_CS13, SW4_CS14, SW4_CS15 }, // 47 X
+ {0, SW5_CS13, SW5_CS14, SW5_CS15 }, // 48 C
+ {0, SW6_CS13, SW6_CS14, SW6_CS15 }, // 49 V
+ {0, SW7_CS13, SW7_CS14, SW7_CS15 }, // 50 B
+ {0, SW8_CS13, SW8_CS14, SW8_CS15 }, // 51 N
+ {0, SW9_CS13, SW9_CS14, SW9_CS15 }, // 52 M
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 53 ,
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 54 .
+ {0, SW12_CS13, SW12_CS14, SW12_CS15}, // 55 /
+ {1, SW8_CS4, SW8_CS5, SW8_CS6 }, // 56 Shift_R
+ {1, SW9_CS4, SW9_CS5, SW9_CS6 }, // 57 Up
+ {1, SW6_CS4, SW6_CS5, SW6_CS6 }, // 58 END
- {0, CS16_SW1, CS17_SW1, CS18_SW1 }, // 59 Ctrl_L
- {0, CS16_SW2, CS17_SW2, CS18_SW2 }, // 60 Win_L
- {0, CS16_SW3, CS17_SW3, CS18_SW3 }, // 61 Alt_L
- {0, CS16_SW6, CS17_SW6, CS18_SW6 }, // 62 Space
- {0, CS16_SW9, CS17_SW9, CS18_SW9 }, // 63 Alt_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 64 FN
- {1, CS4_SW10, CS5_SW10, CS6_SW10 }, // 65 Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11 }, // 66 Down
- {1, CS4_SW12, CS5_SW12, CS6_SW12 }, // 67 Right
+ {0, SW1_CS16, SW1_CS17, SW1_CS18 }, // 59 Ctrl_L
+ {0, SW2_CS16, SW2_CS17, SW2_CS18 }, // 60 Win_L
+ {0, SW3_CS16, SW3_CS17, SW3_CS18 }, // 61 Alt_L
+ {0, SW6_CS16, SW6_CS17, SW6_CS18 }, // 62 Space
+ {0, SW9_CS16, SW9_CS17, SW9_CS18 }, // 63 Alt_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 64 FN
+ {1, SW10_CS4, SW10_CS5, SW10_CS6 }, // 65 Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6 }, // 66 Down
+ {1, SW12_CS4, SW12_CS5, SW12_CS6 }, // 67 Right
- {1, CS13_SW1, CS14_SW1, CS15_SW1 }, // 68 LED 1
- {1, CS13_SW2, CS14_SW2, CS15_SW2 }, // 69 LED 2
- {1, CS13_SW3, CS14_SW3, CS15_SW3 }, // 70 LED 3
- {1, CS13_SW4, CS14_SW4, CS15_SW4 }, // 71 LED 4
- {1, CS13_SW5, CS14_SW5, CS15_SW5 }, // 72 LED 5
- {1, CS13_SW6, CS14_SW6, CS15_SW6 }, // 73 LED 6
- {1, CS13_SW7, CS14_SW7, CS15_SW7 }, // 74 LED 7
- {1, CS13_SW8, CS14_SW8, CS15_SW8 }, // 75 LED 8
- {1, CS13_SW9, CS14_SW9, CS15_SW9 }, // 76 LED 9
- {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 77 LED 10
- {1, CS16_SW1, CS17_SW1, CS18_SW1 }, // 78 LED 11
- {1, CS16_SW2, CS17_SW2, CS18_SW2 }, // 79 LED 12
- {1, CS16_SW3, CS17_SW3, CS18_SW3 }, // 80 LED 13
- {1, CS16_SW4, CS17_SW4, CS18_SW4 }, // 81 LED 14
- {1, CS16_SW5, CS17_SW5, CS18_SW5 }, // 82 LED 15
- {1, CS16_SW6, CS17_SW6, CS18_SW6 }, // 83 LED 16
- {1, CS16_SW7, CS17_SW7, CS18_SW7 }, // 84 LED 17
- {1, CS16_SW8, CS17_SW8, CS18_SW8 }, // 85 LED 18
- {1, CS16_SW9, CS17_SW9, CS18_SW9 }, // 86 LED 19
- {1, CS16_SW10, CS17_SW10, CS18_SW10} // 87 LED 20
+ {1, SW1_CS13, SW1_CS14, SW1_CS15 }, // 68 LED 1
+ {1, SW2_CS13, SW2_CS14, SW2_CS15 }, // 69 LED 2
+ {1, SW3_CS13, SW3_CS14, SW3_CS15 }, // 70 LED 3
+ {1, SW4_CS13, SW4_CS14, SW4_CS15 }, // 71 LED 4
+ {1, SW5_CS13, SW5_CS14, SW5_CS15 }, // 72 LED 5
+ {1, SW6_CS13, SW6_CS14, SW6_CS15 }, // 73 LED 6
+ {1, SW7_CS13, SW7_CS14, SW7_CS15 }, // 74 LED 7
+ {1, SW8_CS13, SW8_CS14, SW8_CS15 }, // 75 LED 8
+ {1, SW9_CS13, SW9_CS14, SW9_CS15 }, // 76 LED 9
+ {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 77 LED 10
+ {1, SW1_CS16, SW1_CS17, SW1_CS18 }, // 78 LED 11
+ {1, SW2_CS16, SW2_CS17, SW2_CS18 }, // 79 LED 12
+ {1, SW3_CS16, SW3_CS17, SW3_CS18 }, // 80 LED 13
+ {1, SW4_CS16, SW4_CS17, SW4_CS18 }, // 81 LED 14
+ {1, SW5_CS16, SW5_CS17, SW5_CS18 }, // 82 LED 15
+ {1, SW6_CS16, SW6_CS17, SW6_CS18 }, // 83 LED 16
+ {1, SW7_CS16, SW7_CS17, SW7_CS18 }, // 84 LED 17
+ {1, SW8_CS16, SW8_CS17, SW8_CS18 }, // 85 LED 18
+ {1, SW9_CS16, SW9_CS17, SW9_CS18 }, // 86 LED 19
+ {1, SW10_CS16, SW10_CS17, SW10_CS18} // 87 LED 20
};
#define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
index 83dcad728a9..d60b9e2254f 100644
--- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
+++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c
@@ -25,131 +25,131 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, k00, Esc
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 1, k10, F1
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 2, k20, F2
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 3, k30, F3
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 4, k40, F4
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 5, k50, F5
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 6, k60, F6
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 7, k70, F7
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 8, k80, F8
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 9, k90, F9
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 10, ka0, F10
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 11, kb0, F11
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 12, kc0, F12
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 13, kd0, Printscreen
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 14, k06, Delete
- {1, CS1_SW2, CS2_SW2, CS3_SW2}, // 15, k16, Insert
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 16, k26, Page Up
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 17, k36, Page Down
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, k00, Esc
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 1, k10, F1
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 2, k20, F2
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 3, k30, F3
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 4, k40, F4
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 5, k50, F5
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 6, k60, F6
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 7, k70, F7
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 8, k80, F8
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 9, k90, F9
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 10, ka0, F10
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 11, kb0, F11
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 12, kc0, F12
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 13, kd0, Printscreen
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 14, k06, Delete
+ {1, SW2_CS1, SW2_CS2, SW2_CS3}, // 15, k16, Insert
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 16, k26, Page Up
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 17, k36, Page Down
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 18, k01, `
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 19, k11, 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 20, k21, 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 21, k31, 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 22, k41, 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 23, k51, 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 24, k61, 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 25, k71, 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 26, k81, 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 27, k91, 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 28, ka1, 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 29, kb1, -
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 30, kc1, =
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 31, kd1, Backspace
- {1, CS7_SW1, CS8_SW1, CS9_SW1}, // 32, k46, Num Lock
- {1, CS7_SW2, CS8_SW2, CS9_SW2}, // 33, k56, Num /
- {1, CS7_SW3, CS8_SW3, CS9_SW3}, // 34, k66, Num *
- {1, CS7_SW4, CS8_SW4, CS9_SW4}, // 35, k76, Num -
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 18, k01, `
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 19, k11, 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 20, k21, 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 21, k31, 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 22, k41, 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 23, k51, 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 24, k61, 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 25, k71, 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 26, k81, 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 27, k91, 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 28, ka1, 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 29, kb1, -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 30, kc1, =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 31, kd1, Backspace
+ {1, SW1_CS7, SW1_CS8, SW1_CS9}, // 32, k46, Num Lock
+ {1, SW2_CS7, SW2_CS8, SW2_CS9}, // 33, k56, Num /
+ {1, SW3_CS7, SW3_CS8, SW3_CS9}, // 34, k66, Num *
+ {1, SW4_CS7, SW4_CS8, SW4_CS9}, // 35, k76, Num -
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 36, k02, Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 37, k12, Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 38, k22, W
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 39, k32, E
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 40, k42, R
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 41, k52, T
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 42, k62, Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 43, k72, U
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 44, k82, I
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 45, k92, O
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 46, ka2, P
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 47, kb2, [
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 48, kc2, ]
- {1, CS1_SW9, CS2_SW9, CS3_SW9}, // 49, kd3, "\\"
- {1, CS7_SW5, CS8_SW5, CS9_SW5}, // 50, k86, Num 7
- {1, CS7_SW6, CS8_SW6, CS9_SW6}, // 51, k96, Num 8
- {1, CS7_SW7, CS8_SW7, CS9_SW7}, // 52, ka6, Num 9
- {1, CS7_SW8, CS8_SW8, CS9_SW8}, // 53, kb6, Num +
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 36, k02, Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 37, k12, Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 38, k22, W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 39, k32, E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 40, k42, R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 41, k52, T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 42, k62, Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 43, k72, U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 44, k82, I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 45, k92, O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 46, ka2, P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 47, kb2, [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 48, kc2, ]
+ {1, SW9_CS1, SW9_CS2, SW9_CS3}, // 49, kd3, "\\"
+ {1, SW5_CS7, SW5_CS8, SW5_CS9}, // 50, k86, Num 7
+ {1, SW6_CS7, SW6_CS8, SW6_CS9}, // 51, k96, Num 8
+ {1, SW7_CS7, SW7_CS8, SW7_CS9}, // 52, ka6, Num 9
+ {1, SW8_CS7, SW8_CS8, SW8_CS9}, // 53, kb6, Num +
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 54, k03, Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 55, k13, A
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 56, k23, S
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 57, k33, D
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 58, k43, F
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 59, k53, G
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 60, k63, H
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 61, k73, J
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 62, k83, K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 63, k93, L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 64, ka3, ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 65, kb3, '
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 66, kc3, Enter
- {1, CS7_SW9, CS8_SW9, CS9_SW9}, // 67, ka7, Num 4
- {1, CS7_SW10, CS8_SW10, CS9_SW10}, // 68, kb7, Num 5
- {1, CS7_SW11, CS8_SW11, CS9_SW11}, // 69, kc7, Num 6
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 54, k03, Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 55, k13, A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 56, k23, S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 57, k33, D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 58, k43, F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 59, k53, G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 60, k63, H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 61, k73, J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 62, k83, K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 63, k93, L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 64, ka3, ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 65, kb3, '
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 66, kc3, Enter
+ {1, SW9_CS7, SW9_CS8, SW9_CS9}, // 67, ka7, Num 4
+ {1, SW10_CS7, SW10_CS8, SW10_CS9}, // 68, kb7, Num 5
+ {1, SW11_CS7, SW11_CS8, SW11_CS9}, // 69, kc7, Num 6
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 70, k04, Shift_L
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 71, k24, Z
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 72, k34, X
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 73, k44, C
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 74, k54, V
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 75, k64, B
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 76, k74, N
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 77, k84, M
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 78, k94, ,
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 79, ka4, .
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 80, kb4, /
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 81, kd4, Shift_R
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 82, k17, Up
- {1, CS10_SW1, CS11_SW1, CS12_SW1}, // 83, k67, Num 1
- {1, CS10_SW2, CS11_SW2, CS12_SW2}, // 84, k77, Num 2
- {1, CS10_SW3, CS11_SW3, CS12_SW3}, // 85, k87, Num 3
- {1, CS10_SW4, CS11_SW4, CS12_SW4}, // 86, k97, Enter_R
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 70, k04, Shift_L
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 71, k24, Z
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 72, k34, X
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 73, k44, C
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 74, k54, V
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 75, k64, B
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 76, k74, N
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 77, k84, M
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 78, k94, ,
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 79, ka4, .
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 80, kb4, /
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 81, kd4, Shift_R
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 82, k17, Up
+ {1, SW1_CS10, SW1_CS11, SW1_CS12}, // 83, k67, Num 1
+ {1, SW2_CS10, SW2_CS11, SW2_CS12}, // 84, k77, Num 2
+ {1, SW3_CS10, SW3_CS11, SW3_CS12}, // 85, k87, Num 3
+ {1, SW4_CS10, SW4_CS11, SW4_CS12}, // 86, k97, Enter_R
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 87, k05, Ctrl_L
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 88, k15, Win_L
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 89, k25, Alt_L
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 90, k65, Space
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 91, k95, Alt_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 92, ka5, FN
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 93, kc5, Ctrl_R
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 94, k07, Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 95, k27, Down
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 96, k37, Right
- {1, CS10_SW6, CS11_SW6, CS12_SW6}, // 97, k47, Num 0
- {1, CS10_SW7, CS11_SW7, CS12_SW7}, // 98, k57, Num .
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 87, k05, Ctrl_L
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 88, k15, Win_L
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 89, k25, Alt_L
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 90, k65, Space
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 91, k95, Alt_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 92, ka5, FN
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 93, kc5, Ctrl_R
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 94, k07, Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 95, k27, Down
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 96, k37, Right
+ {1, SW6_CS10, SW6_CS11, SW6_CS12}, // 97, k47, Num 0
+ {1, SW7_CS10, SW7_CS11, SW7_CS12}, // 98, k57, Num .
- {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 101, LED 1
- {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 102, LED 2
- {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 103, LED 3
- {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 104, LED 4
- {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 105, LED 5
- {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 106, LED 6
- {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 107, LED 7
- {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 108, LED 8
- {1, CS13_SW9, CS14_SW9, CS15_SW9}, // 109, LED 9
- {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 110, LED 10
- {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 111, LED 11
- {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 112, LED 12
- {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 113, LED 13
- {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 114, LED 14
- {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 115, LED 15
- {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 116, LED 16
- {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 117, LED 17
- {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 118, LED 18
- {1, CS16_SW9, CS17_SW9, CS18_SW9}, // 119, LED 19
- {1, CS16_SW10, CS17_SW10, CS18_SW10} // 120, LED 20
+ {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 101, LED 1
+ {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 102, LED 2
+ {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 103, LED 3
+ {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 104, LED 4
+ {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 105, LED 5
+ {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 106, LED 6
+ {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 107, LED 7
+ {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 108, LED 8
+ {1, SW9_CS13, SW9_CS14, SW9_CS15}, // 109, LED 9
+ {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 110, LED 10
+ {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 111, LED 11
+ {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 112, LED 12
+ {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 113, LED 13
+ {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 114, LED 14
+ {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 115, LED 15
+ {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 116, LED 16
+ {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 117, LED 17
+ {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 118, LED 18
+ {1, SW9_CS16, SW9_CS17, SW9_CS18}, // 119, LED 19
+ {1, SW10_CS16, SW10_CS17, SW10_CS18} // 120, LED 20
};
#define __ NO_LED
diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c
index d412215fc48..af2ee17c4ae 100644
--- a/keyboards/gmmk/gmmk2/p96/iso/iso.c
+++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c
@@ -25,132 +25,132 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, k00, Esc
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 1, k10, F1
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 2, k20, F2
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 3, k30, F3
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 4, k40, F4
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 5, k50, F5
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 6, k60, F6
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 7, k70, F7
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 8, k80, F8
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 9, k90, F9
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 10, ka0, F10
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 11, kb0, F11
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 12, kc0, F12
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 13, kd0, Printscreen
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 14, k06, Delete
- {1, CS1_SW2, CS2_SW2, CS3_SW2}, // 15, k16, Insert
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 16, k26, Page Up
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 17, k36, Page Down
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, k00, Esc
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 1, k10, F1
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 2, k20, F2
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 3, k30, F3
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 4, k40, F4
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 5, k50, F5
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 6, k60, F6
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 7, k70, F7
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 8, k80, F8
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 9, k90, F9
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 10, ka0, F10
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 11, kb0, F11
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 12, kc0, F12
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 13, kd0, Printscreen
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 14, k06, Delete
+ {1, SW2_CS1, SW2_CS2, SW2_CS3}, // 15, k16, Insert
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 16, k26, Page Up
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 17, k36, Page Down
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 18, k01, `
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 19, k11, 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 20, k21, 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 21, k31, 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 22, k41, 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 23, k51, 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 24, k61, 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 25, k71, 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 26, k81, 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 27, k91, 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 28, ka1, 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 29, kb1, -
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 30, kc1, =
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 31, kd1, Backspace
- {1, CS7_SW1, CS8_SW1, CS9_SW1}, // 32, k46, Num Lock
- {1, CS7_SW2, CS8_SW2, CS9_SW2}, // 33, k56, Num /
- {1, CS7_SW3, CS8_SW3, CS9_SW3}, // 34, k66, Num *
- {1, CS7_SW4, CS8_SW4, CS9_SW4}, // 35, k76, Num -
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 18, k01, `
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 19, k11, 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 20, k21, 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 21, k31, 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 22, k41, 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 23, k51, 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 24, k61, 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 25, k71, 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 26, k81, 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 27, k91, 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 28, ka1, 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 29, kb1, -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 30, kc1, =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 31, kd1, Backspace
+ {1, SW1_CS7, SW1_CS8, SW1_CS9}, // 32, k46, Num Lock
+ {1, SW2_CS7, SW2_CS8, SW2_CS9}, // 33, k56, Num /
+ {1, SW3_CS7, SW3_CS8, SW3_CS9}, // 34, k66, Num *
+ {1, SW4_CS7, SW4_CS8, SW4_CS9}, // 35, k76, Num -
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 36, k02, Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 37, k12, Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 38, k22, W
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 39, k32, E
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 40, k42, R
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 41, k52, T
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 42, k62, Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 43, k72, U
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 44, k82, I
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 45, k92, O
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 46, ka2, P
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 47, kb2, [
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 48, kc2, ]
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 49, kd3, Enter
- {1, CS7_SW5, CS8_SW5, CS9_SW5}, // 50, k86, Num 7
- {1, CS7_SW6, CS8_SW6, CS9_SW6}, // 51, k96, Num 8
- {1, CS7_SW7, CS8_SW7, CS9_SW7}, // 52, ka6, Num 9
- {1, CS7_SW8, CS8_SW8, CS9_SW8}, // 53, kb6, Num +
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 36, k02, Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 37, k12, Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 38, k22, W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 39, k32, E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 40, k42, R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 41, k52, T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 42, k62, Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 43, k72, U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 44, k82, I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 45, k92, O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 46, ka2, P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 47, kb2, [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 48, kc2, ]
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 49, kd3, Enter
+ {1, SW5_CS7, SW5_CS8, SW5_CS9}, // 50, k86, Num 7
+ {1, SW6_CS7, SW6_CS8, SW6_CS9}, // 51, k96, Num 8
+ {1, SW7_CS7, SW7_CS8, SW7_CS9}, // 52, ka6, Num 9
+ {1, SW8_CS7, SW8_CS8, SW8_CS9}, // 53, kb6, Num +
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 54, k03, Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 55, k13, A
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 56, k23, S
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 57, k33, D
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 58, k43, F
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 59, k53, G
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 60, k63, H
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 61, k73, J
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 62, k83, K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 63, k93, L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 64, ka3, ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 65, kb3, '
- {1, CS1_SW10, CS2_SW10, CS3_SW10}, // 66, kc3, #
- {1, CS7_SW9, CS8_SW9, CS9_SW9}, // 67, ka7, Num 4
- {1, CS7_SW10, CS8_SW10, CS9_SW10}, // 68, kb7, Num 5
- {1, CS7_SW11, CS8_SW11, CS9_SW11}, // 69, kc7, Num 6
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 54, k03, Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 55, k13, A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 56, k23, S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 57, k33, D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 58, k43, F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 59, k53, G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 60, k63, H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 61, k73, J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 62, k83, K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 63, k93, L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 64, ka3, ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 65, kb3, '
+ {1, SW10_CS1, SW10_CS2, SW10_CS3}, // 66, kc3, #
+ {1, SW9_CS7, SW9_CS8, SW9_CS9}, // 67, ka7, Num 4
+ {1, SW10_CS7, SW10_CS8, SW10_CS9}, // 68, kb7, Num 5
+ {1, SW11_CS7, SW11_CS8, SW11_CS9}, // 69, kc7, Num 6
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 70, k04, Shift_L
- {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 71, k14, "\\"
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 72, k24, Z
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 73, k34, X
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 74, k44, C
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 75, k54, V
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 76, k64, B
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 77, k74, N
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 78, k84, M
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 79, k94, ,
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 80, ka4, .
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 81, kb4, /
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 82, kd4, Shift_R
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 83, k17, Up
- {1, CS10_SW1, CS11_SW1, CS12_SW1}, // 84, k67, Num 1
- {1, CS10_SW2, CS11_SW2, CS12_SW2}, // 85, k77, Num 2
- {1, CS10_SW3, CS11_SW3, CS12_SW3}, // 86, k87, Num 3
- {1, CS10_SW4, CS11_SW4, CS12_SW4}, // 87, k97, Enter_R
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 70, k04, Shift_L
+ {0, SW12_CS13, SW12_CS14, SW12_CS15}, // 71, k14, "\\"
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 72, k24, Z
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 73, k34, X
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 74, k44, C
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 75, k54, V
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 76, k64, B
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 77, k74, N
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 78, k84, M
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 79, k94, ,
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 80, ka4, .
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 81, kb4, /
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 82, kd4, Shift_R
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 83, k17, Up
+ {1, SW1_CS10, SW1_CS11, SW1_CS12}, // 84, k67, Num 1
+ {1, SW2_CS10, SW2_CS11, SW2_CS12}, // 85, k77, Num 2
+ {1, SW3_CS10, SW3_CS11, SW3_CS12}, // 86, k87, Num 3
+ {1, SW4_CS10, SW4_CS11, SW4_CS12}, // 87, k97, Enter_R
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 88, k05, Ctrl_L
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 89, k15, Win_L
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 90, k25, Alt_L
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 91, k65, Space
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 92, k95, Alt_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 93, ka5, FN
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 94, kc5, Ctrl_R
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 95, k07, Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 96, k27, Down
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 97, k37, Right
- {1, CS10_SW6, CS11_SW6, CS12_SW6}, // 98, k47, Num 0
- {1, CS10_SW7, CS11_SW7, CS12_SW7}, // 99, k57, Num .
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 88, k05, Ctrl_L
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 89, k15, Win_L
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 90, k25, Alt_L
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 91, k65, Space
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 92, k95, Alt_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 93, ka5, FN
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 94, kc5, Ctrl_R
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 95, k07, Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 96, k27, Down
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 97, k37, Right
+ {1, SW6_CS10, SW6_CS11, SW6_CS12}, // 98, k47, Num 0
+ {1, SW7_CS10, SW7_CS11, SW7_CS12}, // 99, k57, Num .
- {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 101, LED 1
- {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 102, LED 2
- {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 103, LED 3
- {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 104, LED 4
- {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 105, LED 5
- {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 106, LED 6
- {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 107, LED 7
- {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 108, LED 8
- {1, CS13_SW9, CS14_SW9, CS15_SW9}, // 109, LED 9
- {1, CS13_SW10, CS14_SW10, CS15_SW10}, // 110, LED 10
- {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 111, LED 11
- {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 112, LED 12
- {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 113, LED 13
- {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 114, LED 14
- {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 115, LED 15
- {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 116, LED 16
- {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 117, LED 17
- {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 118, LED 18
- {1, CS16_SW9, CS17_SW9, CS18_SW9}, // 119, LED 19
- {1, CS16_SW10, CS17_SW10, CS18_SW10} // 120, LED 20
+ {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 101, LED 1
+ {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 102, LED 2
+ {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 103, LED 3
+ {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 104, LED 4
+ {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 105, LED 5
+ {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 106, LED 6
+ {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 107, LED 7
+ {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 108, LED 8
+ {1, SW9_CS13, SW9_CS14, SW9_CS15}, // 109, LED 9
+ {1, SW10_CS13, SW10_CS14, SW10_CS15}, // 110, LED 10
+ {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 111, LED 11
+ {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 112, LED 12
+ {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 113, LED 13
+ {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 114, LED 14
+ {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 115, LED 15
+ {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 116, LED 16
+ {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 117, LED 17
+ {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 118, LED 18
+ {1, SW9_CS16, SW9_CS17, SW9_CS18}, // 119, LED 19
+ {1, SW10_CS16, SW10_CS17, SW10_CS18} // 120, LED 20
};
#define __ NO_LED
diff --git a/keyboards/gmmk/numpad/numpad.c b/keyboards/gmmk/numpad/numpad.c
index 966ba087109..5a2bbdb1f61 100644
--- a/keyboards/gmmk/numpad/numpad.c
+++ b/keyboards/gmmk/numpad/numpad.c
@@ -26,37 +26,37 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS4_SW1, CS5_SW1, CS6_SW1 }, // 0 NUM
- {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 1 /
- {0, CS7_SW1, CS8_SW1, CS9_SW1 }, // 2 *
- {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 3 -
- {0, CS4_SW3, CS5_SW3, CS6_SW3 }, // 4 7
- {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 5 8
- {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 6 9
- {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 7 +
- {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 8 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 9 5
- {0, CS7_SW5, CS8_SW5, CS9_SW5 }, // 10 6
- {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 11 1
- {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 12 2
- {0, CS7_SW7, CS8_SW7, CS9_SW7 }, // 13 3
- {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 14 ENTER
- {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 15 0
- {0, CS7_SW9, CS8_SW9, CS9_SW9 }, // 16 .
- {0, CS1_SW1, CS2_SW1, CS3_SW1 }, // 17 LED18
- {0, CS1_SW2, CS2_SW2, CS3_SW2 }, // 18 LED19
- {0, CS1_SW3, CS2_SW3, CS3_SW3 }, // 19 LED20
- {0, CS1_SW4, CS2_SW4, CS3_SW4 }, // 20 LED21
- {0, CS1_SW5, CS2_SW5, CS3_SW5 }, // 21 LED22
- {0, CS1_SW6, CS2_SW6, CS3_SW6 }, // 22 LED23
- {0, CS1_SW7, CS2_SW7, CS3_SW7 }, // 23 LED24
- {0, CS10_SW1, CS11_SW1, CS12_SW1 }, // 24 LED27
- {0, CS10_SW2, CS11_SW2, CS12_SW2 }, // 25 LED28
- {0, CS10_SW3, CS11_SW3, CS12_SW3 }, // 26 LED29
- {0, CS10_SW4, CS11_SW4, CS12_SW4 }, // 27 LED30
- {0, CS10_SW5, CS11_SW5, CS12_SW5 }, // 28 LED31
- {0, CS10_SW6, CS11_SW6, CS12_SW6 }, // 29 LED32
- {0, CS10_SW7, CS11_SW7, CS12_SW7 }, // 30 LED33
+ {0, SW1_CS4, SW1_CS5, SW1_CS6 }, // 0 NUM
+ {0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 1 /
+ {0, SW1_CS7, SW1_CS8, SW1_CS9 }, // 2 *
+ {0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 3 -
+ {0, SW3_CS4, SW3_CS5, SW3_CS6 }, // 4 7
+ {0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 5 8
+ {0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 6 9
+ {0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 7 +
+ {0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 8 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 9 5
+ {0, SW5_CS7, SW5_CS8, SW5_CS9 }, // 10 6
+ {0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 11 1
+ {0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 12 2
+ {0, SW7_CS7, SW7_CS8, SW7_CS9 }, // 13 3
+ {0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 14 ENTER
+ {0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 15 0
+ {0, SW9_CS7, SW9_CS8, SW9_CS9 }, // 16 .
+ {0, SW1_CS1, SW1_CS2, SW1_CS3 }, // 17 LED18
+ {0, SW2_CS1, SW2_CS2, SW2_CS3 }, // 18 LED19
+ {0, SW3_CS1, SW3_CS2, SW3_CS3 }, // 19 LED20
+ {0, SW4_CS1, SW4_CS2, SW4_CS3 }, // 20 LED21
+ {0, SW5_CS1, SW5_CS2, SW5_CS3 }, // 21 LED22
+ {0, SW6_CS1, SW6_CS2, SW6_CS3 }, // 22 LED23
+ {0, SW7_CS1, SW7_CS2, SW7_CS3 }, // 23 LED24
+ {0, SW1_CS10, SW1_CS11, SW1_CS12 }, // 24 LED27
+ {0, SW2_CS10, SW2_CS11, SW2_CS12 }, // 25 LED28
+ {0, SW3_CS10, SW3_CS11, SW3_CS12 }, // 26 LED29
+ {0, SW4_CS10, SW4_CS11, SW4_CS12 }, // 27 LED30
+ {0, SW5_CS10, SW5_CS11, SW5_CS12 }, // 28 LED31
+ {0, SW6_CS10, SW6_CS11, SW6_CS12 }, // 29 LED32
+ {0, SW7_CS10, SW7_CS11, SW7_CS12 }, // 30 LED33
};
led_config_t g_led_config = {{
diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c
index ff6382625ac..77e0a8c1a11 100644
--- a/keyboards/gmmk/pro/rev1/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev1/ansi/ansi.c
@@ -137,105 +137,105 @@ led_config_t g_led_config = {{
}};
const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 3, Caps, k21
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 4, Sh_L, k00
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 5, Ct_L, k06
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 6, F1, k26
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 7, 1, k17
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 8, Q, k10
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 9, A, k12
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 10, Z, k14
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 11, Win_L, k90
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 12, F2, k36
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 13, 2, k27
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 14, W, k20
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 15, S, k22
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 16, X, k24
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 17, Alt_L, k93
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 18, F3, k31
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 19, 3, k37
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 20, E, k30
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 21, D, k32
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 22, C, k34
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 23, F4, k33
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 24, 4, k47
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 25, R, k40
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 26, F, k42
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 27, V, k44
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 28, F5, k07
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 29, 5, k46
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 30, T, k41
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 31, G, k43
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 32, B, k45
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 33, SPACE, k94
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 34, F6, k63
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 35, 6, k56
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 36, Y, k51
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 37, H, k53
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 38, N, k55
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 39, F7, k71
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 40, 7, k57
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 41, U, k50
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 42, J, k52
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 43, M, k54
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 44, F8, k76
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 45, 8, k67
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 46, I, k60
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 47, K, k62
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 48, ,, k64
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 49, Alt_R, k95
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 50, F9, ka6
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 51, 9, k77
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 52, O, k70
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 53, L, k72
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 54, ., k74
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 55, FN, k92
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 56, F10, ka7
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 57, 0, k87
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 58, P, k80
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 59, ;, k82
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 60, ?, k85
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 61, F11, ka3
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 62, -, k86
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 63, [, k81
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 64, ", k83
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 65, Ct_R, k04
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, ESC, k13
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 1, ~, k16
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 2, Tab, k11
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 3, Caps, k21
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 4, Sh_L, k00
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 5, Ct_L, k06
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 6, F1, k26
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 7, 1, k17
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 8, Q, k10
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 9, A, k12
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 10, Z, k14
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 11, Win_L, k90
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 12, F2, k36
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 13, 2, k27
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 14, W, k20
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 15, S, k22
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 16, X, k24
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 17, Alt_L, k93
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 18, F3, k31
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 19, 3, k37
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 20, E, k30
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 21, D, k32
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 22, C, k34
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 23, F4, k33
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 24, 4, k47
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 25, R, k40
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 26, F, k42
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 27, V, k44
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 28, F5, k07
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 29, 5, k46
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 30, T, k41
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 31, G, k43
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 32, B, k45
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 33, SPACE, k94
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 34, F6, k63
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 35, 6, k56
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 36, Y, k51
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 37, H, k53
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 38, N, k55
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 39, F7, k71
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 40, 7, k57
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 41, U, k50
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 42, J, k52
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 43, M, k54
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 44, F8, k76
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 45, 8, k67
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 46, I, k60
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 47, K, k62
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 48, ,, k64
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 49, Alt_R, k95
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 50, F9, ka6
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 51, 9, k77
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 52, O, k70
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 53, L, k72
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 54, ., k74
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 55, FN, k92
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 56, F10, ka7
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 57, 0, k87
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 58, P, k80
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 59, ;, k82
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 60, ?, k85
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 61, F11, ka3
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 62, -, k86
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 63, [, k81
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 64, ", k83
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 65, Ct_R, k04
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 66, F12, ka5
- {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 67, LED, l01
- {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 68, LED, l11
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 69, Prt, k97
- {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 70, LED, l02
- {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 71, LED, l12
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 72, Del, k65
- {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 73, LED, l03
- {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 74, LED, l13
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 75, PgUp, k15
- {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 76, LED, l04
- {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 77, LED, l14
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 78, =, k66
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 79, Right, k05
- {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 80, LED, l05
- {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 81, LED, l15
- {1, CS4_SW6, CS5_SW6, CS6_SW6}, // 82, End, k75
- {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 83, LED, l06
- {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 84, LED, l16
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 85, BSpc, ka1
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 86, PgDn, k25
- {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 87, LED, l07
- {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 88, LED, l17
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 89, ], k61
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 90, Sh_R, k91
- {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 91, LED, l08
- {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 92, LED, l18
- {1, CS1_SW9, CS2_SW9, CS3_SW9}, // 93, \, ka2
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 94, Up, k35
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 95, Left, k03
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 96, Enter, ka4
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 97, Down, k73
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 66, F12, ka5
+ {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 67, LED, l01
+ {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 68, LED, l11
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 69, Prt, k97
+ {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 70, LED, l02
+ {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 71, LED, l12
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 72, Del, k65
+ {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 73, LED, l03
+ {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 74, LED, l13
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 75, PgUp, k15
+ {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 76, LED, l04
+ {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 77, LED, l14
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 78, =, k66
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 79, Right, k05
+ {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 80, LED, l05
+ {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 81, LED, l15
+ {1, SW6_CS4, SW6_CS5, SW6_CS6}, // 82, End, k75
+ {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 83, LED, l06
+ {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 84, LED, l16
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 85, BSpc, ka1
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 86, PgDn, k25
+ {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 87, LED, l07
+ {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 88, LED, l17
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 89, ], k61
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 90, Sh_R, k91
+ {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 91, LED, l08
+ {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 92, LED, l18
+ {1, SW9_CS1, SW9_CS2, SW9_CS3}, // 93, \, ka2
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 94, Up, k35
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 95, Left, k03
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 96, Enter, ka4
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 97, Down, k73
};
// clang-format on
#endif
diff --git a/keyboards/gmmk/pro/rev1/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c
index 68165dd27f3..932c6a1f494 100644
--- a/keyboards/gmmk/pro/rev1/iso/iso.c
+++ b/keyboards/gmmk/pro/rev1/iso/iso.c
@@ -138,106 +138,106 @@ led_config_t g_led_config = {{
}};
const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 3, Caps, k21
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 4, Sh_L, k00
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 5, Ct_L, k06
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 6, F1, k26
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 7, 1, k17
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 8, Q, k10
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 9, A, k12
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 10, Z, k14
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 11, Win_L, k90
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 12, F2, k36
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 13, 2, k27
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 14, W, k20
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 15, S, k22
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 16, X, k24
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 17, Alt_L, k93
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 18, F3, k31
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 19, 3, k37
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 20, E, k30
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 21, D, k32
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 22, C, k34
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 23, F4, k33
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 24, 4, k47
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 25, R, k40
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 26, F, k42
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 27, V, k44
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 28, F5, k07
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 29, 5, k46
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 30, T, k41
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 31, G, k43
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 32, B, k45
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 33, SPACE, k94
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 34, F6, k63
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 35, 6, k56
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 36, Y, k51
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 37, H, k53
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 38, N, k55
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 39, F7, k71
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 40, 7, k57
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 41, U, k50
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 42, J, k52
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 43, M, k54
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 44, F8, k76
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 45, 8, k67
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 46, I, k60
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 47, K, k62
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 48, ,, k64
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 49, Alt_R, k95
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 50, F9, ka6
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 51, 9, k77
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 52, O, k70
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 53, L, k72
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 54, ., k74
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 55, FN, k92
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 56, F10, ka7
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 57, 0, k87
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 58, P, k80
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 59, ;, k82
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 60, ?, k85
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 61, F11, ka3
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 62, -, k86
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 63, [, k81
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 64, ", k83
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 65, Ct_R, k04
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, ESC, k13
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 1, ~, k16
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 2, Tab, k11
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 3, Caps, k21
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 4, Sh_L, k00
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 5, Ct_L, k06
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 6, F1, k26
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 7, 1, k17
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 8, Q, k10
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 9, A, k12
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 10, Z, k14
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 11, Win_L, k90
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 12, F2, k36
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 13, 2, k27
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 14, W, k20
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 15, S, k22
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 16, X, k24
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 17, Alt_L, k93
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 18, F3, k31
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 19, 3, k37
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 20, E, k30
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 21, D, k32
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 22, C, k34
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 23, F4, k33
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 24, 4, k47
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 25, R, k40
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 26, F, k42
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 27, V, k44
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 28, F5, k07
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 29, 5, k46
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 30, T, k41
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 31, G, k43
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 32, B, k45
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 33, SPACE, k94
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 34, F6, k63
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 35, 6, k56
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 36, Y, k51
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 37, H, k53
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 38, N, k55
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 39, F7, k71
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 40, 7, k57
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 41, U, k50
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 42, J, k52
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 43, M, k54
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 44, F8, k76
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 45, 8, k67
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 46, I, k60
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 47, K, k62
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 48, ,, k64
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 49, Alt_R, k95
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 50, F9, ka6
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 51, 9, k77
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 52, O, k70
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 53, L, k72
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 54, ., k74
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 55, FN, k92
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 56, F10, ka7
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 57, 0, k87
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 58, P, k80
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 59, ;, k82
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 60, ?, k85
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 61, F11, ka3
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 62, -, k86
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 63, [, k81
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 64, ", k83
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 65, Ct_R, k04
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 66, F12, ka5
- {1, CS4_SW1, CS5_SW1, CS6_SW1}, // 67, \, k23
- {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 68, LED, l01
- {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 69, LED, l11
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 70, Prt, k97
- {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 71, LED, l02
- {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 72, LED, l12
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 73, Del, k65
- {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 74, LED, l03
- {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 75, LED, l13
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 76, PgUp, k15
- {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 77, LED, l04
- {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 78, LED, l14
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 79, =, k66
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 80, Right, k05
- {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 81, LED, l05
- {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 82, LED, l15
- {1, CS4_SW6, CS5_SW6, CS6_SW6}, // 83, End, k75
- {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 84, LED, l06
- {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 85, LED, l16
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 86, BSpc, ka1
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 87, PgDn, k25
- {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 88, LED, l07
- {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 89, LED, l17
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 90, ], k61
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 91, Sh_R, k91
- {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 92, LED, l08
- {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 93, LED, l18
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 94, Up, k35
- {1, CS1_SW10, CS2_SW10, CS3_SW10}, // 95, #, k84
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 96, Left, k03
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 97, Enter, ka4
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 98, Down, k73
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 66, F12, ka5
+ {1, SW1_CS4, SW1_CS5, SW1_CS6}, // 67, \, k23
+ {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 68, LED, l01
+ {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 69, LED, l11
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 70, Prt, k97
+ {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 71, LED, l02
+ {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 72, LED, l12
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 73, Del, k65
+ {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 74, LED, l03
+ {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 75, LED, l13
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 76, PgUp, k15
+ {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 77, LED, l04
+ {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 78, LED, l14
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 79, =, k66
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 80, Right, k05
+ {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 81, LED, l05
+ {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 82, LED, l15
+ {1, SW6_CS4, SW6_CS5, SW6_CS6}, // 83, End, k75
+ {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 84, LED, l06
+ {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 85, LED, l16
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 86, BSpc, ka1
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 87, PgDn, k25
+ {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 88, LED, l07
+ {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 89, LED, l17
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 90, ], k61
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 91, Sh_R, k91
+ {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 92, LED, l08
+ {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 93, LED, l18
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 94, Up, k35
+ {1, SW10_CS1, SW10_CS2, SW10_CS3}, // 95, #, k84
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 96, Left, k03
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 97, Enter, ka4
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 98, Down, k73
};
// clang-format on
#endif
diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c
index c592e3cdaee..a3f957ef0a2 100644
--- a/keyboards/gmmk/pro/rev2/ansi/ansi.c
+++ b/keyboards/gmmk/pro/rev2/ansi/ansi.c
@@ -137,105 +137,105 @@ led_config_t g_led_config = {{
}};
const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 3, Caps, k21
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 4, Sh_L, k00
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 5, Ct_L, k06
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 6, F1, k26
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 7, 1, k17
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 8, Q, k10
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 9, A, k12
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 10, Z, k14
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 11, Win_L, k90
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 12, F2, k36
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 13, 2, k27
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 14, W, k20
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 15, S, k22
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 16, X, k24
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 17, Alt_L, k93
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 18, F3, k31
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 19, 3, k37
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 20, E, k30
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 21, D, k32
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 22, C, k34
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 23, F4, k33
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 24, 4, k47
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 25, R, k40
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 26, F, k42
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 27, V, k44
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 28, F5, k07
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 29, 5, k46
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 30, T, k41
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 31, G, k43
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 32, B, k45
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 33, SPACE, k94
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 34, F6, k63
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 35, 6, k56
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 36, Y, k51
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 37, H, k53
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 38, N, k55
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 39, F7, k71
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 40, 7, k57
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 41, U, k50
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 42, J, k52
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 43, M, k54
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 44, F8, k76
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 45, 8, k67
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 46, I, k60
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 47, K, k62
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 48, ,, k64
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 49, Alt_R, k95
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 50, F9, ka6
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 51, 9, k77
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 52, O, k70
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 53, L, k72
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 54, ., k74
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 55, FN, k92
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 56, F10, ka7
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 57, 0, k87
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 58, P, k80
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 59, ;, k82
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 60, ?, k85
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 61, F11, ka3
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 62, -, k86
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 63, [, k81
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 64, ", k83
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 65, Ct_R, k04
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, ESC, k13
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 1, ~, k16
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 2, Tab, k11
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 3, Caps, k21
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 4, Sh_L, k00
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 5, Ct_L, k06
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 6, F1, k26
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 7, 1, k17
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 8, Q, k10
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 9, A, k12
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 10, Z, k14
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 11, Win_L, k90
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 12, F2, k36
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 13, 2, k27
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 14, W, k20
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 15, S, k22
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 16, X, k24
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 17, Alt_L, k93
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 18, F3, k31
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 19, 3, k37
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 20, E, k30
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 21, D, k32
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 22, C, k34
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 23, F4, k33
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 24, 4, k47
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 25, R, k40
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 26, F, k42
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 27, V, k44
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 28, F5, k07
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 29, 5, k46
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 30, T, k41
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 31, G, k43
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 32, B, k45
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 33, SPACE, k94
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 34, F6, k63
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 35, 6, k56
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 36, Y, k51
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 37, H, k53
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 38, N, k55
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 39, F7, k71
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 40, 7, k57
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 41, U, k50
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 42, J, k52
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 43, M, k54
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 44, F8, k76
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 45, 8, k67
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 46, I, k60
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 47, K, k62
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 48, ,, k64
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 49, Alt_R, k95
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 50, F9, ka6
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 51, 9, k77
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 52, O, k70
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 53, L, k72
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 54, ., k74
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 55, FN, k92
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 56, F10, ka7
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 57, 0, k87
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 58, P, k80
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 59, ;, k82
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 60, ?, k85
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 61, F11, ka3
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 62, -, k86
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 63, [, k81
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 64, ", k83
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 65, Ct_R, k04
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 66, F12, ka5
- {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 67, LED, l01
- {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 68, LED, l11
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 69, Prt, k97
- {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 70, LED, l02
- {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 71, LED, l12
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 72, Del, k65
- {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 73, LED, l03
- {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 74, LED, l13
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 75, PgUp, k15
- {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 76, LED, l04
- {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 77, LED, l14
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 78, =, k66
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 79, Right, k05
- {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 80, LED, l05
- {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 81, LED, l15
- {1, CS4_SW6, CS5_SW6, CS6_SW6}, // 82, End, k75
- {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 83, LED, l06
- {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 84, LED, l16
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 85, BSpc, ka1
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 86, PgDn, k25
- {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 87, LED, l07
- {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 88, LED, l17
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 89, ], k61
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 90, Sh_R, k91
- {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 91, LED, l08
- {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 92, LED, l18
- {1, CS1_SW9, CS2_SW9, CS3_SW9}, // 93, \, ka2
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 94, Up, k35
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 95, Left, k03
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 96, Enter, ka4
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 97, Down, k73
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 66, F12, ka5
+ {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 67, LED, l01
+ {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 68, LED, l11
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 69, Prt, k97
+ {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 70, LED, l02
+ {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 71, LED, l12
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 72, Del, k65
+ {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 73, LED, l03
+ {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 74, LED, l13
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 75, PgUp, k15
+ {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 76, LED, l04
+ {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 77, LED, l14
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 78, =, k66
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 79, Right, k05
+ {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 80, LED, l05
+ {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 81, LED, l15
+ {1, SW6_CS4, SW6_CS5, SW6_CS6}, // 82, End, k75
+ {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 83, LED, l06
+ {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 84, LED, l16
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 85, BSpc, ka1
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 86, PgDn, k25
+ {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 87, LED, l07
+ {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 88, LED, l17
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 89, ], k61
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 90, Sh_R, k91
+ {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 91, LED, l08
+ {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 92, LED, l18
+ {1, SW9_CS1, SW9_CS2, SW9_CS3}, // 93, \, ka2
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 94, Up, k35
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 95, Left, k03
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 96, Enter, ka4
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 97, Down, k73
};
// clang-format on
#endif
diff --git a/keyboards/gmmk/pro/rev2/iso/iso.c b/keyboards/gmmk/pro/rev2/iso/iso.c
index 969ce8bf2e2..7a34f2432fe 100644
--- a/keyboards/gmmk/pro/rev2/iso/iso.c
+++ b/keyboards/gmmk/pro/rev2/iso/iso.c
@@ -138,106 +138,106 @@ led_config_t g_led_config = {{
}};
const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, ESC, k13
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 1, ~, k16
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 2, Tab, k11
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 3, Caps, k21
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 4, Sh_L, k00
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 5, Ct_L, k06
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 6, F1, k26
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 7, 1, k17
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 8, Q, k10
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 9, A, k12
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 10, Z, k14
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 11, Win_L, k90
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 12, F2, k36
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 13, 2, k27
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 14, W, k20
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 15, S, k22
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 16, X, k24
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 17, Alt_L, k93
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 18, F3, k31
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 19, 3, k37
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 20, E, k30
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 21, D, k32
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 22, C, k34
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 23, F4, k33
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 24, 4, k47
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 25, R, k40
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 26, F, k42
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 27, V, k44
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 28, F5, k07
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 29, 5, k46
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 30, T, k41
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 31, G, k43
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 32, B, k45
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 33, SPACE, k94
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 34, F6, k63
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 35, 6, k56
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 36, Y, k51
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 37, H, k53
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 38, N, k55
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 39, F7, k71
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 40, 7, k57
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 41, U, k50
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 42, J, k52
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 43, M, k54
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 44, F8, k76
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 45, 8, k67
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 46, I, k60
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 47, K, k62
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 48, ,, k64
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 49, Alt_R, k95
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 50, F9, ka6
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 51, 9, k77
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 52, O, k70
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 53, L, k72
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 54, ., k74
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 55, FN, k92
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 56, F10, ka7
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 57, 0, k87
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 58, P, k80
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 59, ;, k82
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 60, ?, k85
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 61, F11, ka3
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 62, -, k86
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 63, [, k81
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 64, ", k83
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 65, Ct_R, k04
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, ESC, k13
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 1, ~, k16
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 2, Tab, k11
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 3, Caps, k21
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 4, Sh_L, k00
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 5, Ct_L, k06
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 6, F1, k26
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 7, 1, k17
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 8, Q, k10
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 9, A, k12
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 10, Z, k14
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 11, Win_L, k90
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 12, F2, k36
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 13, 2, k27
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 14, W, k20
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 15, S, k22
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 16, X, k24
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 17, Alt_L, k93
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 18, F3, k31
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 19, 3, k37
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 20, E, k30
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 21, D, k32
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 22, C, k34
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 23, F4, k33
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 24, 4, k47
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 25, R, k40
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 26, F, k42
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 27, V, k44
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 28, F5, k07
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 29, 5, k46
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 30, T, k41
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 31, G, k43
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 32, B, k45
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 33, SPACE, k94
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 34, F6, k63
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 35, 6, k56
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 36, Y, k51
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 37, H, k53
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 38, N, k55
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 39, F7, k71
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 40, 7, k57
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 41, U, k50
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 42, J, k52
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 43, M, k54
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 44, F8, k76
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 45, 8, k67
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 46, I, k60
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 47, K, k62
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 48, ,, k64
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 49, Alt_R, k95
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 50, F9, ka6
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 51, 9, k77
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 52, O, k70
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 53, L, k72
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 54, ., k74
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 55, FN, k92
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 56, F10, ka7
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 57, 0, k87
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 58, P, k80
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 59, ;, k82
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 60, ?, k85
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 61, F11, ka3
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 62, -, k86
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 63, [, k81
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 64, ", k83
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 65, Ct_R, k04
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 66, F12, ka5
- {1, CS4_SW1, CS5_SW1, CS6_SW1}, // 67, \, k23
- {1, CS13_SW1, CS14_SW1, CS15_SW1}, // 68, LED, l01
- {1, CS16_SW1, CS17_SW1, CS18_SW1}, // 69, LED, l11
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 70, Prt, k97
- {1, CS13_SW2, CS14_SW2, CS15_SW2}, // 71, LED, l02
- {1, CS16_SW2, CS17_SW2, CS18_SW2}, // 72, LED, l12
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 73, Del, k65
- {1, CS13_SW3, CS14_SW3, CS15_SW3}, // 74, LED, l03
- {1, CS16_SW3, CS17_SW3, CS18_SW3}, // 75, LED, l13
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 76, PgUp, k15
- {1, CS13_SW4, CS14_SW4, CS15_SW4}, // 77, LED, l04
- {1, CS16_SW4, CS17_SW4, CS18_SW4}, // 78, LED, l14
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 79, =, k66
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 80, Right, k05
- {1, CS13_SW5, CS14_SW5, CS15_SW5}, // 81, LED, l05
- {1, CS16_SW5, CS17_SW5, CS18_SW5}, // 82, LED, l15
- {1, CS4_SW6, CS5_SW6, CS6_SW6}, // 83, End, k75
- {1, CS13_SW6, CS14_SW6, CS15_SW6}, // 84, LED, l06
- {1, CS16_SW6, CS17_SW6, CS18_SW6}, // 85, LED, l16
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 86, BSpc, ka1
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 87, PgDn, k25
- {1, CS13_SW7, CS14_SW7, CS15_SW7}, // 88, LED, l07
- {1, CS16_SW7, CS17_SW7, CS18_SW7}, // 89, LED, l17
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 90, ], k61
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 91, Sh_R, k91
- {1, CS13_SW8, CS14_SW8, CS15_SW8}, // 92, LED, l08
- {1, CS16_SW8, CS17_SW8, CS18_SW8}, // 93, LED, l18
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 94, Up, k35
- {1, CS1_SW10, CS2_SW10, CS3_SW10}, // 95, #, k84
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 96, Left, k03
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 97, Enter, ka4
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 98, Down, k73
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 66, F12, ka5
+ {1, SW1_CS4, SW1_CS5, SW1_CS6}, // 67, \, k23
+ {1, SW1_CS13, SW1_CS14, SW1_CS15}, // 68, LED, l01
+ {1, SW1_CS16, SW1_CS17, SW1_CS18}, // 69, LED, l11
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 70, Prt, k97
+ {1, SW2_CS13, SW2_CS14, SW2_CS15}, // 71, LED, l02
+ {1, SW2_CS16, SW2_CS17, SW2_CS18}, // 72, LED, l12
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 73, Del, k65
+ {1, SW3_CS13, SW3_CS14, SW3_CS15}, // 74, LED, l03
+ {1, SW3_CS16, SW3_CS17, SW3_CS18}, // 75, LED, l13
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 76, PgUp, k15
+ {1, SW4_CS13, SW4_CS14, SW4_CS15}, // 77, LED, l04
+ {1, SW4_CS16, SW4_CS17, SW4_CS18}, // 78, LED, l14
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 79, =, k66
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 80, Right, k05
+ {1, SW5_CS13, SW5_CS14, SW5_CS15}, // 81, LED, l05
+ {1, SW5_CS16, SW5_CS17, SW5_CS18}, // 82, LED, l15
+ {1, SW6_CS4, SW6_CS5, SW6_CS6}, // 83, End, k75
+ {1, SW6_CS13, SW6_CS14, SW6_CS15}, // 84, LED, l06
+ {1, SW6_CS16, SW6_CS17, SW6_CS18}, // 85, LED, l16
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 86, BSpc, ka1
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 87, PgDn, k25
+ {1, SW7_CS13, SW7_CS14, SW7_CS15}, // 88, LED, l07
+ {1, SW7_CS16, SW7_CS17, SW7_CS18}, // 89, LED, l17
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 90, ], k61
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 91, Sh_R, k91
+ {1, SW8_CS13, SW8_CS14, SW8_CS15}, // 92, LED, l08
+ {1, SW8_CS16, SW8_CS17, SW8_CS18}, // 93, LED, l18
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 94, Up, k35
+ {1, SW10_CS1, SW10_CS2, SW10_CS3}, // 95, #, k84
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 96, Left, k03
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 97, Enter, ka4
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 98, Down, k73
};
// clang-format on
#endif
diff --git a/keyboards/hs60/v2/v2.c b/keyboards/hs60/v2/v2.c
index 45b1f54d5f5..5cb6f79fc7f 100644
--- a/keyboards/hs60/v2/v2.c
+++ b/keyboards/hs60/v2/v2.c
@@ -28,69 +28,69 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, B_1, A_1, C_1}, //LA1
- {0, E_1, D_1, F_1}, //LA2
- {0, H_1, G_1, I_1}, //LA3
- {0, K_1, J_1, L_1}, //LA4
- {0, B_2, A_2, C_2}, //LA5
- {0, E_2, D_2, F_2}, //LA6
- {0, H_2, G_2, I_2}, //LA7
- {0, K_2, J_2, L_2}, //LA8
- {0, B_3, A_3, C_3}, //LA9
- {0, E_3, D_3, F_3}, //LA10
- {0, H_3, G_3, I_3}, //LA11
- {0, K_3, J_3, L_3}, //LA12
- {0, B_4, A_4, C_4}, //LA13
- {0, E_4, D_4, F_4}, //LA14
- {0, H_4, G_4, I_4}, //LA15
- {0, K_4, J_4, L_4}, //LA16
- {0, B_5, A_5, C_5}, //LA17
- {0, E_5, D_5, F_5}, //LA18
- {0, H_5, G_5, I_5}, //LA19
- {0, K_5, J_5, L_5}, //LA20
- {0, B_6, A_6, C_6}, //LA21
- {0, E_6, D_6, F_6}, //LA22
- {0, H_6, G_6, I_6}, //LA23
- {0, K_6, J_6, L_6}, //LA24
- {0, B_7, A_7, C_7}, //LA25
- {0, E_7, D_7, F_7}, //LA26
- {0, H_7, G_7, I_7}, //LA27
- {0, K_7, J_7, L_7}, //LA28
- {0, B_8, A_8, C_8}, //LA29
- {0, E_8, D_8, F_8}, //LA30
- {0, H_8, G_8, I_8}, //LA31
- {0, K_8, J_8, L_8}, //LA32
- {0, B_9, A_9, C_9}, //LA33
- {0, E_9, D_9, F_9}, //LA34
- {0, H_9, G_9, I_9}, //LA35
- {0, K_9, J_9, L_9}, //LA36
- {0, B_10, A_10, C_10}, //LA37
- {0, E_10, D_10, F_10}, //LA38
- {0, H_10, G_10, I_10}, //LA39
- {0, K_10, J_10, L_10}, //LA40
- {0, B_11, A_11, C_11}, //LA41
- {0, E_11, D_11, F_11}, //LA42
- {0, H_11, G_11, I_11}, //LA43
- {0, K_11, J_11, L_11}, //LA44
- {0, B_12, A_12, C_12}, //LA45
- {0, E_12, D_12, F_12}, //LA46
- {0, H_12, G_12, I_12}, //LA47
- {0, K_12, J_12, L_12}, //LA48
- {0, B_13, A_13, C_13}, //LA49
- {0, E_13, D_13, F_13}, //LA50
- {0, H_13, G_13, I_13}, //LA51
- {0, K_13, J_13, L_13}, //LA52
- {0, B_14, A_14, C_14}, //LA53
- {0, E_14, D_14, F_14}, //LA54
- {0, H_14, G_14, I_14}, //LA55
- {0, K_14, J_14, L_14}, //LA56
- {0, B_15, A_15, C_15}, //LA57
- {0, E_15, D_15, F_15}, //LA58
- {0, H_15, G_15, I_15}, //LA59
- {0, K_15, J_15, L_15}, //LA60
- {0, B_16, A_16, C_16}, //LA61
- {0, E_16, D_16, F_16}, //LA62
- {0, H_16, G_16, I_16}, //LA63
- {0, K_16, J_16, L_16}, //LA64
+ {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1
+ {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2
+ {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3
+ {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4
+ {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5
+ {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6
+ {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7
+ {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8
+ {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9
+ {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10
+ {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11
+ {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12
+ {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13
+ {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14
+ {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15
+ {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16
+ {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17
+ {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18
+ {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19
+ {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20
+ {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21
+ {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22
+ {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23
+ {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24
+ {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25
+ {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26
+ {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27
+ {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28
+ {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29
+ {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30
+ {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31
+ {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32
+ {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33
+ {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34
+ {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35
+ {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36
+ {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37
+ {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38
+ {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39
+ {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40
+ {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41
+ {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42
+ {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43
+ {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44
+ {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45
+ {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46
+ {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47
+ {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48
+ {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49
+ {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50
+ {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51
+ {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52
+ {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53
+ {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54
+ {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55
+ {0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56
+ {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57
+ {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58
+ {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59
+ {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60
+ {0, SW2_CS16, SW1_CS16, SW3_CS16}, //LA61
+ {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62
+ {0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63
+ {0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64
};
#endif
diff --git a/keyboards/ilumkb/simpler61/simpler61.c b/keyboards/ilumkb/simpler61/simpler61.c
index cb35e554280..99cefc7844c 100644
--- a/keyboards/ilumkb/simpler61/simpler61.c
+++ b/keyboards/ilumkb/simpler61/simpler61.c
@@ -18,71 +18,71 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW4, CS2_SW4, CS1_SW4},
- {0, CS3_SW5, CS2_SW5, CS1_SW5},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS3_SW7, CS2_SW7, CS1_SW7},
- {0, CS3_SW8, CS2_SW8, CS1_SW8},
- {0, CS3_SW9, CS2_SW9, CS1_SW9},
- {0, CS18_SW9, CS17_SW9, CS16_SW9},
- {0, CS18_SW8, CS17_SW8, CS16_SW8},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
- {0, CS18_SW6, CS17_SW6, CS16_SW6},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW4_CS3, SW4_CS2, SW4_CS1},
+ {0, SW5_CS3, SW5_CS2, SW5_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW7_CS3, SW7_CS2, SW7_CS1},
+ {0, SW8_CS3, SW8_CS2, SW8_CS1},
+ {0, SW9_CS3, SW9_CS2, SW9_CS1},
+ {0, SW9_CS18, SW9_CS17, SW9_CS16},
+ {0, SW8_CS18, SW8_CS17, SW8_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
+ {0, SW6_CS18, SW6_CS17, SW6_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW2, CS5_SW2, CS4_SW2},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW5, CS5_SW5, CS4_SW5},
- {0, CS6_SW6, CS5_SW6, CS4_SW6},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS6_SW8, CS5_SW8, CS4_SW8},
- {0, CS6_SW9, CS5_SW9, CS4_SW9},
- {0, CS21_SW9, CS20_SW9, CS19_SW9},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW2_CS6, SW2_CS5, SW2_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW5_CS6, SW5_CS5, SW5_CS4},
+ {0, SW6_CS6, SW6_CS5, SW6_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW8_CS6, SW8_CS5, SW8_CS4},
+ {0, SW9_CS6, SW9_CS5, SW9_CS4},
+ {0, SW9_CS21, SW9_CS20, SW9_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS9_SW9, CS8_SW9, CS7_SW9},
- {0, CS24_SW9, CS23_SW9, CS22_SW9},
- {0, CS24_SW8, CS23_SW8, CS22_SW8},
- {0, CS24_SW7, CS23_SW7, CS22_SW7},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW9_CS9, SW9_CS8, SW9_CS7},
+ {0, SW9_CS24, SW9_CS23, SW9_CS22},
+ {0, SW8_CS24, SW8_CS23, SW8_CS22},
+ {0, SW7_CS24, SW7_CS23, SW7_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS12_SW9, CS11_SW9, CS10_SW9},
- {0, CS27_SW9, CS26_SW9, CS25_SW9},
- {0, CS27_SW8, CS26_SW8, CS25_SW8},
- {0, CS27_SW7, CS26_SW7, CS25_SW7},
- {0, CS27_SW5, CS26_SW5, CS25_SW5},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW9_CS12, SW9_CS11, SW9_CS10},
+ {0, SW9_CS27, SW9_CS26, SW9_CS25},
+ {0, SW8_CS27, SW8_CS26, SW8_CS25},
+ {0, SW7_CS27, SW7_CS26, SW7_CS25},
+ {0, SW5_CS27, SW5_CS26, SW5_CS25},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS30_SW8, CS29_SW8, CS28_SW8},
- {0, CS30_SW7, CS29_SW7, CS28_SW7},
- {0, CS30_SW5, CS29_SW5, CS28_SW5},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW8_CS30, SW8_CS29, SW8_CS28},
+ {0, SW7_CS30, SW7_CS29, SW7_CS28},
+ {0, SW5_CS30, SW5_CS29, SW5_CS28},
};
led_config_t g_led_config = {
diff --git a/keyboards/ilumkb/simpler64/simpler64.c b/keyboards/ilumkb/simpler64/simpler64.c
index 173423cf7e6..21892a55f49 100644
--- a/keyboards/ilumkb/simpler64/simpler64.c
+++ b/keyboards/ilumkb/simpler64/simpler64.c
@@ -18,74 +18,74 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW4, CS2_SW4, CS1_SW4},
- {0, CS3_SW5, CS2_SW5, CS1_SW5},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS3_SW7, CS2_SW7, CS1_SW7},
- {0, CS3_SW8, CS2_SW8, CS1_SW8},
- {0, CS3_SW9, CS2_SW9, CS1_SW9},
- {0, CS18_SW9, CS17_SW9, CS16_SW9},
- {0, CS18_SW8, CS17_SW8, CS16_SW8},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
- {0, CS18_SW6, CS17_SW6, CS16_SW6},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW4_CS3, SW4_CS2, SW4_CS1},
+ {0, SW5_CS3, SW5_CS2, SW5_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW7_CS3, SW7_CS2, SW7_CS1},
+ {0, SW8_CS3, SW8_CS2, SW8_CS1},
+ {0, SW9_CS3, SW9_CS2, SW9_CS1},
+ {0, SW9_CS18, SW9_CS17, SW9_CS16},
+ {0, SW8_CS18, SW8_CS17, SW8_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
+ {0, SW6_CS18, SW6_CS17, SW6_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW2, CS5_SW2, CS4_SW2},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW5, CS5_SW5, CS4_SW5},
- {0, CS6_SW6, CS5_SW6, CS4_SW6},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS6_SW8, CS5_SW8, CS4_SW8},
- {0, CS6_SW9, CS5_SW9, CS4_SW9},
- {0, CS21_SW9, CS20_SW9, CS19_SW9},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW2_CS6, SW2_CS5, SW2_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW5_CS6, SW5_CS5, SW5_CS4},
+ {0, SW6_CS6, SW6_CS5, SW6_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW8_CS6, SW8_CS5, SW8_CS4},
+ {0, SW9_CS6, SW9_CS5, SW9_CS4},
+ {0, SW9_CS21, SW9_CS20, SW9_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS9_SW9, CS8_SW9, CS7_SW9},
- {0, CS24_SW9, CS23_SW9, CS22_SW9},
- {0, CS24_SW8, CS23_SW8, CS22_SW8},
- {0, CS24_SW7, CS23_SW7, CS22_SW7},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW9_CS9, SW9_CS8, SW9_CS7},
+ {0, SW9_CS24, SW9_CS23, SW9_CS22},
+ {0, SW8_CS24, SW8_CS23, SW8_CS22},
+ {0, SW7_CS24, SW7_CS23, SW7_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS12_SW9, CS11_SW9, CS10_SW9},
- {0, CS27_SW9, CS26_SW9, CS25_SW9},
- {0, CS27_SW8, CS26_SW8, CS25_SW8},
- {0, CS27_SW7, CS26_SW7, CS25_SW7},
- {0, CS27_SW6, CS26_SW6, CS25_SW6},
- {0, CS27_SW5, CS26_SW5, CS25_SW5},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW9_CS12, SW9_CS11, SW9_CS10},
+ {0, SW9_CS27, SW9_CS26, SW9_CS25},
+ {0, SW8_CS27, SW8_CS26, SW8_CS25},
+ {0, SW7_CS27, SW7_CS26, SW7_CS25},
+ {0, SW6_CS27, SW6_CS26, SW6_CS25},
+ {0, SW5_CS27, SW5_CS26, SW5_CS25},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS30_SW9, CS29_SW9, CS28_SW9},
- {0, CS30_SW8, CS29_SW8, CS28_SW8},
- {0, CS30_SW7, CS29_SW7, CS28_SW7},
- {0, CS30_SW6, CS29_SW6, CS28_SW6},
- {0, CS30_SW5, CS29_SW5, CS28_SW5},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW9_CS30, SW9_CS29, SW9_CS28},
+ {0, SW8_CS30, SW8_CS29, SW8_CS28},
+ {0, SW7_CS30, SW7_CS29, SW7_CS28},
+ {0, SW6_CS30, SW6_CS29, SW6_CS28},
+ {0, SW5_CS30, SW5_CS29, SW5_CS28},
};
led_config_t g_led_config = {
diff --git a/keyboards/inland/kb83/kb83.c b/keyboards/inland/kb83/kb83.c
index 427a9a5e2d0..65093a3c383 100644
--- a/keyboards/inland/kb83/kb83.c
+++ b/keyboards/inland/kb83/kb83.c
@@ -25,107 +25,107 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, D_2, E_2, F_2},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, G_13, H_13, I_13},
- {1, D_3, E_3, F_3},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, D_7, E_7, F_7},
- {1, D_4, E_4, F_4},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
+ {1, CB4_CA4, CB5_CA4, CB6_CA4},
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
- {0, D_15, E_15, F_15},
- {1, D_6, E_6, F_6},
- {1, D_5, E_5, F_5},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
- {1, G_4, H_4, I_4},
- {1, G_5, H_5, I_5},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
- {1, J_4, K_4, L_4},
- {1, J_5, K_5, L_5},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
};
led_config_t g_led_config = {
diff --git a/keyboards/inland/mk47/mk47.c b/keyboards/inland/mk47/mk47.c
index 959330e6f83..ca417af19f2 100644
--- a/keyboards/inland/mk47/mk47.c
+++ b/keyboards/inland/mk47/mk47.c
@@ -23,56 +23,56 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {0, D_15, E_15, F_15},
- {0, G_13, H_13, I_13},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
};
#endif
diff --git a/keyboards/inland/v83p/v83p.c b/keyboards/inland/v83p/v83p.c
index d0440036150..e14b082ceb8 100644
--- a/keyboards/inland/v83p/v83p.c
+++ b/keyboards/inland/v83p/v83p.c
@@ -12,107 +12,107 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, D_2, E_2, F_2},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, G_13, H_13, I_13},
- {1, D_3, E_3, F_3},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, D_7, E_7, F_7},
- {1, D_4, E_4, F_4},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
+ {1, CB4_CA4, CB5_CA4, CB6_CA4},
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
- {0, D_15, E_15, F_15},
- {1, D_6, E_6, F_6},
- {1, D_5, E_5, F_5},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
- {1, G_4, H_4, I_4},
- {1, G_5, H_5, I_5},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
- {1, J_4, K_4, L_4},
- {1, J_5, K_5, L_5},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
};
#endif
diff --git a/keyboards/input_club/k_type/is31fl3733-dual.h b/keyboards/input_club/k_type/is31fl3733-dual.h
index b7e3eb54e7e..be6e4f9ce95 100644
--- a/keyboards/input_club/k_type/is31fl3733-dual.h
+++ b/keyboards/input_club/k_type/is31fl3733-dual.h
@@ -129,206 +129,206 @@ void is31fl3733_flush(void);
#define IS31FL3733_SYNC_MASTER 0b01
#define IS31FL3733_SYNC_SLAVE 0b10
-#define A_1 0x00
-#define A_2 0x01
-#define A_3 0x02
-#define A_4 0x03
-#define A_5 0x04
-#define A_6 0x05
-#define A_7 0x06
-#define A_8 0x07
-#define A_9 0x08
-#define A_10 0x09
-#define A_11 0x0A
-#define A_12 0x0B
-#define A_13 0x0C
-#define A_14 0x0D
-#define A_15 0x0E
-#define A_16 0x0F
+#define SW1_CS1 0x00
+#define SW1_CS2 0x01
+#define SW1_CS3 0x02
+#define SW1_CS4 0x03
+#define SW1_CS5 0x04
+#define SW1_CS6 0x05
+#define SW1_CS7 0x06
+#define SW1_CS8 0x07
+#define SW1_CS9 0x08
+#define SW1_CS10 0x09
+#define SW1_CS11 0x0A
+#define SW1_CS12 0x0B
+#define SW1_CS13 0x0C
+#define SW1_CS14 0x0D
+#define SW1_CS15 0x0E
+#define SW1_CS16 0x0F
-#define B_1 0x10
-#define B_2 0x11
-#define B_3 0x12
-#define B_4 0x13
-#define B_5 0x14
-#define B_6 0x15
-#define B_7 0x16
-#define B_8 0x17
-#define B_9 0x18
-#define B_10 0x19
-#define B_11 0x1A
-#define B_12 0x1B
-#define B_13 0x1C
-#define B_14 0x1D
-#define B_15 0x1E
-#define B_16 0x1F
+#define SW2_CS1 0x10
+#define SW2_CS2 0x11
+#define SW2_CS3 0x12
+#define SW2_CS4 0x13
+#define SW2_CS5 0x14
+#define SW2_CS6 0x15
+#define SW2_CS7 0x16
+#define SW2_CS8 0x17
+#define SW2_CS9 0x18
+#define SW2_CS10 0x19
+#define SW2_CS11 0x1A
+#define SW2_CS12 0x1B
+#define SW2_CS13 0x1C
+#define SW2_CS14 0x1D
+#define SW2_CS15 0x1E
+#define SW2_CS16 0x1F
-#define C_1 0x20
-#define C_2 0x21
-#define C_3 0x22
-#define C_4 0x23
-#define C_5 0x24
-#define C_6 0x25
-#define C_7 0x26
-#define C_8 0x27
-#define C_9 0x28
-#define C_10 0x29
-#define C_11 0x2A
-#define C_12 0x2B
-#define C_13 0x2C
-#define C_14 0x2D
-#define C_15 0x2E
-#define C_16 0x2F
+#define SW3_CS1 0x20
+#define SW3_CS2 0x21
+#define SW3_CS3 0x22
+#define SW3_CS4 0x23
+#define SW3_CS5 0x24
+#define SW3_CS6 0x25
+#define SW3_CS7 0x26
+#define SW3_CS8 0x27
+#define SW3_CS9 0x28
+#define SW3_CS10 0x29
+#define SW3_CS11 0x2A
+#define SW3_CS12 0x2B
+#define SW3_CS13 0x2C
+#define SW3_CS14 0x2D
+#define SW3_CS15 0x2E
+#define SW3_CS16 0x2F
-#define D_1 0x30
-#define D_2 0x31
-#define D_3 0x32
-#define D_4 0x33
-#define D_5 0x34
-#define D_6 0x35
-#define D_7 0x36
-#define D_8 0x37
-#define D_9 0x38
-#define D_10 0x39
-#define D_11 0x3A
-#define D_12 0x3B
-#define D_13 0x3C
-#define D_14 0x3D
-#define D_15 0x3E
-#define D_16 0x3F
+#define SW4_CS1 0x30
+#define SW4_CS2 0x31
+#define SW4_CS3 0x32
+#define SW4_CS4 0x33
+#define SW4_CS5 0x34
+#define SW4_CS6 0x35
+#define SW4_CS7 0x36
+#define SW4_CS8 0x37
+#define SW4_CS9 0x38
+#define SW4_CS10 0x39
+#define SW4_CS11 0x3A
+#define SW4_CS12 0x3B
+#define SW4_CS13 0x3C
+#define SW4_CS14 0x3D
+#define SW4_CS15 0x3E
+#define SW4_CS16 0x3F
-#define E_1 0x40
-#define E_2 0x41
-#define E_3 0x42
-#define E_4 0x43
-#define E_5 0x44
-#define E_6 0x45
-#define E_7 0x46
-#define E_8 0x47
-#define E_9 0x48
-#define E_10 0x49
-#define E_11 0x4A
-#define E_12 0x4B
-#define E_13 0x4C
-#define E_14 0x4D
-#define E_15 0x4E
-#define E_16 0x4F
+#define SW5_CS1 0x40
+#define SW5_CS2 0x41
+#define SW5_CS3 0x42
+#define SW5_CS4 0x43
+#define SW5_CS5 0x44
+#define SW5_CS6 0x45
+#define SW5_CS7 0x46
+#define SW5_CS8 0x47
+#define SW5_CS9 0x48
+#define SW5_CS10 0x49
+#define SW5_CS11 0x4A
+#define SW5_CS12 0x4B
+#define SW5_CS13 0x4C
+#define SW5_CS14 0x4D
+#define SW5_CS15 0x4E
+#define SW5_CS16 0x4F
-#define F_1 0x50
-#define F_2 0x51
-#define F_3 0x52
-#define F_4 0x53
-#define F_5 0x54
-#define F_6 0x55
-#define F_7 0x56
-#define F_8 0x57
-#define F_9 0x58
-#define F_10 0x59
-#define F_11 0x5A
-#define F_12 0x5B
-#define F_13 0x5C
-#define F_14 0x5D
-#define F_15 0x5E
-#define F_16 0x5F
+#define SW6_CS1 0x50
+#define SW6_CS2 0x51
+#define SW6_CS3 0x52
+#define SW6_CS4 0x53
+#define SW6_CS5 0x54
+#define SW6_CS6 0x55
+#define SW6_CS7 0x56
+#define SW6_CS8 0x57
+#define SW6_CS9 0x58
+#define SW6_CS10 0x59
+#define SW6_CS11 0x5A
+#define SW6_CS12 0x5B
+#define SW6_CS13 0x5C
+#define SW6_CS14 0x5D
+#define SW6_CS15 0x5E
+#define SW6_CS16 0x5F
-#define G_1 0x60
-#define G_2 0x61
-#define G_3 0x62
-#define G_4 0x63
-#define G_5 0x64
-#define G_6 0x65
-#define G_7 0x66
-#define G_8 0x67
-#define G_9 0x68
-#define G_10 0x69
-#define G_11 0x6A
-#define G_12 0x6B
-#define G_13 0x6C
-#define G_14 0x6D
-#define G_15 0x6E
-#define G_16 0x6F
+#define SW7_CS1 0x60
+#define SW7_CS2 0x61
+#define SW7_CS3 0x62
+#define SW7_CS4 0x63
+#define SW7_CS5 0x64
+#define SW7_CS6 0x65
+#define SW7_CS7 0x66
+#define SW7_CS8 0x67
+#define SW7_CS9 0x68
+#define SW7_CS10 0x69
+#define SW7_CS11 0x6A
+#define SW7_CS12 0x6B
+#define SW7_CS13 0x6C
+#define SW7_CS14 0x6D
+#define SW7_CS15 0x6E
+#define SW7_CS16 0x6F
-#define H_1 0x70
-#define H_2 0x71
-#define H_3 0x72
-#define H_4 0x73
-#define H_5 0x74
-#define H_6 0x75
-#define H_7 0x76
-#define H_8 0x77
-#define H_9 0x78
-#define H_10 0x79
-#define H_11 0x7A
-#define H_12 0x7B
-#define H_13 0x7C
-#define H_14 0x7D
-#define H_15 0x7E
-#define H_16 0x7F
+#define SW8_CS1 0x70
+#define SW8_CS2 0x71
+#define SW8_CS3 0x72
+#define SW8_CS4 0x73
+#define SW8_CS5 0x74
+#define SW8_CS6 0x75
+#define SW8_CS7 0x76
+#define SW8_CS8 0x77
+#define SW8_CS9 0x78
+#define SW8_CS10 0x79
+#define SW8_CS11 0x7A
+#define SW8_CS12 0x7B
+#define SW8_CS13 0x7C
+#define SW8_CS14 0x7D
+#define SW8_CS15 0x7E
+#define SW8_CS16 0x7F
-#define I_1 0x80
-#define I_2 0x81
-#define I_3 0x82
-#define I_4 0x83
-#define I_5 0x84
-#define I_6 0x85
-#define I_7 0x86
-#define I_8 0x87
-#define I_9 0x88
-#define I_10 0x89
-#define I_11 0x8A
-#define I_12 0x8B
-#define I_13 0x8C
-#define I_14 0x8D
-#define I_15 0x8E
-#define I_16 0x8F
+#define SW9_CS1 0x80
+#define SW9_CS2 0x81
+#define SW9_CS3 0x82
+#define SW9_CS4 0x83
+#define SW9_CS5 0x84
+#define SW9_CS6 0x85
+#define SW9_CS7 0x86
+#define SW9_CS8 0x87
+#define SW9_CS9 0x88
+#define SW9_CS10 0x89
+#define SW9_CS11 0x8A
+#define SW9_CS12 0x8B
+#define SW9_CS13 0x8C
+#define SW9_CS14 0x8D
+#define SW9_CS15 0x8E
+#define SW9_CS16 0x8F
-#define J_1 0x90
-#define J_2 0x91
-#define J_3 0x92
-#define J_4 0x93
-#define J_5 0x94
-#define J_6 0x95
-#define J_7 0x96
-#define J_8 0x97
-#define J_9 0x98
-#define J_10 0x99
-#define J_11 0x9A
-#define J_12 0x9B
-#define J_13 0x9C
-#define J_14 0x9D
-#define J_15 0x9E
-#define J_16 0x9F
+#define SW10_CS1 0x90
+#define SW10_CS2 0x91
+#define SW10_CS3 0x92
+#define SW10_CS4 0x93
+#define SW10_CS5 0x94
+#define SW10_CS6 0x95
+#define SW10_CS7 0x96
+#define SW10_CS8 0x97
+#define SW10_CS9 0x98
+#define SW10_CS10 0x99
+#define SW10_CS11 0x9A
+#define SW10_CS12 0x9B
+#define SW10_CS13 0x9C
+#define SW10_CS14 0x9D
+#define SW10_CS15 0x9E
+#define SW10_CS16 0x9F
-#define K_1 0xA0
-#define K_2 0xA1
-#define K_3 0xA2
-#define K_4 0xA3
-#define K_5 0xA4
-#define K_6 0xA5
-#define K_7 0xA6
-#define K_8 0xA7
-#define K_9 0xA8
-#define K_10 0xA9
-#define K_11 0xAA
-#define K_12 0xAB
-#define K_13 0xAC
-#define K_14 0xAD
-#define K_15 0xAE
-#define K_16 0xAF
+#define SW11_CS1 0xA0
+#define SW11_CS2 0xA1
+#define SW11_CS3 0xA2
+#define SW11_CS4 0xA3
+#define SW11_CS5 0xA4
+#define SW11_CS6 0xA5
+#define SW11_CS7 0xA6
+#define SW11_CS8 0xA7
+#define SW11_CS9 0xA8
+#define SW11_CS10 0xA9
+#define SW11_CS11 0xAA
+#define SW11_CS12 0xAB
+#define SW11_CS13 0xAC
+#define SW11_CS14 0xAD
+#define SW11_CS15 0xAE
+#define SW11_CS16 0xAF
-#define L_1 0xB0
-#define L_2 0xB1
-#define L_3 0xB2
-#define L_4 0xB3
-#define L_5 0xB4
-#define L_6 0xB5
-#define L_7 0xB6
-#define L_8 0xB7
-#define L_9 0xB8
-#define L_10 0xB9
-#define L_11 0xBA
-#define L_12 0xBB
-#define L_13 0xBC
-#define L_14 0xBD
-#define L_15 0xBE
-#define L_16 0xBF
+#define SW12_CS1 0xB0
+#define SW12_CS2 0xB1
+#define SW12_CS3 0xB2
+#define SW12_CS4 0xB3
+#define SW12_CS5 0xB4
+#define SW12_CS6 0xB5
+#define SW12_CS7 0xB6
+#define SW12_CS8 0xB7
+#define SW12_CS9 0xB8
+#define SW12_CS10 0xB9
+#define SW12_CS11 0xBA
+#define SW12_CS12 0xBB
+#define SW12_CS13 0xBC
+#define SW12_CS14 0xBD
+#define SW12_CS15 0xBE
+#define SW12_CS16 0xBF
diff --git a/keyboards/input_club/k_type/k_type.c b/keyboards/input_club/k_type/k_type.c
index c1377ebe61c..85bdc7ea739 100644
--- a/keyboards/input_club/k_type/k_type.c
+++ b/keyboards/input_club/k_type/k_type.c
@@ -21,133 +21,133 @@ along with this program. If not, see .
# include "is31fl3733-dual.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
- { 0, B_15, A_15, C_15 },
- { 0, B_16, A_16, C_16 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
- { 0, E_15, D_15, F_15 },
- { 0, E_16, D_16, F_16 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_13, G_13, I_13 },
- { 0, H_14, G_14, I_14 },
- { 0, H_15, G_15, I_15 },
- { 0, H_16, G_16, I_16 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_11, J_11, L_11 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
- { 0, K_15, J_15, L_15 },
- { 0, K_16, J_16, L_16 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
// Driver 2 is on I2C2
- { 1, B_1, A_1, C_1 },
- { 1, B_2, A_2, C_2 },
- { 1, B_3, A_3, C_3 },
- { 1, B_4, A_4, C_4 },
- { 1, B_5, A_5, C_5 },
- { 1, B_6, A_6, C_6 },
- { 1, B_7, A_7, C_7 },
- { 1, B_8, A_8, C_8 },
- { 1, B_9, A_9, C_9 },
- { 1, B_10, A_10, C_10 },
- { 1, B_11, A_11, C_11 },
- { 1, B_12, A_12, C_12 },
- { 1, B_13, A_13, C_13 },
- { 1, B_14, A_14, C_14 },
- { 1, B_15, A_15, C_15 },
- { 1, B_16, A_16, C_16 },
+ { 1, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 1, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 1, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 1, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 1, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 1, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 1, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 1, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 1, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 1, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 1, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 1, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 1, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 1, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 1, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 1, SW2_CS16, SW1_CS16, SW3_CS16 },
- { 1, E_1, D_1, F_1 },
- { 1, E_2, D_2, F_2 },
- { 1, E_3, D_3, F_3 },
- { 1, E_4, D_4, F_4 },
- { 1, E_5, D_5, F_5 },
- { 1, E_6, D_6, F_6 },
- { 1, E_7, D_7, F_7 },
- { 1, E_8, D_8, F_8 },
- { 1, E_9, D_9, F_9 },
- { 1, E_10, D_10, F_10 },
- { 1, E_11, D_11, F_11 },
- { 1, E_12, D_12, F_12 },
- { 1, E_13, D_13, F_13 },
- { 1, E_14, D_14, F_14 },
- { 1, E_15, D_15, F_15 },
- { 1, E_16, D_16, F_16 },
+ { 1, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 1, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 1, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 1, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 1, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 1, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 1, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 1, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 1, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 1, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 1, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 1, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 1, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 1, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
- { 1, H_1, G_1, I_1 },
- { 1, H_2, G_2, I_2 },
- { 1, H_3, G_3, I_3 },
- { 1, H_4, G_4, I_4 },
- { 1, H_5, G_5, I_5 },
- { 1, H_6, G_6, I_6 },
- { 1, H_7, G_7, I_7 },
- { 1, H_8, G_8, I_8 },
- { 1, H_9, G_9, I_9 },
- { 1, H_10, G_10, I_10 },
- { 1, H_11, G_11, I_11 },
- { 1, H_12, G_12, I_12 },
- { 1, H_13, G_13, I_13 },
- { 1, H_14, G_14, I_14 },
- { 1, H_15, G_15, I_15 },
- { 1, H_16, G_16, I_16 },
+ { 1, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 1, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 1, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 1, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 1, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 1, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 1, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 1, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 1, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 1, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 1, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 1, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 1, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 1, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 1, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 1, SW8_CS16, SW7_CS16, SW9_CS16 },
- { 1, K_1, J_1, L_1 },
- { 1, K_2, J_2, L_2 },
- { 1, K_3, J_3, L_3 },
- { 1, K_4, J_4, L_4 },
- { 1, K_5, J_5, L_5 },
- { 1, K_6, J_6, L_6 },
- { 1, K_7, J_7, L_7 }
+ { 1, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 1, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 1, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 1, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 1, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 1, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 1, SW11_CS7, SW10_CS7, SW12_CS7 }
};
led_config_t g_led_config = {
diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c
index 96db3b804e9..913e77a55e7 100644
--- a/keyboards/jukaie/jk01/jk01.c
+++ b/keyboards/jukaie/jk01/jk01.c
@@ -25,99 +25,99 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- //{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, k00, Esc
+ //{0, SW4_CS1, SW4_CS2, SW4_CS3}, // 0, k00, Esc
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 1, k13, Esc
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 2, k26, F1
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 3, k36, F2
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 4, k31, F3
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 5, k33, F4
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 6, k07, F5
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 7, k63, F6
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 8, k71, F7
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 9, k76, F8
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 10, ka6, F9
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 11, ka7, F10
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 12, ka3, F11
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // 13, ka5, F12
- {1, CS4_SW2, CS5_SW2, CS6_SW2}, // 14, k97, Printscreen
- {1, CS4_SW5, CS5_SW5, CS6_SW5}, // 15, k02, Del
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 1, k13, Esc
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 2, k26, F1
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 3, k36, F2
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 4, k31, F3
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 5, k33, F4
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 6, k07, F5
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 7, k63, F6
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 8, k71, F7
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 9, k76, F8
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 10, ka6, F9
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 11, ka7, F10
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 12, ka3, F11
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // 13, ka5, F12
+ {1, SW2_CS4, SW2_CS5, SW2_CS6}, // 14, k97, Printscreen
+ {1, SW5_CS4, SW5_CS5, SW5_CS6}, // 15, k02, Del
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 16, k16, `
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 17, k17, 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 18, k27, 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 19, k37, 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 20, k47, 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 21, k46, 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 22, k56, 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 23, k57, 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 24, k67, 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 25, k77, 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 26, k87, 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 27, k86, -
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // 28, k66, =
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // 29, ka1, Backspace
- {1, CS1_SW2, CS2_SW2, CS3_SW2}, // 30, kc6, Home
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 16, k16, `
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 17, k17, 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 18, k27, 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 19, k37, 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 20, k47, 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 21, k46, 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 22, k56, 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 23, k57, 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 24, k67, 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 25, k77, 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 26, k87, 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 27, k86, -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // 28, k66, =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // 29, ka1, Backspace
+ {1, SW2_CS1, SW2_CS2, SW2_CS3}, // 30, kc6, Home
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 31, k11, Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 32, k10, Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 33, k20, W
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 34, k30, E
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 35, k40, R
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 36, k41, T
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 37, k51, Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 38, k50, U
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 39, k60, I
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 40, k70, O
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 41, k80, P
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 42, k81, [
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // 43, k61, ]
- {1, CS1_SW9, CS2_SW9, CS3_SW9}, // 44, ka2, "\\"
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // 45, k65, End
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 31, k11, Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 32, k10, Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 33, k20, W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 34, k30, E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 35, k40, R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 36, k41, T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 37, k51, Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 38, k50, U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 39, k60, I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 40, k70, O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 41, k80, P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 42, k81, [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // 43, k61, ]
+ {1, SW9_CS1, SW9_CS2, SW9_CS3}, // 44, ka2, "\\"
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // 45, k65, End
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 46, k21, Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 47, k12, A
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 48, k22, S
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 49, k32, D
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 50, k42, F
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 51, k43, G
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 52, k53, H
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 53, k52, J
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 54, k62, K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 55, k72, L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 56, k82, ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 57, k83, '
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // 58, ka4, Enter
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // 59, k15, PgUp
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 46, k21, Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 47, k12, A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 48, k22, S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 49, k32, D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 50, k42, F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 51, k43, G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 52, k53, H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 53, k52, J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 54, k62, K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 55, k72, L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 56, k82, ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 57, k83, '
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // 58, ka4, Enter
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // 59, k15, PgUp
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // 60, k00, Shift_L
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 61, k14, Z
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 62, k24, X
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 63, k34, C
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 64, k44, V
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 65, k45, B
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 66, k55, N
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 67, k54, M
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 68, k64, ,
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 69, k74, .
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 70, k85, /
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // 71, k91, Shift_R
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // 72, k35, Up
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // 73, k25, PgDn
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // 60, k00, Shift_L
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 61, k14, Z
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 62, k24, X
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 63, k34, C
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 64, k44, V
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 65, k45, B
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 66, k55, N
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 67, k54, M
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 68, k64, ,
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 69, k74, .
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 70, k85, /
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // 71, k91, Shift_R
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // 72, k35, Up
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // 73, k25, PgDn
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 74, k06, Ctrl_L
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 75, k90, Win_L
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 76, k93, Alt_L
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 77, k94, Space
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 78, k95, Alt_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 79, k92, FN
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 80, k04, Ctrl_R
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // 81, k03, Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // 82, k73, Down
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // 83, k05, Right
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 74, k06, Ctrl_L
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 75, k90, Win_L
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 76, k93, Alt_L
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 77, k94, Space
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 78, k95, Alt_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 79, k92, FN
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 80, k04, Ctrl_R
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // 81, k03, Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // 82, k73, Down
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // 83, k05, Right
- {1, CS10_SW10, CS11_SW10, CS12_SW10}, // 84, kb0, Z1
- {1, CS10_SW11, CS11_SW11, CS12_SW11}, // 85, kb1, Z2
+ {1, SW10_CS10, SW10_CS11, SW10_CS12}, // 84, kb0, Z1
+ {1, SW11_CS10, SW11_CS11, SW11_CS12}, // 85, kb1, Z2
};
#endif
diff --git a/keyboards/kbdcraft/adam64/adam64.c b/keyboards/kbdcraft/adam64/adam64.c
index 3f1565c2f30..db32d2856e1 100644
--- a/keyboards/kbdcraft/adam64/adam64.c
+++ b/keyboards/kbdcraft/adam64/adam64.c
@@ -26,73 +26,73 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS14_SW1, CS13_SW1, CS15_SW1},
- {0, CS14_SW2, CS13_SW2, CS15_SW2},
- {0, CS14_SW3, CS13_SW3, CS15_SW3},
- {0, CS14_SW4, CS13_SW4, CS15_SW4},
- {0, CS14_SW5, CS13_SW5, CS15_SW5},
- {0, CS14_SW6, CS13_SW6, CS15_SW6},
- {0, CS14_SW7, CS13_SW7, CS15_SW7},
- {0, CS32_SW1, CS31_SW1, CS33_SW1},
- {0, CS32_SW2, CS31_SW2, CS33_SW2},
- {0, CS32_SW3, CS31_SW3, CS33_SW3},
- {0, CS32_SW4, CS31_SW4, CS33_SW4},
- {0, CS32_SW5, CS31_SW5, CS33_SW5},
- {0, CS32_SW6, CS31_SW6, CS33_SW6},
- {0, CS32_SW7, CS31_SW7, CS33_SW7},
+ {0, SW1_CS14, SW1_CS13, SW1_CS15},
+ {0, SW2_CS14, SW2_CS13, SW2_CS15},
+ {0, SW3_CS14, SW3_CS13, SW3_CS15},
+ {0, SW4_CS14, SW4_CS13, SW4_CS15},
+ {0, SW5_CS14, SW5_CS13, SW5_CS15},
+ {0, SW6_CS14, SW6_CS13, SW6_CS15},
+ {0, SW7_CS14, SW7_CS13, SW7_CS15},
+ {0, SW1_CS32, SW1_CS31, SW1_CS33},
+ {0, SW2_CS32, SW2_CS31, SW2_CS33},
+ {0, SW3_CS32, SW3_CS31, SW3_CS33},
+ {0, SW4_CS32, SW4_CS31, SW4_CS33},
+ {0, SW5_CS32, SW5_CS31, SW5_CS33},
+ {0, SW6_CS32, SW6_CS31, SW6_CS33},
+ {0, SW7_CS32, SW7_CS31, SW7_CS33},
- {0, CS23_SW1, CS24_SW1, CS22_SW1},
- {0, CS23_SW2, CS24_SW2, CS22_SW2},
- {0, CS23_SW3, CS24_SW3, CS22_SW3},
- {0, CS23_SW4, CS24_SW4, CS22_SW4},
- {0, CS23_SW5, CS24_SW5, CS22_SW5},
- {0, CS23_SW6, CS24_SW6, CS22_SW6},
- {0, CS23_SW7, CS24_SW7, CS22_SW7},
- {0, CS35_SW1, CS34_SW1, CS36_SW1},
- {0, CS35_SW2, CS34_SW2, CS36_SW2},
- {0, CS35_SW3, CS34_SW3, CS36_SW3},
- {0, CS35_SW4, CS34_SW4, CS36_SW4},
- {0, CS35_SW5, CS34_SW5, CS36_SW5},
- {0, CS35_SW6, CS34_SW6, CS36_SW6},
- {0, CS35_SW7, CS34_SW7, CS36_SW7},
+ {0, SW1_CS23, SW1_CS24, SW1_CS22},
+ {0, SW2_CS23, SW2_CS24, SW2_CS22},
+ {0, SW3_CS23, SW3_CS24, SW3_CS22},
+ {0, SW4_CS23, SW4_CS24, SW4_CS22},
+ {0, SW5_CS23, SW5_CS24, SW5_CS22},
+ {0, SW6_CS23, SW6_CS24, SW6_CS22},
+ {0, SW7_CS23, SW7_CS24, SW7_CS22},
+ {0, SW1_CS35, SW1_CS34, SW1_CS36},
+ {0, SW2_CS35, SW2_CS34, SW2_CS36},
+ {0, SW3_CS35, SW3_CS34, SW3_CS36},
+ {0, SW4_CS35, SW4_CS34, SW4_CS36},
+ {0, SW5_CS35, SW5_CS34, SW5_CS36},
+ {0, SW6_CS35, SW6_CS34, SW6_CS36},
+ {0, SW7_CS35, SW7_CS34, SW7_CS36},
- {0, CS17_SW1, CS16_SW1, CS18_SW1},
- {0, CS17_SW2, CS16_SW2, CS18_SW2},
- {0, CS17_SW3, CS16_SW3, CS18_SW3},
- {0, CS17_SW4, CS16_SW4, CS18_SW4},
- {0, CS17_SW5, CS16_SW5, CS18_SW5},
- {0, CS17_SW6, CS16_SW6, CS18_SW6},
- {0, CS17_SW7, CS16_SW7, CS18_SW7},
- {0, CS26_SW1, CS25_SW1, CS27_SW1},
- {0, CS26_SW2, CS25_SW2, CS27_SW2},
- {0, CS26_SW3, CS25_SW3, CS27_SW3},
- {0, CS26_SW4, CS25_SW4, CS27_SW4},
- {0, CS26_SW5, CS25_SW5, CS27_SW5},
- {0, CS26_SW7, CS25_SW7, CS27_SW7},
+ {0, SW1_CS17, SW1_CS16, SW1_CS18},
+ {0, SW2_CS17, SW2_CS16, SW2_CS18},
+ {0, SW3_CS17, SW3_CS16, SW3_CS18},
+ {0, SW4_CS17, SW4_CS16, SW4_CS18},
+ {0, SW5_CS17, SW5_CS16, SW5_CS18},
+ {0, SW6_CS17, SW6_CS16, SW6_CS18},
+ {0, SW7_CS17, SW7_CS16, SW7_CS18},
+ {0, SW1_CS26, SW1_CS25, SW1_CS27},
+ {0, SW2_CS26, SW2_CS25, SW2_CS27},
+ {0, SW3_CS26, SW3_CS25, SW3_CS27},
+ {0, SW4_CS26, SW4_CS25, SW4_CS27},
+ {0, SW5_CS26, SW5_CS25, SW5_CS27},
+ {0, SW7_CS26, SW7_CS25, SW7_CS27},
- {0, CS20_SW1, CS19_SW1, CS21_SW1},
- {0, CS20_SW2, CS19_SW2, CS21_SW2},
- {0, CS20_SW3, CS19_SW3, CS21_SW3},
- {0, CS20_SW4, CS19_SW4, CS21_SW4},
- {0, CS20_SW5, CS19_SW5, CS21_SW5},
- {0, CS20_SW6, CS19_SW6, CS21_SW6},
- {0, CS20_SW7, CS19_SW7, CS21_SW7},
- {0, CS29_SW1, CS28_SW1, CS30_SW1},
- {0, CS29_SW2, CS28_SW2, CS30_SW2},
- {0, CS29_SW3, CS28_SW3, CS30_SW3},
- {0, CS29_SW4, CS28_SW4, CS30_SW4},
- {0, CS29_SW5, CS28_SW5, CS30_SW5},
- {0, CS29_SW6, CS28_SW6, CS30_SW6},
- {0, CS29_SW7, CS28_SW7, CS30_SW7},
+ {0, SW1_CS20, SW1_CS19, SW1_CS21},
+ {0, SW2_CS20, SW2_CS19, SW2_CS21},
+ {0, SW3_CS20, SW3_CS19, SW3_CS21},
+ {0, SW4_CS20, SW4_CS19, SW4_CS21},
+ {0, SW5_CS20, SW5_CS19, SW5_CS21},
+ {0, SW6_CS20, SW6_CS19, SW6_CS21},
+ {0, SW7_CS20, SW7_CS19, SW7_CS21},
+ {0, SW1_CS29, SW1_CS28, SW1_CS30},
+ {0, SW2_CS29, SW2_CS28, SW2_CS30},
+ {0, SW3_CS29, SW3_CS28, SW3_CS30},
+ {0, SW4_CS29, SW4_CS28, SW4_CS30},
+ {0, SW5_CS29, SW5_CS28, SW5_CS30},
+ {0, SW6_CS29, SW6_CS28, SW6_CS30},
+ {0, SW7_CS29, SW7_CS28, SW7_CS30},
- {0, CS9_SW1, CS10_SW1, CS8_SW1},
- {0, CS9_SW2, CS10_SW2, CS8_SW2},
- {0, CS9_SW3, CS10_SW3, CS8_SW3},
- {0, CS9_SW6, CS10_SW6, CS8_SW6},
- {0, CS2_SW3, CS1_SW3, CS3_SW3},
- {0, CS2_SW4, CS1_SW4, CS3_SW4},
- {0, CS2_SW5, CS1_SW5, CS3_SW5},
- {0, CS2_SW6, CS1_SW6, CS3_SW6},
- {0, CS2_SW7, CS1_SW7, CS3_SW7}
+ {0, SW1_CS9, SW1_CS10, SW1_CS8},
+ {0, SW2_CS9, SW2_CS10, SW2_CS8},
+ {0, SW3_CS9, SW3_CS10, SW3_CS8},
+ {0, SW6_CS9, SW6_CS10, SW6_CS8},
+ {0, SW3_CS2, SW3_CS1, SW3_CS3},
+ {0, SW4_CS2, SW4_CS1, SW4_CS3},
+ {0, SW5_CS2, SW5_CS1, SW5_CS3},
+ {0, SW6_CS2, SW6_CS1, SW6_CS3},
+ {0, SW7_CS2, SW7_CS1, SW7_CS3}
};
#endif
diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c
index c666f9198f4..4818c990053 100644
--- a/keyboards/kbdfans/bella/rgb/rgb.c
+++ b/keyboards/kbdfans/bella/rgb/rgb.c
@@ -16,106 +16,106 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB58 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB71 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB84 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB97 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB7 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB20 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB33 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB46 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB59 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB72 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB85 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB6 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB32 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB45 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB58 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB71 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB84 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB97 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB7 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB20 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB33 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB46 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB59 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB72 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB85 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB5 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB18 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB31 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB44 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB57 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB70 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB83 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB96 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB8 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB21 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB34 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB47 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB60 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB73 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB86 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB5 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB18 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB31 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB44 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB57 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB70 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB83 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB96 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB8 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB21 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB34 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB47 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB60 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB73 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB86 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB4 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB17 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB30 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB43 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB56 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB69 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB82 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB95 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB9 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB22 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB35 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB48 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB61 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB74 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB87 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB4 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB17 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB30 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB43 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB56 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB69 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB82 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB95 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB9 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB22 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB35 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB48 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB61 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB74 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB87 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB3 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB16 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB29*/
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB42 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB55 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB68 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB81 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB94 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB10 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB23 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB36 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB49 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB62 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB88 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB3 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB16 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB29*/
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB42 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB55 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB68 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB81 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB94 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB10 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB23 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB36 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB49 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB62 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB88 */
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB2 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB28 */
- {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB41 */
- {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB54 */
- {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* RGB67 */
- {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB80 */
- {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* RGB93 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB11 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB24 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB37 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB50 */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB63 */
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB76 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB2 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB28 */
+ {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* RGB41 */
+ {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB54 */
+ {0, SW6_CS6, SW6_CS5, SW6_CS4}, /* RGB67 */
+ {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB80 */
+ {0, SW8_CS6, SW8_CS5, SW8_CS4}, /* RGB93 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB11 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB24 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB37 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB50 */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB63 */
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB76 */
- {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* RGB1 */
- {0, CS3_SW2, CS2_SW2, CS1_SW2}, /* RGB14 */
- {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* RGB27 */
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB103 */
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB38 */
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB51 */
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB64 */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB77 */
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB90 */
+ {0, SW1_CS3, SW1_CS2, SW1_CS1}, /* RGB1 */
+ {0, SW2_CS3, SW2_CS2, SW2_CS1}, /* RGB14 */
+ {0, SW3_CS3, SW3_CS2, SW3_CS1}, /* RGB27 */
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB103 */
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB38 */
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB51 */
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB64 */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB77 */
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB90 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB110 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB19 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB108 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB98 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB112 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB99 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB107 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB100 */
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB89 */
- {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB115 */
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB116 */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB25 */
- {0, CS3_SW9, CS2_SW9, CS1_SW9}, /* RGB105 */
- {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* RGB40 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB110 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB19 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB108 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB98 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB112 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB99 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB107 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB100 */
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB89 */
+ {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB115 */
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB116 */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB25 */
+ {0, SW9_CS3, SW9_CS2, SW9_CS1}, /* RGB105 */
+ {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */
};
led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
index b4fc00765f5..8d9349e295f 100644
--- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
+++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c
@@ -16,107 +16,107 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB32 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB45 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB58 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB71 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB84 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB97 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB7 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB20 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB33 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB46 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB59 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB72 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB85 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB6 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB32 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB45 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB58 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB71 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB84 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB97 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB7 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB20 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB33 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB46 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB59 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB72 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB85 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB5 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB18 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB31 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB44 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB57 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB70 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB83 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB96 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB8 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB21 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB34 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB47 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB60 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB73 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB86 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB5 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB18 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB31 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB44 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB57 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB70 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB83 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB96 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB8 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB21 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB34 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB47 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB60 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB73 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB86 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB4 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB17 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB30 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB43 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB56 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB69 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB82 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB95 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB9 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB22 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB35 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB48 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB61 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB74 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB87 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB4 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB17 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB30 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB43 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB56 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB69 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB82 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB95 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB9 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB22 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB35 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB48 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB61 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB74 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB87 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB3 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB16 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB29*/
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB42 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB55 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB68 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB81 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB94 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB10 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB23 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB36 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB49 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB62 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB88 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB3 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB16 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB29*/
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB42 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB55 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB68 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB81 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB94 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB10 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB23 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB36 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB49 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB62 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB88 */
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB2 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB15 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB28 */
- {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB41 */
- {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB54 */
- {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* RGB67 */
- {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB80 */
- {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* RGB93 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB11 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB24 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB37 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB50 */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB63 */
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB76 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB2 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB15 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB28 */
+ {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* RGB41 */
+ {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB54 */
+ {0, SW6_CS6, SW6_CS5, SW6_CS4}, /* RGB67 */
+ {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB80 */
+ {0, SW8_CS6, SW8_CS5, SW8_CS4}, /* RGB93 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB11 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB24 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB37 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB50 */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB63 */
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB76 */
- {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* RGB1 */
- {0, CS3_SW2, CS2_SW2, CS1_SW2}, /* RGB14 */
- {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* RGB27 */
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB103 */
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB38 */
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB51 */
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB64 */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB77 */
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB90 */
+ {0, SW1_CS3, SW1_CS2, SW1_CS1}, /* RGB1 */
+ {0, SW2_CS3, SW2_CS2, SW2_CS1}, /* RGB14 */
+ {0, SW3_CS3, SW3_CS2, SW3_CS1}, /* RGB27 */
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB103 */
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB38 */
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB51 */
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB64 */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB77 */
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB90 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB110 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB19 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB108 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB98 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB112 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB99 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB107 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB100 */
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB89 */
- {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB115 */
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB116 */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB25 */
- {0, CS3_SW9, CS2_SW9, CS1_SW9}, /* RGB105 */
- {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* RGB40 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB110 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB19 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB108 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB98 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB112 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB99 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB107 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB100 */
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB89 */
+ {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB115 */
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB116 */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB25 */
+ {0, SW9_CS3, SW9_CS2, SW9_CS1}, /* RGB105 */
+ {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB40 */
};
led_config_t g_led_config = {
diff --git a/keyboards/kbdfans/boop65/rgb/rgb.c b/keyboards/kbdfans/boop65/rgb/rgb.c
index b8145382c7a..f70c92812f9 100644
--- a/keyboards/kbdfans/boop65/rgb/rgb.c
+++ b/keyboards/kbdfans/boop65/rgb/rgb.c
@@ -19,97 +19,97 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
- {0, CS24_SW1, CS23_SW1, CS22_SW1},
- {0, CS24_SW2, CS23_SW2, CS22_SW2},
- {0, CS24_SW3, CS23_SW3, CS22_SW3},
- {0, CS24_SW4, CS23_SW4, CS22_SW4},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
- {0, CS24_SW6, CS23_SW6, CS22_SW6},
- {0, CS24_SW7, CS23_SW7, CS22_SW7},
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
+ {0, SW1_CS24, SW1_CS23, SW1_CS22},
+ {0, SW2_CS24, SW2_CS23, SW2_CS22},
+ {0, SW3_CS24, SW3_CS23, SW3_CS22},
+ {0, SW4_CS24, SW4_CS23, SW4_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
+ {0, SW6_CS24, SW6_CS23, SW6_CS22},
+ {0, SW7_CS24, SW7_CS23, SW7_CS22},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
- {0, CS30_SW5, CS29_SW5, CS28_SW5},
- {0, CS30_SW6, CS29_SW6, CS28_SW6},
- {0, CS30_SW7, CS29_SW7, CS28_SW7},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
+ {0, SW5_CS30, SW5_CS29, SW5_CS28},
+ {0, SW6_CS30, SW6_CS29, SW6_CS28},
+ {0, SW7_CS30, SW7_CS29, SW7_CS28},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
- {0, CS33_SW5, CS32_SW5, CS31_SW5},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
+ {0, SW5_CS33, SW5_CS32, SW5_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS36_SW1, CS35_SW1, CS34_SW1},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW1_CS36, SW1_CS35, SW1_CS34},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS39_SW2, CS38_SW2, CS37_SW2},
- {0, CS39_SW3, CS38_SW3, CS37_SW3},
- {0, CS39_SW4, CS38_SW4, CS37_SW4},
- {0, CS39_SW5, CS38_SW5, CS37_SW5},
- {0, CS39_SW7, CS38_SW7, CS37_SW7},
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW2_CS39, SW2_CS38, SW2_CS37},
+ {0, SW3_CS39, SW3_CS38, SW3_CS37},
+ {0, SW4_CS39, SW4_CS38, SW4_CS37},
+ {0, SW5_CS39, SW5_CS38, SW5_CS37},
+ {0, SW7_CS39, SW7_CS38, SW7_CS37},
/* underglow */
- {0, CS18_SW1, CS17_SW1, CS16_SW1},
- {0, CS18_SW3, CS17_SW3, CS16_SW3},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
- {0, CS27_SW2, CS26_SW2, CS25_SW2},
- {0, CS27_SW4, CS26_SW4, CS25_SW4},
- {0, CS27_SW6, CS26_SW6, CS25_SW6},
- {0, CS27_SW7, CS26_SW7, CS25_SW7},
+ {0, SW1_CS18, SW1_CS17, SW1_CS16},
+ {0, SW3_CS18, SW3_CS17, SW3_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
+ {0, SW2_CS27, SW2_CS26, SW2_CS25},
+ {0, SW4_CS27, SW4_CS26, SW4_CS25},
+ {0, SW6_CS27, SW6_CS26, SW6_CS25},
+ {0, SW7_CS27, SW7_CS26, SW7_CS25},
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS39_SW1, CS38_SW1, CS37_SW1},
- {0, CS33_SW6, CS32_SW6, CS31_SW6},
- {0, CS36_SW6, CS35_SW6, CS34_SW6},
- {0, CS39_SW6, CS38_SW6, CS37_SW6}
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW1_CS39, SW1_CS38, SW1_CS37},
+ {0, SW6_CS33, SW6_CS32, SW6_CS31},
+ {0, SW6_CS36, SW6_CS35, SW6_CS34},
+ {0, SW6_CS39, SW6_CS38, SW6_CS37}
};
led_config_t g_led_config = { {
diff --git a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
index 5910d0cf7b0..0b40afadf9b 100755
--- a/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
+++ b/keyboards/kbdfans/kbd67/mkiirgb/v3/v3.c
@@ -19,78 +19,78 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
- {0, CS24_SW1, CS23_SW1, CS22_SW1},
- {0, CS24_SW2, CS23_SW2, CS22_SW2},
- {0, CS24_SW3, CS23_SW3, CS22_SW3},
- {0, CS24_SW4, CS23_SW4, CS22_SW4},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
- {0, CS24_SW6, CS23_SW6, CS22_SW6},
- {0, CS24_SW7, CS23_SW7, CS22_SW7},
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
+ {0, SW1_CS24, SW1_CS23, SW1_CS22},
+ {0, SW2_CS24, SW2_CS23, SW2_CS22},
+ {0, SW3_CS24, SW3_CS23, SW3_CS22},
+ {0, SW4_CS24, SW4_CS23, SW4_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
+ {0, SW6_CS24, SW6_CS23, SW6_CS22},
+ {0, SW7_CS24, SW7_CS23, SW7_CS22},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
- {0, CS30_SW5, CS29_SW5, CS28_SW5},
- {0, CS30_SW6, CS29_SW6, CS28_SW6},
- {0, CS30_SW7, CS29_SW7, CS28_SW7},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
+ {0, SW5_CS30, SW5_CS29, SW5_CS28},
+ {0, SW6_CS30, SW6_CS29, SW6_CS28},
+ {0, SW7_CS30, SW7_CS29, SW7_CS28},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
- {0, CS33_SW5, CS32_SW5, CS31_SW5},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
+ {0, SW5_CS33, SW5_CS32, SW5_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS36_SW1, CS35_SW1, CS34_SW1},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW1_CS36, SW1_CS35, SW1_CS34},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
-// {0, CS39_SW1, CS38_SW1, CS37_SW1},
- {0, CS39_SW2, CS38_SW2, CS37_SW2},
- {0, CS39_SW3, CS38_SW3, CS37_SW3},
- {0, CS39_SW4, CS38_SW4, CS37_SW4},
- {0, CS39_SW5, CS38_SW5, CS37_SW5},
- {0, CS39_SW7, CS38_SW7, CS37_SW7}
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+// {0, SW1_CS39, SW1_CS38, SW1_CS37},
+ {0, SW2_CS39, SW2_CS38, SW2_CS37},
+ {0, SW3_CS39, SW3_CS38, SW3_CS37},
+ {0, SW4_CS39, SW4_CS38, SW4_CS37},
+ {0, SW5_CS39, SW5_CS38, SW5_CS37},
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}
};
diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c
index 31b2e1a2563..7aec00cbdc2 100644
--- a/keyboards/kbdfans/kbdmini/kbdmini.c
+++ b/keyboards/kbdfans/kbdmini/kbdmini.c
@@ -1,61 +1,61 @@
#include "quantum.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_9, A_9, C_9 }, //LA33
- { 0, B_10, A_10, C_10 }, //LA37
- { 0, B_11, A_11, C_11 }, //LA41
- { 0, B_12, A_12, C_12 }, //LA45
- { 0, B_13, A_13, C_13 }, //LA49
- { 0, B_14, A_14, C_14 }, //LA53
- { 0, B_15, A_15, C_15 }, //LA57
- { 0, B_6, A_6, C_6 }, //LA21
- { 0, B_5, A_5, C_5 }, //LA17
- { 0, B_4, A_4, C_4 }, //LA13
- { 0, B_3, A_3, C_3 }, //LA9
- { 0, B_2, A_2, C_2 }, //LA5
- { 0, B_1, A_1, C_1 }, //LA1
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 }, //LA33
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 }, //LA37
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 }, //LA41
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 }, //LA45
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 }, //LA49
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 }, //LA53
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 }, //LA57
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 }, //LA21
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 }, //LA17
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 }, //LA13
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 }, //LA9
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 }, //LA5
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 }, //LA1
- { 0, E_9, D_9, F_9 }, //LA34
- { 0, E_10, D_10, F_10 }, //LA38
- { 0, E_11, D_11, F_11 }, //LA42
- { 0, E_12, D_12, F_12 }, //LA46
- { 0, E_13, D_13, F_13 }, //LA50
- { 0, E_14, D_14, F_14 }, //LA54
- { 0, E_15, D_15, F_15 }, //LA58
- { 0, E_6, D_6, F_6 }, //LA22
- { 0, E_5, D_5, F_5 }, //LA18
- { 0, E_4, D_4, F_4 }, //LA14
- { 0, E_3, D_3, F_3 }, //LA10
- { 0, E_2, D_2, F_2 }, //LA6
- { 0, E_1, D_1, F_1 }, //LA2
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 }, //LA34
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 }, //LA38
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 }, //LA42
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 }, //LA46
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 }, //LA50
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 }, //LA54
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 }, //LA58
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 }, //LA22
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 }, //LA18
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 }, //LA14
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 }, //LA10
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 }, //LA6
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 }, //LA2
- { 0, H_9, G_9, I_9 }, //LA35
- { 0, H_10, G_10, I_10 }, //LA39
- { 0, H_11, G_11, I_11 }, //LA43
- { 0, H_12, G_12, I_12 }, //LA47
- { 0, H_13, G_13, I_13 }, //LA51
- { 0, H_14, G_14, I_14 }, //LA55
- { 0, H_15, G_15, I_15 }, //LA59
- { 0, H_6, G_6, I_6 }, //LA23
- { 0, H_5, G_5, I_5 }, //LA19
- { 0, H_4, G_4, I_4 }, //LA15
- { 0, H_3, G_3, I_3 }, //LA11
- { 0, H_2, G_2, I_2 }, //LA7
- { 0, H_1, G_1, I_1 }, //LA3
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 }, //LA35
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 }, //LA39
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 }, //LA43
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 }, //LA47
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 }, //LA51
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 }, //LA55
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 }, //LA59
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 }, //LA23
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 }, //LA19
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 }, //LA15
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 }, //LA11
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 }, //LA7
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 }, //LA3
- { 0, K_9, J_9, L_9 }, //LA36
- { 0, K_10, J_10, L_10 }, //LA40
- { 0, K_11, J_11, L_11 }, //LA44
- { 0, K_12, J_12, L_12 }, //LA48
- { 0, K_13, J_13, L_13 }, //LA52
- { 0, K_14, J_14, L_14 }, //LA56
- { 0, K_15, J_15, L_15 }, //LA60
- { 0, K_6, J_6, L_6 }, //LA24
- { 0, K_5, J_5, L_5 }, //LA20
- { 0, K_4, J_4, L_4 }, //LA16
- { 0, K_3, J_3, L_3 }, //LA12
- { 0, K_2, J_2, L_2 }, //LA8
- { 0, K_1, J_1, L_1 } //LA4
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 }, //LA36
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 }, //LA40
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 }, //LA44
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 }, //LA48
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 }, //LA52
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 }, //LA56
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 }, //LA60
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 }, //LA24
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 }, //LA20
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 }, //LA16
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 }, //LA12
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 }, //LA8
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 } //LA4
};
led_config_t g_led_config = {
diff --git a/keyboards/keebwerk/mega/ansi/ansi.c b/keyboards/keebwerk/mega/ansi/ansi.c
index 4b10cdde66e..5218fdd0e19 100755
--- a/keyboards/keebwerk/mega/ansi/ansi.c
+++ b/keyboards/keebwerk/mega/ansi/ansi.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, B_1, A_1, C_1}, //LA1
- {0, E_1, D_1, F_1}, //LA2
- {0, H_1, G_1, I_1}, //LA3
- {0, K_1, J_1, L_1}, //LA4
- {0, B_2, A_2, C_2}, //LA5
- {0, E_2, D_2, F_2}, //LA6
- {0, H_2, G_2, I_2}, //LA7
- {0, K_2, J_2, L_2}, //LA8
- {0, B_3, A_3, C_3}, //LA9
- {0, E_3, D_3, F_3}, //LA10
- {0, H_3, G_3, I_3}, //LA11
- {0, K_3, J_3, L_3}, //LA12
- {0, B_4, A_4, C_4}, //LA13
- {0, E_4, D_4, F_4}, //LA14
- {0, H_4, G_4, I_4}, //LA15
- {0, K_4, J_4, L_4}, //LA16
- {0, B_5, A_5, C_5}, //LA17
- {0, E_5, D_5, F_5}, //LA18
- {0, H_5, G_5, I_5}, //LA19
- {0, K_5, J_5, L_5}, //LA20
- {0, B_6, A_6, C_6}, //LA21
- {0, E_6, D_6, F_6}, //LA22
- {0, H_6, G_6, I_6}, //LA23
- {0, K_6, J_6, L_6}, //LA24
- {0, B_7, A_7, C_7}, //LA25
- {0, E_7, D_7, F_7}, //LA26
- {0, H_7, G_7, I_7}, //LA27
- {0, K_7, J_7, L_7}, //LA28
- {0, B_8, A_8, C_8}, //LA29
- {0, E_8, D_8, F_8}, //LA30
- {0, H_8, G_8, I_8}, //LA31
- {0, K_8, J_8, L_8}, //LA32
- {0, B_9, A_9, C_9}, //LA33
- {0, E_9, D_9, F_9}, //LA34
- {0, H_9, G_9, I_9}, //LA35
- {0, K_9, J_9, L_9}, //LA36
- {0, B_10, A_10, C_10}, //LA37
- {0, E_10, D_10, F_10}, //LA38
- {0, H_10, G_10, I_10}, //LA39
- {0, K_10, J_10, L_10}, //LA40
- {0, B_11, A_11, C_11}, //LA41
- {0, E_11, D_11, F_11}, //LA42
- {0, H_11, G_11, I_11}, //LA43
- {0, K_11, J_11, L_11}, //LA44
- {0, B_12, A_12, C_12}, //LA45
- {0, E_12, D_12, F_12}, //LA46
- {0, H_12, G_12, I_12}, //LA47
- {0, K_12, J_12, L_12}, //LA48
- {0, B_13, A_13, C_13}, //LA49
- {0, E_13, D_13, F_13}, //LA50
- {0, H_13, G_13, I_13}, //LA51
- {0, K_13, J_13, L_13}, //LA52
- {0, B_14, A_14, C_14}, //LA53
- {0, E_14, D_14, F_14}, //LA54
- {0, H_14, G_14, I_14}, //LA55
- {0, K_14, J_14, L_14}, //LA56
- {0, B_15, A_15, C_15}, //LA57
- {0, E_15, D_15, F_15}, //LA58
- {0, H_15, G_15, I_15}, //LA59
- {0, K_15, J_15, L_15}, //LA60
- {0, B_16, A_16, C_16}, //LA61
- {0, E_16, D_16, F_16}, //LA62
- {0, H_16, G_16, I_16}, //LA63
- {0, K_16, J_16, L_16}, //LA64
+ {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1
+ {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2
+ {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3
+ {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4
+ {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5
+ {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6
+ {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7
+ {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8
+ {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9
+ {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10
+ {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11
+ {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12
+ {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13
+ {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14
+ {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15
+ {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16
+ {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17
+ {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18
+ {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19
+ {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20
+ {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21
+ {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22
+ {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23
+ {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24
+ {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25
+ {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26
+ {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27
+ {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28
+ {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29
+ {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30
+ {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31
+ {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32
+ {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33
+ {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34
+ {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35
+ {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36
+ {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37
+ {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38
+ {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39
+ {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40
+ {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41
+ {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42
+ {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43
+ {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44
+ {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45
+ {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46
+ {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47
+ {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48
+ {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49
+ {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50
+ {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51
+ {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52
+ {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53
+ {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54
+ {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55
+ {0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56
+ {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57
+ {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58
+ {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59
+ {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60
+ {0, SW2_CS16, SW1_CS16, SW3_CS16}, //LA61
+ {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62
+ {0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63
+ {0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64
- {1, B_1, A_1, C_1}, //LB1
- {1, E_1, D_1, F_1}, //LB2
- {1, H_1, G_1, I_1}, //LB3
- {1, K_1, J_1, L_1}, //LB4
- {1, B_2, A_2, C_2}, //LB5
- {1, E_2, D_2, F_2}, //LB6
- {1, H_2, G_2, I_2}, //LB7
- {1, K_2, J_2, L_2}, //LB8
- {1, B_3, A_3, C_3}, //LB9
- {1, E_3, D_3, F_3}, //LB10
- {1, H_3, G_3, I_3}, //LB11
- {1, K_3, J_3, L_3}, //LB12
- {1, B_4, A_4, C_4}, //LB13
- {1, E_4, D_4, F_4}, //LB14
- {1, H_4, G_4, I_4}, //LB15
- {1, K_4, J_4, L_4}, //LB16
- {1, B_5, A_5, C_5}, //LB17
- {1, E_5, D_5, F_5}, //LB18
- {1, H_5, G_5, I_5}, //LB19
- {1, K_5, J_5, L_5}, //LB20
- {1, B_6, A_6, C_6}, //LB21
- {1, E_6, D_6, F_6}, //LB22
- {1, H_6, G_6, I_6}, //LB23
- {1, K_6, J_6, L_6}, //LB24
- {1, B_7, A_7, C_7}, //LB25
- {1, E_7, D_7, F_7}, //LB26
- {1, H_7, G_7, I_7}, //LB27
- {1, K_7, J_7, L_7}, //LB28
- {1, B_8, A_8, C_8}, //LB29
- {1, E_8, D_8, F_8}, //LB30
- {1, H_8, G_8, I_8}, //LB31
- {1, K_8, J_8, L_8}, //LB32
- {1, B_9, A_9, C_9}, //LB33
- {1, E_9, D_9, F_9}, //LB34
- {1, H_9, G_9, I_9}, //LB35
- {1, K_9, J_9, L_9}, //LB36
- {1, B_10, A_10, C_10}, //LB37
- {1, E_10, D_10, F_10}, //LB38
- {1, H_10, G_10, I_10}, //LB39
- {1, K_10, J_10, L_10}, //LB40
- {1, B_11, A_11, C_11}, //LB41
- {1, E_11, D_11, F_11}, //LB42
- {1, H_11, G_11, I_11}, //LB43
- {1, K_11, J_11, L_11}, //LB44
- {1, B_12, A_12, C_12}, //LB45
- {1, E_12, D_12, F_12}, //LB46
- {1, H_12, G_12, I_12}, //LB47
- {1, K_12, J_12, L_12}, //LB48
- {1, B_13, A_13, C_13}, //LB49
- {1, E_13, D_13, F_13}, //LB50
- {1, H_13, G_13, I_13}, //LB51
- {1, K_13, J_13, L_13}, //LB52
- {1, B_14, A_14, C_14}, //LB53
- {1, E_14, D_14, F_14}, //LB54
- {1, H_14, G_14, I_14}, //LB55
- {1, K_14, J_14, L_14}, //LB56
- {1, B_15, A_15, C_15}, //LB57
- {1, E_15, D_15, F_15}, //LB58
- {1, H_15, G_15, I_15}, //LB59
- {1, K_15, J_15, L_15}, //LB60
- {1, B_16, A_16, C_16}, //LB61
- {1, E_16, D_16, F_16}, //LB62
- {1, H_16, G_16, I_16}, //LB63
- {1, K_16, J_16, L_16}, //LB64
+ {1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1
+ {1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2
+ {1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3
+ {1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4
+ {1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5
+ {1, SW5_CS2, SW4_CS2, SW6_CS2}, //LB6
+ {1, SW8_CS2, SW7_CS2, SW9_CS2}, //LB7
+ {1, SW11_CS2, SW10_CS2, SW12_CS2}, //LB8
+ {1, SW2_CS3, SW1_CS3, SW3_CS3}, //LB9
+ {1, SW5_CS3, SW4_CS3, SW6_CS3}, //LB10
+ {1, SW8_CS3, SW7_CS3, SW9_CS3}, //LB11
+ {1, SW11_CS3, SW10_CS3, SW12_CS3}, //LB12
+ {1, SW2_CS4, SW1_CS4, SW3_CS4}, //LB13
+ {1, SW5_CS4, SW4_CS4, SW6_CS4}, //LB14
+ {1, SW8_CS4, SW7_CS4, SW9_CS4}, //LB15
+ {1, SW11_CS4, SW10_CS4, SW12_CS4}, //LB16
+ {1, SW2_CS5, SW1_CS5, SW3_CS5}, //LB17
+ {1, SW5_CS5, SW4_CS5, SW6_CS5}, //LB18
+ {1, SW8_CS5, SW7_CS5, SW9_CS5}, //LB19
+ {1, SW11_CS5, SW10_CS5, SW12_CS5}, //LB20
+ {1, SW2_CS6, SW1_CS6, SW3_CS6}, //LB21
+ {1, SW5_CS6, SW4_CS6, SW6_CS6}, //LB22
+ {1, SW8_CS6, SW7_CS6, SW9_CS6}, //LB23
+ {1, SW11_CS6, SW10_CS6, SW12_CS6}, //LB24
+ {1, SW2_CS7, SW1_CS7, SW3_CS7}, //LB25
+ {1, SW5_CS7, SW4_CS7, SW6_CS7}, //LB26
+ {1, SW8_CS7, SW7_CS7, SW9_CS7}, //LB27
+ {1, SW11_CS7, SW10_CS7, SW12_CS7}, //LB28
+ {1, SW2_CS8, SW1_CS8, SW3_CS8}, //LB29
+ {1, SW5_CS8, SW4_CS8, SW6_CS8}, //LB30
+ {1, SW8_CS8, SW7_CS8, SW9_CS8}, //LB31
+ {1, SW11_CS8, SW10_CS8, SW12_CS8}, //LB32
+ {1, SW2_CS9, SW1_CS9, SW3_CS9}, //LB33
+ {1, SW5_CS9, SW4_CS9, SW6_CS9}, //LB34
+ {1, SW8_CS9, SW7_CS9, SW9_CS9}, //LB35
+ {1, SW11_CS9, SW10_CS9, SW12_CS9}, //LB36
+ {1, SW2_CS10, SW1_CS10, SW3_CS10}, //LB37
+ {1, SW5_CS10, SW4_CS10, SW6_CS10}, //LB38
+ {1, SW8_CS10, SW7_CS10, SW9_CS10}, //LB39
+ {1, SW11_CS10, SW10_CS10, SW12_CS10}, //LB40
+ {1, SW2_CS11, SW1_CS11, SW3_CS11}, //LB41
+ {1, SW5_CS11, SW4_CS11, SW6_CS11}, //LB42
+ {1, SW8_CS11, SW7_CS11, SW9_CS11}, //LB43
+ {1, SW11_CS11, SW10_CS11, SW12_CS11}, //LB44
+ {1, SW2_CS12, SW1_CS12, SW3_CS12}, //LB45
+ {1, SW5_CS12, SW4_CS12, SW6_CS12}, //LB46
+ {1, SW8_CS12, SW7_CS12, SW9_CS12}, //LB47
+ {1, SW11_CS12, SW10_CS12, SW12_CS12}, //LB48
+ {1, SW2_CS13, SW1_CS13, SW3_CS13}, //LB49
+ {1, SW5_CS13, SW4_CS13, SW6_CS13}, //LB50
+ {1, SW8_CS13, SW7_CS13, SW9_CS13}, //LB51
+ {1, SW11_CS13, SW10_CS13, SW12_CS13}, //LB52
+ {1, SW2_CS14, SW1_CS14, SW3_CS14}, //LB53
+ {1, SW5_CS14, SW4_CS14, SW6_CS14}, //LB54
+ {1, SW8_CS14, SW7_CS14, SW9_CS14}, //LB55
+ {1, SW11_CS14, SW10_CS14, SW12_CS14}, //LB56
+ {1, SW2_CS15, SW1_CS15, SW3_CS15}, //LB57
+ {1, SW5_CS15, SW4_CS15, SW6_CS15}, //LB58
+ {1, SW8_CS15, SW7_CS15, SW9_CS15}, //LB59
+ {1, SW11_CS15, SW10_CS15, SW12_CS15}, //LB60
+ {1, SW2_CS16, SW1_CS16, SW3_CS16}, //LB61
+ {1, SW5_CS16, SW4_CS16, SW6_CS16}, //LB62
+ {1, SW8_CS16, SW7_CS16, SW9_CS16}, //LB63
+ {1, SW11_CS16, SW10_CS16, SW12_CS16}, //LB64
};
#endif
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
index 38d4a96d3ee..e4c640d6bfa 100644
--- a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c
@@ -25,100 +25,100 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
- {0, I_14, G_14, H_14}, // CAPS_MAC_WIN_LED_INDEX
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // CAPS_MAC_WIN_LED_INDEX
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
// clang-format on
diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c
index d7b75e0dd61..2b41845c9b5 100644
--- a/keyboards/keychron/c1_pro/ansi/white/white.c
+++ b/keyboards/keychron/c1_pro/ansi/white/white.c
@@ -23,102 +23,102 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* driver
* | LED address
* | | */
- {0, A_16}, // esc
- {0, A_15}, // f1
- {0, A_14}, // f2
- {0, A_13}, // f3
- {0, A_12}, // f4
- {0, A_11}, // f5
- {0, A_10}, // f6
- {0, A_9}, // f7
- {0, A_8}, // f8
- {0, A_7}, // f9
- {0, A_6}, // f10
- {0, A_5}, // f11
- {0, A_4}, // f12
- {0, A_2}, // print
- {0, A_1}, // siri
- {0, G_1}, // light
+ {0, CB1_CA16}, // esc
+ {0, CB1_CA15}, // f1
+ {0, CB1_CA14}, // f2
+ {0, CB1_CA13}, // f3
+ {0, CB1_CA12}, // f4
+ {0, CB1_CA11}, // f5
+ {0, CB1_CA10}, // f6
+ {0, CB1_CA9}, // f7
+ {0, CB1_CA8}, // f8
+ {0, CB1_CA7}, // f9
+ {0, CB1_CA6}, // f10
+ {0, CB1_CA5}, // f11
+ {0, CB1_CA4}, // f12
+ {0, CB1_CA2}, // print
+ {0, CB1_CA1}, // siri
+ {0, CB7_CA1}, // light
- {0, B_16}, // ~
- {0, B_15}, // 1!
- {0, B_14}, // 2@
- {0, B_13}, // 3#
- {0, B_12}, // 4$
- {0, B_11}, // 5%
- {0, B_10}, // 6^
- {0, B_9}, // 7&
- {0, B_8}, // 8*
- {0, B_7}, // 9(
- {0, B_6}, // 0)
- {0, B_5}, // -_
- {0, B_4}, // =+
- {0, B_3}, // back space
- {0, B_2}, // INS
- {0, B_1}, // HOME
- {0, H_1}, // PGUP
+ {0, CB2_CA16}, // ~
+ {0, CB2_CA15}, // 1!
+ {0, CB2_CA14}, // 2@
+ {0, CB2_CA13}, // 3#
+ {0, CB2_CA12}, // 4$
+ {0, CB2_CA11}, // 5%
+ {0, CB2_CA10}, // 6^
+ {0, CB2_CA9}, // 7&
+ {0, CB2_CA8}, // 8*
+ {0, CB2_CA7}, // 9(
+ {0, CB2_CA6}, // 0)
+ {0, CB2_CA5}, // -_
+ {0, CB2_CA4}, // =+
+ {0, CB2_CA3}, // back space
+ {0, CB2_CA2}, // INS
+ {0, CB2_CA1}, // HOME
+ {0, CB8_CA1}, // PGUP
- {0, C_16}, // tab
- {0, C_15}, // q
- {0, C_14}, // w
- {0, C_13}, // e
- {0, C_12}, // r
- {0, C_11}, // t
- {0, C_10}, // y
- {0, C_9}, // u
- {0, C_8}, // i
- {0, C_7}, // o
- {0, C_6}, // p
- {0, C_5}, // [{
- {0, C_4}, // ]}
- {0, C_3}, // \|
- {0, C_2}, // DEL
- {0, C_1}, // END
- {0, G_6}, // PGDN
+ {0, CB3_CA16}, // tab
+ {0, CB3_CA15}, // q
+ {0, CB3_CA14}, // w
+ {0, CB3_CA13}, // e
+ {0, CB3_CA12}, // r
+ {0, CB3_CA11}, // t
+ {0, CB3_CA10}, // y
+ {0, CB3_CA9}, // u
+ {0, CB3_CA8}, // i
+ {0, CB3_CA7}, // o
+ {0, CB3_CA6}, // p
+ {0, CB3_CA5}, // [{
+ {0, CB3_CA4}, // ]}
+ {0, CB3_CA3}, // \|
+ {0, CB3_CA2}, // DEL
+ {0, CB3_CA1}, // END
+ {0, CB7_CA6}, // PGDN
- {0, D_16}, // caps lock
- {0, D_15}, // a
- {0, D_14}, // s
- {0, D_13}, // d
- {0, D_12}, // f
- {0, D_11}, // g
- {0, D_10}, // h
- {0, D_9}, // j
- {0, D_8}, // k
- {0, D_7}, // l
- {0, D_6}, // ;:
- {0, D_5}, // '"
- {0, D_3}, // enter
+ {0, CB4_CA16}, // caps lock
+ {0, CB4_CA15}, // a
+ {0, CB4_CA14}, // s
+ {0, CB4_CA13}, // d
+ {0, CB4_CA12}, // f
+ {0, CB4_CA11}, // g
+ {0, CB4_CA10}, // h
+ {0, CB4_CA9}, // j
+ {0, CB4_CA8}, // k
+ {0, CB4_CA7}, // l
+ {0, CB4_CA6}, // ;:
+ {0, CB4_CA5}, // '"
+ {0, CB4_CA3}, // enter
- {0, H_7}, // CPAS
- {0, H_8}, // MAC
- {0, H_9}, // WIN
+ {0, CB8_CA7}, // CPAS
+ {0, CB8_CA8}, // MAC
+ {0, CB8_CA9}, // WIN
- {0, E_16}, // left shift
- {0, E_14}, // z
- {0, E_13}, // x
- {0, E_12}, // c
- {0, E_11}, // v
- {0, E_10}, // b
- {0, E_9}, // b
- {0, E_8}, // n
- {0, E_7}, // m
- {0, E_6}, // ,<
- {0, E_5}, // .>
- {0, E_3}, // right shift
- {0, E_1}, // up
+ {0, CB5_CA16}, // left shift
+ {0, CB5_CA14}, // z
+ {0, CB5_CA13}, // x
+ {0, CB5_CA12}, // c
+ {0, CB5_CA11}, // v
+ {0, CB5_CA10}, // b
+ {0, CB5_CA9}, // b
+ {0, CB5_CA8}, // n
+ {0, CB5_CA7}, // m
+ {0, CB5_CA6}, // ,<
+ {0, CB5_CA5}, // .>
+ {0, CB5_CA3}, // right shift
+ {0, CB5_CA1}, // up
- {0, F_16}, // left ctrl
- {0, F_15}, // left command
- {0, F_14}, // left option
- {0, F_10}, // space
- {0, F_6}, // right command
- {0, F_5}, // right option
- {0, F_4}, // right ctrl
- {0, F_3}, // Fn
- {0, F_2}, // left
- {0, F_1}, // down
- {0, G_13}, // right
+ {0, CB6_CA16}, // left ctrl
+ {0, CB6_CA15}, // left command
+ {0, CB6_CA14}, // left option
+ {0, CB6_CA10}, // space
+ {0, CB6_CA6}, // right command
+ {0, CB6_CA5}, // right option
+ {0, CB6_CA4}, // right ctrl
+ {0, CB6_CA3}, // Fn
+ {0, CB6_CA2}, // left
+ {0, CB6_CA1}, // down
+ {0, CB7_CA13}, // right
};
// clang-format on
diff --git a/keyboards/keychron/c2_pro/ansi/rgb/rgb.c b/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
index 6fce51417cb..4891ceea74e 100644
--- a/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/c2_pro/ansi/rgb/rgb.c
@@ -24,119 +24,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
- {0, L_6, J_6, K_6}, // CapsLock
- {0, L_7, J_7, K_7}, // NumLock
- {0, L_8, J_8, K_8}, // Mac
- {0, L_4, J_4, K_4}, // Win
+ {0, CB12_CA6, CB10_CA6, CB11_CA6}, // CapsLock
+ {0, CB12_CA7, CB10_CA7, CB11_CA7}, // NumLock
+ {0, CB12_CA8, CB10_CA8, CB11_CA8}, // Mac
+ {0, CB12_CA4, CB10_CA4, CB11_CA4}, // Win
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
- {1, L_9, J_9, K_9},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
};
#endif //RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/c2_pro/ansi/white/white.c b/keyboards/keychron/c2_pro/ansi/white/white.c
index 4bad7187cc3..3b10e550955 100644
--- a/keyboards/keychron/c2_pro/ansi/white/white.c
+++ b/keyboards/keychron/c2_pro/ansi/white/white.c
@@ -23,119 +23,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* driver
* | LED address
* | | */
- {0, A_16},
- {0, A_15},
- {0, A_14},
- {0, A_13},
- {0, A_12},
- {0, A_11},
- {0, A_10},
- {0, A_9 },
- {0, A_8 },
- {0, A_7 },
- {0, A_6 },
- {0, A_5 },
- {0, A_4 },
- {0, A_2 },
- {0, A_1 },
- {0, G_1 },
+ {0, CB1_CA16},
+ {0, CB1_CA15},
+ {0, CB1_CA14},
+ {0, CB1_CA13},
+ {0, CB1_CA12},
+ {0, CB1_CA11},
+ {0, CB1_CA10},
+ {0, CB1_CA9 },
+ {0, CB1_CA8 },
+ {0, CB1_CA7 },
+ {0, CB1_CA6 },
+ {0, CB1_CA5 },
+ {0, CB1_CA4 },
+ {0, CB1_CA2 },
+ {0, CB1_CA1 },
+ {0, CB7_CA1 },
- {0, G_2 },
- {0, G_3 }, // NumLock
- {0, G_4 }, // Mac
- {0, G_5 }, // Win
+ {0, CB7_CA2 },
+ {0, CB7_CA3 }, // NumLock
+ {0, CB7_CA4 }, // Mac
+ {0, CB7_CA5 }, // Win
- {0, B_16},
- {0, B_15},
- {0, B_14},
- {0, B_13},
- {0, B_12},
- {0, B_11},
- {0, B_10},
- {0, B_9 },
- {0, B_8 },
- {0, B_7 },
- {0, B_6 },
- {0, B_5 },
- {0, B_4 },
- {0, B_3 },
- {0, B_2 },
- {0, B_1 },
- {0, H_1 },
- {0, H_2 },
- {0, H_3 },
- {0, H_4 },
- {0, H_5 },
+ {0, CB2_CA16},
+ {0, CB2_CA15},
+ {0, CB2_CA14},
+ {0, CB2_CA13},
+ {0, CB2_CA12},
+ {0, CB2_CA11},
+ {0, CB2_CA10},
+ {0, CB2_CA9 },
+ {0, CB2_CA8 },
+ {0, CB2_CA7 },
+ {0, CB2_CA6 },
+ {0, CB2_CA5 },
+ {0, CB2_CA4 },
+ {0, CB2_CA3 },
+ {0, CB2_CA2 },
+ {0, CB2_CA1 },
+ {0, CB8_CA1 },
+ {0, CB8_CA2 },
+ {0, CB8_CA3 },
+ {0, CB8_CA4 },
+ {0, CB8_CA5 },
- {0, C_16},
- {0, C_15},
- {0, C_14},
- {0, C_13},
- {0, C_12},
- {0, C_11},
- {0, C_10},
- {0, C_9 },
- {0, C_8 },
- {0, C_7 },
- {0, C_6 },
- {0, C_5 },
- {0, C_4 },
- {0, C_3 },
- {0, C_2 },
- {0, C_1 },
- {0, G_6 },
- {0, G_7 },
- {0, G_8 },
- {0, G_9 },
- {0, G_10},
+ {0, CB3_CA16},
+ {0, CB3_CA15},
+ {0, CB3_CA14},
+ {0, CB3_CA13},
+ {0, CB3_CA12},
+ {0, CB3_CA11},
+ {0, CB3_CA10},
+ {0, CB3_CA9 },
+ {0, CB3_CA8 },
+ {0, CB3_CA7 },
+ {0, CB3_CA6 },
+ {0, CB3_CA5 },
+ {0, CB3_CA4 },
+ {0, CB3_CA3 },
+ {0, CB3_CA2 },
+ {0, CB3_CA1 },
+ {0, CB7_CA6 },
+ {0, CB7_CA7 },
+ {0, CB7_CA8 },
+ {0, CB7_CA9 },
+ {0, CB7_CA10},
- {0, D_16},
- {0, D_15},
- {0, D_14},
- {0, D_13},
- {0, D_12},
- {0, D_11},
- {0, D_10},
- {0, D_9 },
- {0, D_8 },
- {0, D_7 },
- {0, D_6 },
- {0, D_5 },
- {0, D_3 },
- {0, H_7 },
- {0, H_8 },
- {0, H_9 },
+ {0, CB4_CA16},
+ {0, CB4_CA15},
+ {0, CB4_CA14},
+ {0, CB4_CA13},
+ {0, CB4_CA12},
+ {0, CB4_CA11},
+ {0, CB4_CA10},
+ {0, CB4_CA9 },
+ {0, CB4_CA8 },
+ {0, CB4_CA7 },
+ {0, CB4_CA6 },
+ {0, CB4_CA5 },
+ {0, CB4_CA3 },
+ {0, CB8_CA7 },
+ {0, CB8_CA8 },
+ {0, CB8_CA9 },
- {0, E_16},
- {0, E_14},
- {0, E_13},
- {0, E_12},
- {0, E_11},
- {0, E_10},
- {0, E_9 },
- {0, E_8 },
- {0, E_7 },
- {0, E_6 },
- {0, E_5 },
- {0, E_3 },
- {0, E_1 },
- {0, H_6 },
- {0, H_11},
- {0, H_12},
- {0, H_10},
+ {0, CB5_CA16},
+ {0, CB5_CA14},
+ {0, CB5_CA13},
+ {0, CB5_CA12},
+ {0, CB5_CA11},
+ {0, CB5_CA10},
+ {0, CB5_CA9 },
+ {0, CB5_CA8 },
+ {0, CB5_CA7 },
+ {0, CB5_CA6 },
+ {0, CB5_CA5 },
+ {0, CB5_CA3 },
+ {0, CB5_CA1 },
+ {0, CB8_CA6 },
+ {0, CB8_CA11},
+ {0, CB8_CA12},
+ {0, CB8_CA10},
- {0, F_16},
- {0, F_15},
- {0, F_14},
- {0, F_10},
- {0, F_6 },
- {0, F_5 },
- {0, F_4 },
- {0, F_3 },
- {0, F_2 },
- {0, F_1 },
- {0, G_13},
- {0, G_11},
- {0, G_12},
+ {0, CB6_CA16},
+ {0, CB6_CA15},
+ {0, CB6_CA14},
+ {0, CB6_CA10},
+ {0, CB6_CA6 },
+ {0, CB6_CA5 },
+ {0, CB6_CA4 },
+ {0, CB6_CA3 },
+ {0, CB6_CA2 },
+ {0, CB6_CA1 },
+ {0, CB7_CA13},
+ {0, CB7_CA11},
+ {0, CB7_CA12},
};
#endif //LED_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/base/base.c b/keyboards/keychron/q0/base/base.c
index b9774717303..af33e5c0a36 100644
--- a/keyboards/keychron/q0/base/base.c
+++ b/keyboards/keychron/q0/base/base.c
@@ -27,31 +27,31 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, F_5, D_5, E_5}, // 0
- {0, I_5, G_5, H_5}, // 1
- {0, L_5, J_5, K_5}, // 2
- {0, C_5, A_5, B_5}, // 3
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // 0
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // 1
+ {0, CB12_CA5, CB10_CA5, CB11_CA5}, // 2
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 3
- {0, F_4, D_4, E_4}, // 4
- {0, I_4, G_4, H_4}, // 5
- {0, L_4, J_4, K_4}, // 6
- {0, C_4, A_4, B_4}, // 7
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // 4
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // 5
+ {0, CB12_CA4, CB10_CA4, CB11_CA4}, // 6
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // 7
- {0, F_6, D_6, E_6}, // 8
- {0, I_6, G_6, H_6}, // 9
- {0, L_6, J_6, K_6}, // 10
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // 8
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // 9
+ {0, CB12_CA6, CB10_CA6, CB11_CA6}, // 10
- {0, F_3, D_3, E_3}, // 11
- {0, I_3, G_3, H_3}, // 12
- {0, L_3, J_3, K_3}, // 13
- {0, C_6, A_6, B_6}, // 14
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // 11
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // 12
+ {0, CB12_CA3, CB10_CA3, CB11_CA3}, // 13
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 14
- {0, F_2, D_2, E_2}, // 15
- {0, I_2, G_2, H_2}, // 16
- {0, L_2, J_2, K_2}, // 17
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // 15
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // 16
+ {0, CB12_CA2, CB10_CA2, CB11_CA2}, // 17
- {0, F_1, D_1, E_1}, // 18
- {0, L_1, J_1, K_1}, // 19
- {0, C_2, A_2, B_2}, // 20
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // 18
+ {0, CB12_CA1, CB10_CA1, CB11_CA1}, // 19
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // 20
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q0/plus/plus.c b/keyboards/keychron/q0/plus/plus.c
index 4af7a4572f9..55f71d2a230 100644
--- a/keyboards/keychron/q0/plus/plus.c
+++ b/keyboards/keychron/q0/plus/plus.c
@@ -27,36 +27,36 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_9, D_9, E_9},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
index 06947e9d180..a4432cd4cea 100644
--- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
@@ -27,99 +27,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_2, A_2, B_2}, // ESC
- {0, C_3, A_3, B_3}, // F1
- {0, C_4, A_4, B_4}, // F2
- {0, C_5, A_5, B_5}, // F3
- {0, C_6, A_6, B_6}, // F4
- {0, C_7, A_7, B_7}, // F5
- {0, C_8, A_8, B_8}, // F6
- {0, C_9, A_9, B_9}, // F7
- {0, C_10, A_10, B_10}, // F8
- {0, C_11, A_11, B_11}, // F9
- {0, C_12, A_12, B_12}, // F10
- {0, C_13, A_13, B_13}, // F11
- {0, C_14, A_14, B_14}, // F12
- {0, C_15, A_15, B_15}, // INS
- {0, C_16, A_16, B_16}, // DEL
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // ESC
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // F1
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // F2
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // F3
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // F4
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // F5
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // F6
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // F7
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
- {0, I_1, G_1, H_1}, // M1
- {0, I_2, G_2, H_2}, // `~
- {0, I_3, G_3, H_3}, // 1!
- {0, I_4, G_4, H_4}, // 2@
- {0, I_5, G_5, H_5}, // 3#
- {0, I_6, G_6, H_6}, // 4$
- {0, I_7, G_7, H_7}, // 5%
- {0, I_8, G_8, H_8}, // 6^
- {0, I_9, G_9, H_9}, // 7&
- {0, I_10, G_10, H_10}, // 8*
- {0, I_11, G_11, H_11}, // 9(
- {0, I_12, G_12, H_12}, // 0)
- {0, I_13, G_13, H_13}, // -_
- {0, I_14, G_14, H_14}, // =+
- {0, I_15, G_15, H_15}, // BackSpace
- {0, I_16, G_16, H_16}, // PgUp
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // M1
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // `~
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // 1!
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // 2@
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // 3#
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // 4$
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // 5%
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // 6^
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // 7&
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
- {0, F_1, D_1, E_1}, // M2
- {0, F_2, D_2, E_2}, // TAB
- {0, F_3, D_3, E_3}, // Q
- {0, F_4, D_4, E_4}, // W
- {0, F_5, D_5, E_5}, // E
- {0, F_6, D_6, E_6}, // R
- {0, F_7, D_7, E_7}, // T
- {0, F_8, D_8, E_8}, // Y
- {0, F_9, D_9, E_9}, // U
- {0, F_10, D_10, E_10}, // I
- {0, F_11, D_11, E_11}, // O
- {0, F_12, D_12, E_12}, // P
- {0, F_13, D_13, E_13}, // [
- {0, F_14, D_14, E_14}, // ]
- {0, F_15, D_15, E_15}, // |
- {0, F_16, D_16, E_16}, // PgDn
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // M2
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // TAB
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // Q
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // W
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // E
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // R
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // T
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // Y
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // U
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
- {1, C_16, A_16, B_16}, // M3
- {1, C_15, A_15, B_15}, // CapsLock
- {1, C_14, A_14, B_14}, // A
- {1, C_13, A_13, B_13}, // S
- {1, C_12, A_12, B_12}, // D
- {1, C_11, A_11, B_11}, // F
- {1, C_10, A_10, B_10}, // G
- {1, C_8, A_8, B_8}, // H
- {1, C_7, A_7, B_7}, // J
- {1, C_6, A_6, B_6}, // K
- {1, C_5, A_5, B_5}, // L
- {1, C_4, A_4, B_4}, // ;
- {1, C_3, A_3, B_3}, // '
- {1, C_2, A_2, B_2}, // Enter
- {1, C_1, A_1, B_1}, // Home
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // H
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // J
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // K
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // L
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // ;
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // '
+ {1, CB3_CA2, CB1_CA2, CB2_CA2}, // Enter
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // Home
- {1, I_16, G_16, H_16}, // M4
- {1, I_15, G_15, H_15}, // Shift_L
- {1, I_13, G_13, H_13}, // Z
- {1, I_12, G_12, H_12}, // X
- {1, I_11, G_11, H_11}, // C
- {1, I_10, G_10, H_10}, // V
- {1, I_9, G_9, H_9}, // B
- {1, I_8, G_8, H_8}, // B
- {1, I_7, G_7, H_7}, // N
- {1, I_6, G_6, H_6}, // M
- {1, I_5, G_5, H_5}, // ,
- {1, I_4, G_4, H_4}, // .
- {1, I_3, G_3, H_3}, // ?
- {1, I_2, G_2, H_2}, // Shift_R
- {1, I_1, G_1, H_1}, // Up
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // B
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // B
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // N
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // M
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // ,
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // .
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // ?
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // Shift_R
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Up
- {1, F_16, D_16, E_16}, // M5
- {1, F_15, D_15, E_15}, // Ctrl_L
- {1, F_14, D_14, E_14}, // Win_L
- {1, F_13, D_13, E_13}, // Alt_L
- {1, F_12, D_12, E_12}, // Space
- {1, F_9, D_9, E_9}, // Fn
- {1, F_8, D_8, E_8}, // Space
- {1, F_7, D_7, E_7}, // Alt_R
- {1, F_3, D_3, E_3}, // Left
- {1, F_2, D_2, E_2}, // Down
- {1, F_1, D_1, E_1}, // Right
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+ {1, CB6_CA9, CB4_CA9, CB5_CA9}, // Fn
+ {1, CB6_CA8, CB4_CA8, CB5_CA8}, // Space
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Alt_R
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // Left
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // Right
};
#define __ NO_LED
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.c b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
index 2aebd936ecf..9ff43263b2d 100644
--- a/keyboards/keychron/q10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
@@ -27,100 +27,100 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_2, A_2, B_2}, // ESC
- {0, C_3, A_3, B_3}, // F1
- {0, C_4, A_4, B_4}, // F2
- {0, C_5, A_5, B_5}, // F3
- {0, C_6, A_6, B_6}, // F4
- {0, C_7, A_7, B_7}, // F5
- {0, C_8, A_8, B_8}, // F6
- {0, C_9, A_9, B_9}, // F7
- {0, C_10, A_10, B_10}, // F8
- {0, C_11, A_11, B_11}, // F9
- {0, C_12, A_12, B_12}, // F10
- {0, C_13, A_13, B_13}, // F11
- {0, C_14, A_14, B_14}, // F12
- {0, C_15, A_15, B_15}, // INS
- {0, C_16, A_16, B_16}, // DEL
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // ESC
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // F1
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // F2
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // F3
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // F4
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // F5
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // F6
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // F7
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
- {0, I_1, G_1, H_1}, // M1
- {0, I_2, G_2, H_2}, // `~
- {0, I_3, G_3, H_3}, // 1!
- {0, I_4, G_4, H_4}, // 2@
- {0, I_5, G_5, H_5}, // 3#
- {0, I_6, G_6, H_6}, // 4$
- {0, I_7, G_7, H_7}, // 5%
- {0, I_8, G_8, H_8}, // 6^
- {0, I_9, G_9, H_9}, // 7&
- {0, I_10, G_10, H_10}, // 8*
- {0, I_11, G_11, H_11}, // 9(
- {0, I_12, G_12, H_12}, // 0)
- {0, I_13, G_13, H_13}, // -_
- {0, I_14, G_14, H_14}, // =+
- {0, I_15, G_15, H_15}, // BackSpace
- {0, I_16, G_16, H_16}, // PgUp
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // M1
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // `~
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // 1!
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // 2@
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // 3#
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // 4$
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // 5%
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // 6^
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // 7&
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
- {0, F_1, D_1, E_1}, // M2
- {0, F_2, D_2, E_2}, // TAB
- {0, F_3, D_3, E_3}, // Q
- {0, F_4, D_4, E_4}, // W
- {0, F_5, D_5, E_5}, // E
- {0, F_6, D_6, E_6}, // R
- {0, F_7, D_7, E_7}, // T
- {0, F_8, D_8, E_8}, // Y
- {0, F_9, D_9, E_9}, // U
- {0, F_10, D_10, E_10}, // I
- {0, F_11, D_11, E_11}, // O
- {0, F_12, D_12, E_12}, // P
- {0, F_13, D_13, E_13}, // [
- {0, F_14, D_14, E_14}, // ]
- {0, F_16, D_16, E_16}, // PgDn
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // M2
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // TAB
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // Q
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // W
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // E
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // R
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // T
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // Y
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // U
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
- {1, C_16, A_16, B_16}, // M3
- {1, C_15, A_15, B_15}, // CapsLock
- {1, C_14, A_14, B_14}, // A
- {1, C_13, A_13, B_13}, // S
- {1, C_12, A_12, B_12}, // D
- {1, C_11, A_11, B_11}, // F
- {1, C_10, A_10, B_10}, // G
- {1, C_8, A_8, B_8}, // H
- {1, C_7, A_7, B_7}, // J
- {1, C_6, A_6, B_6}, // K
- {1, C_5, A_5, B_5}, // L
- {1, C_4, A_4, B_4}, // ;
- {1, C_3, A_3, B_3}, // '
- {0, F_15, D_15, E_15}, // |
- {1, C_2, A_2, B_2}, // Enter
- {1, C_1, A_1, B_1}, // Home
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // H
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // J
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // K
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // L
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // ;
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // '
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+ {1, CB3_CA2, CB1_CA2, CB2_CA2}, // Enter
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // Home
- {1, I_16, G_16, H_16}, // M4
- {1, I_15, G_15, H_15}, // Shift_L
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13}, // Z
- {1, I_12, G_12, H_12}, // X
- {1, I_11, G_11, H_11}, // C
- {1, I_10, G_10, H_10}, // V
- {1, I_9, G_9, H_9}, // B
- {1, I_8, G_8, H_8}, // B
- {1, I_7, G_7, H_7}, // N
- {1, I_6, G_6, H_6}, // M
- {1, I_5, G_5, H_5}, // ,
- {1, I_4, G_4, H_4}, // .
- {1, I_3, G_3, H_3}, // ?
- {1, I_2, G_2, H_2}, // Shift_R
- {1, I_1, G_1, H_1}, // Up
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // B
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // B
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // N
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // M
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // ,
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // .
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // ?
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // Shift_R
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Up
- {1, F_16, D_16, E_16}, // M5
- {1, F_15, D_15, E_15}, // Ctrl_L
- {1, F_14, D_14, E_14}, // Win_L
- {1, F_13, D_13, E_13}, // Alt_L
- {1, F_12, D_12, E_12}, // Space
- {1, F_9, D_9, E_9}, // Fn
- {1, F_8, D_8, E_8}, // Space
- {1, F_7, D_7, E_7}, // Alt_R
- {1, F_3, D_3, E_3}, // Left
- {1, F_2, D_2, E_2}, // Down
- {1, F_1, D_1, E_1}, // Right
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+ {1, CB6_CA9, CB4_CA9, CB5_CA9}, // Fn
+ {1, CB6_CA8, CB4_CA8, CB5_CA8}, // Space
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Alt_R
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // Left
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // Right
};
#define __ NO_LED
diff --git a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
index 24b9836b2ec..49e428bc00d 100755
--- a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
@@ -24,105 +24,105 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, A_2, C_2, B_2}, // ESC
- {0, A_3, C_3, B_3}, // F1
- {0, A_4, C_4, B_4}, // F2
- {0, A_5, C_5, B_5}, // F3
- {0, A_6, C_6, B_6}, // F4
- {0, A_7, C_7, B_7}, // F5
- {0, A_8, C_8, B_8}, // F6
+ {0, CB1_CA2, CB3_CA2, CB2_CA2}, // ESC
+ {0, CB1_CA3, CB3_CA3, CB2_CA3}, // F1
+ {0, CB1_CA4, CB3_CA4, CB2_CA4}, // F2
+ {0, CB1_CA5, CB3_CA5, CB2_CA5}, // F3
+ {0, CB1_CA6, CB3_CA6, CB2_CA6}, // F4
+ {0, CB1_CA7, CB3_CA7, CB2_CA7}, // F5
+ {0, CB1_CA8, CB3_CA8, CB2_CA8}, // F6
- {0, D_1, F_1, E_1}, // M1
- {0, D_2, F_2, E_2}, // `~
- {0, D_3, F_3, E_3}, // 1!
- {0, D_4, F_4, E_4}, // 2@
- {0, D_5, F_5, E_5}, // 3#
- {0, D_6, F_6, E_6}, // 4$
- {0, D_7, F_7, E_7}, // 5%
- {0, D_8, F_8, E_8}, // 6^
+ {0, CB4_CA1, CB6_CA1, CB5_CA1}, // M1
+ {0, CB4_CA2, CB6_CA2, CB5_CA2}, // `~
+ {0, CB4_CA3, CB6_CA3, CB5_CA3}, // 1!
+ {0, CB4_CA4, CB6_CA4, CB5_CA4}, // 2@
+ {0, CB4_CA5, CB6_CA5, CB5_CA5}, // 3#
+ {0, CB4_CA6, CB6_CA6, CB5_CA6}, // 4$
+ {0, CB4_CA7, CB6_CA7, CB5_CA7}, // 5%
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // 6^
- {0, G_1, I_1, H_1}, // M2
- {0, G_2, I_2, H_2}, // TAB
- {0, G_3, I_3, H_3}, // Q
- {0, G_4, I_4, H_4}, // W
- {0, G_5, I_5, H_5}, // E
- {0, G_6, I_6, H_6}, // R
- {0, G_7, I_7, H_7}, // T
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // M2
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // TAB
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Q
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // W
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // E
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // R
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // T
- {0, J_1, L_1, K_1}, // M3
- {0, J_2, L_2, K_2}, // CapsJock
- {0, J_3, L_3, K_3}, // A
- {0, J_4, L_4, K_4}, // S
- {0, J_5, L_5, K_5}, // D
- {0, J_6, L_6, K_6}, // F
- {0, J_7, L_7, K_7}, // G
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // M3
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // CapsJock
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // A
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // S
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // D
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // F
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // G
- {0, J_9, L_9, K_9}, // M4
- {0, J_11, L_11, K_11}, // Shift_J
- {0, J_12, L_12, K_12}, // Z
- {0, J_13, L_13, K_13}, // X
- {0, J_14, L_14, K_14}, // C
- {0, J_15, L_15, K_15}, // V
- {0, J_16, L_16, K_16}, // B
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // M4
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // Shift_J
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
- {0, G_9, I_9, H_9}, // M5
- {0, G_10, I_10, H_10}, // Ctrl_L
- {0, G_11, I_11, H_11}, // WGn_L
- {0, G_12, I_12, H_12}, // Alt_L
- {0, G_13, I_13, H_13}, // Fn
- {0, G_15, I_15, H_15}, // Space
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // M5
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
- {0, A_16, C_16, B_16}, // F7
- {0, A_15, C_15, B_15}, // F8
- {0, A_14, C_14, B_14}, // F9
- {0, A_13, C_13, B_13}, // F11
- {0, A_12, C_12, B_12}, // F11
- {0, A_11, C_11, B_11}, // F12
- {0, A_10, C_10, B_10}, // INS
- {0, A_9, C_9, B_9}, // DEL
+ {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+ {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+ {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+ {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+ {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+ {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+ {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+ {0, CB1_CA9, CB3_CA9, CB2_CA9}, // DEL
- {0, D_16, F_16, E_16}, // 7&
- {0, D_15, F_15, E_15}, // 8*
- {0, D_14, F_14, E_14}, // 9(
- {0, D_13, F_13, E_13}, // 1)
- {0, D_12, F_12, E_12}, // -_
- {0, D_11, F_11, E_11}, // =+
- {0, D_10, F_10, E_10}, // BackSpace
- {0, D_8, F_8, E_8}, // PgUp
+ {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+ {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+ {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+ {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+ {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+ {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+ {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // PgUp
- {0, G_16, I_16, H_16}, // Y
- {0, G_15, I_15, H_15}, // U
- {0, G_14, I_14, H_14}, // G
- {0, G_13, I_13, H_13}, // O
- {0, G_12, I_12, H_12}, // P
- {0, G_11, I_11, H_11}, // [
- {0, G_10, I_10, H_10}, // ]
- {0, G_9, I_9, H_9}, // \||
- {0, G_8, I_8, H_8}, // PgDn
+ {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+ {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // \||
+ {0, CB7_CA8, CB9_CA8, CB8_CA8}, // PgDn
- {0, J_16, L_16, K_16}, // H
- {0, J_15, L_15, K_15}, // J
- {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
- {0, J_13, L_13, K_13}, // J
- {0, J_12, L_12, K_12}, // ;:
- {0, J_11, L_11, K_11}, // '"
- {0, J_9, L_9, K_9}, // Enter
- {0, J_8, L_8, K_8}, // Home
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // Enter
+ {0, CB10_CA8, CB12_CA8, CB11_CA8}, // Home
- {0, J_7, L_7, K_7}, // N
- {0, J_6, L_6, K_6}, // M
- {0, J_5, L_5, K_5}, // ,<
- {0, J_4, L_4, K_4}, // .>
- {0, J_3, L_3, K_3}, // ?/
- {0, J_2, L_2, K_2}, // Shift_R
- {0, J_1, L_1, K_1}, // Up
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // N
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // M
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // ,<
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // .>
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // ?/
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // Shift_R
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // Up
- {0, G_6, I_6, H_6}, // Space
- {0, G_5, I_5, H_5}, // Win_R
- {0, G_4, I_4, H_4}, // Fn
- {0, G_3, I_3, H_3}, // Ctrl_R
- {0, G_2, I_2, H_2}, // Left
- {0, G_1, I_1, H_1}, // Down
- {0, G_7, I_7, H_7}, // Right
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // Space
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // Win_R
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // Fn
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Ctrl_R
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // Left
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // Down
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // Right
};
#endif
diff --git a/keyboards/keychron/q11/iso_encoder/iso_encoder.c b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
index feedfd17c39..8725598b1c2 100755
--- a/keyboards/keychron/q11/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q11/iso_encoder/iso_encoder.c
@@ -24,106 +24,106 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, A_2, C_2, B_2}, // ESC
- {0, A_3, C_3, B_3}, // F1
- {0, A_4, C_4, B_4}, // F2
- {0, A_5, C_5, B_5}, // F3
- {0, A_6, C_6, B_6}, // F4
- {0, A_7, C_7, B_7}, // F5
- {0, A_8, C_8, B_8}, // F6
+ {0, CB1_CA2, CB3_CA2, CB2_CA2}, // ESC
+ {0, CB1_CA3, CB3_CA3, CB2_CA3}, // F1
+ {0, CB1_CA4, CB3_CA4, CB2_CA4}, // F2
+ {0, CB1_CA5, CB3_CA5, CB2_CA5}, // F3
+ {0, CB1_CA6, CB3_CA6, CB2_CA6}, // F4
+ {0, CB1_CA7, CB3_CA7, CB2_CA7}, // F5
+ {0, CB1_CA8, CB3_CA8, CB2_CA8}, // F6
- {0, D_1, F_1, E_1}, // M1
- {0, D_2, F_2, E_2}, // `~
- {0, D_3, F_3, E_3}, // 1!
- {0, D_4, F_4, E_4}, // 2@
- {0, D_5, F_5, E_5}, // 3#
- {0, D_6, F_6, E_6}, // 4$
- {0, D_7, F_7, E_7}, // 5%
- {0, D_8, F_8, E_8}, // 6^
+ {0, CB4_CA1, CB6_CA1, CB5_CA1}, // M1
+ {0, CB4_CA2, CB6_CA2, CB5_CA2}, // `~
+ {0, CB4_CA3, CB6_CA3, CB5_CA3}, // 1!
+ {0, CB4_CA4, CB6_CA4, CB5_CA4}, // 2@
+ {0, CB4_CA5, CB6_CA5, CB5_CA5}, // 3#
+ {0, CB4_CA6, CB6_CA6, CB5_CA6}, // 4$
+ {0, CB4_CA7, CB6_CA7, CB5_CA7}, // 5%
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // 6^
- {0, G_1, I_1, H_1}, // M2
- {0, G_2, I_2, H_2}, // TAB
- {0, G_3, I_3, H_3}, // Q
- {0, G_4, I_4, H_4}, // W
- {0, G_5, I_5, H_5}, // E
- {0, G_6, I_6, H_6}, // R
- {0, G_7, I_7, H_7}, // T
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // M2
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // TAB
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Q
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // W
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // E
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // R
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // T
- {0, J_1, L_1, K_1}, // M3
- {0, J_2, L_2, K_2}, // CapsJock
- {0, J_3, L_3, K_3}, // A
- {0, J_4, L_4, K_4}, // S
- {0, J_5, L_5, K_5}, // D
- {0, J_6, L_6, K_6}, // F
- {0, J_7, L_7, K_7}, // G
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // M3
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // CapsJock
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // A
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // S
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // D
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // F
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // G
- {0, J_9, L_9, K_9}, // M4
- {0, J_10, L_10, K_10}, // Shift_L
- {0, J_11, L_11, K_11}, // NUBS
- {0, J_12, L_12, K_12}, // Z
- {0, J_13, L_13, K_13}, // X
- {0, J_14, L_14, K_14}, // C
- {0, J_15, L_15, K_15}, // V
- {0, J_16, L_16, K_16}, // B
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // M4
+ {0, CB10_CA10, CB12_CA10, CB11_CA10}, // Shift_L
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // NUBS
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // Z
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // X
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // C
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // V
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // B
- {0, G_9, I_9, H_9}, // M5
- {0, G_10, I_10, H_10}, // Ctrl_L
- {0, G_11, I_11, H_11}, // WGn_L
- {0, G_12, I_12, H_12}, // Alt_L
- {0, G_13, I_13, H_13}, // Fn
- {0, G_15, I_15, H_15}, // Space
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // M5
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // Ctrl_L
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // WGn_L
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // Alt_L
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // Fn
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // Space
- {0, A_16, C_16, B_16}, // F7
- {0, A_15, C_15, B_15}, // F8
- {0, A_14, C_14, B_14}, // F9
- {0, A_13, C_13, B_13}, // F11
- {0, A_12, C_12, B_12}, // F11
- {0, A_11, C_11, B_11}, // F12
- {0, A_10, C_10, B_10}, // INS
- {0, A_9, C_9, B_9}, // DEL
+ {0, CB1_CA16, CB3_CA16, CB2_CA16}, // F7
+ {0, CB1_CA15, CB3_CA15, CB2_CA15}, // F8
+ {0, CB1_CA14, CB3_CA14, CB2_CA14}, // F9
+ {0, CB1_CA13, CB3_CA13, CB2_CA13}, // F11
+ {0, CB1_CA12, CB3_CA12, CB2_CA12}, // F11
+ {0, CB1_CA11, CB3_CA11, CB2_CA11}, // F12
+ {0, CB1_CA10, CB3_CA10, CB2_CA10}, // INS
+ {0, CB1_CA9, CB3_CA9, CB2_CA9}, // DEL
- {0, D_16, F_16, E_16}, // 7&
- {0, D_15, F_15, E_15}, // 8*
- {0, D_14, F_14, E_14}, // 9(
- {0, D_13, F_13, E_13}, // 1)
- {0, D_12, F_12, E_12}, // -_
- {0, D_11, F_11, E_11}, // =+
- {0, D_10, F_10, E_10}, // BackSpace
- {0, D_8, F_8, E_8}, // PgUp
+ {0, CB4_CA16, CB6_CA16, CB5_CA16}, // 7&
+ {0, CB4_CA15, CB6_CA15, CB5_CA15}, // 8*
+ {0, CB4_CA14, CB6_CA14, CB5_CA14}, // 9(
+ {0, CB4_CA13, CB6_CA13, CB5_CA13}, // 1)
+ {0, CB4_CA12, CB6_CA12, CB5_CA12}, // -_
+ {0, CB4_CA11, CB6_CA11, CB5_CA11}, // =+
+ {0, CB4_CA10, CB6_CA10, CB5_CA10}, // BackSpace
+ {0, CB4_CA8, CB6_CA8, CB5_CA8}, // PgUp
- {0, G_16, I_16, H_16}, // Y
- {0, G_15, I_15, H_15}, // U
- {0, G_14, I_14, H_14}, // G
- {0, G_13, I_13, H_13}, // O
- {0, G_12, I_12, H_12}, // P
- {0, G_11, I_11, H_11}, // [
- {0, G_10, I_10, H_10}, // ]
- {0, G_8, I_8, H_8}, // PgDn
+ {0, CB7_CA16, CB9_CA16, CB8_CA16}, // Y
+ {0, CB7_CA15, CB9_CA15, CB8_CA15}, // U
+ {0, CB7_CA14, CB9_CA14, CB8_CA14}, // G
+ {0, CB7_CA13, CB9_CA13, CB8_CA13}, // O
+ {0, CB7_CA12, CB9_CA12, CB8_CA12}, // P
+ {0, CB7_CA11, CB9_CA11, CB8_CA11}, // [
+ {0, CB7_CA10, CB9_CA10, CB8_CA10}, // ]
+ {0, CB7_CA8, CB9_CA8, CB8_CA8}, // PgDn
- {0, J_16, L_16, K_16}, // H
- {0, J_15, L_15, K_15}, // J
- {0, J_14, L_14, K_14}, // KKEY_PRESS_HOME
- {0, J_13, L_13, K_13}, // J
- {0, J_12, L_12, K_12}, // ;:
- {0, J_11, L_11, K_11}, // '"
- {0, J_9, L_9, K_9}, // NUHS
- {0, G_9, I_9, H_9}, // Enter
- {0, J_8, L_8, K_8}, // Home
+ {0, CB10_CA16, CB12_CA16, CB11_CA16}, // H
+ {0, CB10_CA15, CB12_CA15, CB11_CA15}, // J
+ {0, CB10_CA14, CB12_CA14, CB11_CA14}, // KKEY_PRESS_HOME
+ {0, CB10_CA13, CB12_CA13, CB11_CA13}, // J
+ {0, CB10_CA12, CB12_CA12, CB11_CA12}, // ;:
+ {0, CB10_CA11, CB12_CA11, CB11_CA11}, // '"
+ {0, CB10_CA9, CB12_CA9, CB11_CA9}, // NUHS
+ {0, CB7_CA9, CB9_CA9, CB8_CA9}, // Enter
+ {0, CB10_CA8, CB12_CA8, CB11_CA8}, // Home
- {0, J_7, L_7, K_7}, // N
- {0, J_6, L_6, K_6}, // M
- {0, J_5, L_5, K_5}, // ,<
- {0, J_4, L_4, K_4}, // .>
- {0, J_3, L_3, K_3}, // ?/
- {0, J_2, L_2, K_2}, // Shift_R
- {0, J_1, L_1, K_1}, // Up
+ {0, CB10_CA7, CB12_CA7, CB11_CA7}, // N
+ {0, CB10_CA6, CB12_CA6, CB11_CA6}, // M
+ {0, CB10_CA5, CB12_CA5, CB11_CA5}, // ,<
+ {0, CB10_CA4, CB12_CA4, CB11_CA4}, // .>
+ {0, CB10_CA3, CB12_CA3, CB11_CA3}, // ?/
+ {0, CB10_CA2, CB12_CA2, CB11_CA2}, // Shift_R
+ {0, CB10_CA1, CB12_CA1, CB11_CA1}, // Up
- {0, G_6, I_6, H_6}, // Space
- {0, G_5, I_5, H_5}, // Win_R
- {0, G_4, I_4, H_4}, // Fn
- {0, G_3, I_3, H_3}, // Ctrl_R
- {0, G_2, I_2, H_2}, // Left
- {0, G_1, I_1, H_1}, // Down
- {0, G_7, I_7, H_7}, // Right
+ {0, CB7_CA6, CB9_CA6, CB8_CA6}, // Space
+ {0, CB7_CA5, CB9_CA5, CB8_CA5}, // Win_R
+ {0, CB7_CA4, CB9_CA4, CB8_CA4}, // Fn
+ {0, CB7_CA3, CB9_CA3, CB8_CA3}, // Ctrl_R
+ {0, CB7_CA2, CB9_CA2, CB8_CA2}, // Left
+ {0, CB7_CA1, CB9_CA1, CB8_CA1}, // Down
+ {0, CB7_CA7, CB9_CA7, CB8_CA7}, // Right
};
#endif
diff --git a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
index e2acddd8944..ba32f58fc6a 100644
--- a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
@@ -24,116 +24,116 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- // {0, I_1, G_1, H_1}
- {0, I_2, G_2, H_2}, // F13
- {0, I_3, G_3, H_3}, // F14
- {0, I_4, G_4, H_4}, // F15
- {0, I_5, G_5, H_5}, // Esc
- {0, I_6, G_6, H_6}, // F1
- {0, I_7, G_7, H_7}, // F2
- {0, I_8, G_8, H_8}, // F3
- {0, I_9, G_9, H_9}, // F4
- {0, I_10, G_10, H_10}, // F5
- {0, I_11, G_11, H_11}, // F6
- {0, I_12, G_12, H_12}, // F7
- {0, I_13, G_13, H_13}, // F8
- {0, I_14, G_14, H_14}, // F9
- {0, I_15, G_15, H_15}, // F10
- {0, I_16, G_16, H_16}, // F11
- {0, L_16, J_16, K_16}, // F12
- {0, L_15, J_15, K_15}, // DEL
- {0, L_14, J_14, K_14}, // Light
+ // {0, CB9_CA1, CB7_CA1, CB8_CA1}
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // F13
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // F14
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // F15
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // Esc
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // F1
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // F2
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // F3
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // F4
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F5
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F6
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F7
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F8
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // F9
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // F10
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // F11
+ {0, CB12_CA16, CB10_CA16, CB11_CA16}, // F12
+ {0, CB12_CA15, CB10_CA15, CB11_CA15}, // DEL
+ {0, CB12_CA14, CB10_CA14, CB11_CA14}, // Light
- {0, C_1, A_1, B_1}, // num_lock
- {0, C_2, A_2, B_2}, // /
- {0, C_3, A_3, B_3}, // *
- {0, C_4, A_4, B_4}, // -
- {0, C_5, A_5, B_5}, // ~`
- {0, C_6, A_6, B_6}, // 1!
- {0, C_7, A_7, B_7}, // 2@
- {0, C_8, A_8, B_8}, // 3#
- {0, C_9, A_9, B_9}, // 4$
- {0, C_10, A_10, B_10}, // 5%
- {0, C_11, A_11, B_11}, // 6^
- {0, C_12, A_12, B_12}, // 7&
- {0, C_13, A_13, B_13}, // 8*
- {0, C_14, A_14, B_14}, // 9(
- {0, C_15, A_15, B_15}, // 0)
- {0, C_16, A_16, B_16}, // -_
- {0, L_13, J_13, K_13}, // =+
- {0, L_12, J_12, K_12}, // BackSpace
- {0, L_11, J_11, K_11}, // PgUp
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // num_lock
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // /
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // *
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // -
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // ~`
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 1!
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 2@
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 3#
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 4$
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 5%
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 6^
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // 7&
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // 8*
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // 9(
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // 0)
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // -_
+ {0, CB12_CA13, CB10_CA13, CB11_CA13}, // =+
+ {0, CB12_CA12, CB10_CA12, CB11_CA12}, // BackSpace
+ {0, CB12_CA11, CB10_CA11, CB11_CA11}, // PgUp
- {0, F_1, D_1, E_1}, // 7
- {0, F_2, D_2, E_2}, // 8
- {0, F_3, D_3, E_3}, // 9
- {0, F_4, D_4, E_4}, // +
- {0, F_5, D_5, E_5}, // TAB
- {0, F_6, D_6, E_6}, // Q
- {0, F_7, D_7, E_7}, // W
- {0, F_8, D_8, E_8}, // E
- {0, F_9, D_9, E_9}, // R
- {0, F_10, D_10, E_10}, // T
- {0, F_11, D_11, E_11}, // Y
- {0, F_12, D_12, E_12}, // U
- {0, F_13, D_13, E_13}, // I
- {0, F_14, D_14, E_14}, // O
- {0, F_15, D_15, E_15}, // P
- {0, F_16, D_16, E_16}, // [
- {0, L_10, J_10, K_10}, // ]
- {0, L_9, J_9, K_9}, // \|
- {0, L_8, J_8, K_8}, // PgDn
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // 7
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // 8
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // 9
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // +
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // TAB
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // Q
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // W
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // E
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // R
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // T
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // Y
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // U
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // I
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // O
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // P
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // [
+ {0, CB12_CA10, CB10_CA10, CB11_CA10}, // ]
+ {0, CB12_CA9, CB10_CA9, CB11_CA9}, // \|
+ {0, CB12_CA8, CB10_CA8, CB11_CA8}, // PgDn
- {1, C_16, A_16, B_16}, // 4
- {1, C_15, A_15, B_15}, // 5
- {1, C_14, A_14, B_14}, // 6
- // {0, F_4, D_4, E_4}, // +
- {1, C_12, A_12, B_12}, // CapsLock
- {1, C_11, A_11, B_11}, // A
- {1, C_10, A_10, B_10}, // S
- {1, C_9, A_9, B_9}, // D
- {1, C_8, A_8, B_8}, // F
- {1, C_7, A_7, B_7}, // G
- {1, C_6, A_6, B_6}, // H
- {1, C_5, A_5, B_5}, // J
- {1, C_4, A_4, B_4}, // k
- {1, C_3, A_3, B_3}, // l
- {1, C_2, A_2, B_2}, // ï¼›
- {1, C_1, A_1, B_1}, // '
- {1, L_1, J_1, K_1}, // Enter
- {1, L_2, J_2, K_2}, // Home
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // 4
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // 5
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // 6
+ // {0, CB6_CA4, CB4_CA4, CB5_CA4}, // +
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // CapsLock
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // A
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // S
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // D
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // F
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // G
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // H
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // J
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // k
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // l
+ {1, CB3_CA2, CB1_CA2, CB2_CA2}, // ï¼›
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // '
+ {1, CB12_CA1, CB10_CA1, CB11_CA1}, // Enter
+ {1, CB12_CA2, CB10_CA2, CB11_CA2}, // Home
- {1, I_16, G_16, H_16}, // 1
- {1, I_15, G_15, H_15}, // 2
- {1, I_14, G_14, H_14}, // 3
- {1, I_13, G_13, H_13}, // Enter
- {1, I_12, G_12, H_12}, //Shift_L
- {1, I_10, G_10, H_10}, // Z
- {1, I_9, G_9, H_9}, // X
- {1, I_8, G_8, H_8}, // C
- {1, I_7, G_7, H_7}, // V
- {1, I_6, G_6, H_6}, // B
- {1, I_5, G_5, H_5}, // N
- {1, I_4, G_4, H_4}, // M
- {1, I_3, G_3, H_3}, // ,
- {1, I_2, G_2, H_2}, // .
- {1, I_1, G_1, H_1}, // ?
- {1, L_3, J_3, K_3}, // Shift_R
- {1, L_4, J_4, K_4}, // Up
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // 1
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // 2
+ {1, CB9_CA14, CB7_CA14, CB8_CA14}, // 3
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Enter
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, //Shift_L
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // Z
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // X
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // C
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // V
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // B
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // N
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // M
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // ,
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // .
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // ?
+ {1, CB12_CA3, CB10_CA3, CB11_CA3}, // Shift_R
+ {1, CB12_CA4, CB10_CA4, CB11_CA4}, // Up
- {1, F_16, D_16, E_16}, // 0
- {1, F_14, D_14, E_14}, // .
- {1, F_12, D_12, E_12}, // Ctrl_L
- {1, F_11, D_11, E_11}, // Win_L
- {1, F_10, D_10, E_10}, // Alt_L
- {1, F_6, D_6, E_6}, // Space
- {1, F_3, D_3, E_3}, // Alt_R
- {1, F_2, D_2, E_2}, // Fn
- {1, F_1, D_1, E_1}, // Ctrl_R
- {1, L_5, J_5, K_5}, // Left
- {1, L_6, J_6, K_6}, // Down
- {1, L_7, J_7, K_7}, // Right
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // 0
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // .
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Ctrl_L
+ {1, CB6_CA11, CB4_CA11, CB5_CA11}, // Win_L
+ {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Alt_L
+ {1, CB6_CA6, CB4_CA6, CB5_CA6}, // Space
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // Alt_R
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // Fn
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // Ctrl_R
+ {1, CB12_CA5, CB10_CA5, CB11_CA5}, // Left
+ {1, CB12_CA6, CB10_CA6, CB11_CA6}, // Down
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}, // Right
};
#define __ NO_LED
diff --git a/keyboards/keychron/q12/iso_encoder/iso_encoder.c b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
index f05a35dad8c..f9513e7f418 100644
--- a/keyboards/keychron/q12/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
@@ -25,118 +25,118 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- // {0, I_1, G_1, H_1}
- {0, I_2, G_2, H_2}, // F13
- {0, I_3, G_3, H_3}, // F14
- {0, I_4, G_4, H_4}, // F15
- {0, I_5, G_5, H_5}, // Esc
- {0, I_6, G_6, H_6}, // F1
- {0, I_7, G_7, H_7}, // F2
- {0, I_8, G_8, H_8}, // F3
- {0, I_9, G_9, H_9}, // F4
- {0, I_10, G_10, H_10}, // F5
- {0, I_11, G_11, H_11}, // F6
- {0, I_12, G_12, H_12}, // F7
- {0, I_13, G_13, H_13}, // F8
- {0, I_14, G_14, H_14}, // F9
- {0, I_15, G_15, H_15}, // F10
- {0, I_16, G_16, H_16}, // F11
- {0, L_16, J_16, K_16}, // F12
- {0, L_15, J_15, K_15}, // DEL
- {0, L_14, J_14, K_14}, // Light
+ // {0, CB9_CA1, CB7_CA1, CB8_CA1}
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // F13
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // F14
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // F15
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // Esc
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // F1
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // F2
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // F3
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // F4
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F5
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F6
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F7
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F8
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // F9
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // F10
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // F11
+ {0, CB12_CA16, CB10_CA16, CB11_CA16}, // F12
+ {0, CB12_CA15, CB10_CA15, CB11_CA15}, // DEL
+ {0, CB12_CA14, CB10_CA14, CB11_CA14}, // Light
- {0, C_1, A_1, B_1}, // num_lock
- {0, C_2, A_2, B_2}, // /
- {0, C_3, A_3, B_3}, // *
- {0, C_4, A_4, B_4}, // -
- {0, C_5, A_5, B_5}, // ~`
- {0, C_6, A_6, B_6}, // 1!
- {0, C_7, A_7, B_7}, // 2@
- {0, C_8, A_8, B_8}, // 3#
- {0, C_9, A_9, B_9}, // 4$
- {0, C_10, A_10, B_10}, // 5%
- {0, C_11, A_11, B_11}, // 6^
- {0, C_12, A_12, B_12}, // 7&
- {0, C_13, A_13, B_13}, // 8*
- {0, C_14, A_14, B_14}, // 9(
- {0, C_15, A_15, B_15}, // 0)
- {0, C_16, A_16, B_16}, // -_
- {0, L_13, J_13, K_13}, // =+
- {0, L_12, J_12, K_12}, // BackSpace
- {0, L_11, J_11, K_11}, // PgUp
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // num_lock
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // /
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // *
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // -
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // ~`
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 1!
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 2@
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 3#
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 4$
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 5%
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 6^
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // 7&
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // 8*
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // 9(
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // 0)
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // -_
+ {0, CB12_CA13, CB10_CA13, CB11_CA13}, // =+
+ {0, CB12_CA12, CB10_CA12, CB11_CA12}, // BackSpace
+ {0, CB12_CA11, CB10_CA11, CB11_CA11}, // PgUp
- {0, F_1, D_1, E_1}, // 7
- {0, F_2, D_2, E_2}, // 8
- {0, F_3, D_3, E_3}, // 9
- {0, F_4, D_4, E_4}, // +
- {0, F_5, D_5, E_5}, // TAB
- {0, F_6, D_6, E_6}, // Q
- {0, F_7, D_7, E_7}, // W
- {0, F_8, D_8, E_8}, // E
- {0, F_9, D_9, E_9}, // R
- {0, F_10, D_10, E_10}, // T
- {0, F_11, D_11, E_11}, // Y
- {0, F_12, D_12, E_12}, // U
- {0, F_13, D_13, E_13}, // I
- {0, F_14, D_14, E_14}, // O
- {0, F_15, D_15, E_15}, // P
- {0, F_16, D_16, E_16}, // [
- {0, L_10, J_10, K_10}, // ]
- // {0, L_9, J_9, K_9}, // \|
- {0, L_8, J_8, K_8}, // PgDn
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // 7
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // 8
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // 9
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // +
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // TAB
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // Q
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // W
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // E
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // R
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // T
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // Y
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // U
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // I
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // O
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // P
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // [
+ {0, CB12_CA10, CB10_CA10, CB11_CA10}, // ]
+ // {0, CB12_CA9, CB10_CA9, CB11_CA9}, // \|
+ {0, CB12_CA8, CB10_CA8, CB11_CA8}, // PgDn
- {1, C_16, A_16, B_16}, // 4
- {1, C_15, A_15, B_15}, // 5
- {1, C_14, A_14, B_14}, // 6
- // {0, F_4, D_4, E_4}, // +
- {1, C_12, A_12, B_12}, // CapsLock
- {1, C_11, A_11, B_11}, // A
- {1, C_10, A_10, B_10}, // S
- {1, C_9, A_9, B_9}, // D
- {1, C_8, A_8, B_8}, // F
- {1, C_7, A_7, B_7}, // G
- {1, C_6, A_6, B_6}, // H
- {1, C_5, A_5, B_5}, // J
- {1, C_4, A_4, B_4}, // k
- {1, C_3, A_3, B_3}, // l
- {1, C_2, A_2, B_2}, // ï¼›
- {1, C_1, A_1, B_1}, // '
- {1, L_1, J_1, K_1}, // #~
- {0, L_9, J_9, K_9}, // Enter
- {1, L_2, J_2, K_2}, // Home
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // 4
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // 5
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // 6
+ // {0, CB6_CA4, CB4_CA4, CB5_CA4}, // +
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // CapsLock
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // A
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // S
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // D
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // F
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // G
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // H
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // J
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // k
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // l
+ {1, CB3_CA2, CB1_CA2, CB2_CA2}, // ï¼›
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // '
+ {1, CB12_CA1, CB10_CA1, CB11_CA1}, // #~
+ {0, CB12_CA9, CB10_CA9, CB11_CA9}, // Enter
+ {1, CB12_CA2, CB10_CA2, CB11_CA2}, // Home
- {1, I_16, G_16, H_16}, // 1
- {1, I_15, G_15, H_15}, // 2
- {1, I_14, G_14, H_14}, // 3
- {1, I_13, G_13, H_13}, // Enter
- {1, I_12, G_12, H_12}, //Shift_L
- {1, I_11, G_11, H_11}, // |
- {1, I_10, G_10, H_10}, // Z
- {1, I_9, G_9, H_9}, // X
- {1, I_8, G_8, H_8}, // C
- {1, I_7, G_7, H_7}, // V
- {1, I_6, G_6, H_6}, // B
- {1, I_5, G_5, H_5}, // N
- {1, I_4, G_4, H_4}, // M
- {1, I_3, G_3, H_3}, // ,
- {1, I_2, G_2, H_2}, // .
- {1, I_1, G_1, H_1}, // ?
- {1, L_3, J_3, K_3}, // Shift_R
- {1, L_4, J_4, K_4}, // Up
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // 1
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // 2
+ {1, CB9_CA14, CB7_CA14, CB8_CA14}, // 3
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Enter
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, //Shift_L
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // |
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // Z
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // X
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // C
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // V
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // B
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // N
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // M
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // ,
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // .
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // ?
+ {1, CB12_CA3, CB10_CA3, CB11_CA3}, // Shift_R
+ {1, CB12_CA4, CB10_CA4, CB11_CA4}, // Up
- {1, F_16, D_16, E_16}, // 0
- {1, F_14, D_14, E_14}, // .
- {1, F_12, D_12, E_12}, // Ctrl_L
- {1, F_11, D_11, E_11}, // Win_L
- {1, F_10, D_10, E_10}, // Alt_L
- {1, F_6, D_6, E_6}, // Space
- {1, F_3, D_3, E_3}, // Alt_R
- {1, F_2, D_2, E_2}, // Fn
- {1, F_1, D_1, E_1}, // Ctrl_R
- {1, L_5, J_5, K_5}, // Left
- {1, L_6, J_6, K_6}, // Down
- {1, L_7, J_7, K_7}, // Right
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // 0
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // .
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Ctrl_L
+ {1, CB6_CA11, CB4_CA11, CB5_CA11}, // Win_L
+ {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Alt_L
+ {1, CB6_CA6, CB4_CA6, CB5_CA6}, // Space
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // Alt_R
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // Fn
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // Ctrl_R
+ {1, CB12_CA5, CB10_CA5, CB11_CA5}, // Left
+ {1, CB12_CA6, CB10_CA6, CB11_CA6}, // Down
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}, // Right
};
#define __ NO_LED
diff --git a/keyboards/keychron/q1v1/ansi/ansi.c b/keyboards/keychron/q1v1/ansi/ansi.c
index f45907eaf63..dfd2ee60875 100644
--- a/keyboards/keychron/q1v1/ansi/ansi.c
+++ b/keyboards/keychron/q1v1/ansi/ansi.c
@@ -24,93 +24,93 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, SW3_CS1, SW1_CS1, SW2_CS1},
+ {0, SW3_CS3, SW1_CS3, SW2_CS3},
+ {0, SW3_CS4, SW1_CS4, SW2_CS4},
+ {0, SW3_CS5, SW1_CS5, SW2_CS5},
+ {0, SW3_CS6, SW1_CS6, SW2_CS6},
+ {0, SW3_CS7, SW1_CS7, SW2_CS7},
+ {0, SW3_CS8, SW1_CS8, SW2_CS8},
+ {0, SW3_CS9, SW1_CS9, SW2_CS9},
+ {0, SW3_CS10, SW1_CS10, SW2_CS10},
+ {0, SW3_CS11, SW1_CS11, SW2_CS11},
+ {0, SW3_CS12, SW1_CS12, SW2_CS12},
+ {0, SW3_CS13, SW1_CS13, SW2_CS13},
+ {0, SW3_CS14, SW1_CS14, SW2_CS14},
+ {0, SW3_CS15, SW1_CS15, SW2_CS15},
+ {0, SW3_CS16, SW1_CS16, SW2_CS16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, SW6_CS1, SW4_CS1, SW5_CS1},
+ {0, SW6_CS2, SW4_CS2, SW5_CS2},
+ {0, SW6_CS3, SW4_CS3, SW5_CS3},
+ {0, SW6_CS4, SW4_CS4, SW5_CS4},
+ {0, SW6_CS5, SW4_CS5, SW5_CS5},
+ {0, SW6_CS6, SW4_CS6, SW5_CS6},
+ {0, SW6_CS7, SW4_CS7, SW5_CS7},
+ {0, SW6_CS8, SW4_CS8, SW5_CS8},
+ {0, SW6_CS9, SW4_CS9, SW5_CS9},
+ {0, SW6_CS10, SW4_CS10, SW5_CS10},
+ {0, SW6_CS11, SW4_CS11, SW5_CS11},
+ {0, SW6_CS12, SW4_CS12, SW5_CS12},
+ {0, SW6_CS13, SW4_CS13, SW5_CS13},
+ {0, SW6_CS14, SW4_CS14, SW5_CS14},
+ {0, SW6_CS16, SW4_CS16, SW5_CS16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, SW9_CS1, SW7_CS1, SW8_CS1},
+ {0, SW9_CS2, SW7_CS2, SW8_CS2},
+ {0, SW9_CS3, SW7_CS3, SW8_CS3},
+ {0, SW9_CS4, SW7_CS4, SW8_CS4},
+ {0, SW9_CS5, SW7_CS5, SW8_CS5},
+ {0, SW9_CS6, SW7_CS6, SW8_CS6},
+ {0, SW9_CS7, SW7_CS7, SW8_CS7},
+ {0, SW9_CS8, SW7_CS8, SW8_CS8},
+ {0, SW9_CS9, SW7_CS9, SW8_CS9},
+ {0, SW9_CS10, SW7_CS10, SW8_CS10},
+ {0, SW9_CS11, SW7_CS11, SW8_CS11},
+ {0, SW9_CS12, SW7_CS12, SW8_CS12},
+ {0, SW9_CS13, SW7_CS13, SW8_CS13},
+ {0, SW9_CS14, SW7_CS14, SW8_CS14},
+ {0, SW9_CS16, SW7_CS16, SW8_CS16},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
- {0, L_16, J_16, K_16},
+ {0, SW12_CS1, SW10_CS1, SW11_CS1},
+ {0, SW12_CS2, SW10_CS2, SW11_CS2},
+ {0, SW12_CS3, SW10_CS3, SW11_CS3},
+ {0, SW12_CS4, SW10_CS4, SW11_CS4},
+ {0, SW12_CS5, SW10_CS5, SW11_CS5},
+ {0, SW12_CS6, SW10_CS6, SW11_CS6},
+ {0, SW12_CS7, SW10_CS7, SW11_CS7},
+ {0, SW12_CS8, SW10_CS8, SW11_CS8},
+ {0, SW12_CS9, SW10_CS9, SW11_CS9},
+ {0, SW12_CS10, SW10_CS10, SW11_CS10},
+ {0, SW12_CS11, SW10_CS11, SW11_CS11},
+ {0, SW12_CS12, SW10_CS12, SW11_CS12},
+ {0, SW12_CS14, SW10_CS14, SW11_CS14},
+ {0, SW12_CS16, SW10_CS16, SW11_CS16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, SW3_CS1, SW1_CS1, SW2_CS1},
+ {1, SW3_CS3, SW1_CS3, SW2_CS3},
+ {1, SW3_CS4, SW1_CS4, SW2_CS4},
+ {1, SW3_CS5, SW1_CS5, SW2_CS5},
+ {1, SW3_CS6, SW1_CS6, SW2_CS6},
+ {1, SW3_CS7, SW1_CS7, SW2_CS7},
+ {1, SW3_CS8, SW1_CS8, SW2_CS8},
+ {1, SW3_CS9, SW1_CS9, SW2_CS9},
+ {1, SW3_CS10, SW1_CS10, SW2_CS10},
+ {1, SW3_CS11, SW1_CS11, SW2_CS11},
+ {1, SW3_CS12, SW1_CS12, SW2_CS12},
+ {1, SW3_CS14, SW1_CS14, SW2_CS14},
+ {1, SW3_CS15, SW1_CS15, SW2_CS15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, SW6_CS1, SW4_CS1, SW5_CS1},
+ {1, SW6_CS2, SW4_CS2, SW5_CS2},
+ {1, SW6_CS3, SW4_CS3, SW5_CS3},
+ {1, SW6_CS7, SW4_CS7, SW5_CS7},
+ {1, SW6_CS11, SW4_CS11, SW5_CS11},
+ {1, SW6_CS12, SW4_CS12, SW5_CS12},
+ {1, SW6_CS13, SW4_CS13, SW5_CS13},
+ {1, SW6_CS14, SW4_CS14, SW5_CS14},
+ {1, SW6_CS15, SW4_CS15, SW5_CS15},
+ {1, SW6_CS16, SW4_CS16, SW5_CS16}
};
diff --git a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
index 1c15ac633d5..d8679ee4821 100644
--- a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c
@@ -24,93 +24,93 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, SW3_CS1, SW1_CS1, SW2_CS1},
+ {0, SW3_CS3, SW1_CS3, SW2_CS3},
+ {0, SW3_CS4, SW1_CS4, SW2_CS4},
+ {0, SW3_CS5, SW1_CS5, SW2_CS5},
+ {0, SW3_CS6, SW1_CS6, SW2_CS6},
+ {0, SW3_CS7, SW1_CS7, SW2_CS7},
+ {0, SW3_CS8, SW1_CS8, SW2_CS8},
+ {0, SW3_CS9, SW1_CS9, SW2_CS9},
+ {0, SW3_CS10, SW1_CS10, SW2_CS10},
+ {0, SW3_CS11, SW1_CS11, SW2_CS11},
+ {0, SW3_CS12, SW1_CS12, SW2_CS12},
+ {0, SW3_CS13, SW1_CS13, SW2_CS13},
+ {0, SW3_CS14, SW1_CS14, SW2_CS14},
+ {0, SW3_CS15, SW1_CS15, SW2_CS15},
+ {0, SW3_CS16, SW1_CS16, SW2_CS16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, SW6_CS1, SW4_CS1, SW5_CS1},
+ {0, SW6_CS2, SW4_CS2, SW5_CS2},
+ {0, SW6_CS3, SW4_CS3, SW5_CS3},
+ {0, SW6_CS4, SW4_CS4, SW5_CS4},
+ {0, SW6_CS5, SW4_CS5, SW5_CS5},
+ {0, SW6_CS6, SW4_CS6, SW5_CS6},
+ {0, SW6_CS7, SW4_CS7, SW5_CS7},
+ {0, SW6_CS8, SW4_CS8, SW5_CS8},
+ {0, SW6_CS9, SW4_CS9, SW5_CS9},
+ {0, SW6_CS10, SW4_CS10, SW5_CS10},
+ {0, SW6_CS11, SW4_CS11, SW5_CS11},
+ {0, SW6_CS12, SW4_CS12, SW5_CS12},
+ {0, SW6_CS13, SW4_CS13, SW5_CS13},
+ {0, SW6_CS14, SW4_CS14, SW5_CS14},
+ {0, SW6_CS16, SW4_CS16, SW5_CS16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, SW9_CS1, SW7_CS1, SW8_CS1},
+ {0, SW9_CS2, SW7_CS2, SW8_CS2},
+ {0, SW9_CS3, SW7_CS3, SW8_CS3},
+ {0, SW9_CS4, SW7_CS4, SW8_CS4},
+ {0, SW9_CS5, SW7_CS5, SW8_CS5},
+ {0, SW9_CS6, SW7_CS6, SW8_CS6},
+ {0, SW9_CS7, SW7_CS7, SW8_CS7},
+ {0, SW9_CS8, SW7_CS8, SW8_CS8},
+ {0, SW9_CS9, SW7_CS9, SW8_CS9},
+ {0, SW9_CS10, SW7_CS10, SW8_CS10},
+ {0, SW9_CS11, SW7_CS11, SW8_CS11},
+ {0, SW9_CS12, SW7_CS12, SW8_CS12},
+ {0, SW9_CS13, SW7_CS13, SW8_CS13},
+ {0, SW9_CS14, SW7_CS14, SW8_CS14},
+ {0, SW9_CS16, SW7_CS16, SW8_CS16},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
- {0, L_16, J_16, K_16},
+ {0, SW12_CS1, SW10_CS1, SW11_CS1},
+ {0, SW12_CS2, SW10_CS2, SW11_CS2},
+ {0, SW12_CS3, SW10_CS3, SW11_CS3},
+ {0, SW12_CS4, SW10_CS4, SW11_CS4},
+ {0, SW12_CS5, SW10_CS5, SW11_CS5},
+ {0, SW12_CS6, SW10_CS6, SW11_CS6},
+ {0, SW12_CS7, SW10_CS7, SW11_CS7},
+ {0, SW12_CS8, SW10_CS8, SW11_CS8},
+ {0, SW12_CS9, SW10_CS9, SW11_CS9},
+ {0, SW12_CS10, SW10_CS10, SW11_CS10},
+ {0, SW12_CS11, SW10_CS11, SW11_CS11},
+ {0, SW12_CS12, SW10_CS12, SW11_CS12},
+ {0, SW12_CS14, SW10_CS14, SW11_CS14},
+ {0, SW12_CS16, SW10_CS16, SW11_CS16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, SW3_CS1, SW1_CS1, SW2_CS1},
+ {1, SW3_CS3, SW1_CS3, SW2_CS3},
+ {1, SW3_CS4, SW1_CS4, SW2_CS4},
+ {1, SW3_CS5, SW1_CS5, SW2_CS5},
+ {1, SW3_CS6, SW1_CS6, SW2_CS6},
+ {1, SW3_CS7, SW1_CS7, SW2_CS7},
+ {1, SW3_CS8, SW1_CS8, SW2_CS8},
+ {1, SW3_CS9, SW1_CS9, SW2_CS9},
+ {1, SW3_CS10, SW1_CS10, SW2_CS10},
+ {1, SW3_CS11, SW1_CS11, SW2_CS11},
+ {1, SW3_CS12, SW1_CS12, SW2_CS12},
+ {1, SW3_CS14, SW1_CS14, SW2_CS14},
+ {1, SW3_CS15, SW1_CS15, SW2_CS15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, SW6_CS1, SW4_CS1, SW5_CS1},
+ {1, SW6_CS2, SW4_CS2, SW5_CS2},
+ {1, SW6_CS3, SW4_CS3, SW5_CS3},
+ {1, SW6_CS7, SW4_CS7, SW5_CS7},
+ {1, SW6_CS11, SW4_CS11, SW5_CS11},
+ {1, SW6_CS12, SW4_CS12, SW5_CS12},
+ {1, SW6_CS13, SW4_CS13, SW5_CS13},
+ {1, SW6_CS14, SW4_CS14, SW5_CS14},
+ {1, SW6_CS15, SW4_CS15, SW5_CS15},
+ {1, SW6_CS16, SW4_CS16, SW5_CS16}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1v1/iso/iso.c b/keyboards/keychron/q1v1/iso/iso.c
index 109eb012828..affc41d2196 100644
--- a/keyboards/keychron/q1v1/iso/iso.c
+++ b/keyboards/keychron/q1v1/iso/iso.c
@@ -24,94 +24,94 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, SW3_CS1, SW1_CS1, SW2_CS1},
+ {0, SW3_CS3, SW1_CS3, SW2_CS3},
+ {0, SW3_CS4, SW1_CS4, SW2_CS4},
+ {0, SW3_CS5, SW1_CS5, SW2_CS5},
+ {0, SW3_CS6, SW1_CS6, SW2_CS6},
+ {0, SW3_CS7, SW1_CS7, SW2_CS7},
+ {0, SW3_CS8, SW1_CS8, SW2_CS8},
+ {0, SW3_CS9, SW1_CS9, SW2_CS9},
+ {0, SW3_CS10, SW1_CS10, SW2_CS10},
+ {0, SW3_CS11, SW1_CS11, SW2_CS11},
+ {0, SW3_CS12, SW1_CS12, SW2_CS12},
+ {0, SW3_CS13, SW1_CS13, SW2_CS13},
+ {0, SW3_CS14, SW1_CS14, SW2_CS14},
+ {0, SW3_CS15, SW1_CS15, SW2_CS15},
+ {0, SW3_CS16, SW1_CS16, SW2_CS16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, SW6_CS1, SW4_CS1, SW5_CS1},
+ {0, SW6_CS2, SW4_CS2, SW5_CS2},
+ {0, SW6_CS3, SW4_CS3, SW5_CS3},
+ {0, SW6_CS4, SW4_CS4, SW5_CS4},
+ {0, SW6_CS5, SW4_CS5, SW5_CS5},
+ {0, SW6_CS6, SW4_CS6, SW5_CS6},
+ {0, SW6_CS7, SW4_CS7, SW5_CS7},
+ {0, SW6_CS8, SW4_CS8, SW5_CS8},
+ {0, SW6_CS9, SW4_CS9, SW5_CS9},
+ {0, SW6_CS10, SW4_CS10, SW5_CS10},
+ {0, SW6_CS11, SW4_CS11, SW5_CS11},
+ {0, SW6_CS12, SW4_CS12, SW5_CS12},
+ {0, SW6_CS13, SW4_CS13, SW5_CS13},
+ {0, SW6_CS14, SW4_CS14, SW5_CS14},
+ {0, SW6_CS16, SW4_CS16, SW5_CS16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_16, G_16, H_16},
+ {0, SW9_CS1, SW7_CS1, SW8_CS1},
+ {0, SW9_CS2, SW7_CS2, SW8_CS2},
+ {0, SW9_CS3, SW7_CS3, SW8_CS3},
+ {0, SW9_CS4, SW7_CS4, SW8_CS4},
+ {0, SW9_CS5, SW7_CS5, SW8_CS5},
+ {0, SW9_CS6, SW7_CS6, SW8_CS6},
+ {0, SW9_CS7, SW7_CS7, SW8_CS7},
+ {0, SW9_CS8, SW7_CS8, SW8_CS8},
+ {0, SW9_CS9, SW7_CS9, SW8_CS9},
+ {0, SW9_CS10, SW7_CS10, SW8_CS10},
+ {0, SW9_CS11, SW7_CS11, SW8_CS11},
+ {0, SW9_CS12, SW7_CS12, SW8_CS12},
+ {0, SW9_CS13, SW7_CS13, SW8_CS13},
+ {0, SW9_CS16, SW7_CS16, SW8_CS16},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
- {0, I_14, G_14, H_14},
- {0, L_16, J_16, K_16},
+ {0, SW12_CS1, SW10_CS1, SW11_CS1},
+ {0, SW12_CS2, SW10_CS2, SW11_CS2},
+ {0, SW12_CS3, SW10_CS3, SW11_CS3},
+ {0, SW12_CS4, SW10_CS4, SW11_CS4},
+ {0, SW12_CS5, SW10_CS5, SW11_CS5},
+ {0, SW12_CS6, SW10_CS6, SW11_CS6},
+ {0, SW12_CS7, SW10_CS7, SW11_CS7},
+ {0, SW12_CS8, SW10_CS8, SW11_CS8},
+ {0, SW12_CS9, SW10_CS9, SW11_CS9},
+ {0, SW12_CS10, SW10_CS10, SW11_CS10},
+ {0, SW12_CS11, SW10_CS11, SW11_CS11},
+ {0, SW12_CS12, SW10_CS12, SW11_CS12},
+ {0, SW12_CS14, SW10_CS14, SW11_CS14},
+ {0, SW9_CS14, SW7_CS14, SW8_CS14},
+ {0, SW12_CS16, SW10_CS16, SW11_CS16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, SW3_CS1, SW1_CS1, SW2_CS1},
+ {1, SW3_CS2, SW1_CS2, SW2_CS2},
+ {1, SW3_CS3, SW1_CS3, SW2_CS3},
+ {1, SW3_CS4, SW1_CS4, SW2_CS4},
+ {1, SW3_CS5, SW1_CS5, SW2_CS5},
+ {1, SW3_CS6, SW1_CS6, SW2_CS6},
+ {1, SW3_CS7, SW1_CS7, SW2_CS7},
+ {1, SW3_CS8, SW1_CS8, SW2_CS8},
+ {1, SW3_CS9, SW1_CS9, SW2_CS9},
+ {1, SW3_CS10, SW1_CS10, SW2_CS10},
+ {1, SW3_CS11, SW1_CS11, SW2_CS11},
+ {1, SW3_CS12, SW1_CS12, SW2_CS12},
+ {1, SW3_CS14, SW1_CS14, SW2_CS14},
+ {1, SW3_CS15, SW1_CS15, SW2_CS15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, SW6_CS1, SW4_CS1, SW5_CS1},
+ {1, SW6_CS2, SW4_CS2, SW5_CS2},
+ {1, SW6_CS3, SW4_CS3, SW5_CS3},
+ {1, SW6_CS7, SW4_CS7, SW5_CS7},
+ {1, SW6_CS11, SW4_CS11, SW5_CS11},
+ {1, SW6_CS12, SW4_CS12, SW5_CS12},
+ {1, SW6_CS13, SW4_CS13, SW5_CS13},
+ {1, SW6_CS14, SW4_CS14, SW5_CS14},
+ {1, SW6_CS15, SW4_CS15, SW5_CS15},
+ {1, SW6_CS16, SW4_CS16, SW5_CS16}
};
#define __ NO_LED
diff --git a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
index e46a17cdc63..e1c535b3182 100644
--- a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c
@@ -25,94 +25,94 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, SW3_CS1, SW1_CS1, SW2_CS1},
+ {0, SW3_CS3, SW1_CS3, SW2_CS3},
+ {0, SW3_CS4, SW1_CS4, SW2_CS4},
+ {0, SW3_CS5, SW1_CS5, SW2_CS5},
+ {0, SW3_CS6, SW1_CS6, SW2_CS6},
+ {0, SW3_CS7, SW1_CS7, SW2_CS7},
+ {0, SW3_CS8, SW1_CS8, SW2_CS8},
+ {0, SW3_CS9, SW1_CS9, SW2_CS9},
+ {0, SW3_CS10, SW1_CS10, SW2_CS10},
+ {0, SW3_CS11, SW1_CS11, SW2_CS11},
+ {0, SW3_CS12, SW1_CS12, SW2_CS12},
+ {0, SW3_CS13, SW1_CS13, SW2_CS13},
+ {0, SW3_CS14, SW1_CS14, SW2_CS14},
+ {0, SW3_CS15, SW1_CS15, SW2_CS15},
+ {0, SW3_CS16, SW1_CS16, SW2_CS16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, SW6_CS1, SW4_CS1, SW5_CS1},
+ {0, SW6_CS2, SW4_CS2, SW5_CS2},
+ {0, SW6_CS3, SW4_CS3, SW5_CS3},
+ {0, SW6_CS4, SW4_CS4, SW5_CS4},
+ {0, SW6_CS5, SW4_CS5, SW5_CS5},
+ {0, SW6_CS6, SW4_CS6, SW5_CS6},
+ {0, SW6_CS7, SW4_CS7, SW5_CS7},
+ {0, SW6_CS8, SW4_CS8, SW5_CS8},
+ {0, SW6_CS9, SW4_CS9, SW5_CS9},
+ {0, SW6_CS10, SW4_CS10, SW5_CS10},
+ {0, SW6_CS11, SW4_CS11, SW5_CS11},
+ {0, SW6_CS12, SW4_CS12, SW5_CS12},
+ {0, SW6_CS13, SW4_CS13, SW5_CS13},
+ {0, SW6_CS14, SW4_CS14, SW5_CS14},
+ {0, SW6_CS16, SW4_CS16, SW5_CS16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_16, G_16, H_16},
+ {0, SW9_CS1, SW7_CS1, SW8_CS1},
+ {0, SW9_CS2, SW7_CS2, SW8_CS2},
+ {0, SW9_CS3, SW7_CS3, SW8_CS3},
+ {0, SW9_CS4, SW7_CS4, SW8_CS4},
+ {0, SW9_CS5, SW7_CS5, SW8_CS5},
+ {0, SW9_CS6, SW7_CS6, SW8_CS6},
+ {0, SW9_CS7, SW7_CS7, SW8_CS7},
+ {0, SW9_CS8, SW7_CS8, SW8_CS8},
+ {0, SW9_CS9, SW7_CS9, SW8_CS9},
+ {0, SW9_CS10, SW7_CS10, SW8_CS10},
+ {0, SW9_CS11, SW7_CS11, SW8_CS11},
+ {0, SW9_CS12, SW7_CS12, SW8_CS12},
+ {0, SW9_CS13, SW7_CS13, SW8_CS13},
+ {0, SW9_CS16, SW7_CS16, SW8_CS16},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
- {0, I_14, G_14, H_14},
- {0, L_16, J_16, K_16},
+ {0, SW12_CS1, SW10_CS1, SW11_CS1},
+ {0, SW12_CS2, SW10_CS2, SW11_CS2},
+ {0, SW12_CS3, SW10_CS3, SW11_CS3},
+ {0, SW12_CS4, SW10_CS4, SW11_CS4},
+ {0, SW12_CS5, SW10_CS5, SW11_CS5},
+ {0, SW12_CS6, SW10_CS6, SW11_CS6},
+ {0, SW12_CS7, SW10_CS7, SW11_CS7},
+ {0, SW12_CS8, SW10_CS8, SW11_CS8},
+ {0, SW12_CS9, SW10_CS9, SW11_CS9},
+ {0, SW12_CS10, SW10_CS10, SW11_CS10},
+ {0, SW12_CS11, SW10_CS11, SW11_CS11},
+ {0, SW12_CS12, SW10_CS12, SW11_CS12},
+ {0, SW12_CS14, SW10_CS14, SW11_CS14},
+ {0, SW9_CS14, SW7_CS14, SW8_CS14},
+ {0, SW12_CS16, SW10_CS16, SW11_CS16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, SW3_CS1, SW1_CS1, SW2_CS1},
+ {1, SW3_CS2, SW1_CS2, SW2_CS2},
+ {1, SW3_CS3, SW1_CS3, SW2_CS3},
+ {1, SW3_CS4, SW1_CS4, SW2_CS4},
+ {1, SW3_CS5, SW1_CS5, SW2_CS5},
+ {1, SW3_CS6, SW1_CS6, SW2_CS6},
+ {1, SW3_CS7, SW1_CS7, SW2_CS7},
+ {1, SW3_CS8, SW1_CS8, SW2_CS8},
+ {1, SW3_CS9, SW1_CS9, SW2_CS9},
+ {1, SW3_CS10, SW1_CS10, SW2_CS10},
+ {1, SW3_CS11, SW1_CS11, SW2_CS11},
+ {1, SW3_CS12, SW1_CS12, SW2_CS12},
+ {1, SW3_CS14, SW1_CS14, SW2_CS14},
+ {1, SW3_CS15, SW1_CS15, SW2_CS15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, SW6_CS1, SW4_CS1, SW5_CS1},
+ {1, SW6_CS2, SW4_CS2, SW5_CS2},
+ {1, SW6_CS3, SW4_CS3, SW5_CS3},
+ {1, SW6_CS7, SW4_CS7, SW5_CS7},
+ {1, SW6_CS11, SW4_CS11, SW5_CS11},
+ {1, SW6_CS12, SW4_CS12, SW5_CS12},
+ {1, SW6_CS13, SW4_CS13, SW5_CS13},
+ {1, SW6_CS14, SW4_CS14, SW5_CS14},
+ {1, SW6_CS15, SW4_CS15, SW5_CS15},
+ {1, SW6_CS16, SW4_CS16, SW5_CS16}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q1v2/ansi/ansi.c b/keyboards/keychron/q1v2/ansi/ansi.c
index a25b597b036..a0ff08aa483 100644
--- a/keyboards/keychron/q1v2/ansi/ansi.c
+++ b/keyboards/keychron/q1v2/ansi/ansi.c
@@ -25,93 +25,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#endif
diff --git a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
index a25b597b036..a0ff08aa483 100644
--- a/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q1v2/ansi_encoder/ansi_encoder.c
@@ -25,93 +25,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#endif
diff --git a/keyboards/keychron/q1v2/iso/iso.c b/keyboards/keychron/q1v2/iso/iso.c
index 53cdea506f1..eba47a51bed 100644
--- a/keyboards/keychron/q1v2/iso/iso.c
+++ b/keyboards/keychron/q1v2/iso/iso.c
@@ -25,94 +25,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#endif
diff --git a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
index 53cdea506f1..eba47a51bed 100644
--- a/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q1v2/iso_encoder/iso_encoder.c
@@ -25,94 +25,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#endif
diff --git a/keyboards/keychron/q1v2/jis/jis.c b/keyboards/keychron/q1v2/jis/jis.c
index d43d64dd826..5ba663de460 100644
--- a/keyboards/keychron/q1v2/jis/jis.c
+++ b/keyboards/keychron/q1v2/jis/jis.c
@@ -25,97 +25,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_7, A_7, B_7},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#endif
diff --git a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
index d43d64dd826..5ba663de460 100644
--- a/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q1v2/jis_encoder/jis_encoder.c
@@ -25,97 +25,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_7, A_7, B_7},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#endif
diff --git a/keyboards/keychron/q2/ansi/ansi.c b/keyboards/keychron/q2/ansi/ansi.c
index 64abe016a6f..f26fa9c697b 100644
--- a/keyboards/keychron/q2/ansi/ansi.c
+++ b/keyboards/keychron/q2/ansi/ansi.c
@@ -24,77 +24,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
index 64abe016a6f..f26fa9c697b 100644
--- a/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q2/ansi_encoder/ansi_encoder.c
@@ -24,77 +24,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/iso/iso.c b/keyboards/keychron/q2/iso/iso.c
index 7da02c4a797..a54ec4d718b 100644
--- a/keyboards/keychron/q2/iso/iso.c
+++ b/keyboards/keychron/q2/iso/iso.c
@@ -24,78 +24,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/iso_encoder/iso_encoder.c b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
index 7da02c4a797..a54ec4d718b 100644
--- a/keyboards/keychron/q2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q2/iso_encoder/iso_encoder.c
@@ -24,78 +24,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/jis/jis.c b/keyboards/keychron/q2/jis/jis.c
index b8d36be505e..b46ee106017 100644
--- a/keyboards/keychron/q2/jis/jis.c
+++ b/keyboards/keychron/q2/jis/jis.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q2/jis_encoder/jis_encoder.c b/keyboards/keychron/q2/jis_encoder/jis_encoder.c
index b8d36be505e..b46ee106017 100644
--- a/keyboards/keychron/q2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q2/jis_encoder/jis_encoder.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi/ansi.c b/keyboards/keychron/q3/ansi/ansi.c
index a2793b040c6..f14e9f28cef 100644
--- a/keyboards/keychron/q3/ansi/ansi.c
+++ b/keyboards/keychron/q3/ansi/ansi.c
@@ -25,98 +25,98 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
index 3b88a83d381..ac6c3757771 100644
--- a/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3/ansi_encoder/ansi_encoder.c
@@ -25,98 +25,98 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso/iso.c b/keyboards/keychron/q3/iso/iso.c
index 37f418e66b4..6a942028d51 100644
--- a/keyboards/keychron/q3/iso/iso.c
+++ b/keyboards/keychron/q3/iso/iso.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/iso_encoder/iso_encoder.c b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
index 37f418e66b4..6a942028d51 100644
--- a/keyboards/keychron/q3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q3/iso_encoder/iso_encoder.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis/jis.c b/keyboards/keychron/q3/jis/jis.c
index 0fc70b1af3d..3c51076020c 100644
--- a/keyboards/keychron/q3/jis/jis.c
+++ b/keyboards/keychron/q3/jis/jis.c
@@ -25,102 +25,102 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1}, // ESC
- {0, I_2, G_2, H_2}, // F1
- {0, I_3, G_3, H_3}, // F2
- {0, I_4, G_4, H_4}, // F3
- {0, I_5, G_5, H_5}, // F4
- {0, I_6, G_6, H_6}, // F5
- {0, I_7, G_7, H_7}, // F6
- {0, I_8, G_8, H_8}, // F7
- {0, I_9, G_9, H_9}, // F8
- {0, I_10, G_10, H_10}, // F9
- {0, I_11, G_11, H_11}, // F10
- {0, I_12, G_12, H_12}, // F11
- {0, I_13, G_13, H_13}, // F12
- {0, I_15, G_15, H_15}, // Print
- {0, I_16, G_16, H_16}, // Cortana
- {1, I_15, G_15, H_15}, // Light
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // ESC
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // F1
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // F2
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // F3
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // F4
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // F5
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // F6
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // F7
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // F8
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
- {0, C_1, A_1, B_1}, // `~
- {0, C_2, A_2, B_2}, // 1!
- {0, C_3, A_3, B_3}, // 2@
- {0, C_4, A_4, B_4}, // 3#
- {0, C_5, A_5, B_5}, // 4$
- {0, C_6, A_6, B_6}, // 5%
- {0, C_7, A_7, B_7}, // 6^
- {0, C_8, A_8, B_8}, // 7&
- {0, C_9, A_9, B_9}, // 8*
- {0, C_10, A_10, B_10}, // 9()
- {0, C_11, A_11, B_11}, // 0)
- {0, C_12, A_12, B_12}, // -_
- {0, C_13, A_13, B_13}, // =+
- {0, I_13, G_13, H_13}, // |
- {0, I_14, G_14, H_14}, // Backspace
- {0, C_15, A_15, B_15}, // Ins
- {0, C_16, A_16, B_16}, // Home
- {1, I_16, G_16, H_16}, // Page Up
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // `~
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // 1!
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // 2@
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // 3#
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 4$
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 5%
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 6^
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 7&
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 8*
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // |
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Backspace
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
- {0, F_1, D_1, E_1}, // tab
- {0, F_2, D_2, E_2}, // Q
- {0, F_3, D_3, E_3}, // W
- {0, F_4, D_4, E_4}, // E
- {0, F_5, D_5, E_5}, // R
- {0, F_6, D_6, E_6}, // T
- {0, F_7, D_7, E_7}, // Y
- {0, F_8, D_8, E_8}, // U
- {0, F_9, D_9, E_9}, // I
- {0, F_10, D_10, E_10}, // O
- {0, F_11, D_11, E_11}, // P
- {0, F_12, D_12, E_12}, // [{
- {0, F_14, D_14, E_14}, // }}
- {0, F_15, D_15, E_15}, // Del
- {0, F_16, D_16, E_16}, // End
- {1, I_13, G_13, H_13}, // Page Down
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // tab
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // Q
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // W
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // E
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // R
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // T
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // Y
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // U
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // I
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // }}
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
- {1, I_1, G_1, H_1}, // Cpas
- {1, I_2, G_2, H_2}, // A
- {1, I_3, G_3, H_3}, // S
- {1, I_4, G_4, H_4}, // D
- {1, I_5, G_5, H_5}, // F
- {1, I_6, G_6, H_6}, // G
- {1, I_7, G_7, H_7}, // H
- {1, I_8, G_8, H_8}, // J
- {1, I_9, G_9, H_9}, // K
- {1, I_10, G_10, H_10}, // L
- {1, I_11, G_11, H_11}, // ;
- {1, I_12, G_12, H_12}, // :
- {1, I_14, G_14, H_14}, // #~
- {0, F_13, D_13, E_13}, // Enter
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Cpas
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // A
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // S
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // D
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // F
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // G
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // H
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // J
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // K
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+ {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // Enter
- {1, C_1, A_1, B_1}, // LShift
- {1, C_3, A_3, B_3}, // Z
- {1, C_4, A_4, B_4}, // X
- {1, C_5, A_5, B_5}, // C
- {1, C_6, A_6, B_6}, // V
- {1, C_7, A_7, B_7}, // B
- {1, C_8, A_8, B_8}, // N
- {1, C_9, A_9, B_9}, // M
- {1, C_10, A_10, B_10}, // ,<
- {1, C_11, A_11, B_11}, // .>
- {1, C_12, A_12, B_12}, // /?
- {1, C_13, A_13, B_13}, // |
- {1, C_14, A_14, B_14}, // RShift
- {1, C_16, A_16, B_16}, // Up
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // LShift
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // Z
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // X
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // C
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // V
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // B
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // N
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // M
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
- {1, F_1, D_1, E_1}, // LCtrl
- {1, F_2, D_2, E_2}, // LWin
- {1, F_3, D_3, E_3}, // LAlt
- {1, F_4, D_4, E_4}, // NUm
- {1, F_7, D_7, E_7}, // Space
- {1, F_10, D_10, E_10}, // Jap
- {1, F_11, D_11, E_11}, // RAlt
- {1, F_12, D_12, E_12}, // RWin
- {1, F_13, D_13, E_13}, // Fn
- {1, F_14, D_14, E_14}, // RCtrl
- {1, F_15, D_15, E_15}, // Left
- {1, F_16, D_16, E_16}, // Down
- {1, C_15, A_15, B_15}, // Right
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // LCtrl
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // LWin
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // LAlt
+ {1, CB6_CA4, CB4_CA4, CB5_CA4}, // NUm
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Space
+ {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+ {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
};
#endif // GB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3/jis_encoder/jis_encoder.c b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
index df4a6a467b6..aa34222bf39 100644
--- a/keyboards/keychron/q3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/q3/jis_encoder/jis_encoder.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1}, // ESC
- {0, I_2, G_2, H_2}, // F1
- {0, I_3, G_3, H_3}, // F2
- {0, I_4, G_4, H_4}, // F3
- {0, I_5, G_5, H_5}, // F4
- {0, I_6, G_6, H_6}, // F5
- {0, I_7, G_7, H_7}, // F6
- {0, I_8, G_8, H_8}, // F7
- {0, I_9, G_9, H_9}, // F8
- {0, I_10, G_10, H_10}, // F9
- {0, I_11, G_11, H_11}, // F10
- {0, I_12, G_12, H_12}, // F11
- {0, I_13, G_13, H_13}, // F12
- {0, I_14, G_14, H_14}, // Mute
- {0, I_15, G_15, H_15}, // Print
- {0, I_16, G_16, H_16}, // Cortana
- {1, I_15, G_15, H_15}, // Light
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // ESC
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // F1
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // F2
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // F3
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // F4
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // F5
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // F6
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // F7
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // F8
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Mute
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
- {0, C_1, A_1, B_1}, // `~
- {0, C_2, A_2, B_2}, // 1!
- {0, C_3, A_3, B_3}, // 2@
- {0, C_4, A_4, B_4}, // 3#
- {0, C_5, A_5, B_5}, // 4$
- {0, C_6, A_6, B_6}, // 5%
- {0, C_7, A_7, B_7}, // 6^
- {0, C_8, A_8, B_8}, // 7&
- {0, C_9, A_9, B_9}, // 8*
- {0, C_10, A_10, B_10}, // 9()
- {0, C_11, A_11, B_11}, // 0)
- {0, C_12, A_12, B_12}, // -_
- {0, C_13, A_13, B_13}, // =+
- {0, C_14, A_14, B_14}, // |
- {1, F_6, D_6, E_6}, // Backspace
- {0, C_15, A_15, B_15}, // Ins
- {0, C_16, A_16, B_16}, // Home
- {1, I_16, G_16, H_16}, // Page Up
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // `~
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // 1!
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // 2@
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // 3#
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 4$
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 5%
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 6^
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 7&
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 8*
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // |
+ {1, CB6_CA6, CB4_CA6, CB5_CA6}, // Backspace
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
- {0, F_1, D_1, E_1}, // tab
- {0, F_2, D_2, E_2}, // Q
- {0, F_3, D_3, E_3}, // W
- {0, F_4, D_4, E_4}, // E
- {0, F_5, D_5, E_5}, // R
- {0, F_6, D_6, E_6}, // T
- {0, F_7, D_7, E_7}, // Y
- {0, F_8, D_8, E_8}, // U
- {0, F_9, D_9, E_9}, // I
- {0, F_10, D_10, E_10}, // O
- {0, F_11, D_11, E_11}, // P
- {0, F_12, D_12, E_12}, // [{
- {0, F_13, D_13, E_13}, // }}
- {0, F_15, D_15, E_15}, // Del
- {0, F_16, D_16, E_16}, // End
- {1, I_13, G_13, H_13}, // Page Down
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // tab
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // Q
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // W
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // E
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // R
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // T
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // Y
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // U
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // I
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // }}
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
- {1, I_1, G_1, H_1}, // Cpas
- {1, I_2, G_2, H_2}, // A
- {1, I_3, G_3, H_3}, // S
- {1, I_4, G_4, H_4}, // D
- {1, I_5, G_5, H_5}, // F
- {1, I_6, G_6, H_6}, // G
- {1, I_7, G_7, H_7}, // H
- {1, I_8, G_8, H_8}, // J
- {1, I_9, G_9, H_9}, // K
- {1, I_10, G_10, H_10}, // L
- {1, I_11, G_11, H_11}, // ;
- {1, I_12, G_12, H_12}, // :
- {1, I_14, G_14, H_14}, // #~
- {0, F_14, D_14, E_14}, // Enter
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Cpas
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // A
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // S
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // D
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // F
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // G
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // H
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // J
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // K
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+ {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Enter
- {1, C_1, A_1, B_1}, // LShift
- {1, C_3, A_3, B_3}, // Z
- {1, C_4, A_4, B_4}, // X
- {1, C_5, A_5, B_5}, // C
- {1, C_6, A_6, B_6}, // V
- {1, C_7, A_7, B_7}, // B
- {1, C_8, A_8, B_8}, // N
- {1, C_9, A_9, B_9}, // M
- {1, C_10, A_10, B_10}, // ,<
- {1, C_11, A_11, B_11}, // .>
- {1, C_12, A_12, B_12}, // /?
- {1, C_13, A_13, B_13}, // |
- {1, C_14, A_14, B_14}, // RShift
- {1, C_16, A_16, B_16}, // Up
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // LShift
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // Z
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // X
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // C
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // V
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // B
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // N
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // M
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
- {1, F_1, D_1, E_1}, // LCtrl
- {1, F_2, D_2, E_2}, // LWin
- {1, F_3, D_3, E_3}, // LAlt
- {1, F_4, D_4, E_4}, // NUm
- {1, F_7, D_7, E_7}, // Space
- {1, F_10, D_10, E_10}, // Jap
- {1, F_11, D_11, E_11}, // RAlt
- {1, F_12, D_12, E_12}, // RWin
- {1, F_13, D_13, E_13}, // Fn
- {1, F_14, D_14, E_14}, // RCtrl
- {1, F_15, D_15, E_15}, // Left
- {1, F_16, D_16, E_16}, // Down
- {1, C_15, A_15, B_15}, // Right
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // LCtrl
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // LWin
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // LAlt
+ {1, CB6_CA4, CB4_CA4, CB5_CA4}, // NUm
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Space
+ {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+ {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q4/ansi/v1/v1.c b/keyboards/keychron/q4/ansi/v1/v1.c
index f9e2946bb3e..ee5551fbb8b 100644
--- a/keyboards/keychron/q4/ansi/v1/v1.c
+++ b/keyboards/keychron/q4/ansi/v1/v1.c
@@ -25,71 +25,71 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
};
#endif
diff --git a/keyboards/keychron/q4/ansi/v2/v2.c b/keyboards/keychron/q4/ansi/v2/v2.c
index f7564c02a1a..1a0e2711f3e 100644
--- a/keyboards/keychron/q4/ansi/v2/v2.c
+++ b/keyboards/keychron/q4/ansi/v2/v2.c
@@ -25,71 +25,71 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
+ {0, CB12_CA1, CB10_CA1, CB11_CA1},
+ {0, CB12_CA2, CB10_CA2, CB11_CA2},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_14, A_14, B_14},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
};
#endif
diff --git a/keyboards/keychron/q4/iso/iso.c b/keyboards/keychron/q4/iso/iso.c
index c30f06c6bd9..7f796238f5e 100644
--- a/keyboards/keychron/q4/iso/iso.c
+++ b/keyboards/keychron/q4/iso/iso.c
@@ -25,72 +25,72 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
- {0, I_14, G_14, H_14},
+ {0, CB12_CA1, CB10_CA1, CB11_CA1},
+ {0, CB12_CA2, CB10_CA2, CB11_CA2},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_14, A_14, B_14},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
};
#endif
diff --git a/keyboards/keychron/q5/ansi/ansi.c b/keyboards/keychron/q5/ansi/ansi.c
index 1b74c0eef90..bc6622dd7f6 100644
--- a/keyboards/keychron/q5/ansi/ansi.c
+++ b/keyboards/keychron/q5/ansi/ansi.c
@@ -25,111 +25,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
index 646deb11153..760fdcbc97b 100644
--- a/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q5/ansi_encoder/ansi_encoder.c
@@ -27,111 +27,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- // {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- // {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ // {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ // {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso/iso.c b/keyboards/keychron/q5/iso/iso.c
index e5a6399f7a2..e08df9ab65e 100644
--- a/keyboards/keychron/q5/iso/iso.c
+++ b/keyboards/keychron/q5/iso/iso.c
@@ -27,112 +27,112 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q5/iso_encoder/iso_encoder.c b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
index 887931c0543..e0505e6fb9a 100644
--- a/keyboards/keychron/q5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q5/iso_encoder/iso_encoder.c
@@ -27,110 +27,110 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1}, // `~
- {0, C_2, A_2, B_2}, // 1!
- {0, C_3, A_3, B_3}, // 2@
- {0, C_4, A_4, B_4}, // 3#
- {0, C_5, A_5, B_5}, // 4$
- {0, C_6, A_6, B_6}, // 5%
- {0, C_7, A_7, B_7}, // 6^
- {0, C_8, A_8, B_8}, // 7&
- {0, C_9, A_9, B_9}, // 8*
- {0, C_10, A_10, B_10}, // 9(
- {0, C_11, A_11, B_11}, // 0)
- {0, C_12, A_12, B_12}, // -_
- {0, C_13, A_13, B_13}, // =+
- {0, C_14, A_14, B_14}, // BackSpace
- {0, C_16, A_16, B_16}, // Numlock
- {0, L_9, J_9, K_9}, // /
- {0, L_10, J_10, K_10}, // *
- {0, L_11, J_11, K_11}, // -
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // `~
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // 1!
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // 2@
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // 3#
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 4$
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 5%
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 6^
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 7&
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 8*
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9(
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // BackSpace
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Numlock
+ {0, CB12_CA9, CB10_CA9, CB11_CA9}, // /
+ {0, CB12_CA10, CB10_CA10, CB11_CA10}, // *
+ {0, CB12_CA11, CB10_CA11, CB11_CA11}, // -
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q6/ansi/ansi.c b/keyboards/keychron/q6/ansi/ansi.c
index b9f249e281e..62a22971e11 100644
--- a/keyboards/keychron/q6/ansi/ansi.c
+++ b/keyboards/keychron/q6/ansi/ansi.c
@@ -27,119 +27,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
index 40643290992..b3d8a6bd4ca 100644
--- a/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q6/ansi_encoder/ansi_encoder.c
@@ -27,119 +27,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/q6/iso/iso.c b/keyboards/keychron/q6/iso/iso.c
index 8cdee4cf3b2..eb6cab855ac 100644
--- a/keyboards/keychron/q6/iso/iso.c
+++ b/keyboards/keychron/q6/iso/iso.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/q6/iso_encoder/iso_encoder.c b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
index 5ff71379c97..439e1cee50b 100644
--- a/keyboards/keychron/q6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q6/iso_encoder/iso_encoder.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/q60/ansi/ansi.c b/keyboards/keychron/q60/ansi/ansi.c
index f02d45b42ae..8b702eb5a60 100644
--- a/keyboards/keychron/q60/ansi/ansi.c
+++ b/keyboards/keychron/q60/ansi/ansi.c
@@ -27,70 +27,70 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
+ {0, CB12_CA1, CB10_CA1, CB11_CA1},
+ {0, CB12_CA2, CB10_CA2, CB11_CA2},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_16, J_16, K_16},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
index 3ed44a73873..6c4c2abe21d 100644
--- a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
@@ -25,82 +25,82 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_15, A_15, B_15}, // Esc
- {0, C_14, A_14, B_14}, // 1!
- {0, C_13, A_13, B_13}, // 2@
- {0, C_12, A_12, B_12}, // 3#
- {0, C_11, A_11, B_11}, // 4$
- {0, C_10, A_10, B_10}, // 5%
- {0, C_9, A_9, B_9}, // 6^
- {0, C_8, A_8, B_8}, // 7&
- {0, C_7, A_7, B_7}, // 8*
- {0, C_6, A_6, B_6}, // 9(
- {0, C_5, A_5, B_5}, // 0)
- {0, C_4, A_4, B_4}, // -_
- {0, C_3, A_3, B_3}, // =+
- {0, C_2, A_2, B_2}, // BackSpace
- {0, C_1, A_1, B_1}, // Delete
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Esc
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // 1!
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // 2@
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // 3#
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 4$
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 5%
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 6^
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 7&
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 8*
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 9(
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 0)
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // -_
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // =+
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // BackSpace
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // Delete
- {0, F_16, D_16, E_16}, // Macro2
- {0, F_15, D_15, E_15}, // Tab
- {0, F_14, D_14, E_14}, // Q
- {0, F_13, D_13, E_13}, // W
- {0, F_12, D_12, E_12}, // E
- {0, F_11, D_11, E_11}, // R
- {0, F_10, D_10, E_10}, // T
- {0, F_9, D_9, E_9}, // Y
- {0, F_8, D_8, E_8}, // U
- {0, F_7, D_7, E_7}, // I
- {0, F_6, D_6, E_6}, // O
- {0, F_5, D_5, E_5}, // P
- {0, F_4, D_4, E_4}, // [{
- {0, F_3, D_3, E_3}, // ]}
- {0, F_2, D_2, E_2}, // |
- {0, F_1, D_1, E_1}, // PageUp
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // Macro2
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Tab
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Q
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // W
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // E
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // R
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // T
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // Y
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // U
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // I
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // O
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // P
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // [{
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // ]}
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // |
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // PageUp
- {1, C_16, A_16, B_16}, // Macro3
- {1, C_15, A_15, B_15}, // CapsLock
- {1, C_14, A_14, B_14}, // A
- {1, C_13, A_13, B_13}, // S
- {1, C_12, A_12, B_12}, // D
- {1, C_11, A_11, B_11}, // F
- {1, C_10, A_10, B_10}, // G
- {1, C_9, A_9, B_9}, // H
- {1, C_8, A_8, B_8}, // J
- {1, C_7, A_7, B_7}, // K
- {1, C_6, A_6, B_6}, // L
- {1, C_5, A_5, B_5}, // ;:
- {1, C_4, A_4, B_4}, // '"
- {1, C_2, A_2, B_2}, // Enter
- {1, C_1, A_1, B_1}, // PageDown
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Macro3
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // H
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // J
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // K
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // L
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // ;:
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // '"
+ {1, CB3_CA2, CB1_CA2, CB2_CA2}, // Enter
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // PageDown
- {1, I_16, G_16, H_16}, // Macro4
- {1, I_15, G_15, H_15}, // LeftShift
- {1, I_13, G_13, H_13}, // Z
- {1, I_12, G_12, H_12}, // X
- {1, I_11, G_11, H_11}, // C
- {1, I_10, G_10, H_10}, // V
- {1, I_9, G_9, H_9}, // B
- {1, I_8, G_8, H_8}, // N
- {1, I_7, G_7, H_7}, // M
- {1, I_6, G_6, H_6}, // ,<
- {1, I_5, G_5, H_5}, // .>
- {1, I_4, G_4, H_4}, // /?
- {1, I_3, G_3, H_3}, // RightShift
- {1, I_2, G_2, H_2}, // Up
- {1, I_1, G_1, H_1}, // Home
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Macro4
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // LeftShift
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // B
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // N
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // M
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // ,<
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // .>
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // /?
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // RightShift
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // Up
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Home
- {1, F_16, D_16, E_16}, // Macro5
- {1, F_15, D_15, E_15}, // LeftControl
- {1, F_14, D_14, E_14}, // LeftOption
- {1, F_13, D_13, E_13}, // LeftCommand
- {1, F_9, D_9, E_9}, // Space
- {1, F_6, D_6, E_6}, // RightCommand
- {1, F_5, D_5, E_5}, // Fn1
- {1, F_4, D_4, E_4}, // Fn2
- {1, F_3, D_3, E_3}, // Left
- {1, F_2, D_2, E_2}, // Down
- {1, F_1, D_1, E_1}, // Right
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Macro5
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftControl
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftOption
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // LeftCommand
+ {1, CB6_CA9, CB4_CA9, CB5_CA9}, // Space
+ {1, CB6_CA6, CB4_CA6, CB5_CA6}, // RightCommand
+ {1, CB6_CA5, CB4_CA5, CB5_CA5}, // Fn1
+ {1, CB6_CA4, CB4_CA4, CB5_CA4}, // Fn2
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // Left
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // Right
};
#define __ NO_LED
diff --git a/keyboards/keychron/q7/ansi/ansi.c b/keyboards/keychron/q7/ansi/ansi.c
index 828028b39e1..ef21433f575 100644
--- a/keyboards/keychron/q7/ansi/ansi.c
+++ b/keyboards/keychron/q7/ansi/ansi.c
@@ -27,82 +27,82 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_15, G_15, H_15},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q7/iso/iso.c b/keyboards/keychron/q7/iso/iso.c
index 85774429b8a..dfda79c8435 100644
--- a/keyboards/keychron/q7/iso/iso.c
+++ b/keyboards/keychron/q7/iso/iso.c
@@ -25,83 +25,83 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_15, G_15, H_15},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi/ansi.c b/keyboards/keychron/q8/ansi/ansi.c
index fbb68134488..e60752d7ddb 100644
--- a/keyboards/keychron/q8/ansi/ansi.c
+++ b/keyboards/keychron/q8/ansi/ansi.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- // {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ // {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
index fbb68134488..e60752d7ddb 100644
--- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- // {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ // {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso/iso.c b/keyboards/keychron/q8/iso/iso.c
index aab7ab357b4..720c1eb34be 100644
--- a/keyboards/keychron/q8/iso/iso.c
+++ b/keyboards/keychron/q8/iso/iso.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.c b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
index aab7ab357b4..720c1eb34be 100644
--- a/keyboards/keychron/q8/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q8/iso_encoder/iso_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c
index 0034c79c789..e00c7f7e9d8 100644
--- a/keyboards/keychron/q9/ansi/ansi.c
+++ b/keyboards/keychron/q9/ansi/ansi.c
@@ -27,61 +27,61 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, L_16, J_16, K_16},
- {0, L_15, J_15, K_15},
- {0, L_14, J_14, K_14},
- {0, L_13, J_13, K_13},
- {0, L_12, J_12, K_12},
- {0, L_11, J_11, K_11},
- {0, L_10, J_10, K_10},
- {0, L_9, J_9, K_9},
- {0, L_8, J_8, K_8},
- {0, L_7, J_7, K_7},
- {0, L_6, J_6, K_6},
- {0, L_5, J_5, K_5},
- {0, L_4, J_4, K_4},
- {0, L_3, J_3, K_3},
- {0, L_2, J_2, K_2},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA2, CB10_CA2, CB11_CA2},
- {0, C_16, A_16, B_16},
- {0, C_15, A_15, B_15},
- {0, C_14, A_14, B_14},
- {0, C_13, A_13, B_13},
- {0, C_12, A_12, B_12},
- {0, C_11, A_11, B_11},
- {0, C_10, A_10, B_10},
- {0, C_9, A_9, B_9},
- {0, C_8, A_8, B_8},
- {0, C_7, A_7, B_7},
- {0, C_6, A_6, B_6},
- {0, C_5, A_5, B_5},
- {0, C_3, A_3, B_3},
- {0, C_2, A_2, B_2},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
- {0, I_16, G_16, H_16},
- {0, I_14, G_14, H_14},
- {0, I_13, G_13, H_13},
- {0, I_12, G_12, H_12},
- {0, I_11, G_11, H_11},
- {0, I_10, G_10, H_10},
- {0, I_9, G_9, H_9},
- {0, I_8, G_8, H_8},
- {0, I_7, G_7, H_7},
- {0, I_6, G_6, H_6},
- {0, I_5, G_5, H_5},
- {0, I_3, G_3, H_3},
- {0, I_2, G_2, H_2},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
- {0, F_16, D_16, E_16},
- {0, F_15, D_15, E_15},
- {0, F_14, D_14, E_14},
- {0, F_10, D_10, E_10},
- {0, F_6, D_6, E_6},
- {0, F_5, D_5, E_5},
- {0, F_4, D_4, E_4},
- {0, F_3, D_3, E_3},
- {0, F_2, D_2, E_2},
- {0, C_4, A_4, B_4}
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
index 0034c79c789..e00c7f7e9d8 100644
--- a/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9/ansi_encoder/ansi_encoder.c
@@ -27,61 +27,61 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, L_16, J_16, K_16},
- {0, L_15, J_15, K_15},
- {0, L_14, J_14, K_14},
- {0, L_13, J_13, K_13},
- {0, L_12, J_12, K_12},
- {0, L_11, J_11, K_11},
- {0, L_10, J_10, K_10},
- {0, L_9, J_9, K_9},
- {0, L_8, J_8, K_8},
- {0, L_7, J_7, K_7},
- {0, L_6, J_6, K_6},
- {0, L_5, J_5, K_5},
- {0, L_4, J_4, K_4},
- {0, L_3, J_3, K_3},
- {0, L_2, J_2, K_2},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA2, CB10_CA2, CB11_CA2},
- {0, C_16, A_16, B_16},
- {0, C_15, A_15, B_15},
- {0, C_14, A_14, B_14},
- {0, C_13, A_13, B_13},
- {0, C_12, A_12, B_12},
- {0, C_11, A_11, B_11},
- {0, C_10, A_10, B_10},
- {0, C_9, A_9, B_9},
- {0, C_8, A_8, B_8},
- {0, C_7, A_7, B_7},
- {0, C_6, A_6, B_6},
- {0, C_5, A_5, B_5},
- {0, C_3, A_3, B_3},
- {0, C_2, A_2, B_2},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
- {0, I_16, G_16, H_16},
- {0, I_14, G_14, H_14},
- {0, I_13, G_13, H_13},
- {0, I_12, G_12, H_12},
- {0, I_11, G_11, H_11},
- {0, I_10, G_10, H_10},
- {0, I_9, G_9, H_9},
- {0, I_8, G_8, H_8},
- {0, I_7, G_7, H_7},
- {0, I_6, G_6, H_6},
- {0, I_5, G_5, H_5},
- {0, I_3, G_3, H_3},
- {0, I_2, G_2, H_2},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
- {0, F_16, D_16, E_16},
- {0, F_15, D_15, E_15},
- {0, F_14, D_14, E_14},
- {0, F_10, D_10, E_10},
- {0, F_6, D_6, E_6},
- {0, F_5, D_5, E_5},
- {0, F_4, D_4, E_4},
- {0, F_3, D_3, E_3},
- {0, F_2, D_2, E_2},
- {0, C_4, A_4, B_4}
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso/iso.c b/keyboards/keychron/q9/iso/iso.c
index e6a06b39098..f059b4bf58e 100644
--- a/keyboards/keychron/q9/iso/iso.c
+++ b/keyboards/keychron/q9/iso/iso.c
@@ -27,62 +27,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, L_16, J_16, K_16}, // Tab
- {0, L_15, J_15, K_15}, // Q
- {0, L_14, J_14, K_14}, // W
- {0, L_13, J_13, K_13}, // E
- {0, L_12, J_12, K_12}, // R
- {0, L_11, J_11, K_11}, // T
- {0, L_10, J_10, K_10}, // Y
- {0, L_9, J_9, K_9}, // U
- {0, L_8, J_8, K_8}, // I
- {0, L_7, J_7, K_7}, // O
- {0, L_6, J_6, K_6}, // P
- {0, L_5, J_5, K_5}, // [
- {0, L_4, J_4, K_4}, // ]
- {0, L_2, J_2, K_2}, // Del
+ {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+ {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+ {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+ {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+ {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+ {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+ {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+ {0, CB12_CA9, CB10_CA9, CB11_CA9}, // U
+ {0, CB12_CA8, CB10_CA8, CB11_CA8}, // I
+ {0, CB12_CA7, CB10_CA7, CB11_CA7}, // O
+ {0, CB12_CA6, CB10_CA6, CB11_CA6}, // P
+ {0, CB12_CA5, CB10_CA5, CB11_CA5}, // [
+ {0, CB12_CA4, CB10_CA4, CB11_CA4}, // ]
+ {0, CB12_CA2, CB10_CA2, CB11_CA2}, // Del
- {0, C_16, A_16, B_16}, // CapsLock
- {0, C_15, A_15, B_15}, // A
- {0, C_14, A_14, B_14}, // S
- {0, C_13, A_13, B_13}, // D
- {0, C_12, A_12, B_12}, // F
- {0, C_11, A_11, B_11}, // G
- {0, C_10, A_10, B_10}, // H
- {0, C_9, A_9, B_9}, // J
- {0, C_8, A_8, B_8}, // K
- {0, C_7, A_7, B_7}, // L
- {0, C_6, A_6, B_6}, // ;
- {0, C_5, A_5, B_5}, // '
- {0, C_3, A_3, B_3}, // #
- {0, L_3, J_3, K_3}, // Enter
- {0, C_2, A_2, B_2}, // Home
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // J
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // K
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // L
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // ;
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // '
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // #
+ {0, CB12_CA3, CB10_CA3, CB11_CA3}, // Enter
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // Home
- {0, I_16, G_16, H_16}, // LeftShift
- {0, I_15, G_15, H_15}, // |
- {0, I_14, G_14, H_14}, // Z
- {0, I_13, G_13, H_13}, // X
- {0, I_12, G_12, H_12}, // C
- {0, I_11, G_11, H_11}, // V
- {0, I_10, G_10, H_10}, // B
- {0, I_9, G_9, H_9}, // N
- {0, I_8, G_8, H_8}, // M
- {0, I_7, G_7, H_7}, // ,
- {0, I_6, G_6, H_6}, // .
- {0, I_5, G_5, H_5}, // ?
- {0, I_3, G_3, H_3}, // RightShift
- {0, I_2, G_2, H_2}, // Up
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // N
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // M
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // ,
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // .
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // ?
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // RightShift
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // Up
- {0, F_16, D_16, E_16}, // LeftCtrl
- {0, F_15, D_15, E_15}, // LeftWin
- {0, F_14, D_14, E_14}, // LeftAlt
- {0, F_10, D_10, E_10}, // Space
- {0, F_6, D_6, E_6}, // RightAlt
- {0, F_5, D_5, E_5}, // Fn1
- {0, F_4, D_4, E_4}, // Fn2
- {0, F_3, D_3, E_3}, // Left
- {0, F_2, D_2, E_2}, // Down
- {0, C_4, A_4, B_4} // Right
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // RightAlt
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // Fn1
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // Fn2
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // Left
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
+ {0, CB3_CA4, CB1_CA4, CB2_CA4} // Right
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9/iso_encoder/iso_encoder.c b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
index d607880eb25..1fdb4fc8cbb 100644
--- a/keyboards/keychron/q9/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q9/iso_encoder/iso_encoder.c
@@ -27,62 +27,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, L_16, J_16, K_16}, // Tab
- {0, L_15, J_15, K_15}, // Q
- {0, L_14, J_14, K_14}, // W
- {0, L_13, J_13, K_13}, // E
- {0, L_12, J_12, K_12}, // R
- {0, L_11, J_11, K_11}, // T
- {0, L_10, J_10, K_10}, // Y
- {0, L_9, J_9, K_9}, // U
- {0, L_8, J_8, K_8}, // I
- {0, L_7, J_7, K_7}, // O
- {0, L_6, J_6, K_6}, // P
- {0, L_5, J_5, K_5}, // [
- {0, L_4, J_4, K_4}, // ]
- // {0, L_2, J_2, K_2}, // Mute
+ {0, CB12_CA16, CB10_CA16, CB11_CA16}, // Tab
+ {0, CB12_CA15, CB10_CA15, CB11_CA15}, // Q
+ {0, CB12_CA14, CB10_CA14, CB11_CA14}, // W
+ {0, CB12_CA13, CB10_CA13, CB11_CA13}, // E
+ {0, CB12_CA12, CB10_CA12, CB11_CA12}, // R
+ {0, CB12_CA11, CB10_CA11, CB11_CA11}, // T
+ {0, CB12_CA10, CB10_CA10, CB11_CA10}, // Y
+ {0, CB12_CA9, CB10_CA9, CB11_CA9}, // U
+ {0, CB12_CA8, CB10_CA8, CB11_CA8}, // I
+ {0, CB12_CA7, CB10_CA7, CB11_CA7}, // O
+ {0, CB12_CA6, CB10_CA6, CB11_CA6}, // P
+ {0, CB12_CA5, CB10_CA5, CB11_CA5}, // [
+ {0, CB12_CA4, CB10_CA4, CB11_CA4}, // ]
+ // {0, CB12_CA2, CB10_CA2, CB11_CA2}, // Mute
- {0, C_16, A_16, B_16}, // CapsLock
- {0, C_15, A_15, B_15}, // A
- {0, C_14, A_14, B_14}, // S
- {0, C_13, A_13, B_13}, // D
- {0, C_12, A_12, B_12}, // F
- {0, C_11, A_11, B_11}, // G
- {0, C_10, A_10, B_10}, // H
- {0, C_9, A_9, B_9}, // J
- {0, C_8, A_8, B_8}, // K
- {0, C_7, A_7, B_7}, // L
- {0, C_6, A_6, B_6}, // ;
- {0, C_5, A_5, B_5}, // '
- {0, C_3, A_3, B_3}, // #
- {0, L_3, J_3, K_3}, // Enter
- {0, C_2, A_2, B_2}, // Home
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // CapsLock
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // A
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // S
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // D
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // G
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // H
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // J
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // K
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // L
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // ;
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // '
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // #
+ {0, CB12_CA3, CB10_CA3, CB11_CA3}, // Enter
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // Home
- {0, I_16, G_16, H_16}, // LeftShift
- {0, I_15, G_15, H_15}, // |
- {0, I_14, G_14, H_14}, // Z
- {0, I_13, G_13, H_13}, // X
- {0, I_12, G_12, H_12}, // C
- {0, I_11, G_11, H_11}, // V
- {0, I_10, G_10, H_10}, // B
- {0, I_9, G_9, H_9}, // N
- {0, I_8, G_8, H_8}, // M
- {0, I_7, G_7, H_7}, // ,
- {0, I_6, G_6, H_6}, // .
- {0, I_5, G_5, H_5}, // ?
- {0, I_3, G_3, H_3}, // RightShift
- {0, I_2, G_2, H_2}, // Up
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // LeftShift
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // |
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Z
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // X
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // C
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // V
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // B
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // N
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // M
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // ,
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // .
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // ?
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // RightShift
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // Up
- {0, F_16, D_16, E_16}, // LeftCtrl
- {0, F_15, D_15, E_15}, // LeftWin
- {0, F_14, D_14, E_14}, // LeftAlt
- {0, F_10, D_10, E_10}, // Space
- {0, F_6, D_6, E_6}, // RightAlt
- {0, F_5, D_5, E_5}, // Fn1
- {0, F_4, D_4, E_4}, // Fn2
- {0, F_3, D_3, E_3}, // Left
- {0, F_2, D_2, E_2}, // Down
- {0, C_4, A_4, B_4} // Right
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // LeftCtrl
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // LeftWin
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // LeftAlt
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // Space
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // RightAlt
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // Fn1
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // Fn2
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // Left
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
+ {0, CB3_CA4, CB1_CA4, CB2_CA4} // Right
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
index ffc213b75b9..f9277d570b2 100755
--- a/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q9_plus/ansi_encoder/ansi_encoder.c
@@ -24,62 +24,62 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, L_16, J_16, K_16},
- {0, L_15, J_15, K_15},
- {0, L_14, J_14, K_14},
- {0, L_13, J_13, K_13},
- {0, L_12, J_12, K_12},
- {0, L_11, J_11, K_11},
- {0, L_10, J_10, K_10},
- {0, L_9, J_9, K_9},
- {0, L_8, J_8, K_8},
- {0, L_7, J_7, K_7},
- {0, L_6, J_6, K_6},
- {0, L_5, J_5, K_5},
- {0, L_4, J_4, K_4},
- {0, L_3, J_3, K_3},
- // {0, L_2, J_2, K_2},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ // {0, CB12_CA2, CB10_CA2, CB11_CA2},
- {0, C_16, A_16, B_16},
- {0, C_15, A_15, B_15},
- {0, C_14, A_14, B_14},
- {0, C_13, A_13, B_13},
- {0, C_12, A_12, B_12},
- {0, C_11, A_11, B_11},
- {0, C_10, A_10, B_10},
- {0, C_9, A_9, B_9},
- {0, C_8, A_8, B_8},
- {0, C_7, A_7, B_7},
- {0, C_6, A_6, B_6},
- {0, C_5, A_5, B_5},
- {0, C_3, A_3, B_3},
- {0, C_2, A_2, B_2},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
- {0, I_16, G_16, H_16},
- {0, I_14, G_14, H_14},
- {0, I_13, G_13, H_13},
- {0, I_12, G_12, H_12},
- {0, I_11, G_11, H_11},
- {0, I_10, G_10, H_10},
- {0, I_9, G_9, H_9},
- {0, I_8, G_8, H_8},
- {0, I_7, G_7, H_7},
- {0, I_6, G_6, H_6},
- {0, I_5, G_5, H_5},
- {0, I_3, G_3, H_3},
- {0, I_2, G_2, H_2},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
- {0, F_16, D_16, E_16},
- {0, F_15, D_15, E_15},
- {0, F_14, D_14, E_14},
- {0, F_13, D_13, E_13},
- {0, F_10, D_10, E_10},
- {0, F_7, D_7, E_7},
- {0, F_6, D_6, E_6},
- {0, F_5, D_5, E_5},
- {0, F_4, D_4, E_4},
- {0, F_3, D_3, E_3},
- {0, F_2, D_2, E_2},
- {0, C_4, A_4, B_4},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
};
#endif
diff --git a/keyboards/keychron/s1/ansi/rgb/rgb.c b/keyboards/keychron/s1/ansi/rgb/rgb.c
index e81e7db402f..af6390f7532 100644
--- a/keyboards/keychron/s1/ansi/rgb/rgb.c
+++ b/keyboards/keychron/s1/ansi/rgb/rgb.c
@@ -27,95 +27,95 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1}, // esc
- {0, I_2, G_2, H_2}, // f1
- {0, I_3, G_3, H_3}, // f2
- {0, I_4, G_4, H_4}, // f3
- {0, I_5, G_5, H_5}, // f4
- {0, I_6, G_6, H_6}, // f4
- {0, I_7, G_7, H_7}, // f6
- {0, I_8, G_8, H_8}, // f7
- {0, I_9, G_9, H_9}, // f8
- {0, I_10, G_10, H_10}, // f9
- {0, I_11, G_11, H_11}, // f10
- {0, I_12, G_12, H_12}, // f11
- {0, I_13, G_13, H_13}, // f12
- {0, I_14, G_14, H_14}, // print
- {0, I_15, G_15, H_15}, // del
- {0, I_16, G_16, H_16}, // light
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // esc
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // f1
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // f2
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // f3
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // f4
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // f4
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // f6
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // f7
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // f8
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // f9
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // f10
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // f11
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // f12
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // print
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // del
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // light
- {0, F_1, D_1, E_1}, // ~
- {0, F_2, D_2, E_2}, // 1!
- {0, F_3, D_3, E_3}, // 2@
- {0, F_4, D_4, E_4}, // 3#
- {0, F_5, D_5, E_5}, // 4$
- {0, F_6, D_6, E_6}, // 5%
- {0, F_7, D_7, E_7}, // 6^
- {0, F_8, D_8, E_8}, // 7&
- {0, F_9, D_9, E_9}, // 8*
- {0, F_10, D_10, E_10}, // 9(
- {0, F_11, D_11, E_11}, // 0)
- {0, F_12, D_12, E_12}, // -_
- {0, F_13, D_13, E_13}, // =+
- {0, F_14, D_14, E_14}, // back space
- {0, F_16, D_16, E_16}, // page up
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // ~
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // 1!
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // 2@
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // 3#
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // 4$
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // 5%
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // 6^
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // 7&
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // 8*
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // 9(
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // 0)
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // -_
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // =+
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // back space
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // page up
- {0, C_1, A_1, B_1}, // tab
- {0, C_2, A_2, B_2}, // q
- {0, C_3, A_3, B_3}, // w
- {0, C_4, A_4, B_4}, // e
- {0, C_5, A_5, B_5}, // r
- {0, C_6, A_6, B_6}, // t
- {0, C_7, A_7, B_7}, // y
- {0, C_8, A_8, B_8}, // u
- {0, C_9, A_9, B_9}, // i
- {0, C_10, A_10, B_10}, // o
- {0, C_11, A_11, B_11}, // p
- {0, C_12, A_12, B_12}, // [{
- {0, C_13, A_13, B_13}, // ]}
- {0, C_14, A_14, B_14}, // |
- {0, C_16, A_16, B_16}, // page down
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // tab
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // q
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // w
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // e
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // r
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // t
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // y
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // u
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // i
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // o
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // p
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // [{
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // ]}
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // |
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // page down
- {1, I_1, G_1, H_1}, // caps lock
- {1, I_2, G_2, H_2}, // a
- {1, I_3, G_3, H_3}, // s
- {1, I_4, G_4, H_4}, // d
- {1, I_5, G_5, H_5}, // f
- {1, I_6, G_6, H_6}, // g
- {1, I_7, G_7, H_7}, // h
- {1, I_8, G_8, H_8}, // j
- {1, I_9, G_9, H_9}, // k
- {1, I_10, G_10, H_10}, // l
- {1, I_11, G_11, H_11}, // ;:
- {1, I_12, G_12, H_12}, // '"
- {1, I_14, G_14, H_14}, // enter
- {1, I_16, G_16, H_16}, // home
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // caps lock
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // a
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // s
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // d
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // f
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // g
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // h
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // j
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // k
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // l
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;:
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // '"
+ {1, CB9_CA14, CB7_CA14, CB8_CA14}, // enter
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // home
- {1, C_1, A_1, B_1}, // left shift
- {1, C_3, A_3, B_3}, // z
- {1, C_4, A_4, B_4}, // x
- {1, C_5, A_5, B_5}, // c
- {1, C_6, A_6, B_6}, // v
- {1, C_7, A_7, B_7}, // b
- {1, C_8, A_8, B_8}, // b
- {1, C_9, A_9, B_9}, // n
- {1, C_10, A_10, B_10}, // m
- {1, C_11, A_11, B_11}, // ,<
- {1, C_12, A_12, B_12}, // .>
- {1, C_13, A_13, B_13}, // right shift
- {1, C_14, A_14, B_14}, // up
- {1, C_16, A_16, B_16}, // end
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // left shift
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // z
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // x
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // c
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // v
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // b
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // b
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // n
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // m
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // ,<
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // .>
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // right shift
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // up
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // end
- {1, F_1, D_1, E_1}, // left
- {1, F_2, D_2, E_2}, // left command
- {1, F_3, D_3, E_3}, // left optin
- {1, F_7, D_7, E_7}, // space
- {1, F_10, D_10, E_10}, // right command
- {1, F_11, D_11, E_11}, // fn
- {1, F_12, D_12, E_12}, // right ctrl
- {1, F_13, D_13, E_13}, // left
- {1, F_14, D_14, E_14}, // down
- {1, F_16, D_16, E_16}, // right
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // left
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // left command
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // left optin
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // space
+ {1, CB6_CA10, CB4_CA10, CB5_CA10}, // right command
+ {1, CB6_CA11, CB4_CA11, CB5_CA11}, // fn
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // right ctrl
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // left
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // down
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // right
};
#define __ NO_LED
diff --git a/keyboards/keychron/s1/ansi/white/white.c b/keyboards/keychron/s1/ansi/white/white.c
index d6a5eaf2320..69623863d1f 100644
--- a/keyboards/keychron/s1/ansi/white/white.c
+++ b/keyboards/keychron/s1/ansi/white/white.c
@@ -25,95 +25,95 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* driver
* | LED address
* | | */
- {0, F_1}, // esc
- {0, F_2}, // f1
- {0, F_3}, // f2
- {0, F_4}, // f3
- {0, F_5}, // f4
- {0, F_6}, // f4
- {0, F_7}, // f6
- {0, F_8}, // f7
- {0, F_9}, // f8
- {0, F_10}, // f9
- {0, F_11}, // f10
- {0, F_12}, // f11
- {0, F_13}, // f12
- {0, F_14}, // print
- {0, F_15}, // del
- {0, F_16}, // light
+ {0, CB6_CA1}, // esc
+ {0, CB6_CA2}, // f1
+ {0, CB6_CA3}, // f2
+ {0, CB6_CA4}, // f3
+ {0, CB6_CA5}, // f4
+ {0, CB6_CA6}, // f4
+ {0, CB6_CA7}, // f6
+ {0, CB6_CA8}, // f7
+ {0, CB6_CA9}, // f8
+ {0, CB6_CA10}, // f9
+ {0, CB6_CA11}, // f10
+ {0, CB6_CA12}, // f11
+ {0, CB6_CA13}, // f12
+ {0, CB6_CA14}, // print
+ {0, CB6_CA15}, // del
+ {0, CB6_CA16}, // light
- {0, E_1}, // ~
- {0, E_2}, // 1!
- {0, E_3}, // 2@
- {0, E_4}, // 3#
- {0, E_5}, // 4$
- {0, E_6}, // 5%
- {0, E_7}, // 6^
- {0, E_8}, // 7&
- {0, E_9}, // 8*
- {0, E_10}, // 9(
- {0, E_11}, // 0)
- {0, E_12}, // -_
- {0, E_13}, // =+
- {0, E_14}, // back space
- {0, E_16}, // page up
+ {0, CB5_CA1}, // ~
+ {0, CB5_CA2}, // 1!
+ {0, CB5_CA3}, // 2@
+ {0, CB5_CA4}, // 3#
+ {0, CB5_CA5}, // 4$
+ {0, CB5_CA6}, // 5%
+ {0, CB5_CA7}, // 6^
+ {0, CB5_CA8}, // 7&
+ {0, CB5_CA9}, // 8*
+ {0, CB5_CA10}, // 9(
+ {0, CB5_CA11}, // 0)
+ {0, CB5_CA12}, // -_
+ {0, CB5_CA13}, // =+
+ {0, CB5_CA14}, // back space
+ {0, CB5_CA16}, // page up
- {0, D_1}, // tab
- {0, D_2}, // q
- {0, D_3}, // w
- {0, D_4}, // e
- {0, D_5}, // r
- {0, D_6}, // t
- {0, D_7}, // y
- {0, D_8}, // u
- {0, D_9}, // i
- {0, D_10}, // o
- {0, D_11}, // p
- {0, D_12}, // [{
- {0, D_13}, // ]}
- {0, D_14}, // |
- {0, D_16}, // page down
+ {0, CB4_CA1}, // tab
+ {0, CB4_CA2}, // q
+ {0, CB4_CA3}, // w
+ {0, CB4_CA4}, // e
+ {0, CB4_CA5}, // r
+ {0, CB4_CA6}, // t
+ {0, CB4_CA7}, // y
+ {0, CB4_CA8}, // u
+ {0, CB4_CA9}, // i
+ {0, CB4_CA10}, // o
+ {0, CB4_CA11}, // p
+ {0, CB4_CA12}, // [{
+ {0, CB4_CA13}, // ]}
+ {0, CB4_CA14}, // |
+ {0, CB4_CA16}, // page down
- {0, C_1}, // caps lock
- {0, C_2}, // a
- {0, C_3}, // s
- {0, C_4}, // d
- {0, C_5}, // f
- {0, C_6}, // g
- {0, C_7}, // h
- {0, C_8}, // j
- {0, C_9}, // k
- {0, C_10}, // l
- {0, C_11}, // ;:
- {0, C_12}, // '"
- {0, C_14}, // enter
- {0, C_16}, // home
+ {0, CB3_CA1}, // caps lock
+ {0, CB3_CA2}, // a
+ {0, CB3_CA3}, // s
+ {0, CB3_CA4}, // d
+ {0, CB3_CA5}, // f
+ {0, CB3_CA6}, // g
+ {0, CB3_CA7}, // h
+ {0, CB3_CA8}, // j
+ {0, CB3_CA9}, // k
+ {0, CB3_CA10}, // l
+ {0, CB3_CA11}, // ;:
+ {0, CB3_CA12}, // '"
+ {0, CB3_CA14}, // enter
+ {0, CB3_CA16}, // home
- {0, B_1}, // left shift
- {0, B_3}, // z
- {0, B_4}, // x
- {0, B_5}, // c
- {0, B_6}, // v
- {0, B_7}, // b
- {0, B_8}, // b
- {0, B_9}, // n
- {0, B_10}, // m
- {0, B_11}, // ,<
- {0, B_12}, // .>
- {0, B_13}, // right shift
- {0, B_14}, // up
- {0, B_16}, // end
+ {0, CB2_CA1}, // left shift
+ {0, CB2_CA3}, // z
+ {0, CB2_CA4}, // x
+ {0, CB2_CA5}, // c
+ {0, CB2_CA6}, // v
+ {0, CB2_CA7}, // b
+ {0, CB2_CA8}, // b
+ {0, CB2_CA9}, // n
+ {0, CB2_CA10}, // m
+ {0, CB2_CA11}, // ,<
+ {0, CB2_CA12}, // .>
+ {0, CB2_CA13}, // right shift
+ {0, CB2_CA14}, // up
+ {0, CB2_CA16}, // end
- {0, A_1}, // left
- {0, A_2}, // left command
- {0, A_3}, // left optin
- {0, A_7}, // space
- {0, A_10}, // right command
- {0, A_11}, // fn
- {0, A_12}, // right ctrl
- {0, A_13}, // left
- {0, A_14}, // down
- {0, A_16}, // right
+ {0, CB1_CA1}, // left
+ {0, CB1_CA2}, // left command
+ {0, CB1_CA3}, // left optin
+ {0, CB1_CA7}, // space
+ {0, CB1_CA10}, // right command
+ {0, CB1_CA11}, // fn
+ {0, CB1_CA12}, // right ctrl
+ {0, CB1_CA13}, // left
+ {0, CB1_CA14}, // down
+ {0, CB1_CA16}, // right
};
#define __ NO_LED
diff --git a/keyboards/keychron/v1/ansi/ansi.c b/keyboards/keychron/v1/ansi/ansi.c
index 2db3ab782dd..a78d5dd4d78 100644
--- a/keyboards/keychron/v1/ansi/ansi.c
+++ b/keyboards/keychron/v1/ansi/ansi.c
@@ -27,93 +27,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
index 2db3ab782dd..a78d5dd4d78 100644
--- a/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v1/ansi_encoder/ansi_encoder.c
@@ -27,93 +27,93 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v1/iso/iso.c b/keyboards/keychron/v1/iso/iso.c
index dff029055ba..a1095dcc926 100644
--- a/keyboards/keychron/v1/iso/iso.c
+++ b/keyboards/keychron/v1/iso/iso.c
@@ -27,94 +27,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v1/iso_encoder/iso_encoder.c b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
index dff029055ba..a1095dcc926 100644
--- a/keyboards/keychron/v1/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v1/iso_encoder/iso_encoder.c
@@ -27,94 +27,94 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_7, A_7, B_7},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v1/jis/jis.c b/keyboards/keychron/v1/jis/jis.c
index 029c58fd709..d3b3f9aa900 100644
--- a/keyboards/keychron/v1/jis/jis.c
+++ b/keyboards/keychron/v1/jis/jis.c
@@ -27,97 +27,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_7, A_7, B_7},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v1/jis_encoder/jis_encoder.c b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
index 029c58fd709..d3b3f9aa900 100644
--- a/keyboards/keychron/v1/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v1/jis_encoder/jis_encoder.c
@@ -27,97 +27,97 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, F_1, D_1, E_1},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_5, D_5, E_5},
- {1, F_6, D_6, E_6},
- {1, F_7, D_7, E_7},
- {1, F_8, D_8, E_8},
- {1, F_9, D_9, E_9},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_7, A_7, B_7},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
index 10cf2a85fdd..7a58d4deefb 100644
--- a/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v10/ansi_encoder/ansi_encoder.c
@@ -27,99 +27,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_2, A_2, B_2}, // ESC
- {0, C_3, A_3, B_3}, // F1
- {0, C_4, A_4, B_4}, // F2
- {0, C_5, A_5, B_5}, // F3
- {0, C_6, A_6, B_6}, // F4
- {0, C_7, A_7, B_7}, // F5
- {0, C_8, A_8, B_8}, // F6
- {0, C_9, A_9, B_9}, // F7
- {0, C_10, A_10, B_10}, // F8
- {0, C_11, A_11, B_11}, // F9
- {0, C_12, A_12, B_12}, // F10
- {0, C_13, A_13, B_13}, // F11
- {0, C_14, A_14, B_14}, // F12
- {0, C_15, A_15, B_15}, // INS
- {0, C_16, A_16, B_16}, // DEL
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // ESC
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // F1
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // F2
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // F3
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // F4
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // F5
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // F6
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // F7
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
- {0, I_1, G_1, H_1}, // M1
- {0, I_2, G_2, H_2}, // `~
- {0, I_3, G_3, H_3}, // 1!
- {0, I_4, G_4, H_4}, // 2@
- {0, I_5, G_5, H_5}, // 3#
- {0, I_6, G_6, H_6}, // 4$
- {0, I_7, G_7, H_7}, // 5%
- {0, I_8, G_8, H_8}, // 6^
- {0, I_9, G_9, H_9}, // 7&
- {0, I_10, G_10, H_10}, // 8*
- {0, I_11, G_11, H_11}, // 9(
- {0, I_12, G_12, H_12}, // 0)
- {0, I_13, G_13, H_13}, // -_
- {0, I_14, G_14, H_14}, // =+
- {0, I_15, G_15, H_15}, // BackSpace
- {0, I_16, G_16, H_16}, // PgUp
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // M1
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // `~
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // 1!
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // 2@
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // 3#
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // 4$
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // 5%
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // 6^
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // 7&
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
- {0, F_1, D_1, E_1}, // M2
- {0, F_2, D_2, E_2}, // TAB
- {0, F_3, D_3, E_3}, // Q
- {0, F_4, D_4, E_4}, // W
- {0, F_5, D_5, E_5}, // E
- {0, F_6, D_6, E_6}, // R
- {0, F_7, D_7, E_7}, // T
- {0, F_8, D_8, E_8}, // Y
- {0, F_9, D_9, E_9}, // U
- {0, F_10, D_10, E_10}, // I
- {0, F_11, D_11, E_11}, // O
- {0, F_12, D_12, E_12}, // P
- {0, F_13, D_13, E_13}, // [
- {0, F_14, D_14, E_14}, // ]
- {0, F_15, D_15, E_15}, // |
- {0, F_16, D_16, E_16}, // PgDn
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // M2
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // TAB
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // Q
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // W
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // E
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // R
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // T
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // Y
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // U
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
- {1, C_16, A_16, B_16}, // M3
- {1, C_15, A_15, B_15}, // CapsLock
- {1, C_14, A_14, B_14}, // A
- {1, C_13, A_13, B_13}, // S
- {1, C_12, A_12, B_12}, // D
- {1, C_11, A_11, B_11}, // F
- {1, C_10, A_10, B_10}, // G
- {1, C_8, A_8, B_8}, // H
- {1, C_7, A_7, B_7}, // J
- {1, C_6, A_6, B_6}, // K
- {1, C_5, A_5, B_5}, // L
- {1, C_4, A_4, B_4}, // ;
- {1, C_3, A_3, B_3}, // '
- {1, C_2, A_2, B_2}, // Enter
- {1, C_1, A_1, B_1}, // Home
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // H
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // J
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // K
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // L
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // ;
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // '
+ {1, CB3_CA2, CB1_CA2, CB2_CA2}, // Enter
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // Home
- {1, I_16, G_16, H_16}, // M4
- {1, I_15, G_15, H_15}, // Shift_L
- {1, I_13, G_13, H_13}, // Z
- {1, I_12, G_12, H_12}, // X
- {1, I_11, G_11, H_11}, // C
- {1, I_10, G_10, H_10}, // V
- {1, I_9, G_9, H_9}, // B
- {1, I_8, G_8, H_8}, // B
- {1, I_7, G_7, H_7}, // N
- {1, I_6, G_6, H_6}, // M
- {1, I_5, G_5, H_5}, // ,
- {1, I_4, G_4, H_4}, // .
- {1, I_3, G_3, H_3}, // ?
- {1, I_2, G_2, H_2}, // Shift_R
- {1, I_1, G_1, H_1}, // Up
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // B
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // B
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // N
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // M
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // ,
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // .
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // ?
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // Shift_R
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Up
- {1, F_16, D_16, E_16}, // M5
- {1, F_15, D_15, E_15}, // Ctrl_L
- {1, F_14, D_14, E_14}, // Win_L
- {1, F_13, D_13, E_13}, // Alt_L
- {1, F_12, D_12, E_12}, // Space
- {1, F_9, D_9, E_9}, // Fn
- {1, F_8, D_8, E_8}, // Space
- {1, F_7, D_7, E_7}, // Alt_R
- {1, F_3, D_3, E_3}, // Left
- {1, F_2, D_2, E_2}, // Down
- {1, F_1, D_1, E_1}, // Right
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+ {1, CB6_CA9, CB4_CA9, CB5_CA9}, // Fn
+ {1, CB6_CA8, CB4_CA8, CB5_CA8}, // Space
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Alt_R
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // Left
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // Right
};
#define __ NO_LED
diff --git a/keyboards/keychron/v10/iso_encoder/iso_encoder.c b/keyboards/keychron/v10/iso_encoder/iso_encoder.c
index b4bfb692068..359646b5426 100644
--- a/keyboards/keychron/v10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v10/iso_encoder/iso_encoder.c
@@ -27,100 +27,100 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_2, A_2, B_2}, // ESC
- {0, C_3, A_3, B_3}, // F1
- {0, C_4, A_4, B_4}, // F2
- {0, C_5, A_5, B_5}, // F3
- {0, C_6, A_6, B_6}, // F4
- {0, C_7, A_7, B_7}, // F5
- {0, C_8, A_8, B_8}, // F6
- {0, C_9, A_9, B_9}, // F7
- {0, C_10, A_10, B_10}, // F8
- {0, C_11, A_11, B_11}, // F9
- {0, C_12, A_12, B_12}, // F10
- {0, C_13, A_13, B_13}, // F11
- {0, C_14, A_14, B_14}, // F12
- {0, C_15, A_15, B_15}, // INS
- {0, C_16, A_16, B_16}, // DEL
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // ESC
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // F1
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // F2
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // F3
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // F4
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // F5
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // F6
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // F7
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // F8
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // F9
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // F10
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // F11
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // F12
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // INS
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // DEL
- {0, I_1, G_1, H_1}, // M1
- {0, I_2, G_2, H_2}, // `~
- {0, I_3, G_3, H_3}, // 1!
- {0, I_4, G_4, H_4}, // 2@
- {0, I_5, G_5, H_5}, // 3#
- {0, I_6, G_6, H_6}, // 4$
- {0, I_7, G_7, H_7}, // 5%
- {0, I_8, G_8, H_8}, // 6^
- {0, I_9, G_9, H_9}, // 7&
- {0, I_10, G_10, H_10}, // 8*
- {0, I_11, G_11, H_11}, // 9(
- {0, I_12, G_12, H_12}, // 0)
- {0, I_13, G_13, H_13}, // -_
- {0, I_14, G_14, H_14}, // =+
- {0, I_15, G_15, H_15}, // BackSpace
- {0, I_16, G_16, H_16}, // PgUp
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // M1
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // `~
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // 1!
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // 2@
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // 3#
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // 4$
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // 5%
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // 6^
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // 7&
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // 8*
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // 9(
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // 0)
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // -_
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // =+
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // BackSpace
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // PgUp
- {0, F_1, D_1, E_1}, // M2
- {0, F_2, D_2, E_2}, // TAB
- {0, F_3, D_3, E_3}, // Q
- {0, F_4, D_4, E_4}, // W
- {0, F_5, D_5, E_5}, // E
- {0, F_6, D_6, E_6}, // R
- {0, F_7, D_7, E_7}, // T
- {0, F_8, D_8, E_8}, // Y
- {0, F_9, D_9, E_9}, // U
- {0, F_10, D_10, E_10}, // I
- {0, F_11, D_11, E_11}, // O
- {0, F_12, D_12, E_12}, // P
- {0, F_13, D_13, E_13}, // [
- {0, F_14, D_14, E_14}, // ]
- {0, F_16, D_16, E_16}, // PgDn
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // M2
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // TAB
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // Q
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // W
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // E
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // R
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // T
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // Y
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // U
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // I
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // O
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // P
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // [
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // ]
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // PgDn
- {1, C_16, A_16, B_16}, // M3
- {1, C_15, A_15, B_15}, // CapsLock
- {1, C_14, A_14, B_14}, // A
- {1, C_13, A_13, B_13}, // S
- {1, C_12, A_12, B_12}, // D
- {1, C_11, A_11, B_11}, // F
- {1, C_10, A_10, B_10}, // G
- {1, C_8, A_8, B_8}, // H
- {1, C_7, A_7, B_7}, // J
- {1, C_6, A_6, B_6}, // K
- {1, C_5, A_5, B_5}, // L
- {1, C_4, A_4, B_4}, // ;
- {1, C_3, A_3, B_3}, // '
- {0, F_15, D_15, E_15}, // |
- {1, C_2, A_2, B_2}, // Enter
- {1, C_1, A_1, B_1}, // Home
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // M3
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // CapsLock
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // A
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // S
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // D
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // F
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // G
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // H
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // J
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // K
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // L
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // ;
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // '
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // |
+ {1, CB3_CA2, CB1_CA2, CB2_CA2}, // Enter
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // Home
- {1, I_16, G_16, H_16}, // M4
- {1, I_15, G_15, H_15}, // Shift_L
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13}, // Z
- {1, I_12, G_12, H_12}, // X
- {1, I_11, G_11, H_11}, // C
- {1, I_10, G_10, H_10}, // V
- {1, I_9, G_9, H_9}, // B
- {1, I_8, G_8, H_8}, // B
- {1, I_7, G_7, H_7}, // N
- {1, I_6, G_6, H_6}, // M
- {1, I_5, G_5, H_5}, // ,
- {1, I_4, G_4, H_4}, // .
- {1, I_3, G_3, H_3}, // ?
- {1, I_2, G_2, H_2}, // Shift_R
- {1, I_1, G_1, H_1}, // Up
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // M4
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Shift_L
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Z
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // X
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // C
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // V
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // B
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // B
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // N
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // M
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // ,
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // .
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // ?
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // Shift_R
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Up
- {1, F_16, D_16, E_16}, // M5
- {1, F_15, D_15, E_15}, // Ctrl_L
- {1, F_14, D_14, E_14}, // Win_L
- {1, F_13, D_13, E_13}, // Alt_L
- {1, F_12, D_12, E_12}, // Space
- {1, F_9, D_9, E_9}, // Fn
- {1, F_8, D_8, E_8}, // Space
- {1, F_7, D_7, E_7}, // Alt_R
- {1, F_3, D_3, E_3}, // Left
- {1, F_2, D_2, E_2}, // Down
- {1, F_1, D_1, E_1}, // Right
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // M5
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Ctrl_L
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // Win_L
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Alt_L
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // Space
+ {1, CB6_CA9, CB4_CA9, CB5_CA9}, // Fn
+ {1, CB6_CA8, CB4_CA8, CB5_CA8}, // Space
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Alt_R
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // Left
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // Down
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // Right
};
#define __ NO_LED
diff --git a/keyboards/keychron/v2/ansi/ansi.c b/keyboards/keychron/v2/ansi/ansi.c
index 7e3214f1751..722aa27b470 100644
--- a/keyboards/keychron/v2/ansi/ansi.c
+++ b/keyboards/keychron/v2/ansi/ansi.c
@@ -27,77 +27,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
index df33725b5e1..6203483285f 100644
--- a/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v2/ansi_encoder/ansi_encoder.c
@@ -27,77 +27,77 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v2/iso/iso.c b/keyboards/keychron/v2/iso/iso.c
index ba9d47a2f14..aca0879838e 100644
--- a/keyboards/keychron/v2/iso/iso.c
+++ b/keyboards/keychron/v2/iso/iso.c
@@ -27,78 +27,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v2/iso_encoder/iso_encoder.c b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
index ba9d47a2f14..aca0879838e 100644
--- a/keyboards/keychron/v2/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v2/iso_encoder/iso_encoder.c
@@ -27,78 +27,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v2/jis/jis.c b/keyboards/keychron/v2/jis/jis.c
index 0d638b57538..1269d9b1e69 100644
--- a/keyboards/keychron/v2/jis/jis.c
+++ b/keyboards/keychron/v2/jis/jis.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v2/jis_encoder/jis_encoder.c b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
index 10a3ca25a7f..85aaf165f69 100644
--- a/keyboards/keychron/v2/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v2/jis_encoder/jis_encoder.c
@@ -25,81 +25,81 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_13, A_13, B_13},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_4, D_4, E_4},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16}
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v3/ansi/ansi.c b/keyboards/keychron/v3/ansi/ansi.c
index 6205b0b01bf..7c476786193 100644
--- a/keyboards/keychron/v3/ansi/ansi.c
+++ b/keyboards/keychron/v3/ansi/ansi.c
@@ -25,98 +25,98 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
index 27f1f1f8304..d85708937aa 100644
--- a/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v3/ansi_encoder/ansi_encoder.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- // {0, I_14, G_14, H_14}, // Encoder
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ // {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Encoder
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v3/iso/iso.c b/keyboards/keychron/v3/iso/iso.c
index be0934b4a0e..83798392c6b 100644
--- a/keyboards/keychron/v3/iso/iso.c
+++ b/keyboards/keychron/v3/iso/iso.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v3/iso_encoder/iso_encoder.c b/keyboards/keychron/v3/iso_encoder/iso_encoder.c
index 0456fb99f9c..ef0567dbe14 100644
--- a/keyboards/keychron/v3/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v3/iso_encoder/iso_encoder.c
@@ -25,99 +25,99 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {1, I_16, G_16, H_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {1, I_13, G_13, H_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
- {1, I_1, G_1, H_1},
- {1, I_2, G_2, H_2},
- {1, I_3, G_3, H_3},
- {1, I_4, G_4, H_4},
- {1, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
- {1, C_15, A_15, B_15},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v3/jis/jis.c b/keyboards/keychron/v3/jis/jis.c
index be93dbc6415..c04827dc5d9 100644
--- a/keyboards/keychron/v3/jis/jis.c
+++ b/keyboards/keychron/v3/jis/jis.c
@@ -25,102 +25,102 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1}, // ESC
- {0, I_2, G_2, H_2}, // F1
- {0, I_3, G_3, H_3}, // F2
- {0, I_4, G_4, H_4}, // F3
- {0, I_5, G_5, H_5}, // F4
- {0, I_6, G_6, H_6}, // F5
- {0, I_7, G_7, H_7}, // F6
- {0, I_8, G_8, H_8}, // F7
- {0, I_9, G_9, H_9}, // F8
- {0, I_10, G_10, H_10}, // F9
- {0, I_11, G_11, H_11}, // F10
- {0, I_12, G_12, H_12}, // F11
- {0, I_13, G_13, H_13}, // F12
- {0, I_15, G_15, H_15}, // Print
- {0, I_16, G_16, H_16}, // Cortana
- {1, I_15, G_15, H_15}, // Light
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // ESC
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // F1
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // F2
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // F3
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // F4
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // F5
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // F6
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // F7
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // F8
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
- {0, C_1, A_1, B_1}, // `~
- {0, C_2, A_2, B_2}, // 1!
- {0, C_3, A_3, B_3}, // 2@
- {0, C_4, A_4, B_4}, // 3#
- {0, C_5, A_5, B_5}, // 4$
- {0, C_6, A_6, B_6}, // 5%
- {0, C_7, A_7, B_7}, // 6^
- {0, C_8, A_8, B_8}, // 7&
- {0, C_9, A_9, B_9}, // 8*
- {0, C_10, A_10, B_10}, // 9()
- {0, C_11, A_11, B_11}, // 0)
- {0, C_12, A_12, B_12}, // -_
- {0, C_13, A_13, B_13}, // =+
- {0, C_14, A_14, B_14}, // /
- {0, I_14, G_14, H_14}, // Backspace
- {0, C_15, A_15, B_15}, // Ins
- {0, C_16, A_16, B_16}, // Home
- {1, I_16, G_16, H_16}, // Page Up
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // `~
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // 1!
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // 2@
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // 3#
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 4$
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 5%
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 6^
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 7&
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 8*
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // /
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Backspace
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
- {0, F_1, D_1, E_1}, // tab
- {0, F_2, D_2, E_2}, // Q
- {0, F_3, D_3, E_3}, // W
- {0, F_4, D_4, E_4}, // E
- {0, F_5, D_5, E_5}, // R
- {0, F_6, D_6, E_6}, // T
- {0, F_7, D_7, E_7}, // Y
- {0, F_8, D_8, E_8}, // U
- {0, F_9, D_9, E_9}, // I
- {0, F_10, D_10, E_10}, // O
- {0, F_11, D_11, E_11}, // P
- {0, F_12, D_12, E_12}, // [{
- {0, F_13, D_13, E_13}, // }}
- {0, F_15, D_15, E_15}, // Del
- {0, F_16, D_16, E_16}, // End
- {1, I_13, G_13, H_13}, // Page Down
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // tab
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // Q
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // W
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // E
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // R
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // T
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // Y
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // U
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // I
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // }}
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
- {1, I_1, G_1, H_1}, // Cpas
- {1, I_2, G_2, H_2}, // A
- {1, I_3, G_3, H_3}, // S
- {1, I_4, G_4, H_4}, // D
- {1, I_5, G_5, H_5}, // F
- {1, I_6, G_6, H_6}, // G
- {1, I_7, G_7, H_7}, // H
- {1, I_8, G_8, H_8}, // J
- {1, I_9, G_9, H_9}, // K
- {1, I_10, G_10, H_10}, // L
- {1, I_11, G_11, H_11}, // ;
- {1, I_12, G_12, H_12}, // :
- {1, I_14, G_14, H_14}, // #~
- {0, F_14, D_14, E_14}, // Enter
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Cpas
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // A
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // S
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // D
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // F
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // G
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // H
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // J
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // K
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+ {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Enter
- {1, C_1, A_1, B_1}, // LShift
- {1, C_3, A_3, B_3}, // Z
- {1, C_4, A_4, B_4}, // X
- {1, C_5, A_5, B_5}, // C
- {1, C_6, A_6, B_6}, // V
- {1, C_7, A_7, B_7}, // B
- {1, C_8, A_8, B_8}, // N
- {1, C_9, A_9, B_9}, // M
- {1, C_10, A_10, B_10}, // ,<
- {1, C_11, A_11, B_11}, // .>
- {1, C_12, A_12, B_12}, // /?
- {1, C_13, A_13, B_13}, // |
- {1, C_14, A_14, B_14}, // RShift
- {1, C_16, A_16, B_16}, // Up
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // LShift
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // Z
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // X
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // C
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // V
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // B
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // N
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // M
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
- {1, F_1, D_1, E_1}, // LCtrl
- {1, F_2, D_2, E_2}, // LWin
- {1, F_3, D_3, E_3}, // LAlt
- {1, F_4, D_4, E_4}, // NUm
- {1, F_7, D_7, E_7}, // Space
- {1, F_10, D_10, E_10}, // Jap
- {1, F_11, D_11, E_11}, // RAlt
- {1, F_12, D_12, E_12}, // RWin
- {1, F_13, D_13, E_13}, // Fn
- {1, F_14, D_14, E_14}, // RCtrl
- {1, F_15, D_15, E_15}, // Left
- {1, F_16, D_16, E_16}, // Down
- {1, C_15, A_15, B_15}, // Right
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // LCtrl
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // LWin
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // LAlt
+ {1, CB6_CA4, CB4_CA4, CB5_CA4}, // NUm
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Space
+ {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+ {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
};
# define __ NO_LED
diff --git a/keyboards/keychron/v3/jis_encoder/jis_encoder.c b/keyboards/keychron/v3/jis_encoder/jis_encoder.c
index 9eea7b3994e..bf2018d86f1 100644
--- a/keyboards/keychron/v3/jis_encoder/jis_encoder.c
+++ b/keyboards/keychron/v3/jis_encoder/jis_encoder.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1}, // ESC
- {0, I_2, G_2, H_2}, // F1
- {0, I_3, G_3, H_3}, // F2
- {0, I_4, G_4, H_4}, // F3
- {0, I_5, G_5, H_5}, // F4
- {0, I_6, G_6, H_6}, // F5
- {0, I_7, G_7, H_7}, // F6
- {0, I_8, G_8, H_8}, // F7
- {0, I_9, G_9, H_9}, // F8
- {0, I_10, G_10, H_10}, // F9
- {0, I_11, G_11, H_11}, // F10
- {0, I_12, G_12, H_12}, // F11
- {0, I_13, G_13, H_13}, // F12
- {0, I_14, G_14, H_14}, // Mute
- {0, I_15, G_15, H_15}, // Print
- {0, I_16, G_16, H_16}, // Cortana
- {1, I_15, G_15, H_15}, // Light
+ {0, CB9_CA1, CB7_CA1, CB8_CA1}, // ESC
+ {0, CB9_CA2, CB7_CA2, CB8_CA2}, // F1
+ {0, CB9_CA3, CB7_CA3, CB8_CA3}, // F2
+ {0, CB9_CA4, CB7_CA4, CB8_CA4}, // F3
+ {0, CB9_CA5, CB7_CA5, CB8_CA5}, // F4
+ {0, CB9_CA6, CB7_CA6, CB8_CA6}, // F5
+ {0, CB9_CA7, CB7_CA7, CB8_CA7}, // F6
+ {0, CB9_CA8, CB7_CA8, CB8_CA8}, // F7
+ {0, CB9_CA9, CB7_CA9, CB8_CA9}, // F8
+ {0, CB9_CA10, CB7_CA10, CB8_CA10}, // F9
+ {0, CB9_CA11, CB7_CA11, CB8_CA11}, // F10
+ {0, CB9_CA12, CB7_CA12, CB8_CA12}, // F11
+ {0, CB9_CA13, CB7_CA13, CB8_CA13}, // F12
+ {0, CB9_CA14, CB7_CA14, CB8_CA14}, // Mute
+ {0, CB9_CA15, CB7_CA15, CB8_CA15}, // Print
+ {0, CB9_CA16, CB7_CA16, CB8_CA16}, // Cortana
+ {1, CB9_CA15, CB7_CA15, CB8_CA15}, // Light
- {0, C_1, A_1, B_1}, // `~
- {0, C_2, A_2, B_2}, // 1!
- {0, C_3, A_3, B_3}, // 2@
- {0, C_4, A_4, B_4}, // 3#
- {0, C_5, A_5, B_5}, // 4$
- {0, C_6, A_6, B_6}, // 5%
- {0, C_7, A_7, B_7}, // 6^
- {0, C_8, A_8, B_8}, // 7&
- {0, C_9, A_9, B_9}, // 8*
- {0, C_10, A_10, B_10}, // 9()
- {0, C_11, A_11, B_11}, // 0)
- {0, C_12, A_12, B_12}, // -_
- {0, C_13, A_13, B_13}, // =+
- {0, C_14, A_14, B_14}, // |
- {1, F_6, D_6, E_6}, // Backspace
- {0, C_15, A_15, B_15}, // Ins
- {0, C_16, A_16, B_16}, // Home
- {1, I_16, G_16, H_16}, // Page Up
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // `~
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // 1!
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // 2@
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // 3#
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 4$
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 5%
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 6^
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 7&
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 8*
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9()
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // |
+ {1, CB6_CA6, CB4_CA6, CB5_CA6}, // Backspace
+ {0, CB3_CA15, CB1_CA15, CB2_CA15}, // Ins
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Home
+ {1, CB9_CA16, CB7_CA16, CB8_CA16}, // Page Up
- {0, F_1, D_1, E_1}, // tab
- {0, F_2, D_2, E_2}, // Q
- {0, F_3, D_3, E_3}, // W
- {0, F_4, D_4, E_4}, // E
- {0, F_5, D_5, E_5}, // R
- {0, F_6, D_6, E_6}, // T
- {0, F_7, D_7, E_7}, // Y
- {0, F_8, D_8, E_8}, // U
- {0, F_9, D_9, E_9}, // I
- {0, F_10, D_10, E_10}, // O
- {0, F_11, D_11, E_11}, // P
- {0, F_12, D_12, E_12}, // [{
- {0, F_13, D_13, E_13}, // }}
- {0, F_15, D_15, E_15}, // Del
- {0, F_16, D_16, E_16}, // End
- {1, I_13, G_13, H_13}, // Page Down
+ {0, CB6_CA1, CB4_CA1, CB5_CA1}, // tab
+ {0, CB6_CA2, CB4_CA2, CB5_CA2}, // Q
+ {0, CB6_CA3, CB4_CA3, CB5_CA3}, // W
+ {0, CB6_CA4, CB4_CA4, CB5_CA4}, // E
+ {0, CB6_CA5, CB4_CA5, CB5_CA5}, // R
+ {0, CB6_CA6, CB4_CA6, CB5_CA6}, // T
+ {0, CB6_CA7, CB4_CA7, CB5_CA7}, // Y
+ {0, CB6_CA8, CB4_CA8, CB5_CA8}, // U
+ {0, CB6_CA9, CB4_CA9, CB5_CA9}, // I
+ {0, CB6_CA10, CB4_CA10, CB5_CA10}, // O
+ {0, CB6_CA11, CB4_CA11, CB5_CA11}, // P
+ {0, CB6_CA12, CB4_CA12, CB5_CA12}, // [{
+ {0, CB6_CA13, CB4_CA13, CB5_CA13}, // }}
+ {0, CB6_CA15, CB4_CA15, CB5_CA15}, // Del
+ {0, CB6_CA16, CB4_CA16, CB5_CA16}, // End
+ {1, CB9_CA13, CB7_CA13, CB8_CA13}, // Page Down
- {1, I_1, G_1, H_1}, // Cpas
- {1, I_2, G_2, H_2}, // A
- {1, I_3, G_3, H_3}, // S
- {1, I_4, G_4, H_4}, // D
- {1, I_5, G_5, H_5}, // F
- {1, I_6, G_6, H_6}, // G
- {1, I_7, G_7, H_7}, // H
- {1, I_8, G_8, H_8}, // J
- {1, I_9, G_9, H_9}, // K
- {1, I_10, G_10, H_10}, // L
- {1, I_11, G_11, H_11}, // ;
- {1, I_12, G_12, H_12}, // :
- {1, I_14, G_14, H_14}, // #~
- {0, F_14, D_14, E_14}, // Enter
+ {1, CB9_CA1, CB7_CA1, CB8_CA1}, // Cpas
+ {1, CB9_CA2, CB7_CA2, CB8_CA2}, // A
+ {1, CB9_CA3, CB7_CA3, CB8_CA3}, // S
+ {1, CB9_CA4, CB7_CA4, CB8_CA4}, // D
+ {1, CB9_CA5, CB7_CA5, CB8_CA5}, // F
+ {1, CB9_CA6, CB7_CA6, CB8_CA6}, // G
+ {1, CB9_CA7, CB7_CA7, CB8_CA7}, // H
+ {1, CB9_CA8, CB7_CA8, CB8_CA8}, // J
+ {1, CB9_CA9, CB7_CA9, CB8_CA9}, // K
+ {1, CB9_CA10, CB7_CA10, CB8_CA10}, // L
+ {1, CB9_CA11, CB7_CA11, CB8_CA11}, // ;
+ {1, CB9_CA12, CB7_CA12, CB8_CA12}, // :
+ {1, CB9_CA14, CB7_CA14, CB8_CA14}, // #~
+ {0, CB6_CA14, CB4_CA14, CB5_CA14}, // Enter
- {1, C_1, A_1, B_1}, // LShift
- {1, C_3, A_3, B_3}, // Z
- {1, C_4, A_4, B_4}, // X
- {1, C_5, A_5, B_5}, // C
- {1, C_6, A_6, B_6}, // V
- {1, C_7, A_7, B_7}, // B
- {1, C_8, A_8, B_8}, // N
- {1, C_9, A_9, B_9}, // M
- {1, C_10, A_10, B_10}, // ,<
- {1, C_11, A_11, B_11}, // .>
- {1, C_12, A_12, B_12}, // /?
- {1, C_13, A_13, B_13}, // |
- {1, C_14, A_14, B_14}, // RShift
- {1, C_16, A_16, B_16}, // Up
+ {1, CB3_CA1, CB1_CA1, CB2_CA1}, // LShift
+ {1, CB3_CA3, CB1_CA3, CB2_CA3}, // Z
+ {1, CB3_CA4, CB1_CA4, CB2_CA4}, // X
+ {1, CB3_CA5, CB1_CA5, CB2_CA5}, // C
+ {1, CB3_CA6, CB1_CA6, CB2_CA6}, // V
+ {1, CB3_CA7, CB1_CA7, CB2_CA7}, // B
+ {1, CB3_CA8, CB1_CA8, CB2_CA8}, // N
+ {1, CB3_CA9, CB1_CA9, CB2_CA9}, // M
+ {1, CB3_CA10, CB1_CA10, CB2_CA10}, // ,<
+ {1, CB3_CA11, CB1_CA11, CB2_CA11}, // .>
+ {1, CB3_CA12, CB1_CA12, CB2_CA12}, // /?
+ {1, CB3_CA13, CB1_CA13, CB2_CA13}, // |
+ {1, CB3_CA14, CB1_CA14, CB2_CA14}, // RShift
+ {1, CB3_CA16, CB1_CA16, CB2_CA16}, // Up
- {1, F_1, D_1, E_1}, // LCtrl
- {1, F_2, D_2, E_2}, // LWin
- {1, F_3, D_3, E_3}, // LAlt
- {1, F_4, D_4, E_4}, // NUm
- {1, F_7, D_7, E_7}, // Space
- {1, F_10, D_10, E_10}, // Jap
- {1, F_11, D_11, E_11}, // RAlt
- {1, F_12, D_12, E_12}, // RWin
- {1, F_13, D_13, E_13}, // Fn
- {1, F_14, D_14, E_14}, // RCtrl
- {1, F_15, D_15, E_15}, // Left
- {1, F_16, D_16, E_16}, // Down
- {1, C_15, A_15, B_15}, // Right
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}, // LCtrl
+ {1, CB6_CA2, CB4_CA2, CB5_CA2}, // LWin
+ {1, CB6_CA3, CB4_CA3, CB5_CA3}, // LAlt
+ {1, CB6_CA4, CB4_CA4, CB5_CA4}, // NUm
+ {1, CB6_CA7, CB4_CA7, CB5_CA7}, // Space
+ {1, CB6_CA10, CB4_CA10, CB5_CA10}, // Jap
+ {1, CB6_CA11, CB4_CA11, CB5_CA11}, // RAlt
+ {1, CB6_CA12, CB4_CA12, CB5_CA12}, // RWin
+ {1, CB6_CA13, CB4_CA13, CB5_CA13}, // Fn
+ {1, CB6_CA14, CB4_CA14, CB5_CA14}, // RCtrl
+ {1, CB6_CA15, CB4_CA15, CB5_CA15}, // Left
+ {1, CB6_CA16, CB4_CA16, CB5_CA16}, // Down
+ {1, CB3_CA15, CB1_CA15, CB2_CA15}, // Right
};
# define __ NO_LED
diff --git a/keyboards/keychron/v4/ansi/ansi.c b/keyboards/keychron/v4/ansi/ansi.c
index 24afdb65b76..7368144c8d8 100644
--- a/keyboards/keychron/v4/ansi/ansi.c
+++ b/keyboards/keychron/v4/ansi/ansi.c
@@ -27,71 +27,71 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_14, G_14, H_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
- {0, L_1, J_1, K_1},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
+ {0, CB12_CA1, CB10_CA1, CB11_CA1},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v4/iso/iso.c b/keyboards/keychron/v4/iso/iso.c
index 0b59f04d527..dc6a0f44d0b 100644
--- a/keyboards/keychron/v4/iso/iso.c
+++ b/keyboards/keychron/v4/iso/iso.c
@@ -27,72 +27,72 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
- {0, L_1, J_1, K_1},
- {0, L_2, J_2, K_2},
- {0, L_3, J_3, K_3},
- {0, L_4, J_4, K_4},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_14, J_14, K_14},
+ {0, CB12_CA1, CB10_CA1, CB11_CA1},
+ {0, CB12_CA2, CB10_CA2, CB11_CA2},
+ {0, CB12_CA3, CB10_CA3, CB11_CA3},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v5/ansi/ansi.c b/keyboards/keychron/v5/ansi/ansi.c
index 3f85b6b210a..b38d5f508f7 100644
--- a/keyboards/keychron/v5/ansi/ansi.c
+++ b/keyboards/keychron/v5/ansi/ansi.c
@@ -27,111 +27,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
index 06c7ae6d92f..bc68731d7de 100644
--- a/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v5/ansi_encoder/ansi_encoder.c
@@ -27,111 +27,111 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- // {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- // {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ // {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ // {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v5/iso/iso.c b/keyboards/keychron/v5/iso/iso.c
index 7b2739d53e2..d8f5ae329cd 100644
--- a/keyboards/keychron/v5/iso/iso.c
+++ b/keyboards/keychron/v5/iso/iso.c
@@ -27,112 +27,112 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v5/iso_encoder/iso_encoder.c b/keyboards/keychron/v5/iso_encoder/iso_encoder.c
index 9a13422d2c0..2d2a458577e 100644
--- a/keyboards/keychron/v5/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v5/iso_encoder/iso_encoder.c
@@ -27,110 +27,110 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
- {0, L_14, J_14, K_14},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
- {0, C_1, A_1, B_1}, // `~
- {0, C_2, A_2, B_2}, // 1!
- {0, C_3, A_3, B_3}, // 2@
- {0, C_4, A_4, B_4}, // 3#
- {0, C_5, A_5, B_5}, // 4$
- {0, C_6, A_6, B_6}, // 5%
- {0, C_7, A_7, B_7}, // 6^
- {0, C_8, A_8, B_8}, // 7&
- {0, C_9, A_9, B_9}, // 8*
- {0, C_10, A_10, B_10}, // 9(
- {0, C_11, A_11, B_11}, // 0)
- {0, C_12, A_12, B_12}, // -_
- {0, C_13, A_13, B_13}, // =+
- {0, C_14, A_14, B_14}, // BackSpace
- {0, C_16, A_16, B_16}, // Numlock
- {0, L_9, J_9, K_9}, // /
- {0, L_10, J_10, K_10}, // *
- {0, L_11, J_11, K_11}, // -
+ {0, CB3_CA1, CB1_CA1, CB2_CA1}, // `~
+ {0, CB3_CA2, CB1_CA2, CB2_CA2}, // 1!
+ {0, CB3_CA3, CB1_CA3, CB2_CA3}, // 2@
+ {0, CB3_CA4, CB1_CA4, CB2_CA4}, // 3#
+ {0, CB3_CA5, CB1_CA5, CB2_CA5}, // 4$
+ {0, CB3_CA6, CB1_CA6, CB2_CA6}, // 5%
+ {0, CB3_CA7, CB1_CA7, CB2_CA7}, // 6^
+ {0, CB3_CA8, CB1_CA8, CB2_CA8}, // 7&
+ {0, CB3_CA9, CB1_CA9, CB2_CA9}, // 8*
+ {0, CB3_CA10, CB1_CA10, CB2_CA10}, // 9(
+ {0, CB3_CA11, CB1_CA11, CB2_CA11}, // 0)
+ {0, CB3_CA12, CB1_CA12, CB2_CA12}, // -_
+ {0, CB3_CA13, CB1_CA13, CB2_CA13}, // =+
+ {0, CB3_CA14, CB1_CA14, CB2_CA14}, // BackSpace
+ {0, CB3_CA16, CB1_CA16, CB2_CA16}, // Numlock
+ {0, CB12_CA9, CB10_CA9, CB11_CA9}, // /
+ {0, CB12_CA10, CB10_CA10, CB11_CA10}, // *
+ {0, CB12_CA11, CB10_CA11, CB11_CA11}, // -
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_15, J_15, K_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {0, L_16, J_16, K_16},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
- {1, L_5, J_5, K_5},
- {1, L_6, J_6, K_6},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_1, J_1, K_1},
- {1, L_2, J_2, K_2},
- {1, L_7, J_7, K_7}
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v6/ansi/ansi.c b/keyboards/keychron/v6/ansi/ansi.c
index be5bad84ff2..2e055e57af8 100644
--- a/keyboards/keychron/v6/ansi/ansi.c
+++ b/keyboards/keychron/v6/ansi/ansi.c
@@ -25,119 +25,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
index b83a5b0fb09..1ebf9479124 100644
--- a/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v6/ansi_encoder/ansi_encoder.c
@@ -27,119 +27,119 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v6/iso/iso.c b/keyboards/keychron/v6/iso/iso.c
index 1138cb07d78..cc9dbd8c231 100644
--- a/keyboards/keychron/v6/iso/iso.c
+++ b/keyboards/keychron/v6/iso/iso.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v6/iso_encoder/iso_encoder.c b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
index 47f609d8178..f1a8e18acf5 100644
--- a/keyboards/keychron/v6/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v6/iso_encoder/iso_encoder.c
@@ -27,120 +27,120 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_15, G_15, H_15},
- {0, I_16, G_16, H_16},
- {0, L_5, J_5, K_5},
- {0, L_6, J_6, K_6},
- {0, L_7, J_7, K_7},
- {0, L_8, J_8, K_8},
- {0, L_4, J_4, K_4},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
+ {0, CB9_CA16, CB7_CA16, CB8_CA16},
+ {0, CB12_CA5, CB10_CA5, CB11_CA5},
+ {0, CB12_CA6, CB10_CA6, CB11_CA6},
+ {0, CB12_CA7, CB10_CA7, CB11_CA7},
+ {0, CB12_CA8, CB10_CA8, CB11_CA8},
+ {0, CB12_CA4, CB10_CA4, CB11_CA4},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
- {0, L_9, J_9, K_9},
- {0, L_10, J_10, K_10},
- {0, L_11, J_11, K_11},
- {0, L_12, J_12, K_12},
- {0, L_13, J_13, K_13},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
+ {0, CB12_CA9, CB10_CA9, CB11_CA9},
+ {0, CB12_CA10, CB10_CA10, CB11_CA10},
+ {0, CB12_CA11, CB10_CA11, CB11_CA11},
+ {0, CB12_CA12, CB10_CA12, CB11_CA12},
+ {0, CB12_CA13, CB10_CA13, CB11_CA13},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
- {0, L_14, J_14, K_14},
- {0, L_15, J_15, K_15},
- {0, L_16, J_16, K_16},
- {1, L_1, J_1, K_1},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
+ {0, CB12_CA14, CB10_CA14, CB11_CA14},
+ {0, CB12_CA15, CB10_CA15, CB11_CA15},
+ {0, CB12_CA16, CB10_CA16, CB11_CA16},
+ {1, CB12_CA1, CB10_CA1, CB11_CA1},
- {1, C_16, A_16, B_16},
- {1, C_15, A_15, B_15},
- {1, C_14, A_14, B_14},
- {1, C_13, A_13, B_13},
- {1, C_12, A_12, B_12},
- {1, C_11, A_11, B_11},
- {1, C_10, A_10, B_10},
- {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_3, A_3, B_3},
- {0, F_14, D_14, E_14},
- {1, L_3, J_3, K_3},
- {1, L_4, J_4, K_4},
- {1, L_5, J_5, K_5},
- {1, L_2, J_2, K_2},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA13, CB1_CA13, CB2_CA13},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB12_CA3, CB10_CA3, CB11_CA3},
+ {1, CB12_CA4, CB10_CA4, CB11_CA4},
+ {1, CB12_CA5, CB10_CA5, CB11_CA5},
+ {1, CB12_CA2, CB10_CA2, CB11_CA2},
- {1, I_16, G_16, H_16},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_3, G_3, H_3},
- {1, I_1, G_1, H_1},
- {1, L_6, J_6, K_6},
- {1, L_7, J_7, K_7},
- {1, L_8, J_8, K_8},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
+ {1, CB12_CA6, CB10_CA6, CB11_CA6},
+ {1, CB12_CA7, CB10_CA7, CB11_CA7},
+ {1, CB12_CA8, CB10_CA8, CB11_CA8},
- {1, F_16, D_16, E_16},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_10, D_10, E_10},
- {1, F_6, D_6, E_6},
- {1, F_5, D_5, E_5},
- {1, F_4, D_4, E_4},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1},
- {1, L_10, J_10, K_10},
- {1, L_11, J_11, K_11},
- {1, L_12, J_12, K_12},
- {1, L_9, J_9, K_9},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA5, CB4_CA5, CB5_CA5},
+ {1, CB6_CA4, CB4_CA4, CB5_CA4},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB12_CA10, CB10_CA10, CB11_CA10},
+ {1, CB12_CA11, CB10_CA11, CB11_CA11},
+ {1, CB12_CA12, CB10_CA12, CB11_CA12},
+ {1, CB12_CA9, CB10_CA9, CB11_CA9},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v7/ansi/ansi.c b/keyboards/keychron/v7/ansi/ansi.c
index 132f5685191..4d0bedff097 100644
--- a/keyboards/keychron/v7/ansi/ansi.c
+++ b/keyboards/keychron/v7/ansi/ansi.c
@@ -27,82 +27,82 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {1, I_15, G_15, H_15},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v7/iso/iso.c b/keyboards/keychron/v7/iso/iso.c
index 7aaeafe65e2..cdd2d97209a 100644
--- a/keyboards/keychron/v7/iso/iso.c
+++ b/keyboards/keychron/v7/iso/iso.c
@@ -27,83 +27,83 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {0, C_6, A_6, B_6},
- {0, C_7, A_7, B_7},
- {0, C_8, A_8, B_8},
- {0, C_9, A_9, B_9},
- {0, C_10, A_10, B_10},
- {0, C_11, A_11, B_11},
- {0, C_12, A_12, B_12},
- {0, C_13, A_13, B_13},
- {0, C_14, A_14, B_14},
- {0, C_15, A_15, B_15},
- {0, C_16, A_16, B_16},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {0, CB3_CA6, CB1_CA6, CB2_CA6},
+ {0, CB3_CA7, CB1_CA7, CB2_CA7},
+ {0, CB3_CA8, CB1_CA8, CB2_CA8},
+ {0, CB3_CA9, CB1_CA9, CB2_CA9},
+ {0, CB3_CA10, CB1_CA10, CB2_CA10},
+ {0, CB3_CA11, CB1_CA11, CB2_CA11},
+ {0, CB3_CA12, CB1_CA12, CB2_CA12},
+ {0, CB3_CA13, CB1_CA13, CB2_CA13},
+ {0, CB3_CA14, CB1_CA14, CB2_CA14},
+ {0, CB3_CA15, CB1_CA15, CB2_CA15},
+ {0, CB3_CA16, CB1_CA16, CB2_CA16},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
- {0, F_16, D_16, E_16},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
+ {0, CB6_CA16, CB4_CA16, CB5_CA16},
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {1, I_6, G_6, H_6},
- {1, I_7, G_7, H_7},
- {1, I_8, G_8, H_8},
- {1, I_9, G_9, H_9},
- {1, I_10, G_10, H_10},
- {1, I_11, G_11, H_11},
- {1, I_12, G_12, H_12},
- {1, I_14, G_14, H_14},
- {0, F_14, D_14, E_14},
- {1, I_15, G_15, H_15},
- {1, I_16, G_16, H_16},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA16, CB7_CA16, CB8_CA16},
- {1, C_1, A_1, B_1},
- {1, C_2, A_2, B_2},
- {1, C_3, A_3, B_3},
- {1, C_4, A_4, B_4},
- {1, C_5, A_5, B_5},
- {1, C_6, A_6, B_6},
- {1, C_7, A_7, B_7},
- {1, C_8, A_8, B_8},
- {1, C_9, A_9, B_9},
- {1, C_10, A_10, B_10},
- {1, C_11, A_11, B_11},
- {1, C_12, A_12, B_12},
- {1, C_14, A_14, B_14},
- {1, C_15, A_15, B_15},
- {1, C_16, A_16, B_16},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA11, CB1_CA11, CB2_CA11},
+ {1, CB3_CA12, CB1_CA12, CB2_CA12},
+ {1, CB3_CA14, CB1_CA14, CB2_CA14},
+ {1, CB3_CA15, CB1_CA15, CB2_CA15},
+ {1, CB3_CA16, CB1_CA16, CB2_CA16},
- {1, F_1, D_1, E_1},
- {1, F_2, D_2, E_2},
- {1, F_3, D_3, E_3},
- {1, F_7, D_7, E_7},
- {1, F_10, D_10, E_10},
- {1, F_11, D_11, E_11},
- {1, F_12, D_12, E_12},
- {1, F_13, D_13, E_13},
- {1, F_14, D_14, E_14},
- {1, F_15, D_15, E_15},
- {1, F_16, D_16, E_16},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA10, CB4_CA10, CB5_CA10},
+ {1, CB6_CA11, CB4_CA11, CB5_CA11},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA16, CB4_CA16, CB5_CA16},
};
#define __ NO_LED
diff --git a/keyboards/keychron/v8/ansi/ansi.c b/keyboards/keychron/v8/ansi/ansi.c
index e5840fe966f..fcc232511fa 100644
--- a/keyboards/keychron/v8/ansi/ansi.c
+++ b/keyboards/keychron/v8/ansi/ansi.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- // {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ // {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c b/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
index e5840fe966f..fcc232511fa 100644
--- a/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/v8/ansi_encoder/ansi_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_14, D_14, E_14},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- // {1, C_9, A_9, B_9},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ // {1, CB3_CA9, CB1_CA9, CB2_CA9},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v8/iso/iso.c b/keyboards/keychron/v8/iso/iso.c
index 07b350209d0..4658969a105 100644
--- a/keyboards/keychron/v8/iso/iso.c
+++ b/keyboards/keychron/v8/iso/iso.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#define __ NO_LED
diff --git a/keyboards/keychron/v8/iso_encoder/iso_encoder.c b/keyboards/keychron/v8/iso_encoder/iso_encoder.c
index 07b350209d0..4658969a105 100644
--- a/keyboards/keychron/v8/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/v8/iso_encoder/iso_encoder.c
@@ -27,80 +27,80 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, I_1, G_1, H_1},
- {0, I_2, G_2, H_2},
- {0, I_3, G_3, H_3},
- {0, I_4, G_4, H_4},
- {0, I_5, G_5, H_5},
- {0, I_6, G_6, H_6},
- {0, I_7, G_7, H_7},
- {0, I_8, G_8, H_8},
- {0, I_9, G_9, H_9},
- {0, I_10, G_10, H_10},
- {0, I_11, G_11, H_11},
- {0, I_12, G_12, H_12},
- {0, I_13, G_13, H_13},
- {0, I_14, G_14, H_14},
- {0, I_15, G_15, H_15},
+ {0, CB9_CA1, CB7_CA1, CB8_CA1},
+ {0, CB9_CA2, CB7_CA2, CB8_CA2},
+ {0, CB9_CA3, CB7_CA3, CB8_CA3},
+ {0, CB9_CA4, CB7_CA4, CB8_CA4},
+ {0, CB9_CA5, CB7_CA5, CB8_CA5},
+ {0, CB9_CA6, CB7_CA6, CB8_CA6},
+ {0, CB9_CA7, CB7_CA7, CB8_CA7},
+ {0, CB9_CA8, CB7_CA8, CB8_CA8},
+ {0, CB9_CA9, CB7_CA9, CB8_CA9},
+ {0, CB9_CA10, CB7_CA10, CB8_CA10},
+ {0, CB9_CA11, CB7_CA11, CB8_CA11},
+ {0, CB9_CA12, CB7_CA12, CB8_CA12},
+ {0, CB9_CA13, CB7_CA13, CB8_CA13},
+ {0, CB9_CA14, CB7_CA14, CB8_CA14},
+ {0, CB9_CA15, CB7_CA15, CB8_CA15},
- {0, F_1, D_1, E_1},
- {0, F_2, D_2, E_2},
- {0, F_3, D_3, E_3},
- {0, F_4, D_4, E_4},
- {0, F_5, D_5, E_5},
- {0, F_6, D_6, E_6},
- {0, F_7, D_7, E_7},
- {0, F_8, D_8, E_8},
- {0, F_9, D_9, E_9},
- {0, F_10, D_10, E_10},
- {0, F_11, D_11, E_11},
- {0, F_12, D_12, E_12},
- {0, F_13, D_13, E_13},
- {0, F_15, D_15, E_15},
+ {0, CB6_CA1, CB4_CA1, CB5_CA1},
+ {0, CB6_CA2, CB4_CA2, CB5_CA2},
+ {0, CB6_CA3, CB4_CA3, CB5_CA3},
+ {0, CB6_CA4, CB4_CA4, CB5_CA4},
+ {0, CB6_CA5, CB4_CA5, CB5_CA5},
+ {0, CB6_CA6, CB4_CA6, CB5_CA6},
+ {0, CB6_CA7, CB4_CA7, CB5_CA7},
+ {0, CB6_CA8, CB4_CA8, CB5_CA8},
+ {0, CB6_CA9, CB4_CA9, CB5_CA9},
+ {0, CB6_CA10, CB4_CA10, CB5_CA10},
+ {0, CB6_CA11, CB4_CA11, CB5_CA11},
+ {0, CB6_CA12, CB4_CA12, CB5_CA12},
+ {0, CB6_CA13, CB4_CA13, CB5_CA13},
+ {0, CB6_CA15, CB4_CA15, CB5_CA15},
- {0, C_1, A_1, B_1},
- {0, C_2, A_2, B_2},
- {0, C_3, A_3, B_3},
- {0, C_4, A_4, B_4},
- {0, C_5, A_5, B_5},
- {1, C_10, A_10, B_10},
- {1, C_8, A_8, B_8},
- {1, C_7, A_7, B_7},
- {1, C_6, A_6, B_6},
- {1, C_5, A_5, B_5},
- {1, C_4, A_4, B_4},
- {1, C_3, A_3, B_3},
- {1, C_2, A_2, B_2},
- {0, F_14, D_14, E_14},
- {1, C_1, A_1, B_1},
+ {0, CB3_CA1, CB1_CA1, CB2_CA1},
+ {0, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB3_CA3, CB1_CA3, CB2_CA3},
+ {0, CB3_CA4, CB1_CA4, CB2_CA4},
+ {0, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA10, CB1_CA10, CB2_CA10},
+ {1, CB3_CA8, CB1_CA8, CB2_CA8},
+ {1, CB3_CA7, CB1_CA7, CB2_CA7},
+ {1, CB3_CA6, CB1_CA6, CB2_CA6},
+ {1, CB3_CA5, CB1_CA5, CB2_CA5},
+ {1, CB3_CA4, CB1_CA4, CB2_CA4},
+ {1, CB3_CA3, CB1_CA3, CB2_CA3},
+ {1, CB3_CA2, CB1_CA2, CB2_CA2},
+ {0, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB3_CA1, CB1_CA1, CB2_CA1},
- {1, I_15, G_15, H_15},
- {1, I_14, G_14, H_14},
- {1, I_13, G_13, H_13},
- {1, I_12, G_12, H_12},
- {1, I_11, G_11, H_11},
- {1, I_10, G_10, H_10},
- {1, I_9, G_9, H_9},
- {1, I_8, G_8, H_8},
- {1, I_7, G_7, H_7},
- {1, I_6, G_6, H_6},
- {1, I_5, G_5, H_5},
- {1, I_4, G_4, H_4},
- {1, I_3, G_3, H_3},
- {1, I_2, G_2, H_2},
- {1, I_1, G_1, H_1},
+ {1, CB9_CA15, CB7_CA15, CB8_CA15},
+ {1, CB9_CA14, CB7_CA14, CB8_CA14},
+ {1, CB9_CA13, CB7_CA13, CB8_CA13},
+ {1, CB9_CA12, CB7_CA12, CB8_CA12},
+ {1, CB9_CA11, CB7_CA11, CB8_CA11},
+ {1, CB9_CA10, CB7_CA10, CB8_CA10},
+ {1, CB9_CA9, CB7_CA9, CB8_CA9},
+ {1, CB9_CA8, CB7_CA8, CB8_CA8},
+ {1, CB9_CA7, CB7_CA7, CB8_CA7},
+ {1, CB9_CA6, CB7_CA6, CB8_CA6},
+ {1, CB9_CA5, CB7_CA5, CB8_CA5},
+ {1, CB9_CA4, CB7_CA4, CB8_CA4},
+ {1, CB9_CA3, CB7_CA3, CB8_CA3},
+ {1, CB9_CA2, CB7_CA2, CB8_CA2},
+ {1, CB9_CA1, CB7_CA1, CB8_CA1},
- {1, F_15, D_15, E_15},
- {1, F_14, D_14, E_14},
- {1, F_13, D_13, E_13},
- {1, F_12, D_12, E_12},
- {1, F_9, D_9, E_9},
- {1, F_8, D_8, E_8},
- {1, F_7, D_7, E_7},
- {1, F_6, D_6, E_6},
- {1, F_3, D_3, E_3},
- {1, F_2, D_2, E_2},
- {1, F_1, D_1, E_1}
+ {1, CB6_CA15, CB4_CA15, CB5_CA15},
+ {1, CB6_CA14, CB4_CA14, CB5_CA14},
+ {1, CB6_CA13, CB4_CA13, CB5_CA13},
+ {1, CB6_CA12, CB4_CA12, CB5_CA12},
+ {1, CB6_CA9, CB4_CA9, CB5_CA9},
+ {1, CB6_CA8, CB4_CA8, CB5_CA8},
+ {1, CB6_CA7, CB4_CA7, CB5_CA7},
+ {1, CB6_CA6, CB4_CA6, CB5_CA6},
+ {1, CB6_CA3, CB4_CA3, CB5_CA3},
+ {1, CB6_CA2, CB4_CA2, CB5_CA2},
+ {1, CB6_CA1, CB4_CA1, CB5_CA1}
};
#define __ NO_LED
diff --git a/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
index 8dd4cc2af1c..a867cb0f20d 100755
--- a/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm40hsrgb/rev2/rev2.c
@@ -18,56 +18,56 @@
#if defined(RGB_MATRIX_ENABLE)
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_11, J_11, L_11 },
- { 0, K_12, J_12, L_12 }
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 }
};
#endif /* RGB_MATRIX_ENABLE */
diff --git a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
index ce12ad67fe9..3ee74755fad 100644
--- a/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb/rev2/rev2.c
@@ -23,73 +23,73 @@
# include "ws2812.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_14, G_14, I_14 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
- { 0, H_16, G_16, I_16 },
- { 0, H_15, G_15, I_15 },
- { 0, H_13, G_13, I_13 },
- { 0, E_15, D_15, F_15 },
- { 0, K_15, J_15, L_15 },
- { 0, K_11, J_11, L_11 },
- { 0, K_16, J_16, L_16 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 }
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
index 982bf39c52c..eca53e98934 100644
--- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c
@@ -16,73 +16,73 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_14, G_14, I_14 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
- { 0, H_16, G_16, I_16 },
- { 0, H_15, G_15, I_15 },
- { 0, H_13, G_13, I_13 },
- { 0, E_15, D_15, F_15 },
- { 0, K_15, J_15, L_15 },
- { 0, K_11, J_11, L_11 },
- { 0, K_16, J_16, L_16 },
- { 0, B_16, A_16, C_16 },
- { 0, E_16, D_16, F_16 }
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
index 24c785d28e2..e7641bf4e5e 100644
--- a/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_iso/rev2/rev2.c
@@ -25,74 +25,74 @@
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_13, G_13, I_13 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
- { 0, K_1, J_1, L_1 },
- { 0, K_11, J_11, L_11 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_12, J_12, L_12 },
- { 0, K_13, J_13, L_13 },
- { 0, K_14, J_14, L_14 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS14, SW10_CS14, SW12_CS14 },
- { 0, H_16, G_16, I_16 },
- { 0, H_14, G_14, I_14 },
- { 0, H_15, G_15, I_15 },
- { 0, E_15, D_15, F_15 },
- { 0, K_15, J_15, L_15 },
- { 0, K_16, J_16, L_16 },
- { 0, B_16, A_16, C_16 },
- { 0, B_15, A_15, C_15 },
- { 0, E_16, D_16, F_16 }
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW2_CS15, SW1_CS15, SW3_CS15 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
};
led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
index f2f63375421..5cb6d850c9f 100644
--- a/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
+++ b/keyboards/kprepublic/bm60hsrgb_poker/rev2/rev2.c
@@ -22,71 +22,71 @@
# include "ws2812.h"
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, B_1, A_1, C_1 },
- { 0, B_2, A_2, C_2 },
- { 0, B_3, A_3, C_3 },
- { 0, B_4, A_4, C_4 },
- { 0, B_5, A_5, C_5 },
- { 0, B_6, A_6, C_6 },
- { 0, B_7, A_7, C_7 },
- { 0, B_8, A_8, C_8 },
- { 0, B_9, A_9, C_9 },
- { 0, B_10, A_10, C_10 },
- { 0, B_11, A_11, C_11 },
- { 0, B_12, A_12, C_12 },
- { 0, B_13, A_13, C_13 },
- { 0, B_14, A_14, C_14 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
- { 0, E_1, D_1, F_1 },
- { 0, E_2, D_2, F_2 },
- { 0, E_3, D_3, F_3 },
- { 0, E_4, D_4, F_4 },
- { 0, E_5, D_5, F_5 },
- { 0, E_6, D_6, F_6 },
- { 0, E_7, D_7, F_7 },
- { 0, E_8, D_8, F_8 },
- { 0, E_9, D_9, F_9 },
- { 0, E_10, D_10, F_10 },
- { 0, E_11, D_11, F_11 },
- { 0, E_12, D_12, F_12 },
- { 0, E_13, D_13, F_13 },
- { 0, E_14, D_14, F_14 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
- { 0, H_1, G_1, I_1 },
- { 0, H_2, G_2, I_2 },
- { 0, H_3, G_3, I_3 },
- { 0, H_4, G_4, I_4 },
- { 0, H_5, G_5, I_5 },
- { 0, H_6, G_6, I_6 },
- { 0, H_7, G_7, I_7 },
- { 0, H_8, G_8, I_8 },
- { 0, H_9, G_9, I_9 },
- { 0, H_10, G_10, I_10 },
- { 0, H_11, G_11, I_11 },
- { 0, H_12, G_12, I_12 },
- { 0, H_14, G_14, I_14 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
- { 0, K_1, J_1, L_1 },
- { 0, K_2, J_2, L_2 },
- { 0, K_3, J_3, L_3 },
- { 0, K_4, J_4, L_4 },
- { 0, K_5, J_5, L_5 },
- { 0, K_6, J_6, L_6 },
- { 0, K_7, J_7, L_7 },
- { 0, K_8, J_8, L_8 },
- { 0, K_9, J_9, L_9 },
- { 0, K_10, J_10, L_10 },
- { 0, K_11, J_11, L_11 },
- { 0, K_13, J_13, L_13 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
- { 0, H_16, G_16, I_16 },
- { 0, H_15, G_15, I_15 },
- { 0, H_13, G_13, I_13 },
- { 0, E_15, D_15, F_15 },
- { 0, K_15, J_15, L_15 },
- { 0, K_16, J_16, L_16 },
- { 0, K_12, J_12, L_12 },
- { 0, E_16, D_16, F_16 }
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW11_CS15, SW10_CS15, SW12_CS15 },
+ { 0, SW11_CS16, SW10_CS16, SW12_CS16 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 }
};
led_config_t g_led_config = {
diff --git a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
index 357ce13e960..68068d7fb97 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
+++ b/keyboards/kprepublic/bm68hsrgb/rev2/rev2.c
@@ -18,78 +18,78 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW2, CS5_SW2, CS4_SW2},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW5, CS5_SW5, CS4_SW5},
- {0, CS6_SW6, CS5_SW6, CS4_SW6},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS6_SW8, CS5_SW8, CS4_SW8},
- {0, CS18_SW1, CS17_SW1, CS16_SW1},
- {0, CS18_SW2, CS17_SW2, CS16_SW2},
- {0, CS18_SW3, CS17_SW3, CS16_SW3},
- {0, CS18_SW4, CS17_SW4, CS16_SW4},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
- {0, CS18_SW6, CS17_SW6, CS16_SW6},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW2_CS6, SW2_CS5, SW2_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW5_CS6, SW5_CS5, SW5_CS4},
+ {0, SW6_CS6, SW6_CS5, SW6_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW8_CS6, SW8_CS5, SW8_CS4},
+ {0, SW1_CS18, SW1_CS17, SW1_CS16},
+ {0, SW2_CS18, SW2_CS17, SW2_CS16},
+ {0, SW3_CS18, SW3_CS17, SW3_CS16},
+ {0, SW4_CS18, SW4_CS17, SW4_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
+ {0, SW6_CS18, SW6_CS17, SW6_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS24_SW1, CS23_SW1, CS22_SW1},
- {0, CS24_SW2, CS23_SW2, CS22_SW2},
- {0, CS24_SW3, CS23_SW3, CS22_SW3},
- {0, CS24_SW4, CS23_SW4, CS22_SW4},
- {0, CS24_SW6, CS23_SW6, CS22_SW6},
- {0, CS24_SW7, CS23_SW7, CS22_SW7},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW1_CS24, SW1_CS23, SW1_CS22},
+ {0, SW2_CS24, SW2_CS23, SW2_CS22},
+ {0, SW3_CS24, SW3_CS23, SW3_CS22},
+ {0, SW4_CS24, SW4_CS23, SW4_CS22},
+ {0, SW6_CS24, SW6_CS23, SW6_CS22},
+ {0, SW7_CS24, SW7_CS23, SW7_CS22},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS27_SW1, CS26_SW1, CS25_SW1},
- {0, CS27_SW2, CS26_SW2, CS25_SW2},
- {0, CS27_SW3, CS26_SW3, CS25_SW3},
- {0, CS27_SW4, CS26_SW4, CS25_SW4},
- {0, CS27_SW5, CS26_SW5, CS25_SW5},
- {0, CS27_SW6, CS26_SW6, CS25_SW6},
- {0, CS27_SW7, CS26_SW7, CS25_SW7},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW1_CS27, SW1_CS26, SW1_CS25},
+ {0, SW2_CS27, SW2_CS26, SW2_CS25},
+ {0, SW3_CS27, SW3_CS26, SW3_CS25},
+ {0, SW4_CS27, SW4_CS26, SW4_CS25},
+ {0, SW5_CS27, SW5_CS26, SW5_CS25},
+ {0, SW6_CS27, SW6_CS26, SW6_CS25},
+ {0, SW7_CS27, SW7_CS26, SW7_CS25},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW7, CS2_SW7, CS1_SW7},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
- {0, CS30_SW5, CS29_SW5, CS28_SW5},
- {0, CS30_SW6, CS29_SW6, CS28_SW6},
- {0, CS30_SW7, CS29_SW7, CS28_SW7}
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW7_CS3, SW7_CS2, SW7_CS1},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
+ {0, SW5_CS30, SW5_CS29, SW5_CS28},
+ {0, SW6_CS30, SW6_CS29, SW6_CS28},
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}
};
led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80v2/bm80v2.c b/keyboards/kprepublic/bm80v2/bm80v2.c
index 3e3de08288b..9c1b71d0579 100644
--- a/keyboards/kprepublic/bm80v2/bm80v2.c
+++ b/keyboards/kprepublic/bm80v2/bm80v2.c
@@ -17,99 +17,99 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW5, CS5_SW5, CS4_SW5},
- {0, CS6_SW6, CS5_SW6, CS4_SW6},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS6_SW8, CS5_SW8, CS4_SW8},
- {0, CS6_SW9, CS5_SW9, CS4_SW9},
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW5_CS6, SW5_CS5, SW5_CS4},
+ {0, SW6_CS6, SW6_CS5, SW6_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW8_CS6, SW8_CS5, SW8_CS4},
+ {0, SW9_CS6, SW9_CS5, SW9_CS4},
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS9_SW9, CS8_SW9, CS7_SW9},
- {0,CS24_SW1, CS23_SW1, CS22_SW1},
- {0,CS24_SW2, CS23_SW2, CS22_SW2},
- {0,CS24_SW3, CS23_SW3, CS22_SW3},
- {0,CS24_SW4, CS23_SW4, CS22_SW4},
- {0,CS24_SW5, CS23_SW5, CS22_SW5},
- {0,CS24_SW6, CS23_SW6, CS22_SW6},
- {0,CS24_SW7, CS23_SW7, CS22_SW7},
- {0,CS24_SW8, CS23_SW8, CS22_SW8},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW9_CS9, SW9_CS8, SW9_CS7},
+ {0,SW1_CS24, SW1_CS23, SW1_CS22},
+ {0,SW2_CS24, SW2_CS23, SW2_CS22},
+ {0,SW3_CS24, SW3_CS23, SW3_CS22},
+ {0,SW4_CS24, SW4_CS23, SW4_CS22},
+ {0,SW5_CS24, SW5_CS23, SW5_CS22},
+ {0,SW6_CS24, SW6_CS23, SW6_CS22},
+ {0,SW7_CS24, SW7_CS23, SW7_CS22},
+ {0,SW8_CS24, SW8_CS23, SW8_CS22},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS12_SW9, CS11_SW9, CS10_SW9},
- {0, CS27_SW1, CS26_SW1, CS25_SW1},
- {0, CS27_SW2, CS26_SW2, CS25_SW2},
- {0, CS27_SW3, CS26_SW3, CS25_SW3},
- {0, CS27_SW4, CS26_SW4, CS25_SW4},
- {0, CS27_SW5, CS26_SW5, CS25_SW5},
- {0, CS27_SW6, CS26_SW6, CS25_SW6},
- {0, CS27_SW7, CS26_SW7, CS25_SW7},
- {0, CS27_SW8, CS26_SW8, CS25_SW8},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW9_CS12, SW9_CS11, SW9_CS10},
+ {0, SW1_CS27, SW1_CS26, SW1_CS25},
+ {0, SW2_CS27, SW2_CS26, SW2_CS25},
+ {0, SW3_CS27, SW3_CS26, SW3_CS25},
+ {0, SW4_CS27, SW4_CS26, SW4_CS25},
+ {0, SW5_CS27, SW5_CS26, SW5_CS25},
+ {0, SW6_CS27, SW6_CS26, SW6_CS25},
+ {0, SW7_CS27, SW7_CS26, SW7_CS25},
+ {0, SW8_CS27, SW8_CS26, SW8_CS25},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS15_SW9, CS14_SW9, CS13_SW9},
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW9_CS15, SW9_CS14, SW9_CS13},
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
- {0, CS18_SW1, CS17_SW1, CS16_SW1},
- {0, CS18_SW3, CS17_SW3, CS16_SW3},
- {0, CS18_SW4, CS17_SW4, CS16_SW4},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
- {0, CS18_SW6, CS17_SW6, CS16_SW6},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
- {0, CS18_SW8, CS17_SW8, CS16_SW8},
- {0, CS18_SW9, CS17_SW9, CS16_SW9},
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW1_CS18, SW1_CS17, SW1_CS16},
+ {0, SW3_CS18, SW3_CS17, SW3_CS16},
+ {0, SW4_CS18, SW4_CS17, SW4_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
+ {0, SW6_CS18, SW6_CS17, SW6_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
+ {0, SW8_CS18, SW8_CS17, SW8_CS16},
+ {0, SW9_CS18, SW9_CS17, SW9_CS16},
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW6, CS35_SW6, CS34_SW6},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
- {0, CS36_SW8, CS35_SW8, CS34_SW8}
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW6_CS36, SW6_CS35, SW6_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}
};
led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
index 1d6e3df5479..3009359c65f 100644
--- a/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
+++ b/keyboards/kprepublic/bm80v2_iso/bm80v2_iso.c
@@ -17,100 +17,100 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW5, CS5_SW5, CS4_SW5},
- {0, CS6_SW6, CS5_SW6, CS4_SW6},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS6_SW8, CS5_SW8, CS4_SW8},
- {0, CS6_SW9, CS5_SW9, CS4_SW9},
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6},
- {0, CS21_SW7, CS20_SW7, CS19_SW7},
- {0, CS21_SW8, CS20_SW8, CS19_SW8},
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW5_CS6, SW5_CS5, SW5_CS4},
+ {0, SW6_CS6, SW6_CS5, SW6_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW8_CS6, SW8_CS5, SW8_CS4},
+ {0, SW9_CS6, SW9_CS5, SW9_CS4},
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19},
+ {0, SW7_CS21, SW7_CS20, SW7_CS19},
+ {0, SW8_CS21, SW8_CS20, SW8_CS19},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS9_SW9, CS8_SW9, CS7_SW9},
- {0,CS24_SW1, CS23_SW1, CS22_SW1},
- {0,CS24_SW2, CS23_SW2, CS22_SW2},
- {0,CS24_SW3, CS23_SW3, CS22_SW3},
- {0,CS24_SW4, CS23_SW4, CS22_SW4},
- {0,CS24_SW5, CS23_SW5, CS22_SW5},
- {0,CS24_SW6, CS23_SW6, CS22_SW6},
- {0,CS24_SW7, CS23_SW7, CS22_SW7},
- {0,CS24_SW8, CS23_SW8, CS22_SW8},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW9_CS9, SW9_CS8, SW9_CS7},
+ {0,SW1_CS24, SW1_CS23, SW1_CS22},
+ {0,SW2_CS24, SW2_CS23, SW2_CS22},
+ {0,SW3_CS24, SW3_CS23, SW3_CS22},
+ {0,SW4_CS24, SW4_CS23, SW4_CS22},
+ {0,SW5_CS24, SW5_CS23, SW5_CS22},
+ {0,SW6_CS24, SW6_CS23, SW6_CS22},
+ {0,SW7_CS24, SW7_CS23, SW7_CS22},
+ {0,SW8_CS24, SW8_CS23, SW8_CS22},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS12_SW9, CS11_SW9, CS10_SW9},
- {0, CS27_SW1, CS26_SW1, CS25_SW1},
- {0, CS27_SW2, CS26_SW2, CS25_SW2},
- {0, CS27_SW3, CS26_SW3, CS25_SW3},
- {0, CS27_SW4, CS26_SW4, CS25_SW4},
- {0, CS27_SW5, CS26_SW5, CS25_SW5},
- {0, CS27_SW6, CS26_SW6, CS25_SW6},
- {0, CS27_SW7, CS26_SW7, CS25_SW7},
- {0, CS27_SW8, CS26_SW8, CS25_SW8},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW9_CS12, SW9_CS11, SW9_CS10},
+ {0, SW1_CS27, SW1_CS26, SW1_CS25},
+ {0, SW2_CS27, SW2_CS26, SW2_CS25},
+ {0, SW3_CS27, SW3_CS26, SW3_CS25},
+ {0, SW4_CS27, SW4_CS26, SW4_CS25},
+ {0, SW5_CS27, SW5_CS26, SW5_CS25},
+ {0, SW6_CS27, SW6_CS26, SW6_CS25},
+ {0, SW7_CS27, SW7_CS26, SW7_CS25},
+ {0, SW8_CS27, SW8_CS26, SW8_CS25},
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS15_SW9, CS14_SW9, CS13_SW9},
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW9_CS15, SW9_CS14, SW9_CS13},
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
- {0, CS18_SW1, CS17_SW1, CS16_SW1},
- {0, CS18_SW2, CS17_SW2, CS16_SW2},
- {0, CS18_SW3, CS17_SW3, CS16_SW3},
- {0, CS18_SW4, CS17_SW4, CS16_SW4},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
- {0, CS18_SW6, CS17_SW6, CS16_SW6},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
- {0, CS18_SW8, CS17_SW8, CS16_SW8},
- {0, CS18_SW9, CS17_SW9, CS16_SW9},
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW1_CS18, SW1_CS17, SW1_CS16},
+ {0, SW2_CS18, SW2_CS17, SW2_CS16},
+ {0, SW3_CS18, SW3_CS17, SW3_CS16},
+ {0, SW4_CS18, SW4_CS17, SW4_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
+ {0, SW6_CS18, SW6_CS17, SW6_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
+ {0, SW8_CS18, SW8_CS17, SW8_CS16},
+ {0, SW9_CS18, SW9_CS17, SW9_CS16},
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW6, CS35_SW6, CS34_SW6},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
- {0, CS36_SW8, CS35_SW8, CS34_SW8}
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW6_CS36, SW6_CS35, SW6_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}
};
led_config_t g_led_config = { {
diff --git a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
index 1df130fe533..38fac99155a 100644
--- a/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
+++ b/keyboards/kprepublic/cstc40/daughterboard/daughterboard.c
@@ -17,55 +17,55 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, L_1, K_1, J_1 },
- { 0, L_2, K_2, J_2 },
- { 0, L_3, K_3, J_3 },
- { 0, L_4, K_4, J_4 },
- { 0, L_5, K_5, J_5 },
- { 0, L_6, K_6, J_6 },
- { 0, L_7, K_7, J_7 },
- { 0, L_8, K_8, J_8 },
- { 0, L_9, K_9, J_9 },
- { 0, L_10, K_10, J_10 },
- { 0, L_11, K_11, J_11 },
- { 0, L_12, K_12, J_12 },
+ { 0, SW12_CS1, SW11_CS1, SW10_CS1 },
+ { 0, SW12_CS2, SW11_CS2, SW10_CS2 },
+ { 0, SW12_CS3, SW11_CS3, SW10_CS3 },
+ { 0, SW12_CS4, SW11_CS4, SW10_CS4 },
+ { 0, SW12_CS5, SW11_CS5, SW10_CS5 },
+ { 0, SW12_CS6, SW11_CS6, SW10_CS6 },
+ { 0, SW12_CS7, SW11_CS7, SW10_CS7 },
+ { 0, SW12_CS8, SW11_CS8, SW10_CS8 },
+ { 0, SW12_CS9, SW11_CS9, SW10_CS9 },
+ { 0, SW12_CS10, SW11_CS10, SW10_CS10 },
+ { 0, SW12_CS11, SW11_CS11, SW10_CS11 },
+ { 0, SW12_CS12, SW11_CS12, SW10_CS12 },
- { 0, I_1, H_1, G_1 },
- { 0, I_2, H_2, G_2 },
- { 0, I_3, H_3, G_3 },
- { 0, I_4, H_4, G_4 },
- { 0, I_5, H_5, G_5 },
- { 0, I_6, H_6, G_6 },
- { 0, I_7, H_7, G_7 },
- { 0, I_8, H_8, G_8 },
- { 0, I_9, H_9, G_9 },
- { 0, I_10, H_10, G_10 },
- { 0, I_11, H_11, G_11 },
- { 0, I_12, H_12, G_12 },
+ { 0, SW9_CS1, SW8_CS1, SW7_CS1 },
+ { 0, SW9_CS2, SW8_CS2, SW7_CS2 },
+ { 0, SW9_CS3, SW8_CS3, SW7_CS3 },
+ { 0, SW9_CS4, SW8_CS4, SW7_CS4 },
+ { 0, SW9_CS5, SW8_CS5, SW7_CS5 },
+ { 0, SW9_CS6, SW8_CS6, SW7_CS6 },
+ { 0, SW9_CS7, SW8_CS7, SW7_CS7 },
+ { 0, SW9_CS8, SW8_CS8, SW7_CS8 },
+ { 0, SW9_CS9, SW8_CS9, SW7_CS9 },
+ { 0, SW9_CS10, SW8_CS10, SW7_CS10 },
+ { 0, SW9_CS11, SW8_CS11, SW7_CS11 },
+ { 0, SW9_CS12, SW8_CS12, SW7_CS12 },
- { 0, F_1, E_1, D_1 },
- { 0, F_2, E_2, D_2 },
- { 0, F_3, E_3, D_3 },
- { 0, F_4, E_4, D_4 },
- { 0, F_5, E_5, D_5 },
- { 0, F_6, E_6, D_6 },
- { 0, F_7, E_7, D_7 },
- { 0, F_8, E_8, D_8 },
- { 0, F_9, E_9, D_9 },
- { 0, F_10, E_10, D_10 },
- { 0, F_11, E_11, D_11 },
- { 0, F_12, E_12, D_12 },
+ { 0, SW6_CS1, SW5_CS1, SW4_CS1 },
+ { 0, SW6_CS2, SW5_CS2, SW4_CS2 },
+ { 0, SW6_CS3, SW5_CS3, SW4_CS3 },
+ { 0, SW6_CS4, SW5_CS4, SW4_CS4 },
+ { 0, SW6_CS5, SW5_CS5, SW4_CS5 },
+ { 0, SW6_CS6, SW5_CS6, SW4_CS6 },
+ { 0, SW6_CS7, SW5_CS7, SW4_CS7 },
+ { 0, SW6_CS8, SW5_CS8, SW4_CS8 },
+ { 0, SW6_CS9, SW5_CS9, SW4_CS9 },
+ { 0, SW6_CS10, SW5_CS10, SW4_CS10 },
+ { 0, SW6_CS11, SW5_CS11, SW4_CS11 },
+ { 0, SW6_CS12, SW5_CS12, SW4_CS12 },
- { 0, C_1, B_1, A_1 },
- { 0, C_2, B_2, A_2 },
- { 0, C_3, B_3, A_3 },
- { 0, C_4, B_4, A_4 },
- { 0, C_5, B_5, A_5 },
- { 0, C_6, B_6, A_6 },
- { 0, C_8, B_8, A_8 },
- { 0, C_9, B_9, A_9 },
- { 0, C_10, B_10, A_10 },
- { 0, C_11, B_11, A_11 },
- { 0, C_12, B_12, A_12 }
+ { 0, SW3_CS1, SW2_CS1, SW1_CS1 },
+ { 0, SW3_CS2, SW2_CS2, SW1_CS2 },
+ { 0, SW3_CS3, SW2_CS3, SW1_CS3 },
+ { 0, SW3_CS4, SW2_CS4, SW1_CS4 },
+ { 0, SW3_CS5, SW2_CS5, SW1_CS5 },
+ { 0, SW3_CS6, SW2_CS6, SW1_CS6 },
+ { 0, SW3_CS8, SW2_CS8, SW1_CS8 },
+ { 0, SW3_CS9, SW2_CS9, SW1_CS9 },
+ { 0, SW3_CS10, SW2_CS10, SW1_CS10 },
+ { 0, SW3_CS11, SW2_CS11, SW1_CS11 },
+ { 0, SW3_CS12, SW2_CS12, SW1_CS12 }
};
#endif
\ No newline at end of file
diff --git a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
index 1df130fe533..38fac99155a 100644
--- a/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
+++ b/keyboards/kprepublic/cstc40/single_pcb/single_pcb.c
@@ -17,55 +17,55 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, L_1, K_1, J_1 },
- { 0, L_2, K_2, J_2 },
- { 0, L_3, K_3, J_3 },
- { 0, L_4, K_4, J_4 },
- { 0, L_5, K_5, J_5 },
- { 0, L_6, K_6, J_6 },
- { 0, L_7, K_7, J_7 },
- { 0, L_8, K_8, J_8 },
- { 0, L_9, K_9, J_9 },
- { 0, L_10, K_10, J_10 },
- { 0, L_11, K_11, J_11 },
- { 0, L_12, K_12, J_12 },
+ { 0, SW12_CS1, SW11_CS1, SW10_CS1 },
+ { 0, SW12_CS2, SW11_CS2, SW10_CS2 },
+ { 0, SW12_CS3, SW11_CS3, SW10_CS3 },
+ { 0, SW12_CS4, SW11_CS4, SW10_CS4 },
+ { 0, SW12_CS5, SW11_CS5, SW10_CS5 },
+ { 0, SW12_CS6, SW11_CS6, SW10_CS6 },
+ { 0, SW12_CS7, SW11_CS7, SW10_CS7 },
+ { 0, SW12_CS8, SW11_CS8, SW10_CS8 },
+ { 0, SW12_CS9, SW11_CS9, SW10_CS9 },
+ { 0, SW12_CS10, SW11_CS10, SW10_CS10 },
+ { 0, SW12_CS11, SW11_CS11, SW10_CS11 },
+ { 0, SW12_CS12, SW11_CS12, SW10_CS12 },
- { 0, I_1, H_1, G_1 },
- { 0, I_2, H_2, G_2 },
- { 0, I_3, H_3, G_3 },
- { 0, I_4, H_4, G_4 },
- { 0, I_5, H_5, G_5 },
- { 0, I_6, H_6, G_6 },
- { 0, I_7, H_7, G_7 },
- { 0, I_8, H_8, G_8 },
- { 0, I_9, H_9, G_9 },
- { 0, I_10, H_10, G_10 },
- { 0, I_11, H_11, G_11 },
- { 0, I_12, H_12, G_12 },
+ { 0, SW9_CS1, SW8_CS1, SW7_CS1 },
+ { 0, SW9_CS2, SW8_CS2, SW7_CS2 },
+ { 0, SW9_CS3, SW8_CS3, SW7_CS3 },
+ { 0, SW9_CS4, SW8_CS4, SW7_CS4 },
+ { 0, SW9_CS5, SW8_CS5, SW7_CS5 },
+ { 0, SW9_CS6, SW8_CS6, SW7_CS6 },
+ { 0, SW9_CS7, SW8_CS7, SW7_CS7 },
+ { 0, SW9_CS8, SW8_CS8, SW7_CS8 },
+ { 0, SW9_CS9, SW8_CS9, SW7_CS9 },
+ { 0, SW9_CS10, SW8_CS10, SW7_CS10 },
+ { 0, SW9_CS11, SW8_CS11, SW7_CS11 },
+ { 0, SW9_CS12, SW8_CS12, SW7_CS12 },
- { 0, F_1, E_1, D_1 },
- { 0, F_2, E_2, D_2 },
- { 0, F_3, E_3, D_3 },
- { 0, F_4, E_4, D_4 },
- { 0, F_5, E_5, D_5 },
- { 0, F_6, E_6, D_6 },
- { 0, F_7, E_7, D_7 },
- { 0, F_8, E_8, D_8 },
- { 0, F_9, E_9, D_9 },
- { 0, F_10, E_10, D_10 },
- { 0, F_11, E_11, D_11 },
- { 0, F_12, E_12, D_12 },
+ { 0, SW6_CS1, SW5_CS1, SW4_CS1 },
+ { 0, SW6_CS2, SW5_CS2, SW4_CS2 },
+ { 0, SW6_CS3, SW5_CS3, SW4_CS3 },
+ { 0, SW6_CS4, SW5_CS4, SW4_CS4 },
+ { 0, SW6_CS5, SW5_CS5, SW4_CS5 },
+ { 0, SW6_CS6, SW5_CS6, SW4_CS6 },
+ { 0, SW6_CS7, SW5_CS7, SW4_CS7 },
+ { 0, SW6_CS8, SW5_CS8, SW4_CS8 },
+ { 0, SW6_CS9, SW5_CS9, SW4_CS9 },
+ { 0, SW6_CS10, SW5_CS10, SW4_CS10 },
+ { 0, SW6_CS11, SW5_CS11, SW4_CS11 },
+ { 0, SW6_CS12, SW5_CS12, SW4_CS12 },
- { 0, C_1, B_1, A_1 },
- { 0, C_2, B_2, A_2 },
- { 0, C_3, B_3, A_3 },
- { 0, C_4, B_4, A_4 },
- { 0, C_5, B_5, A_5 },
- { 0, C_6, B_6, A_6 },
- { 0, C_8, B_8, A_8 },
- { 0, C_9, B_9, A_9 },
- { 0, C_10, B_10, A_10 },
- { 0, C_11, B_11, A_11 },
- { 0, C_12, B_12, A_12 }
+ { 0, SW3_CS1, SW2_CS1, SW1_CS1 },
+ { 0, SW3_CS2, SW2_CS2, SW1_CS2 },
+ { 0, SW3_CS3, SW2_CS3, SW1_CS3 },
+ { 0, SW3_CS4, SW2_CS4, SW1_CS4 },
+ { 0, SW3_CS5, SW2_CS5, SW1_CS5 },
+ { 0, SW3_CS6, SW2_CS6, SW1_CS6 },
+ { 0, SW3_CS8, SW2_CS8, SW1_CS8 },
+ { 0, SW3_CS9, SW2_CS9, SW1_CS9 },
+ { 0, SW3_CS10, SW2_CS10, SW1_CS10 },
+ { 0, SW3_CS11, SW2_CS11, SW1_CS11 },
+ { 0, SW3_CS12, SW2_CS12, SW1_CS12 }
};
#endif
\ No newline at end of file
diff --git a/keyboards/latincompass/latin60rgb/latin60rgb.c b/keyboards/latincompass/latin60rgb/latin60rgb.c
index 95ddc428daa..8a032d76b14 100644
--- a/keyboards/latincompass/latin60rgb/latin60rgb.c
+++ b/keyboards/latincompass/latin60rgb/latin60rgb.c
@@ -17,69 +17,69 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- { 0, K_13, J_13, L_13 },
- { 0, K_12, J_12, L_12 },
- { 0, K_11, J_11, L_11 },
- { 0, K_10, J_10, L_10 },
- { 0, K_9, J_9, L_9 },
- { 0, K_8, J_8, L_8 },
- { 0, K_7, J_7, L_7 },
- { 0, K_6, J_6, L_6 },
- { 0, K_5, J_5, L_5 },
- { 0, K_4, J_4, L_4 },
- { 0, K_3, J_3, L_3 },
- { 0, K_2, J_2, L_2 },
- { 0, K_1, J_1, L_1 },
+ { 0, SW11_CS13, SW10_CS13, SW12_CS13 },
+ { 0, SW11_CS12, SW10_CS12, SW12_CS12 },
+ { 0, SW11_CS11, SW10_CS11, SW12_CS11 },
+ { 0, SW11_CS10, SW10_CS10, SW12_CS10 },
+ { 0, SW11_CS9, SW10_CS9, SW12_CS9 },
+ { 0, SW11_CS8, SW10_CS8, SW12_CS8 },
+ { 0, SW11_CS7, SW10_CS7, SW12_CS7 },
+ { 0, SW11_CS6, SW10_CS6, SW12_CS6 },
+ { 0, SW11_CS5, SW10_CS5, SW12_CS5 },
+ { 0, SW11_CS4, SW10_CS4, SW12_CS4 },
+ { 0, SW11_CS3, SW10_CS3, SW12_CS3 },
+ { 0, SW11_CS2, SW10_CS2, SW12_CS2 },
+ { 0, SW11_CS1, SW10_CS1, SW12_CS1 },
- { 0, H_16, G_16, I_16 },
- { 0, H_15, G_15, I_15 },
- { 0, H_14, G_14, I_14 },
- { 0, H_13, G_13, I_13 },
- { 0, H_12, G_12, I_12 },
- { 0, H_11, G_11, I_11 },
- { 0, H_10, G_10, I_10 },
- { 0, H_9, G_9, I_9 },
- { 0, H_8, G_8, I_8 },
- { 0, H_7, G_7, I_7 },
- { 0, H_6, G_6, I_6 },
- { 0, H_5, G_5, I_5 },
- { 0, H_4, G_4, I_4 },
- { 0, H_3, G_3, I_3 },
- { 0, H_2, G_2, I_2 },
- { 0, H_1, G_1, I_1 },
+ { 0, SW8_CS16, SW7_CS16, SW9_CS16 },
+ { 0, SW8_CS15, SW7_CS15, SW9_CS15 },
+ { 0, SW8_CS14, SW7_CS14, SW9_CS14 },
+ { 0, SW8_CS13, SW7_CS13, SW9_CS13 },
+ { 0, SW8_CS12, SW7_CS12, SW9_CS12 },
+ { 0, SW8_CS11, SW7_CS11, SW9_CS11 },
+ { 0, SW8_CS10, SW7_CS10, SW9_CS10 },
+ { 0, SW8_CS9, SW7_CS9, SW9_CS9 },
+ { 0, SW8_CS8, SW7_CS8, SW9_CS8 },
+ { 0, SW8_CS7, SW7_CS7, SW9_CS7 },
+ { 0, SW8_CS6, SW7_CS6, SW9_CS6 },
+ { 0, SW8_CS5, SW7_CS5, SW9_CS5 },
+ { 0, SW8_CS4, SW7_CS4, SW9_CS4 },
+ { 0, SW8_CS3, SW7_CS3, SW9_CS3 },
+ { 0, SW8_CS2, SW7_CS2, SW9_CS2 },
+ { 0, SW8_CS1, SW7_CS1, SW9_CS1 },
- { 0, E_16, D_16, F_16 },
- { 0, E_15, D_15, F_15 },
- { 0, E_14, D_14, F_14 },
- { 0, E_13, D_13, F_13 },
- { 0, E_12, D_12, F_12 },
- { 0, E_11, D_11, F_11 },
- { 0, E_10, D_10, F_10 },
- { 0, E_9, D_9, F_9 },
- { 0, E_8, D_8, F_8 },
- { 0, E_7, D_7, F_7 },
- { 0, E_6, D_6, F_6 },
- { 0, E_5, D_5, F_5 },
- { 0, E_4, D_4, F_4 },
- { 0, E_3, D_3, F_3 },
- { 0, E_2, D_2, F_2 },
- { 0, E_1, D_1, F_1 },
+ { 0, SW5_CS16, SW4_CS16, SW6_CS16 },
+ { 0, SW5_CS15, SW4_CS15, SW6_CS15 },
+ { 0, SW5_CS14, SW4_CS14, SW6_CS14 },
+ { 0, SW5_CS13, SW4_CS13, SW6_CS13 },
+ { 0, SW5_CS12, SW4_CS12, SW6_CS12 },
+ { 0, SW5_CS11, SW4_CS11, SW6_CS11 },
+ { 0, SW5_CS10, SW4_CS10, SW6_CS10 },
+ { 0, SW5_CS9, SW4_CS9, SW6_CS9 },
+ { 0, SW5_CS8, SW4_CS8, SW6_CS8 },
+ { 0, SW5_CS7, SW4_CS7, SW6_CS7 },
+ { 0, SW5_CS6, SW4_CS6, SW6_CS6 },
+ { 0, SW5_CS5, SW4_CS5, SW6_CS5 },
+ { 0, SW5_CS4, SW4_CS4, SW6_CS4 },
+ { 0, SW5_CS3, SW4_CS3, SW6_CS3 },
+ { 0, SW5_CS2, SW4_CS2, SW6_CS2 },
+ { 0, SW5_CS1, SW4_CS1, SW6_CS1 },
- { 0, B_16, A_16, C_16 },
- { 0, B_14, A_14, C_14 },
- { 0, B_13, A_13, C_13 },
- { 0, B_12, A_12, C_12 },
- { 0, B_11, A_11, C_11 },
- { 0, B_10, A_10, C_10 },
- { 0, B_9, A_9, C_9 },
- { 0, B_8, A_8, C_8 },
- { 0, B_7, A_7, C_7 },
- { 0, B_6, A_6, C_6 },
- { 0, B_5, A_5, C_5 },
- { 0, B_4, A_4, C_4 },
- { 0, B_3, A_3, C_3 },
- { 0, B_2, A_2, C_2 },
- { 0, B_1, A_1, C_1 }
+ { 0, SW2_CS16, SW1_CS16, SW3_CS16 },
+ { 0, SW2_CS14, SW1_CS14, SW3_CS14 },
+ { 0, SW2_CS13, SW1_CS13, SW3_CS13 },
+ { 0, SW2_CS12, SW1_CS12, SW3_CS12 },
+ { 0, SW2_CS11, SW1_CS11, SW3_CS11 },
+ { 0, SW2_CS10, SW1_CS10, SW3_CS10 },
+ { 0, SW2_CS9, SW1_CS9, SW3_CS9 },
+ { 0, SW2_CS8, SW1_CS8, SW3_CS8 },
+ { 0, SW2_CS7, SW1_CS7, SW3_CS7 },
+ { 0, SW2_CS6, SW1_CS6, SW3_CS6 },
+ { 0, SW2_CS5, SW1_CS5, SW3_CS5 },
+ { 0, SW2_CS4, SW1_CS4, SW3_CS4 },
+ { 0, SW2_CS3, SW1_CS3, SW3_CS3 },
+ { 0, SW2_CS2, SW1_CS2, SW3_CS2 },
+ { 0, SW2_CS1, SW1_CS1, SW3_CS1 }
};
diff --git a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
index 5eebd7ec8a9..33dd2157e40 100644
--- a/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
+++ b/keyboards/mechlovin/adelais/rgb_led/rev3/rev3.c
@@ -18,74 +18,74 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* D9-K31-00 */
- {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* D46-K00-01 */
- {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* D59-K01-02 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* D73-K02-03 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* D75-K03-04 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* D77-K04-05 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* D79-K05-06 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* D81-K06-07 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* D83-K07-08 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* D85-K08-09 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* D87-K09-10 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* D90-K0A-11 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* D93-K0B-12 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* D95-K0C-13 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* D98-K0D-14 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* D100-K0E-15 */
- {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* D94-K41-16 */
- {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* D92-K10-17 */
- {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* D89-K11-18 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* D86-K12-19 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* D84-K13-20 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* D82-K14-21 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* D80-K15-22 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* D78-K16-23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* D76-K17-24 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* D74-K18-25 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* D72-K19-26 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* D51-K1A-27 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* D10-K1B-28 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* D101-K1C-29 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* D104-K1D-30 */
- {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* D108-K43-31 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* D111-K20-32 */
- {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* D114-K21-33 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* D117-K22-34 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* D120-K23-35 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* D123-K24-36 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* D126-K25-37 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* D129-K26-38 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* D133-K27-39 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* D142-K28-40 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* D146-K29-41 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* D160-K2A-42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* D167-K2B-43 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* D168-K2D-44 */
+ {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* D9-K31-00 */
+ {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* D46-K00-01 */
+ {0, SW9_CS6, SW9_CS5, SW9_CS4}, /* D59-K01-02 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* D73-K02-03 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* D75-K03-04 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* D77-K04-05 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* D79-K05-06 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* D81-K06-07 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* D83-K07-08 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* D85-K08-09 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* D87-K09-10 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* D90-K0A-11 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* D93-K0B-12 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* D95-K0C-13 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* D98-K0D-14 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* D100-K0E-15 */
+ {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* D94-K41-16 */
+ {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* D92-K10-17 */
+ {0, SW6_CS6, SW6_CS5, SW6_CS4}, /* D89-K11-18 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* D86-K12-19 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* D84-K13-20 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* D82-K14-21 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* D80-K15-22 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* D78-K16-23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* D76-K17-24 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* D74-K18-25 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* D72-K19-26 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* D51-K1A-27 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* D10-K1B-28 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* D101-K1C-29 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* D104-K1D-30 */
+ {0, SW3_CS3, SW3_CS2, SW3_CS1}, /* D108-K43-31 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* D111-K20-32 */
+ {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* D114-K21-33 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* D117-K22-34 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* D120-K23-35 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* D123-K24-36 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* D126-K25-37 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* D129-K26-38 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* D133-K27-39 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* D142-K28-40 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* D146-K29-41 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* D160-K2A-42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* D167-K2B-43 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* D168-K2D-44 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* D163-K30-45 */
- {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* D147-K31-46 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* D144-K32-47 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* D137-K33-48 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* D130-K34-49 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* D127-K35-50 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* D124-K36-51 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* D121-K37-52 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* D118-K38-53 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* D115-K39-54 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* D112-K3A-55 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* D109-K3B-56 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* D105-K3D-57 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* D103-K3E-58 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* D163-K30-45 */
+ {0, SW8_CS6, SW8_CS5, SW8_CS4}, /* D147-K31-46 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* D144-K32-47 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* D137-K33-48 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* D130-K34-49 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* D127-K35-50 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* D124-K36-51 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* D121-K37-52 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* D118-K38-53 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* D115-K39-54 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* D112-K3A-55 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* D109-K3B-56 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* D105-K3D-57 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* D103-K3E-58 */
- {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* D163-K40-59 */
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* D147-K42-60 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* D137-K44-61 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* D127-K46-62 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* D121-K48-63 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* D115-K4A-64 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* D103-K4E-65 */
+ {0, SW1_CS3, SW1_CS2, SW1_CS1}, /* D163-K40-59 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* D147-K42-60 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* D137-K44-61 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* D127-K46-62 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* D121-K48-63 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* D115-K4A-64 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* D103-K4E-65 */
};
led_config_t g_led_config = {
diff --git a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
index cd8f2e2ca0f..8df305bb1a1 100644
--- a/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
+++ b/keyboards/mechlovin/infinity87/rgb_rev1/rgb_rev1.c
@@ -18,97 +18,97 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS34_SW1, CS35_SW1, CS36_SW1}, //D92-K00-0
- {0, CS37_SW1, CS38_SW1, CS39_SW1}, //D94-K01-1
- {0, CS31_SW1, CS32_SW1, CS33_SW1}, //D96-K02-2
- {0, CS28_SW1, CS29_SW1, CS30_SW1}, //D98-K03-3
- {0, CS25_SW1, CS26_SW1, CS27_SW1}, //D100-K04-4
- {0, CS22_SW1, CS23_SW1, CS24_SW1}, //D102-K05-5
- {0, CS19_SW1, CS20_SW1, CS21_SW1}, //D104-K06-6
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, //D106-K07-7
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, //D108-K08-8
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, //D110-K09-9
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, //D112-K0A-10
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, //D114-K0B-11
- {0, CS3_SW1, CS2_SW1, CS1_SW1}, //D116-K0C-12
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, //D157-K0D-13
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, //D118-K0E-14
- {0, CS19_SW7, CS20_SW7, CS21_SW7}, //D120-K0F-15
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, //D122-K0G-16
- {0, CS34_SW2, CS35_SW2, CS36_SW2}, //D93-K10-17
- {0, CS37_SW2, CS38_SW2, CS39_SW2}, //D95-K11-18
- {0, CS31_SW2, CS32_SW2, CS33_SW2}, //D97-K12-19
- {0, CS28_SW2, CS29_SW2, CS30_SW2}, //D99-K13-20
- {0, CS25_SW2, CS26_SW2, CS27_SW2}, //D101-K14-21
- {0, CS22_SW2, CS23_SW2, CS24_SW2}, //D103-K15-22
- {0, CS19_SW2, CS20_SW2, CS21_SW2}, //D105-K16-23
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, //D107-K17-24
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, //D109-K18-25
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, //D111-K19-26
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, //D113-K1A-27
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, //D115-K1B-28
- {0, CS3_SW2, CS2_SW2, CS1_SW2}, //D117-K1C-29
- {0, CS3_SW8, CS2_SW8, CS1_SW8}, //D158-K1D-30
- {0, CS3_SW7, CS2_SW7, CS1_SW7}, //D119-K1E-31
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, //D121-K1F-32
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, //D123-K1G-33
- {0, CS34_SW3, CS35_SW3, CS36_SW3}, //D124-K20-34
- {0, CS37_SW3, CS38_SW3, CS39_SW3}, //D127-K21-35
- {0, CS31_SW3, CS32_SW3, CS33_SW3}, //D130-K22-36
- {0, CS28_SW3, CS29_SW3, CS30_SW3}, //D133-K23-37
- {0, CS25_SW3, CS26_SW3, CS27_SW3}, //D135-K24-38
- {0, CS22_SW3, CS23_SW3, CS24_SW3}, //D137-K25-39
- {0, CS19_SW3, CS20_SW3, CS21_SW3}, //D139-K26-40
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, //D142-K27-41
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, //D144-K28-42
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, //D146-K29-43
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, //D148-K2A-44
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, //D151-K2B-45
- {0, CS3_SW3, CS2_SW3, CS1_SW3}, //D154-K2C-46
- {0, CS6_SW8, CS5_SW8, CS4_SW8}, //D159-K2D-47
- {0, CS6_SW7, CS5_SW7, CS4_SW7}, //D180-K2E-48
- {0, CS19_SW8, CS20_SW8, CS21_SW8}, //D181-K2F-49
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, //D182-K2G-50
- {0, CS34_SW4, CS35_SW4, CS36_SW4}, //D166-K30-51
- {0, CS37_SW4, CS38_SW4, CS39_SW4}, //D167-K31-52
- {0, CS31_SW4, CS32_SW4, CS33_SW4}, //D168-K32-53
- {0, CS28_SW4, CS29_SW4, CS30_SW4}, //D169-K33-54
- {0, CS25_SW4, CS26_SW4, CS27_SW4}, //D170-K34-55
- {0, CS22_SW4, CS23_SW4, CS24_SW4}, //D171-K35-56
- {0, CS19_SW4, CS20_SW4, CS21_SW4}, //D172-K36-57
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D173-K37-58
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D174-K38-59
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D175-K39-60
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, //D176-K3A-61
- {0, CS6_SW4, CS5_SW4, CS4_SW4}, //D177-K3B-62
- {0, CS3_SW4, CS2_SW4, CS1_SW4}, //D178-K3C-63
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, //D179-K3D-64
- {0, CS34_SW5, CS35_SW5, CS36_SW5}, //D125-K40-65
- {0, CS37_SW5, CS38_SW5, CS39_SW5}, //D128-K41-66
- {0, CS31_SW5, CS32_SW5, CS33_SW5}, //D131-K42-67
- {0, CS28_SW5, CS29_SW5, CS30_SW5}, //D134-K43-68
- {0, CS25_SW5, CS26_SW5, CS27_SW5}, //D136-K44-69
- {0, CS22_SW5, CS23_SW5, CS24_SW5}, //D138-K45-70
- {0, CS19_SW5, CS20_SW5, CS21_SW5}, //D140-K46-71
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, //D143-K47-72
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, //D145-K48-73
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, //D147-K49-74
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, //D149-K4A-75
- {0, CS6_SW5, CS5_SW5, CS4_SW5}, //D152-K4B-76
- {0, CS3_SW5, CS2_SW5, CS1_SW5}, //D155-K4C-77
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, //D160-K4D-78
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, //D163-K4E-79
- {0, CS34_SW6, CS35_SW6, CS36_SW6}, //D126-K20-80
- {0, CS37_SW6, CS38_SW6, CS39_SW6}, //D129-K21-81
- {0, CS31_SW6, CS32_SW6, CS33_SW6}, //D132-K22-82
- {0, CS19_SW6, CS20_SW6, CS21_SW6}, //D141-K26-83
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, //D150-K2A-84
- {0, CS6_SW6, CS5_SW6, CS4_SW6}, //D153-K2B-85
- {0, CS3_SW6, CS2_SW6, CS1_SW6}, //D156-K2C-86
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, //D161-K2D-87
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, //D162-K2E-88
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, //D164-K2F-89
- {0, CS19_SW9, CS20_SW9, CS21_SW9}, //D165-K2G-90
+ {0, SW1_CS34, SW1_CS35, SW1_CS36}, //D92-K00-0
+ {0, SW1_CS37, SW1_CS38, SW1_CS39}, //D94-K01-1
+ {0, SW1_CS31, SW1_CS32, SW1_CS33}, //D96-K02-2
+ {0, SW1_CS28, SW1_CS29, SW1_CS30}, //D98-K03-3
+ {0, SW1_CS25, SW1_CS26, SW1_CS27}, //D100-K04-4
+ {0, SW1_CS22, SW1_CS23, SW1_CS24}, //D102-K05-5
+ {0, SW1_CS19, SW1_CS20, SW1_CS21}, //D104-K06-6
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, //D106-K07-7
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, //D108-K08-8
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, //D110-K09-9
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, //D112-K0A-10
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, //D114-K0B-11
+ {0, SW1_CS3, SW1_CS2, SW1_CS1}, //D116-K0C-12
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, //D157-K0D-13
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, //D118-K0E-14
+ {0, SW7_CS19, SW7_CS20, SW7_CS21}, //D120-K0F-15
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, //D122-K0G-16
+ {0, SW2_CS34, SW2_CS35, SW2_CS36}, //D93-K10-17
+ {0, SW2_CS37, SW2_CS38, SW2_CS39}, //D95-K11-18
+ {0, SW2_CS31, SW2_CS32, SW2_CS33}, //D97-K12-19
+ {0, SW2_CS28, SW2_CS29, SW2_CS30}, //D99-K13-20
+ {0, SW2_CS25, SW2_CS26, SW2_CS27}, //D101-K14-21
+ {0, SW2_CS22, SW2_CS23, SW2_CS24}, //D103-K15-22
+ {0, SW2_CS19, SW2_CS20, SW2_CS21}, //D105-K16-23
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, //D107-K17-24
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, //D109-K18-25
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, //D111-K19-26
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, //D113-K1A-27
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, //D115-K1B-28
+ {0, SW2_CS3, SW2_CS2, SW2_CS1}, //D117-K1C-29
+ {0, SW8_CS3, SW8_CS2, SW8_CS1}, //D158-K1D-30
+ {0, SW7_CS3, SW7_CS2, SW7_CS1}, //D119-K1E-31
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, //D121-K1F-32
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, //D123-K1G-33
+ {0, SW3_CS34, SW3_CS35, SW3_CS36}, //D124-K20-34
+ {0, SW3_CS37, SW3_CS38, SW3_CS39}, //D127-K21-35
+ {0, SW3_CS31, SW3_CS32, SW3_CS33}, //D130-K22-36
+ {0, SW3_CS28, SW3_CS29, SW3_CS30}, //D133-K23-37
+ {0, SW3_CS25, SW3_CS26, SW3_CS27}, //D135-K24-38
+ {0, SW3_CS22, SW3_CS23, SW3_CS24}, //D137-K25-39
+ {0, SW3_CS19, SW3_CS20, SW3_CS21}, //D139-K26-40
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, //D142-K27-41
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, //D144-K28-42
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, //D146-K29-43
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, //D148-K2A-44
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, //D151-K2B-45
+ {0, SW3_CS3, SW3_CS2, SW3_CS1}, //D154-K2C-46
+ {0, SW8_CS6, SW8_CS5, SW8_CS4}, //D159-K2D-47
+ {0, SW7_CS6, SW7_CS5, SW7_CS4}, //D180-K2E-48
+ {0, SW8_CS19, SW8_CS20, SW8_CS21}, //D181-K2F-49
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, //D182-K2G-50
+ {0, SW4_CS34, SW4_CS35, SW4_CS36}, //D166-K30-51
+ {0, SW4_CS37, SW4_CS38, SW4_CS39}, //D167-K31-52
+ {0, SW4_CS31, SW4_CS32, SW4_CS33}, //D168-K32-53
+ {0, SW4_CS28, SW4_CS29, SW4_CS30}, //D169-K33-54
+ {0, SW4_CS25, SW4_CS26, SW4_CS27}, //D170-K34-55
+ {0, SW4_CS22, SW4_CS23, SW4_CS24}, //D171-K35-56
+ {0, SW4_CS19, SW4_CS20, SW4_CS21}, //D172-K36-57
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, //D173-K37-58
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, //D174-K38-59
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, //D175-K39-60
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, //D176-K3A-61
+ {0, SW4_CS6, SW4_CS5, SW4_CS4}, //D177-K3B-62
+ {0, SW4_CS3, SW4_CS2, SW4_CS1}, //D178-K3C-63
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, //D179-K3D-64
+ {0, SW5_CS34, SW5_CS35, SW5_CS36}, //D125-K40-65
+ {0, SW5_CS37, SW5_CS38, SW5_CS39}, //D128-K41-66
+ {0, SW5_CS31, SW5_CS32, SW5_CS33}, //D131-K42-67
+ {0, SW5_CS28, SW5_CS29, SW5_CS30}, //D134-K43-68
+ {0, SW5_CS25, SW5_CS26, SW5_CS27}, //D136-K44-69
+ {0, SW5_CS22, SW5_CS23, SW5_CS24}, //D138-K45-70
+ {0, SW5_CS19, SW5_CS20, SW5_CS21}, //D140-K46-71
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, //D143-K47-72
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, //D145-K48-73
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, //D147-K49-74
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, //D149-K4A-75
+ {0, SW5_CS6, SW5_CS5, SW5_CS4}, //D152-K4B-76
+ {0, SW5_CS3, SW5_CS2, SW5_CS1}, //D155-K4C-77
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, //D160-K4D-78
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, //D163-K4E-79
+ {0, SW6_CS34, SW6_CS35, SW6_CS36}, //D126-K20-80
+ {0, SW6_CS37, SW6_CS38, SW6_CS39}, //D129-K21-81
+ {0, SW6_CS31, SW6_CS32, SW6_CS33}, //D132-K22-82
+ {0, SW6_CS19, SW6_CS20, SW6_CS21}, //D141-K26-83
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, //D150-K2A-84
+ {0, SW6_CS6, SW6_CS5, SW6_CS4}, //D153-K2B-85
+ {0, SW6_CS3, SW6_CS2, SW6_CS1}, //D156-K2C-86
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, //D161-K2D-87
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, //D162-K2E-88
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, //D164-K2F-89
+ {0, SW9_CS19, SW9_CS20, SW9_CS21}, //D165-K2G-90
};
led_config_t g_led_config = { {
diff --git a/keyboards/melgeek/mach80/rev1/rev1.c b/keyboards/melgeek/mach80/rev1/rev1.c
index 630b399e210..a4b49610cc2 100755
--- a/keyboards/melgeek/mach80/rev1/rev1.c
+++ b/keyboards/melgeek/mach80/rev1/rev1.c
@@ -20,103 +20,103 @@
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */
- {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */
- {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */
- {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */
- {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */
- {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB110 */
- {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB111 */
- {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB112 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */
+ {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */
+ {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */
+ {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */
+ {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */
+ {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB110 */
+ {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB111 */
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB112 */
};
led_config_t g_led_config = {
{
@@ -145,9 +145,9 @@ led_config_t g_led_config = {
};
const is31fl3741_led_t g_is31_indicator_leds[3] = {
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */
};
bool led_update_kb(led_t led_state) {
diff --git a/keyboards/melgeek/mach80/rev2/rev2.c b/keyboards/melgeek/mach80/rev2/rev2.c
index 5cea55620b1..1a759f38c60 100755
--- a/keyboards/melgeek/mach80/rev2/rev2.c
+++ b/keyboards/melgeek/mach80/rev2/rev2.c
@@ -20,100 +20,100 @@
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB67 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB68 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB69 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB70 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB71 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB72 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB73 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB74 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB75 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB76 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB77 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB78 */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB79 */
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB80 */
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB83 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB81 */
- {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB82 */
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB89 */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB90 */
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB91 */
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB92 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB84 */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB88 */
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB86 */
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB87 */
- {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB98 */
- {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB99 */
- {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB100 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB101 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB67 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB68 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB69 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB70 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB71 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB72 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB73 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB74 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB75 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB76 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB77 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB78 */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB79 */
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB80 */
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB83 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB81 */
+ {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB82 */
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB89 */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB90 */
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB91 */
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB92 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB84 */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB88 */
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB86 */
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB87 */
+ {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB98 */
+ {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB99 */
+ {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB100 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB101 */
};
led_config_t g_led_config = {
{
@@ -143,9 +143,9 @@ led_config_t g_led_config = {
};
const is31fl3741_led_t g_is31_indicator_leds[3] = {
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB107 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB108 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB109 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB107 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB108 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB109 */
};
bool led_update_kb(led_t led_state) {
diff --git a/keyboards/melgeek/mj61/rev1/rev1.c b/keyboards/melgeek/mj61/rev1/rev1.c
index 227d8c32aa2..3ee0da5183b 100644
--- a/keyboards/melgeek/mj61/rev1/rev1.c
+++ b/keyboards/melgeek/mj61/rev1/rev1.c
@@ -18,69 +18,69 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB1 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB2 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB3 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB4 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB5 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB6 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB7 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB8 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB9 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB10 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB11 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB12 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB13 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB14 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB15 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB16 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB17 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB18 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB19 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB21 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB22 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB23 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB24 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB25 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB26 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB27 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB28 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB29 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB30 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB31 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB32 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB33 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB34 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB35 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB36 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB37 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB38 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB39 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB40 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB41 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB42 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB43 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB44 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB45 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB46 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB47 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB48 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB49 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB50 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB51 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB52 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB53 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB54 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB55 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB56 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB57 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB58 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB59 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB60 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB1 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB2 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB3 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB4 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB5 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB6 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB7 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB8 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB9 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB10 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB11 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB12 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB13 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB14 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB15 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB16 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB17 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB18 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB19 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB20 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB21 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB22 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB23 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB24 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB25 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB26 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB27 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB28 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB29 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB30 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB31 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB32 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB33 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB34 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB35 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB36 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB37 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB38 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB39 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB40 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB41 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB42 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB43 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB44 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB45 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB46 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB47 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB48 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB49 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB50 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB51 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB52 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB53 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB54 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB55 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB56 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB57 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB58 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB59 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB60 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj61/rev2/rev2.c b/keyboards/melgeek/mj61/rev2/rev2.c
index 5c797a58225..71d41c16b3f 100644
--- a/keyboards/melgeek/mj61/rev2/rev2.c
+++ b/keyboards/melgeek/mj61/rev2/rev2.c
@@ -20,77 +20,77 @@
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB3 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB4 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB5 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB6 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB7 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB2 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj63/rev1/rev1.c b/keyboards/melgeek/mj63/rev1/rev1.c
index 78e12b3f73c..e3baf32de7c 100644
--- a/keyboards/melgeek/mj63/rev1/rev1.c
+++ b/keyboards/melgeek/mj63/rev1/rev1.c
@@ -20,71 +20,71 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj63/rev2/rev2.c b/keyboards/melgeek/mj63/rev2/rev2.c
index d452661c45c..418092ec9f6 100644
--- a/keyboards/melgeek/mj63/rev2/rev2.c
+++ b/keyboards/melgeek/mj63/rev2/rev2.c
@@ -20,77 +20,77 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB3 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB4 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB5 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB6 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB7 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB2 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj64/rev1/rev1.c b/keyboards/melgeek/mj64/rev1/rev1.c
index efc9637db81..b9609cad1e8 100644
--- a/keyboards/melgeek/mj64/rev1/rev1.c
+++ b/keyboards/melgeek/mj64/rev1/rev1.c
@@ -19,70 +19,70 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj64/rev2/rev2.c b/keyboards/melgeek/mj64/rev2/rev2.c
index 2f11cc95baf..16c8e1f6125 100644
--- a/keyboards/melgeek/mj64/rev2/rev2.c
+++ b/keyboards/melgeek/mj64/rev2/rev2.c
@@ -19,72 +19,72 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB61 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB62 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB65 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB61 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB62 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB65 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj64/rev3/rev3.c b/keyboards/melgeek/mj64/rev3/rev3.c
index d797301b0a7..7af80c7388f 100644
--- a/keyboards/melgeek/mj64/rev3/rev3.c
+++ b/keyboards/melgeek/mj64/rev3/rev3.c
@@ -19,78 +19,78 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB3 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB4 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB5 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB6 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB7 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB2 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB48 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB46 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB49 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB50 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB51 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB52 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB53 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB16 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB12 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB17 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB13 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB14 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB18 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB15 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB47 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB60 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB61 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB21 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB22 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB26 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB23 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB24 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB25 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB56 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB57 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB62 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB58 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB63 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB35 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB32 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB33 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB34 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB40 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB43 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB38 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB44 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB45 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB39 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB42 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB3 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB4 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB5 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB6 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB7 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB2 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB48 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB46 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB49 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB50 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB51 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB52 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB53 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB16 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB12 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB17 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB13 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB14 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB18 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB15 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB47 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB60 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB61 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB21 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB22 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB26 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB23 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB24 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB25 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB56 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB57 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB62 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB58 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB63 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB35 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB32 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB33 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB34 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB40 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB43 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB38 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB44 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB45 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB39 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB42 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mj65/rev3/rev3.c b/keyboards/melgeek/mj65/rev3/rev3.c
index 39eb0431641..1392d5af4e5 100644
--- a/keyboards/melgeek/mj65/rev3/rev3.c
+++ b/keyboards/melgeek/mj65/rev3/rev3.c
@@ -19,82 +19,82 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB69 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB70 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB71 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB72 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB73 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB74 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB75 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB76 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB69 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB70 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB71 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB72 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB73 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB74 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB75 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB76 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/mojo68/rev1/rev1.c b/keyboards/melgeek/mojo68/rev1/rev1.c
index 0490acd7dcd..af17d96c6d9 100755
--- a/keyboards/melgeek/mojo68/rev1/rev1.c
+++ b/keyboards/melgeek/mojo68/rev1/rev1.c
@@ -19,74 +19,74 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
};
led_config_t g_led_config = {
@@ -113,9 +113,9 @@ led_config_t g_led_config = {
};
const is31fl3741_led_t g_is31_indicator_leds[3] = {
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB124 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB125 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB126 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB124 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB125 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB126 */
};
bool led_update_kb(led_t led_state) {
diff --git a/keyboards/melgeek/mojo75/rev1/rev1.c b/keyboards/melgeek/mojo75/rev1/rev1.c
index 7a8e3cb2d3f..18daafebf8d 100644
--- a/keyboards/melgeek/mojo75/rev1/rev1.c
+++ b/keyboards/melgeek/mojo75/rev1/rev1.c
@@ -19,98 +19,98 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB2 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB3 */
- {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB4 */
- {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB5 */
- {0, CS6_SW6, CS5_SW6, CS4_SW6}, /* RGB6 */
- {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB7 */
- {0, CS6_SW8, CS5_SW8, CS4_SW8}, /* RGB8 */
- {0, CS6_SW9, CS5_SW9, CS4_SW9}, /* RGB9 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB55 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB56 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB57 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB58 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB59 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB60 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB61 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB10 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB11 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB12 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB13 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB14 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB15 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB16 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB17 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB18 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB62 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB63 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB64 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB65 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB66 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB67 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB68 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB69 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB19 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB20 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB21 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB22 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB23 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB24 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB25 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB26 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB27 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB70 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB71 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB72 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB86 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB73 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB74 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB28 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB29 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB30 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB31 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB32 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB33 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB34 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB35 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB36 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB75 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB76 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB77 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB78 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB79 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB80 */
- {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB91 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB37 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB38 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB39 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB40 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB41 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB42 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB43 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB44 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB45 */
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB84 */
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB83 */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB82 */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB85 */
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB81 */
- {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB87 */
- {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB89 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB46 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB47 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB48 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB49 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB50 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB51 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB52 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB53 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB54 */
- {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB88 */
- {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB92 */
- {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB90 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB1 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB2 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB3 */
+ {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* RGB4 */
+ {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB5 */
+ {0, SW6_CS6, SW6_CS5, SW6_CS4}, /* RGB6 */
+ {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB7 */
+ {0, SW8_CS6, SW8_CS5, SW8_CS4}, /* RGB8 */
+ {0, SW9_CS6, SW9_CS5, SW9_CS4}, /* RGB9 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB55 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB56 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB57 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB58 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB59 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB60 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB61 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB10 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB11 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB12 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB13 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB14 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB15 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB16 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB17 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB18 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB62 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB63 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB64 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB65 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB66 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB67 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB68 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB69 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB19 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB20 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB21 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB22 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB23 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB24 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB25 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB26 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB27 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB70 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB71 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB72 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB86 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB73 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB74 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB28 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB29 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB30 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB31 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB32 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB33 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB34 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB35 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB36 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB75 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB76 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB77 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB78 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB79 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB80 */
+ {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB91 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB37 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB38 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB39 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB40 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB41 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB42 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB43 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB44 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB45 */
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB84 */
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB83 */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB82 */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB85 */
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB81 */
+ {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB87 */
+ {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB89 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB46 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB47 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB48 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB49 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB50 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB51 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB52 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB53 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB54 */
+ {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB88 */
+ {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB92 */
+ {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB90 */
};
led_config_t g_led_config = {
diff --git a/keyboards/melgeek/tegic/rev1/rev1.c b/keyboards/melgeek/tegic/rev1/rev1.c
index eacbebf94c1..b087264919c 100755
--- a/keyboards/melgeek/tegic/rev1/rev1.c
+++ b/keyboards/melgeek/tegic/rev1/rev1.c
@@ -20,102 +20,102 @@
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB1 */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB2 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB3 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB4 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB5 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB6 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB7 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB8 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB9 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB55 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB56 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB57 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB58 */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB59 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB60 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB1 */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB2 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB3 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB4 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB5 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB6 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB7 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB8 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB9 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB55 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB56 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB57 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB58 */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB59 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB60 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB10 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB11 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB12 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB13 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB14 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB15 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB16 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB17 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB18 */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB61 */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB62 */
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB63 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB64 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB65 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB66 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB67 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB68 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB10 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB11 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB12 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB13 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB14 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB15 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB16 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB17 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB18 */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB61 */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB62 */
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB63 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB64 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB65 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB66 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB67 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB68 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB19 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB21 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB22 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB23 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB24 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB25 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB26 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB27 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB127 */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB128 */
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, /* RGB129 */
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, /* RGB130 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB136 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB135 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB19 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB21 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB22 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB23 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB24 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB25 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB26 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB27 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB127 */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB128 */
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, /* RGB129 */
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, /* RGB130 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB136 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB135 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB28 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB29 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB30 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB31 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB32 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB33 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB34 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB35 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB36 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB138 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB139 */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB137 */
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB131 */
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB132 */
- {0, CS33_SW8, CS32_SW8, CS31_SW8}, /* RGB133*/
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB28 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB29 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB30 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB31 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB32 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB33 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB34 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB35 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB36 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB138 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB139 */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB137 */
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB131 */
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB132 */
+ {0, SW8_CS33, SW8_CS32, SW8_CS31}, /* RGB133*/
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB37 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB38 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB39 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB40 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB41 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB42 */
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, /* RGB43 */
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, /* RGB44 */
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, /* RGB45 */
- {0, CS33_SW9, CS32_SW9, CS31_SW9}, /* RGB134 */
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB145 */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB144*/
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB148 */
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB147 */
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB146 */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB140 */
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB141 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB37 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB38 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB39 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB40 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB41 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB42 */
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, /* RGB43 */
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, /* RGB44 */
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, /* RGB45 */
+ {0, SW9_CS33, SW9_CS32, SW9_CS31}, /* RGB134 */
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB145 */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB144*/
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB148 */
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB147 */
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB146 */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB140 */
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB141 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB46 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB47 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB48 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB49 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB50 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB51 */
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, /* RGB52 */
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, /* RGB53 */
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, /* RGB54 */
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB142 */
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB143 */
- {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB149 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB46 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB47 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB48 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB49 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB50 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB51 */
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, /* RGB52 */
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, /* RGB53 */
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, /* RGB54 */
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB142 */
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB143 */
+ {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB149 */
};
led_config_t g_led_config = {
{
diff --git a/keyboards/melgeek/z70ultra/z70ultra.c b/keyboards/melgeek/z70ultra/z70ultra.c
index 51827ab15ed..1cb46df643a 100644
--- a/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/keyboards/melgeek/z70ultra/z70ultra.c
@@ -19,77 +19,77 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS28_SW1, CS30_SW1, CS29_SW1}, /* RGB10 */
- {0, CS28_SW2, CS30_SW2, CS29_SW2}, /* RGB11 */
- {0, CS28_SW3, CS30_SW3, CS29_SW3}, /* RGB12 */
- {0, CS28_SW4, CS30_SW4, CS29_SW4}, /* RGB13 */
- {0, CS28_SW5, CS30_SW5, CS29_SW5}, /* RGB14 */
- {0, CS28_SW6, CS30_SW6, CS29_SW6}, /* RGB15 */
- {0, CS28_SW7, CS30_SW7, CS29_SW7}, /* RGB16 */
- {0, CS28_SW8, CS30_SW8, CS29_SW8}, /* RGB17 */
- {0, CS28_SW9, CS30_SW9, CS29_SW9}, /* RGB18 */
- {0, CS31_SW1, CS33_SW1, CS32_SW1}, /* RGB28 */
- {0, CS31_SW2, CS33_SW2, CS32_SW2}, /* RGB29 */
- {0, CS31_SW3, CS33_SW3, CS32_SW3}, /* RGB30 */
- {0, CS31_SW4, CS33_SW4, CS32_SW4}, /* RGB31 */
- {0, CS31_SW5, CS33_SW5, CS32_SW5}, /* RGB32 */
- {0, CS31_SW6, CS33_SW6, CS32_SW6}, /* RGB33 */
- {0, CS25_SW1, CS27_SW1, CS26_SW1}, /* RGB1 */
- {0, CS25_SW2, CS27_SW2, CS26_SW2}, /* RGB2 */
- {0, CS25_SW3, CS27_SW3, CS26_SW3}, /* RGB3 */
- {0, CS25_SW4, CS27_SW4, CS26_SW4}, /* RGB4 */
- {0, CS25_SW5, CS27_SW5, CS26_SW5}, /* RGB5 */
- {0, CS25_SW6, CS27_SW6, CS26_SW6}, /* RGB6 */
- {0, CS25_SW7, CS27_SW7, CS26_SW7}, /* RGB7 */
- {0, CS25_SW8, CS27_SW8, CS26_SW8}, /* RGB8 */
- {0, CS25_SW9, CS27_SW9, CS26_SW9}, /* RGB9 */
- {0, CS34_SW1, CS36_SW1, CS35_SW1}, /* RGB46 */
- {0, CS34_SW2, CS36_SW2, CS35_SW2}, /* RGB47 */
- {0, CS34_SW3, CS36_SW3, CS35_SW3}, /* RGB48 */
- {0, CS34_SW4, CS36_SW4, CS35_SW4}, /* RGB49 */
- {0, CS34_SW5, CS36_SW5, CS35_SW5}, /* RGB50 */
- {0, CS31_SW7, CS33_SW7, CS32_SW7}, /* RGB34 */
- {0, CS22_SW1, CS24_SW1, CS23_SW1}, /* RGB37 */
- {0, CS22_SW2, CS24_SW2, CS23_SW2}, /* RGB38 */
- {0, CS22_SW3, CS24_SW3, CS23_SW3}, /* RGB39 */
- {0, CS22_SW4, CS24_SW4, CS23_SW4}, /* RGB40 */
- {0, CS22_SW5, CS24_SW5, CS23_SW5}, /* RGB41 */
- {0, CS22_SW6, CS24_SW6, CS23_SW6}, /* RGB42 */
- {0, CS22_SW7, CS24_SW7, CS23_SW7}, /* RGB43 */
- {0, CS22_SW8, CS24_SW8, CS23_SW8}, /* RGB44 */
- {0, CS22_SW9, CS24_SW9, CS23_SW9}, /* RGB45 */
- {0, CS34_SW9, CS36_SW9, CS35_SW9}, /* RGB54 */
- {0, CS34_SW8, CS36_SW8, CS35_SW8}, /* RGB53 */
- {0, CS34_SW7, CS36_SW7, CS35_SW7}, /* RGB52 */
- {0, CS34_SW6, CS36_SW6, CS35_SW6}, /* RGB51 */
- {0, CS31_SW8, CS33_SW8, CS32_SW8}, /* RGB35 */
- {0, CS19_SW2, CS21_SW2, CS20_SW2}, /* RGB56 */
- {0, CS19_SW4, CS21_SW4, CS20_SW4}, /* RGB60 */
- {0, CS19_SW5, CS21_SW5, CS20_SW5}, /* RGB59 */
- {0, CS19_SW6, CS21_SW6, CS20_SW6}, /* RGB60 */
- {0, CS19_SW7, CS21_SW7, CS20_SW7}, /* RGB61 */
- {0, CS19_SW8, CS21_SW8, CS20_SW8}, /* RGB62 */
- {0, CS19_SW9, CS21_SW9, CS20_SW9}, /* RGB63 */
- {0, CS19_SW3, CS21_SW3, CS20_SW3}, /* RGB57 */
- {0, CS19_SW1, CS21_SW1, CS20_SW1}, /* RGB55 */
- {0, CS37_SW5, CS39_SW5, CS38_SW5}, /* RGB23 */
- {0, CS37_SW6, CS39_SW6, CS38_SW6}, /* RGB24 */
- {0, CS37_SW7, CS39_SW7, CS38_SW7}, /* RGB25 */
- {0, CS37_SW8, CS39_SW8, CS38_SW8}, /* RGB26 */
- {0, CS31_SW9, CS33_SW9, CS32_SW9}, /* RGB36 */
+ {0, SW1_CS28, SW1_CS30, SW1_CS29}, /* RGB10 */
+ {0, SW2_CS28, SW2_CS30, SW2_CS29}, /* RGB11 */
+ {0, SW3_CS28, SW3_CS30, SW3_CS29}, /* RGB12 */
+ {0, SW4_CS28, SW4_CS30, SW4_CS29}, /* RGB13 */
+ {0, SW5_CS28, SW5_CS30, SW5_CS29}, /* RGB14 */
+ {0, SW6_CS28, SW6_CS30, SW6_CS29}, /* RGB15 */
+ {0, SW7_CS28, SW7_CS30, SW7_CS29}, /* RGB16 */
+ {0, SW8_CS28, SW8_CS30, SW8_CS29}, /* RGB17 */
+ {0, SW9_CS28, SW9_CS30, SW9_CS29}, /* RGB18 */
+ {0, SW1_CS31, SW1_CS33, SW1_CS32}, /* RGB28 */
+ {0, SW2_CS31, SW2_CS33, SW2_CS32}, /* RGB29 */
+ {0, SW3_CS31, SW3_CS33, SW3_CS32}, /* RGB30 */
+ {0, SW4_CS31, SW4_CS33, SW4_CS32}, /* RGB31 */
+ {0, SW5_CS31, SW5_CS33, SW5_CS32}, /* RGB32 */
+ {0, SW6_CS31, SW6_CS33, SW6_CS32}, /* RGB33 */
+ {0, SW1_CS25, SW1_CS27, SW1_CS26}, /* RGB1 */
+ {0, SW2_CS25, SW2_CS27, SW2_CS26}, /* RGB2 */
+ {0, SW3_CS25, SW3_CS27, SW3_CS26}, /* RGB3 */
+ {0, SW4_CS25, SW4_CS27, SW4_CS26}, /* RGB4 */
+ {0, SW5_CS25, SW5_CS27, SW5_CS26}, /* RGB5 */
+ {0, SW6_CS25, SW6_CS27, SW6_CS26}, /* RGB6 */
+ {0, SW7_CS25, SW7_CS27, SW7_CS26}, /* RGB7 */
+ {0, SW8_CS25, SW8_CS27, SW8_CS26}, /* RGB8 */
+ {0, SW9_CS25, SW9_CS27, SW9_CS26}, /* RGB9 */
+ {0, SW1_CS34, SW1_CS36, SW1_CS35}, /* RGB46 */
+ {0, SW2_CS34, SW2_CS36, SW2_CS35}, /* RGB47 */
+ {0, SW3_CS34, SW3_CS36, SW3_CS35}, /* RGB48 */
+ {0, SW4_CS34, SW4_CS36, SW4_CS35}, /* RGB49 */
+ {0, SW5_CS34, SW5_CS36, SW5_CS35}, /* RGB50 */
+ {0, SW7_CS31, SW7_CS33, SW7_CS32}, /* RGB34 */
+ {0, SW1_CS22, SW1_CS24, SW1_CS23}, /* RGB37 */
+ {0, SW2_CS22, SW2_CS24, SW2_CS23}, /* RGB38 */
+ {0, SW3_CS22, SW3_CS24, SW3_CS23}, /* RGB39 */
+ {0, SW4_CS22, SW4_CS24, SW4_CS23}, /* RGB40 */
+ {0, SW5_CS22, SW5_CS24, SW5_CS23}, /* RGB41 */
+ {0, SW6_CS22, SW6_CS24, SW6_CS23}, /* RGB42 */
+ {0, SW7_CS22, SW7_CS24, SW7_CS23}, /* RGB43 */
+ {0, SW8_CS22, SW8_CS24, SW8_CS23}, /* RGB44 */
+ {0, SW9_CS22, SW9_CS24, SW9_CS23}, /* RGB45 */
+ {0, SW9_CS34, SW9_CS36, SW9_CS35}, /* RGB54 */
+ {0, SW8_CS34, SW8_CS36, SW8_CS35}, /* RGB53 */
+ {0, SW7_CS34, SW7_CS36, SW7_CS35}, /* RGB52 */
+ {0, SW6_CS34, SW6_CS36, SW6_CS35}, /* RGB51 */
+ {0, SW8_CS31, SW8_CS33, SW8_CS32}, /* RGB35 */
+ {0, SW2_CS19, SW2_CS21, SW2_CS20}, /* RGB56 */
+ {0, SW4_CS19, SW4_CS21, SW4_CS20}, /* RGB60 */
+ {0, SW5_CS19, SW5_CS21, SW5_CS20}, /* RGB59 */
+ {0, SW6_CS19, SW6_CS21, SW6_CS20}, /* RGB60 */
+ {0, SW7_CS19, SW7_CS21, SW7_CS20}, /* RGB61 */
+ {0, SW8_CS19, SW8_CS21, SW8_CS20}, /* RGB62 */
+ {0, SW9_CS19, SW9_CS21, SW9_CS20}, /* RGB63 */
+ {0, SW3_CS19, SW3_CS21, SW3_CS20}, /* RGB57 */
+ {0, SW1_CS19, SW1_CS21, SW1_CS20}, /* RGB55 */
+ {0, SW5_CS37, SW5_CS39, SW5_CS38}, /* RGB23 */
+ {0, SW6_CS37, SW6_CS39, SW6_CS38}, /* RGB24 */
+ {0, SW7_CS37, SW7_CS39, SW7_CS38}, /* RGB25 */
+ {0, SW8_CS37, SW8_CS39, SW8_CS38}, /* RGB26 */
+ {0, SW9_CS31, SW9_CS33, SW9_CS32}, /* RGB36 */
- {0, CS6_SW1, CS8_SW1, CS7_SW1}, /* RGB64 */
- {0, CS6_SW3, CS8_SW3, CS7_SW3}, /* RGB66 */
- {0, CS6_SW4, CS8_SW4, CS7_SW4}, /* RGB67 */
- {0, CS6_SW5, CS8_SW5, CS7_SW5}, /* RGB69 */
- {0, CS6_SW6, CS8_SW6, CS7_SW6}, /* RGB70 */
- {0, CS6_SW2, CS8_SW2, CS7_SW2}, /* RGB65 */
+ {0, SW1_CS6, SW1_CS8, SW1_CS7}, /* RGB64 */
+ {0, SW3_CS6, SW3_CS8, SW3_CS7}, /* RGB66 */
+ {0, SW4_CS6, SW4_CS8, SW4_CS7}, /* RGB67 */
+ {0, SW5_CS6, SW5_CS8, SW5_CS7}, /* RGB69 */
+ {0, SW6_CS6, SW6_CS8, SW6_CS7}, /* RGB70 */
+ {0, SW2_CS6, SW2_CS8, SW2_CS7}, /* RGB65 */
- {0, CS37_SW1, CS39_SW1, CS38_SW1}, /* RGB19 */
- {0, CS37_SW2, CS39_SW2, CS38_SW2}, /* RGB20 */
- {0, CS37_SW3, CS39_SW3, CS38_SW3}, /* RGB21 */
- {0, CS37_SW4, CS39_SW4, CS38_SW4}, /* RGB22 */
- {0, CS37_SW9, CS39_SW9, CS38_SW9}, /* RGB27 */
+ {0, SW1_CS37, SW1_CS39, SW1_CS38}, /* RGB19 */
+ {0, SW2_CS37, SW2_CS39, SW2_CS38}, /* RGB20 */
+ {0, SW3_CS37, SW3_CS39, SW3_CS38}, /* RGB21 */
+ {0, SW4_CS37, SW4_CS39, SW4_CS38}, /* RGB22 */
+ {0, SW9_CS37, SW9_CS39, SW9_CS38}, /* RGB27 */
};
led_config_t g_led_config = {
{
@@ -118,12 +118,12 @@ led_config_t g_led_config = {
};
const is31fl3741_led_t g_is31_indicator_leds[6] = {
- {0, CS5_SW1, CS3_SW1, CS4_SW1}, /* RGB71 */
- {0, CS5_SW2, CS3_SW2, CS4_SW2}, /* RGB72 */
- {0, CS5_SW3, CS3_SW3, CS4_SW3}, /* RGB73 */
- {0, CS5_SW4, CS3_SW4, CS4_SW4}, /* RGB74 */
- {0, CS5_SW5, CS3_SW5, CS4_SW5}, /* RGB75 */
- {0, CS5_SW6, CS3_SW6, CS4_SW6}, /* RGB76 */
+ {0, SW1_CS5, SW1_CS3, SW1_CS4}, /* RGB71 */
+ {0, SW2_CS5, SW2_CS3, SW2_CS4}, /* RGB72 */
+ {0, SW3_CS5, SW3_CS3, SW3_CS4}, /* RGB73 */
+ {0, SW4_CS5, SW4_CS3, SW4_CS4}, /* RGB74 */
+ {0, SW5_CS5, SW5_CS3, SW5_CS4}, /* RGB75 */
+ {0, SW6_CS5, SW6_CS3, SW6_CS4}, /* RGB76 */
};
bool led_update_kb(led_t led_state) {
diff --git a/keyboards/miller/gm862/gm862.c b/keyboards/miller/gm862/gm862.c
index 3dcbe122fb1..534ef6cdc65 100644
--- a/keyboards/miller/gm862/gm862.c
+++ b/keyboards/miller/gm862/gm862.c
@@ -2,67 +2,67 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- {0, B_1, A_1, C_1},
- {0, B_2, A_2, C_2},
- {0, B_3, A_3, C_3},
- {0, B_4, A_4, C_4},
- {0, B_5, A_5, C_5},
- {0, B_6, A_6, C_6},
- {0, B_7, A_7, C_7},
- {0, B_8, A_8, C_8},
- {0, B_9, A_9, C_9},
- {0, B_10, A_10, C_10},
- {0, B_11, A_11, C_11},
- {0, B_12, A_12, C_12},
- {0, B_13, A_13, C_13},
- {0, B_14, A_14, C_14},
- {0, E_1, D_1, F_1},
- {0, E_2, D_2, F_2},
- {0, E_3, D_3, F_3},
- {0, E_4, D_4, F_4},
- {0, E_5, D_5, F_5},
- {0, E_6, D_6, F_6},
- {0, E_7, D_7, F_7},
- {0, E_8, D_8, F_8},
- {0, E_9, D_9, F_9},
- {0, E_10, D_10, F_10},
- {0, E_11, D_11, F_11},
- {0, E_12, D_12, F_12},
- {0, E_13, D_13, F_13},
- {0, E_14, D_14, F_14},
- {0, H_1, G_1, I_1},
- {0, H_2, G_2, I_2},
- {0, H_3, G_3, I_3},
- {0, H_4, G_4, I_4},
- {0, H_5, G_5, I_5},
- {0, H_6, G_6, I_6},
- {0, H_7, G_7, I_7},
- {0, H_8, G_8, I_8},
- {0, H_9, G_9, I_9},
- {0, H_10, G_10, I_10},
- {0, H_11, G_11, I_11},
- {0, H_12, G_12, I_12},
- {0, H_13, G_13, I_13},
- {0, K_1, J_1, L_1},
- {0, K_2, J_2, L_2},
- {0, K_3, J_3, L_3},
- {0, K_4, J_4, L_4},
- {0, K_5, J_5, L_5},
- {0, K_6, J_6, L_6},
- {0, K_7, J_7, L_7},
- {0, K_8, J_8, L_8},
- {0, K_9, J_9, L_9},
- {0, K_10, J_10, L_10},
- {0, K_11, J_11, L_11},
- {0, K_14, J_14, L_14},
- {0, B_16, A_16, C_16},
- {0, E_16, D_16, F_16},
- {0, H_16, G_16, I_16},
- {0, K_16, J_16, L_16},
- {0, K_15, J_15, L_15},
- {0, K_12, J_12, L_12},
- {0, K_13, J_13, L_13},
- {0, H_14, G_14, I_14},
+ {0, SW2_CS1, SW1_CS1, SW3_CS1},
+ {0, SW2_CS2, SW1_CS2, SW3_CS2},
+ {0, SW2_CS3, SW1_CS3, SW3_CS3},
+ {0, SW2_CS4, SW1_CS4, SW3_CS4},
+ {0, SW2_CS5, SW1_CS5, SW3_CS5},
+ {0, SW2_CS6, SW1_CS6, SW3_CS6},
+ {0, SW2_CS7, SW1_CS7, SW3_CS7},
+ {0, SW2_CS8, SW1_CS8, SW3_CS8},
+ {0, SW2_CS9, SW1_CS9, SW3_CS9},
+ {0, SW2_CS10, SW1_CS10, SW3_CS10},
+ {0, SW2_CS11, SW1_CS11, SW3_CS11},
+ {0, SW2_CS12, SW1_CS12, SW3_CS12},
+ {0, SW2_CS13, SW1_CS13, SW3_CS13},
+ {0, SW2_CS14, SW1_CS14, SW3_CS14},
+ {0, SW5_CS1, SW4_CS1, SW6_CS1},
+ {0, SW5_CS2, SW4_CS2, SW6_CS2},
+ {0, SW5_CS3, SW4_CS3, SW6_CS3},
+ {0, SW5_CS4, SW4_CS4, SW6_CS4},
+ {0, SW5_CS5, SW4_CS5, SW6_CS5},
+ {0, SW5_CS6, SW4_CS6, SW6_CS6},
+ {0, SW5_CS7, SW4_CS7, SW6_CS7},
+ {0, SW5_CS8, SW4_CS8, SW6_CS8},
+ {0, SW5_CS9, SW4_CS9, SW6_CS9},
+ {0, SW5_CS10, SW4_CS10, SW6_CS10},
+ {0, SW5_CS11, SW4_CS11, SW6_CS11},
+ {0, SW5_CS12, SW4_CS12, SW6_CS12},
+ {0, SW5_CS13, SW4_CS13, SW6_CS13},
+ {0, SW5_CS14, SW4_CS14, SW6_CS14},
+ {0, SW8_CS1, SW7_CS1, SW9_CS1},
+ {0, SW8_CS2, SW7_CS2, SW9_CS2},
+ {0, SW8_CS3, SW7_CS3, SW9_CS3},
+ {0, SW8_CS4, SW7_CS4, SW9_CS4},
+ {0, SW8_CS5, SW7_CS5, SW9_CS5},
+ {0, SW8_CS6, SW7_CS6, SW9_CS6},
+ {0, SW8_CS7, SW7_CS7, SW9_CS7},
+ {0, SW8_CS8, SW7_CS8, SW9_CS8},
+ {0, SW8_CS9, SW7_CS9, SW9_CS9},
+ {0, SW8_CS10, SW7_CS10, SW9_CS10},
+ {0, SW8_CS11, SW7_CS11, SW9_CS11},
+ {0, SW8_CS12, SW7_CS12, SW9_CS12},
+ {0, SW8_CS13, SW7_CS13, SW9_CS13},
+ {0, SW11_CS1, SW10_CS1, SW12_CS1},
+ {0, SW11_CS2, SW10_CS2, SW12_CS2},
+ {0, SW11_CS3, SW10_CS3, SW12_CS3},
+ {0, SW11_CS4, SW10_CS4, SW12_CS4},
+ {0, SW11_CS5, SW10_CS5, SW12_CS5},
+ {0, SW11_CS6, SW10_CS6, SW12_CS6},
+ {0, SW11_CS7, SW10_CS7, SW12_CS7},
+ {0, SW11_CS8, SW10_CS8, SW12_CS8},
+ {0, SW11_CS9, SW10_CS9, SW12_CS9},
+ {0, SW11_CS10, SW10_CS10, SW12_CS10},
+ {0, SW11_CS11, SW10_CS11, SW12_CS11},
+ {0, SW11_CS14, SW10_CS14, SW12_CS14},
+ {0, SW2_CS16, SW1_CS16, SW3_CS16},
+ {0, SW5_CS16, SW4_CS16, SW6_CS16},
+ {0, SW8_CS16, SW7_CS16, SW9_CS16},
+ {0, SW11_CS16, SW10_CS16, SW12_CS16},
+ {0, SW11_CS15, SW10_CS15, SW12_CS15},
+ {0, SW11_CS12, SW10_CS12, SW12_CS12},
+ {0, SW11_CS13, SW10_CS13, SW12_CS13},
+ {0, SW8_CS14, SW7_CS14, SW9_CS14},
};
led_config_t g_led_config = { {
diff --git a/keyboards/monsgeek/m1/m1.c b/keyboards/monsgeek/m1/m1.c
index a0375b2c0f7..006eb66d7f9 100644
--- a/keyboards/monsgeek/m1/m1.c
+++ b/keyboards/monsgeek/m1/m1.c
@@ -24,121 +24,121 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, D_2, E_2, F_2},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, A_15, B_15, C_15},
- {0, G_13, H_13, I_13},
- {1, D_3, E_3, F_3},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB1_CA15, CB2_CA15, CB3_CA15},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
- {0, J_1, K_1, L_1},
- {0, A_16, B_16, C_16},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, D_7, E_7, F_7},
- {1, D_4, E_4, F_4},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB1_CA16, CB2_CA16, CB3_CA16},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
+ {1, CB4_CA4, CB5_CA4, CB6_CA4},
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
- {0, D_15, E_15, F_15},
- {1, D_6, E_6, F_6},
- {1, D_5, E_5, F_5},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
- {1, G_4, H_4, I_4},
- {1, G_5, H_5, I_5},
- {1, G_6, H_6, I_6},
- {1, G_7, H_7, I_7},
- {1, G_8, H_8, I_8},
- {1, G_9, H_9, I_9},
- {1, G_10, H_10, I_10},
- {1, G_11, H_11, I_11},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
+ {1, CB7_CA6, CB8_CA6, CB9_CA6},
+ {1, CB7_CA7, CB8_CA7, CB9_CA7},
+ {1, CB7_CA8, CB8_CA8, CB9_CA8},
+ {1, CB7_CA9, CB8_CA9, CB9_CA9},
+ {1, CB7_CA10, CB8_CA10, CB9_CA10},
+ {1, CB7_CA11, CB8_CA11, CB9_CA11},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
- {1, J_4, K_4, L_4},
- {1, J_5, K_5, L_5},
- {1, J_6, K_6, L_6},
- {1, J_7, K_7, L_7},
- {1, J_8, K_8, L_8},
- {1, J_9, K_9, L_9},
- {1, J_10, K_10, L_10},
- {1, J_11, K_11, L_11},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
+ {1, CB10_CA6, CB11_CA6, CB12_CA6},
+ {1, CB10_CA7, CB11_CA7, CB12_CA7},
+ {1, CB10_CA8, CB11_CA8, CB12_CA8},
+ {1, CB10_CA9, CB11_CA9, CB12_CA9},
+ {1, CB10_CA10, CB11_CA10, CB12_CA10},
+ {1, CB10_CA11, CB11_CA11, CB12_CA11},
};
// clang-format on
diff --git a/keyboards/monsgeek/m3/m3.c b/keyboards/monsgeek/m3/m3.c
index 2bdba9fa314..9a93a7d7d4e 100644
--- a/keyboards/monsgeek/m3/m3.c
+++ b/keyboards/monsgeek/m3/m3.c
@@ -25,103 +25,103 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | | B location
* | | | | */
/*row0*/
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
- {1, A_15, B_15, C_15},
- {1, A_16, B_16, C_16},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB1_CA15, CB2_CA15, CB3_CA15},
+ {1, CB1_CA16, CB2_CA16, CB3_CA16},
/*row1*/
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
- {1, D_2, E_2, F_2},
- {1, D_3, E_3, F_3},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
/*row2*/
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
/*row3*/
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, G_13, H_13, I_13},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
/*row4*/
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, J_4, K_4, L_4},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
/*row5*/
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
- {0, D_15, E_15, F_15},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
};
#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/monsgeek/m5/m5.c b/keyboards/monsgeek/m5/m5.c
index 2e244542ef5..822214a05ca 100644
--- a/keyboards/monsgeek/m5/m5.c
+++ b/keyboards/monsgeek/m5/m5.c
@@ -25,125 +25,125 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | | B location
* | | | | */
/*row0*/
- {1, A_1, B_1, C_1},
- {1, A_2, B_2, C_2},
- {1, A_3, B_3, C_3},
- {1, A_4, B_4, C_4},
- {1, A_5, B_5, C_5},
- {1, A_6, B_6, C_6},
- {1, A_7, B_7, C_7},
- {1, A_8, B_8, C_8},
- {1, A_9, B_9, C_9},
- {1, A_10, B_10, C_10},
- {1, A_11, B_11, C_11},
- {1, A_12, B_12, C_12},
- {1, A_13, B_13, C_13},
- {1, A_14, B_14, C_14},
- {1, A_15, B_15, C_15},
- {1, A_16, B_16, C_16},
- {1, D_11, E_11, F_11},
- {1, D_12, E_12, F_12},
- {1, D_13, E_13, F_13},
- {1, D_14, E_14, F_14},
+ {1, CB1_CA1, CB2_CA1, CB3_CA1},
+ {1, CB1_CA2, CB2_CA2, CB3_CA2},
+ {1, CB1_CA3, CB2_CA3, CB3_CA3},
+ {1, CB1_CA4, CB2_CA4, CB3_CA4},
+ {1, CB1_CA5, CB2_CA5, CB3_CA5},
+ {1, CB1_CA6, CB2_CA6, CB3_CA6},
+ {1, CB1_CA7, CB2_CA7, CB3_CA7},
+ {1, CB1_CA8, CB2_CA8, CB3_CA8},
+ {1, CB1_CA9, CB2_CA9, CB3_CA9},
+ {1, CB1_CA10, CB2_CA10, CB3_CA10},
+ {1, CB1_CA11, CB2_CA11, CB3_CA11},
+ {1, CB1_CA12, CB2_CA12, CB3_CA12},
+ {1, CB1_CA13, CB2_CA13, CB3_CA13},
+ {1, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB1_CA15, CB2_CA15, CB3_CA15},
+ {1, CB1_CA16, CB2_CA16, CB3_CA16},
+ {1, CB4_CA11, CB5_CA11, CB6_CA11},
+ {1, CB4_CA12, CB5_CA12, CB6_CA12},
+ {1, CB4_CA13, CB5_CA13, CB6_CA13},
+ {1, CB4_CA14, CB5_CA14, CB6_CA14},
/*row1*/
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1 },
- {1, D_2, E_2, F_2},
- {1, D_3, E_3, F_3},
- {1, D_4, E_4, F_4},
- {1, D_5, E_5, F_5},
- {1, D_6, E_6, F_6},
- {1, D_7, E_7, F_7},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1 },
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
+ {1, CB4_CA4, CB5_CA4, CB6_CA4},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
/*row2*/
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
- {1, D_8, E_8, F_8},
- {1, D_9, E_9, F_9},
- {1, D_10, E_10, F_10},
- {1, G_7, H_7, I_7},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
+ {1, CB4_CA8, CB5_CA8, CB6_CA8},
+ {1, CB4_CA9, CB5_CA9, CB6_CA9},
+ {1, CB4_CA10, CB5_CA10, CB6_CA10},
+ {1, CB7_CA7, CB8_CA7, CB9_CA7},
/*row3*/
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, G_13, H_13, I_13},
- {1, G_4, H_4, I_4},
- {1, G_5, H_5, I_5},
- {1, G_6, H_6, I_6},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
+ {1, CB7_CA6, CB8_CA6, CB9_CA6},
/*row4*/
- {0, J_1, K_1, L_1},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, J_4, K_4, L_4},
- {1, J_7, K_7, L_7},
- {1, J_8, K_8, L_8},
- {1, J_9, K_9, L_9},
- {1, J_10, K_10, L_10},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA7, CB11_CA7, CB12_CA7},
+ {1, CB10_CA8, CB11_CA8, CB12_CA8},
+ {1, CB10_CA9, CB11_CA9, CB12_CA9},
+ {1, CB10_CA10, CB11_CA10, CB12_CA10},
/*row5*/
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
- {0, D_15, E_15, F_15},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
- {1, J_5, K_5, L_5},
- {1, J_6, K_6, L_6},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
+ {1, CB10_CA6, CB11_CA6, CB12_CA6},
};
#endif
diff --git a/keyboards/monsgeek/m6/m6.c b/keyboards/monsgeek/m6/m6.c
index 3d0a60eb0db..ef7fc92015f 100644
--- a/keyboards/monsgeek/m6/m6.c
+++ b/keyboards/monsgeek/m6/m6.c
@@ -24,105 +24,105 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, A_1, B_1, C_1},
- {0, A_2, B_2, C_2},
- {0, A_3, B_3, C_3},
- {0, A_4, B_4, C_4},
- {0, A_5, B_5, C_5},
- {0, A_6, B_6, C_6},
- {0, A_7, B_7, C_7},
- {0, A_8, B_8, C_8},
- {0, A_9, B_9, C_9},
- {0, A_10, B_10, C_10},
- {0, A_11, B_11, C_11},
- {0, A_12, B_12, C_12},
- {0, A_13, B_13, C_13},
- {0, A_14, B_14, C_14},
- {1, D_1, E_1, F_1},
+ {0, CB1_CA1, CB2_CA1, CB3_CA1},
+ {0, CB1_CA2, CB2_CA2, CB3_CA2},
+ {0, CB1_CA3, CB2_CA3, CB3_CA3},
+ {0, CB1_CA4, CB2_CA4, CB3_CA4},
+ {0, CB1_CA5, CB2_CA5, CB3_CA5},
+ {0, CB1_CA6, CB2_CA6, CB3_CA6},
+ {0, CB1_CA7, CB2_CA7, CB3_CA7},
+ {0, CB1_CA8, CB2_CA8, CB3_CA8},
+ {0, CB1_CA9, CB2_CA9, CB3_CA9},
+ {0, CB1_CA10, CB2_CA10, CB3_CA10},
+ {0, CB1_CA11, CB2_CA11, CB3_CA11},
+ {0, CB1_CA12, CB2_CA12, CB3_CA12},
+ {0, CB1_CA13, CB2_CA13, CB3_CA13},
+ {0, CB1_CA14, CB2_CA14, CB3_CA14},
+ {1, CB4_CA1, CB5_CA1, CB6_CA1},
- {0, D_1, E_1, F_1},
- {0, D_2, E_2, F_2},
- {0, D_3, E_3, F_3},
- {0, D_4, E_4, F_4},
- {0, D_5, E_5, F_5},
- {0, D_6, E_6, F_6},
- {0, D_7, E_7, F_7},
- {0, D_8, E_8, F_8},
- {0, D_9, E_9, F_9},
- {0, D_10, E_10, F_10},
- {0, D_11, E_11, F_11},
- {0, D_12, E_12, F_12},
- {0, D_13, E_13, F_13},
- {0, D_14, E_14, F_14},
- {1, D_2, E_2, F_2},
+ {0, CB4_CA1, CB5_CA1, CB6_CA1},
+ {0, CB4_CA2, CB5_CA2, CB6_CA2},
+ {0, CB4_CA3, CB5_CA3, CB6_CA3},
+ {0, CB4_CA4, CB5_CA4, CB6_CA4},
+ {0, CB4_CA5, CB5_CA5, CB6_CA5},
+ {0, CB4_CA6, CB5_CA6, CB6_CA6},
+ {0, CB4_CA7, CB5_CA7, CB6_CA7},
+ {0, CB4_CA8, CB5_CA8, CB6_CA8},
+ {0, CB4_CA9, CB5_CA9, CB6_CA9},
+ {0, CB4_CA10, CB5_CA10, CB6_CA10},
+ {0, CB4_CA11, CB5_CA11, CB6_CA11},
+ {0, CB4_CA12, CB5_CA12, CB6_CA12},
+ {0, CB4_CA13, CB5_CA13, CB6_CA13},
+ {0, CB4_CA14, CB5_CA14, CB6_CA14},
+ {1, CB4_CA2, CB5_CA2, CB6_CA2},
- {0, G_1, H_1, I_1},
- {0, G_2, H_2, I_2},
- {0, G_3, H_3, I_3},
- {0, G_4, H_4, I_4},
- {0, G_5, H_5, I_5},
- {0, G_6, H_6, I_6},
- {0, G_7, H_7, I_7},
- {0, G_8, H_8, I_8},
- {0, G_9, H_9, I_9},
- {0, G_10, H_10, I_10},
- {0, G_11, H_11, I_11},
- {0, G_12, H_12, I_12},
- {0, A_15, B_15, C_15},
- {0, G_13, H_13, I_13},
- {1, D_3, E_3, F_3},
+ {0, CB7_CA1, CB8_CA1, CB9_CA1},
+ {0, CB7_CA2, CB8_CA2, CB9_CA2},
+ {0, CB7_CA3, CB8_CA3, CB9_CA3},
+ {0, CB7_CA4, CB8_CA4, CB9_CA4},
+ {0, CB7_CA5, CB8_CA5, CB9_CA5},
+ {0, CB7_CA6, CB8_CA6, CB9_CA6},
+ {0, CB7_CA7, CB8_CA7, CB9_CA7},
+ {0, CB7_CA8, CB8_CA8, CB9_CA8},
+ {0, CB7_CA9, CB8_CA9, CB9_CA9},
+ {0, CB7_CA10, CB8_CA10, CB9_CA10},
+ {0, CB7_CA11, CB8_CA11, CB9_CA11},
+ {0, CB7_CA12, CB8_CA12, CB9_CA12},
+ {0, CB1_CA15, CB2_CA15, CB3_CA15},
+ {0, CB7_CA13, CB8_CA13, CB9_CA13},
+ {1, CB4_CA3, CB5_CA3, CB6_CA3},
- {0, J_1, K_1, L_1},
- {0, A_16, B_16, C_16},
- {0, J_2, K_2, L_2},
- {0, J_3, K_3, L_3},
- {0, J_4, K_4, L_4},
- {0, J_5, K_5, L_5},
- {0, J_6, K_6, L_6},
- {0, J_7, K_7, L_7},
- {0, J_8, K_8, L_8},
- {0, J_9, K_9, L_9},
- {0, J_10, K_10, L_10},
- {0, J_11, K_11, L_11},
- {0, J_12, K_12, L_12},
- {1, D_7, E_7, F_7},
- {1, D_4, E_4, F_4},
+ {0, CB10_CA1, CB11_CA1, CB12_CA1},
+ {0, CB1_CA16, CB2_CA16, CB3_CA16},
+ {0, CB10_CA2, CB11_CA2, CB12_CA2},
+ {0, CB10_CA3, CB11_CA3, CB12_CA3},
+ {0, CB10_CA4, CB11_CA4, CB12_CA4},
+ {0, CB10_CA5, CB11_CA5, CB12_CA5},
+ {0, CB10_CA6, CB11_CA6, CB12_CA6},
+ {0, CB10_CA7, CB11_CA7, CB12_CA7},
+ {0, CB10_CA8, CB11_CA8, CB12_CA8},
+ {0, CB10_CA9, CB11_CA9, CB12_CA9},
+ {0, CB10_CA10, CB11_CA10, CB12_CA10},
+ {0, CB10_CA11, CB11_CA11, CB12_CA11},
+ {0, CB10_CA12, CB11_CA12, CB12_CA12},
+ {1, CB4_CA7, CB5_CA7, CB6_CA7},
+ {1, CB4_CA4, CB5_CA4, CB6_CA4},
- {0, J_13, K_13, L_13},
- {0, J_14, K_14, L_14},
- {0, J_15, K_15, L_15},
- {0, J_16, K_16, L_16},
- {0, G_14, H_14, I_14},
- {0, G_15, H_15, I_15},
- {0, G_16, H_16, I_16},
- {0, D_15, E_15, F_15},
- {1, D_6, E_6, F_6},
- {1, D_5, E_5, F_5},
+ {0, CB10_CA13, CB11_CA13, CB12_CA13},
+ {0, CB10_CA14, CB11_CA14, CB12_CA14},
+ {0, CB10_CA15, CB11_CA15, CB12_CA15},
+ {0, CB10_CA16, CB11_CA16, CB12_CA16},
+ {0, CB7_CA14, CB8_CA14, CB9_CA14},
+ {0, CB7_CA15, CB8_CA15, CB9_CA15},
+ {0, CB7_CA16, CB8_CA16, CB9_CA16},
+ {0, CB4_CA15, CB5_CA15, CB6_CA15},
+ {1, CB4_CA6, CB5_CA6, CB6_CA6},
+ {1, CB4_CA5, CB5_CA5, CB6_CA5},
- {1, G_1, H_1, I_1},
- {1, G_2, H_2, I_2},
- {1, G_3, H_3, I_3},
- {1, G_4, H_4, I_4},
- {1, G_5, H_5, I_5},
- {1, G_6, H_6, I_6},
- {1, G_7, H_7, I_7},
- {1, G_8, H_8, I_8},
- {1, G_9, H_9, I_9},
- {1, G_10, H_10, I_10},
- {1, G_11, H_11, I_11},
+ {1, CB7_CA1, CB8_CA1, CB9_CA1},
+ {1, CB7_CA2, CB8_CA2, CB9_CA2},
+ {1, CB7_CA3, CB8_CA3, CB9_CA3},
+ {1, CB7_CA4, CB8_CA4, CB9_CA4},
+ {1, CB7_CA5, CB8_CA5, CB9_CA5},
+ {1, CB7_CA6, CB8_CA6, CB9_CA6},
+ {1, CB7_CA7, CB8_CA7, CB9_CA7},
+ {1, CB7_CA8, CB8_CA8, CB9_CA8},
+ {1, CB7_CA9, CB8_CA9, CB9_CA9},
+ {1, CB7_CA10, CB8_CA10, CB9_CA10},
+ {1, CB7_CA11, CB8_CA11, CB9_CA11},
- {1, J_1, K_1, L_1},
- {1, J_2, K_2, L_2},
- {1, J_3, K_3, L_3},
- {1, J_4, K_4, L_4},
- {1, J_5, K_5, L_5},
- {1, J_6, K_6, L_6},
- {1, J_7, K_7, L_7},
- {1, J_8, K_8, L_8},
- {1, J_9, K_9, L_9},
- {1, J_10, K_10, L_10},
- {1, J_11, K_11, L_11},
+ {1, CB10_CA1, CB11_CA1, CB12_CA1},
+ {1, CB10_CA2, CB11_CA2, CB12_CA2},
+ {1, CB10_CA3, CB11_CA3, CB12_CA3},
+ {1, CB10_CA4, CB11_CA4, CB12_CA4},
+ {1, CB10_CA5, CB11_CA5, CB12_CA5},
+ {1, CB10_CA6, CB11_CA6, CB12_CA6},
+ {1, CB10_CA7, CB11_CA7, CB12_CA7},
+ {1, CB10_CA8, CB11_CA8, CB12_CA8},
+ {1, CB10_CA9, CB11_CA9, CB12_CA9},
+ {1, CB10_CA10, CB11_CA10, CB12_CA10},
+ {1, CB10_CA11, CB11_CA11, CB12_CA11},
};
// clang-format on
diff --git a/keyboards/mt/mt64rgb/mt64rgb.c b/keyboards/mt/mt64rgb/mt64rgb.c
index 42e6a48dc2a..bcf26de2313 100644
--- a/keyboards/mt/mt64rgb/mt64rgb.c
+++ b/keyboards/mt/mt64rgb/mt64rgb.c
@@ -24,74 +24,74 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | | B location
* | | | | */
- {0, A_1, B_1, C_1},
- {0, D_1, E_1, F_1},
- {0, G_1, H_1, I_1},
- {0, J_1, K_1, L_1},
- {0, A_6, B_6, C_6},
- {0, D_6, E_6, F_6},
- {0, G_6, H_6, I_6},
- {0, J_6, K_6, L_6},
- {0, A_11, B_11, C_11},
- {0, D_11, E_11, F_11},
- {0, G_11, H_11, I_11},
- {0, J_11, K_11, L_11},
- {0, A_16, B_16, C_16},
- {0, D_16, E_16, F_16},
+ {0, SW1_CS1, SW2_CS1, SW3_CS1},
+ {0, SW4_CS1, SW5_CS1, SW6_CS1},
+ {0, SW7_CS1, SW8_CS1, SW9_CS1},
+ {0, SW10_CS1, SW11_CS1, SW12_CS1},
+ {0, SW1_CS6, SW2_CS6, SW3_CS6},
+ {0, SW4_CS6, SW5_CS6, SW6_CS6},
+ {0, SW7_CS6, SW8_CS6, SW9_CS6},
+ {0, SW10_CS6, SW11_CS6, SW12_CS6},
+ {0, SW1_CS11, SW2_CS11, SW3_CS11},
+ {0, SW4_CS11, SW5_CS11, SW6_CS11},
+ {0, SW7_CS11, SW8_CS11, SW9_CS11},
+ {0, SW10_CS11, SW11_CS11, SW12_CS11},
+ {0, SW1_CS16, SW2_CS16, SW3_CS16},
+ {0, SW4_CS16, SW5_CS16, SW6_CS16},
- {0, A_2, B_2, C_2},
- {0, D_2, E_2, F_2},
- {0, G_2, H_2, I_2},
- {0, J_2, K_2, L_2},
- {0, A_7, B_7, C_7},
- {0, D_7, E_7, F_7},
- {0, G_7, H_7, I_7},
- {0, J_7, K_7, L_7},
- {0, A_12, B_12, C_12},
- {0, D_12, E_12, F_12},
- {0, G_12, H_12, I_12},
- {0, J_12, K_12, L_12},
- {0, G_16, H_16, I_16},
- {0, J_16, K_16, L_16},
+ {0, SW1_CS2, SW2_CS2, SW3_CS2},
+ {0, SW4_CS2, SW5_CS2, SW6_CS2},
+ {0, SW7_CS2, SW8_CS2, SW9_CS2},
+ {0, SW10_CS2, SW11_CS2, SW12_CS2},
+ {0, SW1_CS7, SW2_CS7, SW3_CS7},
+ {0, SW4_CS7, SW5_CS7, SW6_CS7},
+ {0, SW7_CS7, SW8_CS7, SW9_CS7},
+ {0, SW10_CS7, SW11_CS7, SW12_CS7},
+ {0, SW1_CS12, SW2_CS12, SW3_CS12},
+ {0, SW4_CS12, SW5_CS12, SW6_CS12},
+ {0, SW7_CS12, SW8_CS12, SW9_CS12},
+ {0, SW10_CS12, SW11_CS12, SW12_CS12},
+ {0, SW7_CS16, SW8_CS16, SW9_CS16},
+ {0, SW10_CS16, SW11_CS16, SW12_CS16},
- {0, A_3, B_3, C_3},
- {0, D_3, E_3, F_3},
- {0, G_3, H_3, I_3},
- {0, J_3, K_3, L_3},
- {0, A_8, B_8, C_8},
- {0, D_8, E_8, F_8},
- {0, G_8, H_8, I_8},
- {0, J_8, K_8, L_8},
- {0, A_13, B_13, C_13},
- {0, D_13, E_13, F_13},
- {0, G_13, H_13, I_13},
- {0, J_13, K_13, L_13},
- {0, A_15, B_15, C_15},
+ {0, SW1_CS3, SW2_CS3, SW3_CS3},
+ {0, SW4_CS3, SW5_CS3, SW6_CS3},
+ {0, SW7_CS3, SW8_CS3, SW9_CS3},
+ {0, SW10_CS3, SW11_CS3, SW12_CS3},
+ {0, SW1_CS8, SW2_CS8, SW3_CS8},
+ {0, SW4_CS8, SW5_CS8, SW6_CS8},
+ {0, SW7_CS8, SW8_CS8, SW9_CS8},
+ {0, SW10_CS8, SW11_CS8, SW12_CS8},
+ {0, SW1_CS13, SW2_CS13, SW3_CS13},
+ {0, SW4_CS13, SW5_CS13, SW6_CS13},
+ {0, SW7_CS13, SW8_CS13, SW9_CS13},
+ {0, SW10_CS13, SW11_CS13, SW12_CS13},
+ {0, SW1_CS15, SW2_CS15, SW3_CS15},
- {0, A_4, B_4, C_4},
- {0, D_4, E_4, F_4},
- {0, G_4, H_4, I_4},
- {0, J_4, K_4, L_4},
- {0, A_9, B_9, C_9},
- {0, D_9, E_9, F_9},
- {0, G_9, H_9, I_9},
- {0, J_9, K_9, L_9},
- {0, A_14, B_14, C_14},
- {0, D_14, E_14, F_14},
- {0, G_14, H_14, I_14},
- {0, J_14, K_14, L_14},
- {0, D_15, E_15, F_15},
- {0, G_15, H_15, I_15},
+ {0, SW1_CS4, SW2_CS4, SW3_CS4},
+ {0, SW4_CS4, SW5_CS4, SW6_CS4},
+ {0, SW7_CS4, SW8_CS4, SW9_CS4},
+ {0, SW10_CS4, SW11_CS4, SW12_CS4},
+ {0, SW1_CS9, SW2_CS9, SW3_CS9},
+ {0, SW4_CS9, SW5_CS9, SW6_CS9},
+ {0, SW7_CS9, SW8_CS9, SW9_CS9},
+ {0, SW10_CS9, SW11_CS9, SW12_CS9},
+ {0, SW1_CS14, SW2_CS14, SW3_CS14},
+ {0, SW4_CS14, SW5_CS14, SW6_CS14},
+ {0, SW7_CS14, SW8_CS14, SW9_CS14},
+ {0, SW10_CS14, SW11_CS14, SW12_CS14},
+ {0, SW4_CS15, SW5_CS15, SW6_CS15},
+ {0, SW7_CS15, SW8_CS15, SW9_CS15},
- {0, A_5, B_5, C_5},
- {0, D_5, E_5, F_5},
- {0, G_5, H_5, I_5},
- {0, J_5, K_5, L_5},
- {0, A_10, B_10, C_10},
- {0, D_10, E_10, F_10},
- {0, G_10, H_10, I_10},
- {0, J_10, K_10, L_10},
- {0, J_15, K_15, L_15}
+ {0, SW1_CS5, SW2_CS5, SW3_CS5},
+ {0, SW4_CS5, SW5_CS5, SW6_CS5},
+ {0, SW7_CS5, SW8_CS5, SW9_CS5},
+ {0, SW10_CS5, SW11_CS5, SW12_CS5},
+ {0, SW1_CS10, SW2_CS10, SW3_CS10},
+ {0, SW4_CS10, SW5_CS10, SW6_CS10},
+ {0, SW7_CS10, SW8_CS10, SW9_CS10},
+ {0, SW10_CS10, SW11_CS10, SW12_CS10},
+ {0, SW10_CS15, SW11_CS15, SW12_CS15}
};
led_config_t g_led_config = {{
diff --git a/keyboards/mt/mt84/mt84.c b/keyboards/mt/mt84/mt84.c
index 4dd24c30b22..276c92fc065 100644
--- a/keyboards/mt/mt84/mt84.c
+++ b/keyboards/mt/mt84/mt84.c
@@ -24,95 +24,95 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
* | | | B location
* | | | | */
- {0, A_11, B_11, C_11},
- {0, D_11, E_11, F_11},
- {0, G_11, H_11, I_11},
- {0, J_11, K_11, L_11},
- {0, A_12, B_12, C_12},
- {0, D_12, E_12, F_12},
- {0, G_12, H_12, I_12},
- {0, J_12, K_12, L_12},
- {1, A_11, B_11, C_11},
- {1, D_11, E_11, F_11},
- {1, G_11, H_11, I_11},
- {1, J_11, K_11, L_11},
- {1, A_12, B_12, C_12},
- {1, D_12, E_12, F_12},
- {1, G_12, H_12, I_12},
- {1, J_12, K_12, L_12},
+ {0, SW1_CS11, SW2_CS11, SW3_CS11},
+ {0, SW4_CS11, SW5_CS11, SW6_CS11},
+ {0, SW7_CS11, SW8_CS11, SW9_CS11},
+ {0, SW10_CS11, SW11_CS11, SW12_CS11},
+ {0, SW1_CS12, SW2_CS12, SW3_CS12},
+ {0, SW4_CS12, SW5_CS12, SW6_CS12},
+ {0, SW7_CS12, SW8_CS12, SW9_CS12},
+ {0, SW10_CS12, SW11_CS12, SW12_CS12},
+ {1, SW1_CS11, SW2_CS11, SW3_CS11},
+ {1, SW4_CS11, SW5_CS11, SW6_CS11},
+ {1, SW7_CS11, SW8_CS11, SW9_CS11},
+ {1, SW10_CS11, SW11_CS11, SW12_CS11},
+ {1, SW1_CS12, SW2_CS12, SW3_CS12},
+ {1, SW4_CS12, SW5_CS12, SW6_CS12},
+ {1, SW7_CS12, SW8_CS12, SW9_CS12},
+ {1, SW10_CS12, SW11_CS12, SW12_CS12},
- {0, A_1, B_1, C_1},
- {0, D_1, E_1, F_1},
- {0, G_1, H_1, I_1},
- {0, J_1, K_1, L_1},
- {0, A_6, B_6, C_6},
- {0, D_6, E_6, F_6},
- {0, G_6, H_6, I_6},
- {0, J_6, K_6, L_6},
- {1, A_1, B_1, C_1},
- {1, D_1, E_1, F_1},
- {1, G_1, H_1, I_1},
- {1, J_1, K_1, L_1},
- {1, A_6, B_6, C_6},
- {1, D_6, E_6, F_6},
- {1, G_6, H_6, I_6},
+ {0, SW1_CS1, SW2_CS1, SW3_CS1},
+ {0, SW4_CS1, SW5_CS1, SW6_CS1},
+ {0, SW7_CS1, SW8_CS1, SW9_CS1},
+ {0, SW10_CS1, SW11_CS1, SW12_CS1},
+ {0, SW1_CS6, SW2_CS6, SW3_CS6},
+ {0, SW4_CS6, SW5_CS6, SW6_CS6},
+ {0, SW7_CS6, SW8_CS6, SW9_CS6},
+ {0, SW10_CS6, SW11_CS6, SW12_CS6},
+ {1, SW1_CS1, SW2_CS1, SW3_CS1},
+ {1, SW4_CS1, SW5_CS1, SW6_CS1},
+ {1, SW7_CS1, SW8_CS1, SW9_CS1},
+ {1, SW10_CS1, SW11_CS1, SW12_CS1},
+ {1, SW1_CS6, SW2_CS6, SW3_CS6},
+ {1, SW4_CS6, SW5_CS6, SW6_CS6},
+ {1, SW7_CS6, SW8_CS6, SW9_CS6},
- {0, A_2, B_2, C_2},
- {0, D_2, E_2, F_2},
- {0, G_2, H_2, I_2},
- {0, J_2, K_2, L_2},
- {0, A_7, B_7, C_7},
- {0, D_7, E_7, F_7},
- {0, G_7, H_7, I_7},
- {0, J_7, K_7, L_7},
- {1, A_2, B_2, C_2},
- {1, D_2, E_2, F_2},
- {1, G_2, H_2, I_2},
- {1, J_2, K_2, L_2},
- {1, A_7, B_7, C_7},
- {1, D_7, E_7, F_7},
- {1, G_7, H_7, I_7},
+ {0, SW1_CS2, SW2_CS2, SW3_CS2},
+ {0, SW4_CS2, SW5_CS2, SW6_CS2},
+ {0, SW7_CS2, SW8_CS2, SW9_CS2},
+ {0, SW10_CS2, SW11_CS2, SW12_CS2},
+ {0, SW1_CS7, SW2_CS7, SW3_CS7},
+ {0, SW4_CS7, SW5_CS7, SW6_CS7},
+ {0, SW7_CS7, SW8_CS7, SW9_CS7},
+ {0, SW10_CS7, SW11_CS7, SW12_CS7},
+ {1, SW1_CS2, SW2_CS2, SW3_CS2},
+ {1, SW4_CS2, SW5_CS2, SW6_CS2},
+ {1, SW7_CS2, SW8_CS2, SW9_CS2},
+ {1, SW10_CS2, SW11_CS2, SW12_CS2},
+ {1, SW1_CS7, SW2_CS7, SW3_CS7},
+ {1, SW4_CS7, SW5_CS7, SW6_CS7},
+ {1, SW7_CS7, SW8_CS7, SW9_CS7},
- {0, A_3, B_3, C_3},
- {0, D_3, E_3, F_3},
- {0, G_3, H_3, I_3},
- {0, J_3, K_3, L_3},
- {0, A_8, B_8, C_8},
- {0, D_8, E_8, F_8},
- {0, G_8, H_8, I_8},
- {0, J_8, K_8, L_8},
- {1, A_3, B_3, C_3},
- {1, D_3, E_3, F_3},
- {1, G_3, H_3, I_3},
- {1, J_3, K_3, L_3},
- {1, A_8, B_8, C_8},
- {1, G_8, H_8, I_8},
+ {0, SW1_CS3, SW2_CS3, SW3_CS3},
+ {0, SW4_CS3, SW5_CS3, SW6_CS3},
+ {0, SW7_CS3, SW8_CS3, SW9_CS3},
+ {0, SW10_CS3, SW11_CS3, SW12_CS3},
+ {0, SW1_CS8, SW2_CS8, SW3_CS8},
+ {0, SW4_CS8, SW5_CS8, SW6_CS8},
+ {0, SW7_CS8, SW8_CS8, SW9_CS8},
+ {0, SW10_CS8, SW11_CS8, SW12_CS8},
+ {1, SW1_CS3, SW2_CS3, SW3_CS3},
+ {1, SW4_CS3, SW5_CS3, SW6_CS3},
+ {1, SW7_CS3, SW8_CS3, SW9_CS3},
+ {1, SW10_CS3, SW11_CS3, SW12_CS3},
+ {1, SW1_CS8, SW2_CS8, SW3_CS8},
+ {1, SW7_CS8, SW8_CS8, SW9_CS8},
- {0, A_4, B_4, C_4},
- {0, D_4, E_4, F_4},
- {0, G_4, H_4, I_4},
- {0, J_4, K_4, L_4},
- {0, A_9, B_9, C_9},
- {0, D_9, E_9, F_9},
- {0, G_9, H_9, I_9},
- {0, J_9, K_9, L_9},
- {1, A_4, B_4, C_4},
- {1, D_4, E_4, F_4},
- {1, G_4, H_4, I_4},
- {1, J_4, K_4, L_4},
- {1, A_9, B_9, C_9},
- {1, G_9, H_9, I_9},
+ {0, SW1_CS4, SW2_CS4, SW3_CS4},
+ {0, SW4_CS4, SW5_CS4, SW6_CS4},
+ {0, SW7_CS4, SW8_CS4, SW9_CS4},
+ {0, SW10_CS4, SW11_CS4, SW12_CS4},
+ {0, SW1_CS9, SW2_CS9, SW3_CS9},
+ {0, SW4_CS9, SW5_CS9, SW6_CS9},
+ {0, SW7_CS9, SW8_CS9, SW9_CS9},
+ {0, SW10_CS9, SW11_CS9, SW12_CS9},
+ {1, SW1_CS4, SW2_CS4, SW3_CS4},
+ {1, SW4_CS4, SW5_CS4, SW6_CS4},
+ {1, SW7_CS4, SW8_CS4, SW9_CS4},
+ {1, SW10_CS4, SW11_CS4, SW12_CS4},
+ {1, SW1_CS9, SW2_CS9, SW3_CS9},
+ {1, SW7_CS9, SW8_CS9, SW9_CS9},
- {0, A_5, B_5, C_5},
- {0, D_5, E_5, F_5},
- {0, G_5, H_5, I_5},
- {0, D_10, E_10, F_10},
- {1, D_5, E_5, F_5},
- {1, G_5, H_5, I_5},
- {1, J_5, K_5, L_5},
- {1, A_10, B_10, C_10},
- {1, D_10, E_10, F_10},
- {1, G_10, H_10, I_10}
+ {0, SW1_CS5, SW2_CS5, SW3_CS5},
+ {0, SW4_CS5, SW5_CS5, SW6_CS5},
+ {0, SW7_CS5, SW8_CS5, SW9_CS5},
+ {0, SW4_CS10, SW5_CS10, SW6_CS10},
+ {1, SW4_CS5, SW5_CS5, SW6_CS5},
+ {1, SW7_CS5, SW8_CS5, SW9_CS5},
+ {1, SW10_CS5, SW11_CS5, SW12_CS5},
+ {1, SW1_CS10, SW2_CS10, SW3_CS10},
+ {1, SW4_CS10, SW5_CS10, SW6_CS10},
+ {1, SW7_CS10, SW8_CS10, SW9_CS10}
};
led_config_t g_led_config = {{
diff --git a/keyboards/novelkeys/nk65/nk65.c b/keyboards/novelkeys/nk65/nk65.c
index c4a14e7087b..dd0a94a8e6f 100755
--- a/keyboards/novelkeys/nk65/nk65.c
+++ b/keyboards/novelkeys/nk65/nk65.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, B_1, A_1, C_1}, //LA1
- {0, E_1, D_1, F_1}, //LA2
- {0, H_1, G_1, I_1}, //LA3
- {0, K_1, J_1, L_1}, //LA4
- {0, B_2, A_2, C_2}, //LA5
- {0, E_2, D_2, F_2}, //LA6
- {0, H_2, G_2, I_2}, //LA7
- {0, K_2, J_2, L_2}, //LA8
- {0, B_3, A_3, C_3}, //LA9
- {0, E_3, D_3, F_3}, //LA10
- {0, H_3, G_3, I_3}, //LA11
- {0, K_3, J_3, L_3}, //LA12
- {0, B_4, A_4, C_4}, //LA13
- {0, E_4, D_4, F_4}, //LA14
- {0, H_4, G_4, I_4}, //LA15
- {0, K_4, J_4, L_4}, //LA16
- {0, B_5, A_5, C_5}, //LA17
- {0, E_5, D_5, F_5}, //LA18
- {0, H_5, G_5, I_5}, //LA19
- {0, K_5, J_5, L_5}, //LA20
- {0, B_6, A_6, C_6}, //LA21
- {0, E_6, D_6, F_6}, //LA22
- {0, H_6, G_6, I_6}, //LA23
- {0, K_6, J_6, L_6}, //LA24
- {0, B_7, A_7, C_7}, //LA25
- {0, E_7, D_7, F_7}, //LA26
- {0, H_7, G_7, I_7}, //LA27
- {0, K_7, J_7, L_7}, //LA28
- {0, B_8, A_8, C_8}, //LA29
- {0, E_8, D_8, F_8}, //LA30
- {0, H_8, G_8, I_8}, //LA31
- {0, K_8, J_8, L_8}, //LA32
- {0, B_9, A_9, C_9}, //LA33
- {0, E_9, D_9, F_9}, //LA34
- {0, H_9, G_9, I_9}, //LA35
- {0, K_9, J_9, L_9}, //LA36
- {0, B_10, A_10, C_10}, //LA37
- {0, E_10, D_10, F_10}, //LA38
- {0, H_10, G_10, I_10}, //LA39
- {0, K_10, J_10, L_10}, //LA40
- {0, B_11, A_11, C_11}, //LA41
- {0, E_11, D_11, F_11}, //LA42
- {0, H_11, G_11, I_11}, //LA43
- {0, K_11, J_11, L_11}, //LA44
- {0, B_12, A_12, C_12}, //LA45
- {0, E_12, D_12, F_12}, //LA46
- {0, H_12, G_12, I_12}, //LA47
- {0, K_12, J_12, L_12}, //LA48
- {0, B_13, A_13, C_13}, //LA49
- {0, E_13, D_13, F_13}, //LA50
- {0, H_13, G_13, I_13}, //LA51
- {0, K_13, J_13, L_13}, //LA52
- {0, B_14, A_14, C_14}, //LA53
- {0, E_14, D_14, F_14}, //LA54
- {0, H_14, G_14, I_14}, //LA55
- {0, K_14, J_14, L_14}, //LA56
- {0, B_15, A_15, C_15}, //LA57
- {0, E_15, D_15, F_15}, //LA58
- {0, H_15, G_15, I_15}, //LA59
- {0, K_15, J_15, L_15}, //LA60
- {0, B_16, A_16, C_16}, //LA61
- {0, E_16, D_16, F_16}, //LA62
- {0, H_16, G_16, I_16}, //LA63
- {0, K_16, J_16, L_16}, //LA64
+ {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1
+ {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2
+ {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3
+ {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4
+ {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5
+ {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6
+ {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7
+ {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8
+ {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9
+ {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10
+ {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11
+ {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12
+ {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13
+ {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14
+ {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15
+ {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16
+ {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17
+ {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18
+ {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19
+ {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20
+ {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21
+ {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22
+ {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23
+ {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24
+ {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25
+ {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26
+ {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27
+ {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28
+ {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29
+ {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30
+ {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31
+ {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32
+ {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33
+ {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34
+ {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35
+ {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36
+ {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37
+ {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38
+ {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39
+ {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40
+ {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41
+ {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42
+ {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43
+ {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44
+ {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45
+ {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46
+ {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47
+ {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48
+ {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49
+ {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50
+ {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51
+ {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52
+ {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53
+ {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54
+ {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55
+ {0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56
+ {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57
+ {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58
+ {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59
+ {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60
+ {0, SW2_CS16, SW1_CS16, SW3_CS16}, //LA61
+ {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62
+ {0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63
+ {0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64
- {1, B_1, A_1, C_1}, //LB1
- {1, E_1, D_1, F_1}, //LB2
- {1, H_1, G_1, I_1}, //LB3
- {1, K_1, J_1, L_1}, //LB4
- {1, B_2, A_2, C_2}, //LB5
- {1, E_2, D_2, F_2}, //LB6
- {1, H_2, G_2, I_2}, //LB7
- {1, K_2, J_2, L_2}, //LB8
- {1, B_3, A_3, C_3}, //LB9
- {1, E_3, D_3, F_3}, //LB10
- {1, H_3, G_3, I_3}, //LB11
- {1, K_3, J_3, L_3}, //LB12
- {1, B_4, A_4, C_4}, //LB13
- {1, E_4, D_4, F_4}, //LB14
- {1, H_4, G_4, I_4}, //LB15
- {1, K_4, J_4, L_4}, //LB16
- {1, B_5, A_5, C_5}, //LB17
- {1, E_5, D_5, F_5}, //LB18
- {1, H_5, G_5, I_5}, //LB19
- {1, K_5, J_5, L_5}, //LB20
- {1, B_6, A_6, C_6}, //LB21
- {1, E_6, D_6, F_6}, //LB22
- {1, H_6, G_6, I_6}, //LB23
- {1, K_6, J_6, L_6}, //LB24
- {1, B_7, A_7, C_7}, //LB25
- {1, E_7, D_7, F_7}, //LB26
- {1, H_7, G_7, I_7}, //LB27
- {1, K_7, J_7, L_7}, //LB28
- {1, B_8, A_8, C_8}, //LB29
- {1, E_8, D_8, F_8}, //LB30
- {1, H_8, G_8, I_8}, //LB31
- {1, K_8, J_8, L_8}, //LB32
- {1, B_9, A_9, C_9}, //LB33
- {1, E_9, D_9, F_9}, //LB34
- {1, H_9, G_9, I_9}, //LB35
- {1, K_9, J_9, L_9}, //LB36
- {1, B_10, A_10, C_10}, //LB37
- {1, E_10, D_10, F_10}, //LB38
- {1, H_10, G_10, I_10}, //LB39
- {1, K_10, J_10, L_10}, //LB40
- {1, B_11, A_11, C_11}, //LB41
- {1, E_11, D_11, F_11}, //LB42
- {1, H_11, G_11, I_11}, //LB43
- {1, K_11, J_11, L_11}, //LB44
- {1, B_12, A_12, C_12}, //LB45
- {1, E_12, D_12, F_12}, //LB46
- {1, H_12, G_12, I_12}, //LB47
- {1, K_12, J_12, L_12}, //LB48
- {1, B_13, A_13, C_13}, //LB49
- {1, E_13, D_13, F_13}, //LB50
- {1, H_13, G_13, I_13}, //LB51
- {1, K_13, J_13, L_13}, //LB52
- {1, B_14, A_14, C_14}, //LB53
- {1, E_14, D_14, F_14}, //LB54
- {1, H_14, G_14, I_14}, //LB55
- {1, K_14, J_14, L_14}, //LB56
- {1, B_15, A_15, C_15}, //LB57
- {1, E_15, D_15, F_15}, //LB58
- {1, H_15, G_15, I_15}, //LB59
- {1, K_15, J_15, L_15}, //LB60
- {1, B_16, A_16, C_16}, //LB61
- {1, E_16, D_16, F_16}, //LB62
- {1, H_16, G_16, I_16}, //LB63
- {1, K_16, J_16, L_16}, //LB64
+ {1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1
+ {1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2
+ {1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3
+ {1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4
+ {1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5
+ {1, SW5_CS2, SW4_CS2, SW6_CS2}, //LB6
+ {1, SW8_CS2, SW7_CS2, SW9_CS2}, //LB7
+ {1, SW11_CS2, SW10_CS2, SW12_CS2}, //LB8
+ {1, SW2_CS3, SW1_CS3, SW3_CS3}, //LB9
+ {1, SW5_CS3, SW4_CS3, SW6_CS3}, //LB10
+ {1, SW8_CS3, SW7_CS3, SW9_CS3}, //LB11
+ {1, SW11_CS3, SW10_CS3, SW12_CS3}, //LB12
+ {1, SW2_CS4, SW1_CS4, SW3_CS4}, //LB13
+ {1, SW5_CS4, SW4_CS4, SW6_CS4}, //LB14
+ {1, SW8_CS4, SW7_CS4, SW9_CS4}, //LB15
+ {1, SW11_CS4, SW10_CS4, SW12_CS4}, //LB16
+ {1, SW2_CS5, SW1_CS5, SW3_CS5}, //LB17
+ {1, SW5_CS5, SW4_CS5, SW6_CS5}, //LB18
+ {1, SW8_CS5, SW7_CS5, SW9_CS5}, //LB19
+ {1, SW11_CS5, SW10_CS5, SW12_CS5}, //LB20
+ {1, SW2_CS6, SW1_CS6, SW3_CS6}, //LB21
+ {1, SW5_CS6, SW4_CS6, SW6_CS6}, //LB22
+ {1, SW8_CS6, SW7_CS6, SW9_CS6}, //LB23
+ {1, SW11_CS6, SW10_CS6, SW12_CS6}, //LB24
+ {1, SW2_CS7, SW1_CS7, SW3_CS7}, //LB25
+ {1, SW5_CS7, SW4_CS7, SW6_CS7}, //LB26
+ {1, SW8_CS7, SW7_CS7, SW9_CS7}, //LB27
+ {1, SW11_CS7, SW10_CS7, SW12_CS7}, //LB28
+ {1, SW2_CS8, SW1_CS8, SW3_CS8}, //LB29
+ {1, SW5_CS8, SW4_CS8, SW6_CS8}, //LB30
+ {1, SW8_CS8, SW7_CS8, SW9_CS8}, //LB31
+ {1, SW11_CS8, SW10_CS8, SW12_CS8}, //LB32
+ {1, SW2_CS9, SW1_CS9, SW3_CS9}, //LB33
+ {1, SW5_CS9, SW4_CS9, SW6_CS9}, //LB34
+ {1, SW8_CS9, SW7_CS9, SW9_CS9}, //LB35
+ {1, SW11_CS9, SW10_CS9, SW12_CS9}, //LB36
+ {1, SW2_CS10, SW1_CS10, SW3_CS10}, //LB37
+ {1, SW5_CS10, SW4_CS10, SW6_CS10}, //LB38
+ {1, SW8_CS10, SW7_CS10, SW9_CS10}, //LB39
+ {1, SW11_CS10, SW10_CS10, SW12_CS10}, //LB40
+ {1, SW2_CS11, SW1_CS11, SW3_CS11}, //LB41
+ {1, SW5_CS11, SW4_CS11, SW6_CS11}, //LB42
+ {1, SW8_CS11, SW7_CS11, SW9_CS11}, //LB43
+ {1, SW11_CS11, SW10_CS11, SW12_CS11}, //LB44
+ {1, SW2_CS12, SW1_CS12, SW3_CS12}, //LB45
+ {1, SW5_CS12, SW4_CS12, SW6_CS12}, //LB46
+ {1, SW8_CS12, SW7_CS12, SW9_CS12}, //LB47
+ {1, SW11_CS12, SW10_CS12, SW12_CS12}, //LB48
+ {1, SW2_CS13, SW1_CS13, SW3_CS13}, //LB49
+ {1, SW5_CS13, SW4_CS13, SW6_CS13}, //LB50
+ {1, SW8_CS13, SW7_CS13, SW9_CS13}, //LB51
+ {1, SW11_CS13, SW10_CS13, SW12_CS13}, //LB52
+ {1, SW2_CS14, SW1_CS14, SW3_CS14}, //LB53
+ {1, SW5_CS14, SW4_CS14, SW6_CS14}, //LB54
+ {1, SW8_CS14, SW7_CS14, SW9_CS14}, //LB55
+ {1, SW11_CS14, SW10_CS14, SW12_CS14}, //LB56
+ {1, SW2_CS15, SW1_CS15, SW3_CS15}, //LB57
+ {1, SW5_CS15, SW4_CS15, SW6_CS15}, //LB58
+ {1, SW8_CS15, SW7_CS15, SW9_CS15}, //LB59
+ {1, SW11_CS15, SW10_CS15, SW12_CS15}, //LB60
+ {1, SW2_CS16, SW1_CS16, SW3_CS16}, //LB61
+ {1, SW5_CS16, SW4_CS16, SW6_CS16}, //LB62
+ {1, SW8_CS16, SW7_CS16, SW9_CS16}, //LB63
+ {1, SW11_CS16, SW10_CS16, SW12_CS16}, //LB64
};
#endif
diff --git a/keyboards/novelkeys/nk87/nk87.c b/keyboards/novelkeys/nk87/nk87.c
index e701bfaccf9..420141c7283 100755
--- a/keyboards/novelkeys/nk87/nk87.c
+++ b/keyboards/novelkeys/nk87/nk87.c
@@ -28,135 +28,135 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, B_1, A_1, C_1}, //LA1
- {0, E_1, D_1, F_1}, //LA2
- {0, H_1, G_1, I_1}, //LA3
- {0, K_1, J_1, L_1}, //LA4
- {0, B_2, A_2, C_2}, //LA5
- {0, E_2, D_2, F_2}, //LA6
- {0, H_2, G_2, I_2}, //LA7
- {0, K_2, J_2, L_2}, //LA8
- {0, B_3, A_3, C_3}, //LA9
- {0, E_3, D_3, F_3}, //LA10
- {0, H_3, G_3, I_3}, //LA11
- {0, K_3, J_3, L_3}, //LA12
- {0, B_4, A_4, C_4}, //LA13
- {0, E_4, D_4, F_4}, //LA14
- {0, H_4, G_4, I_4}, //LA15
- {0, K_4, J_4, L_4}, //LA16
- {0, B_5, A_5, C_5}, //LA17
- {0, E_5, D_5, F_5}, //LA18
- {0, H_5, G_5, I_5}, //LA19
- {0, K_5, J_5, L_5}, //LA20
- {0, B_6, A_6, C_6}, //LA21
- {0, E_6, D_6, F_6}, //LA22
- {0, H_6, G_6, I_6}, //LA23
- {0, K_6, J_6, L_6}, //LA24
- {0, B_7, A_7, C_7}, //LA25
- {0, E_7, D_7, F_7}, //LA26
- {0, H_7, G_7, I_7}, //LA27
- {0, K_7, J_7, L_7}, //LA28
- {0, B_8, A_8, C_8}, //LA29
- {0, E_8, D_8, F_8}, //LA30
- {0, H_8, G_8, I_8}, //LA31
- {0, K_8, J_8, L_8}, //LA32
- {0, B_9, A_9, C_9}, //LA33
- {0, E_9, D_9, F_9}, //LA34
- {0, H_9, G_9, I_9}, //LA35
- {0, K_9, J_9, L_9}, //LA36
- {0, B_10, A_10, C_10}, //LA37
- {0, E_10, D_10, F_10}, //LA38
- {0, H_10, G_10, I_10}, //LA39
- {0, K_10, J_10, L_10}, //LA40
- {0, B_11, A_11, C_11}, //LA41
- {0, E_11, D_11, F_11}, //LA42
- {0, H_11, G_11, I_11}, //LA43
- {0, K_11, J_11, L_11}, //LA44
- {0, B_12, A_12, C_12}, //LA45
- {0, E_12, D_12, F_12}, //LA46
- {0, H_12, G_12, I_12}, //LA47
- {0, K_12, J_12, L_12}, //LA48
- {0, B_13, A_13, C_13}, //LA49
- {0, E_13, D_13, F_13}, //LA50
- {0, H_13, G_13, I_13}, //LA51
- {0, K_13, J_13, L_13}, //LA52
- {0, B_14, A_14, C_14}, //LA53
- {0, E_14, D_14, F_14}, //LA54
- {0, H_14, G_14, I_14}, //LA55
- {0, K_14, J_14, L_14}, //LA56
- {0, B_15, A_15, C_15}, //LA57
- {0, E_15, D_15, F_15}, //LA58
- {0, H_15, G_15, I_15}, //LA59
- {0, K_15, J_15, L_15}, //LA60
- {0, B_16, A_16, C_16}, //LA61
- {0, E_16, D_16, F_16}, //LA62
- {0, H_16, G_16, I_16}, //LA63
- {0, K_16, J_16, L_16}, //LA64
+ {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1
+ {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2
+ {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3
+ {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4
+ {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5
+ {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6
+ {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7
+ {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8
+ {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9
+ {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10
+ {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11
+ {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12
+ {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13
+ {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14
+ {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15
+ {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16
+ {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17
+ {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18
+ {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19
+ {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20
+ {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21
+ {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22
+ {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23
+ {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24
+ {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25
+ {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26
+ {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27
+ {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28
+ {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29
+ {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30
+ {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31
+ {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32
+ {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33
+ {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34
+ {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35
+ {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36
+ {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37
+ {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38
+ {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39
+ {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40
+ {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41
+ {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42
+ {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43
+ {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44
+ {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45
+ {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46
+ {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47
+ {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48
+ {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49
+ {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50
+ {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51
+ {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52
+ {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53
+ {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54
+ {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55
+ {0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56
+ {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57
+ {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58
+ {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59
+ {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60
+ {0, SW2_CS16, SW1_CS16, SW3_CS16}, //LA61
+ {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62
+ {0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63
+ {0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64
- {1, B_1, A_1, C_1}, //LB1
- {1, E_1, D_1, F_1}, //LB2
- {1, H_1, G_1, I_1}, //LB3
- {1, K_1, J_1, L_1}, //LB4
- {1, B_2, A_2, C_2}, //LB5
- {1, E_2, D_2, F_2}, //LB6
- {1, H_2, G_2, I_2}, //LB7
- {1, K_2, J_2, L_2}, //LB8
- {1, B_3, A_3, C_3}, //LB9
- {1, E_3, D_3, F_3}, //LB10
- {1, H_3, G_3, I_3}, //LB11
- {1, K_3, J_3, L_3}, //LB12
- {1, B_4, A_4, C_4}, //LB13
- {1, E_4, D_4, F_4}, //LB14
- {1, H_4, G_4, I_4}, //LB15
- {1, K_4, J_4, L_4}, //LB16
- {1, B_5, A_5, C_5}, //LB17
- {1, E_5, D_5, F_5}, //LB18
- {1, H_5, G_5, I_5}, //LB19
- {1, K_5, J_5, L_5}, //LB20
- {1, B_6, A_6, C_6}, //LB21
- {1, E_6, D_6, F_6}, //LB22
- {1, H_6, G_6, I_6}, //LB23
- {1, K_6, J_6, L_6}, //LB24
- {1, B_7, A_7, C_7}, //LB25
- {1, E_7, D_7, F_7}, //LB26
- {1, H_7, G_7, I_7}, //LB27
- {1, K_7, J_7, L_7}, //LB28
- {1, B_8, A_8, C_8}, //LB29
- {1, E_8, D_8, F_8}, //LB30
- {1, H_8, G_8, I_8}, //LB31
- {1, K_8, J_8, L_8}, //LB32
- {1, B_9, A_9, C_9}, //LB33
- {1, E_9, D_9, F_9}, //LB34
- {1, H_9, G_9, I_9}, //LB35
- {1, K_9, J_9, L_9}, //LB36
- {1, B_10, A_10, C_10}, //LB37
- {1, E_10, D_10, F_10}, //LB38
- {1, H_10, G_10, I_10}, //LB39
- {1, K_10, J_10, L_10}, //LB40
- {1, B_11, A_11, C_11}, //LB41
- {1, E_11, D_11, F_11}, //LB42
- {1, H_11, G_11, I_11}, //LB43
- {1, K_11, J_11, L_11}, //LB44
- {1, B_12, A_12, C_12}, //LB45
- {1, E_12, D_12, F_12}, //LB46
- {1, H_12, G_12, I_12}, //LB47
- {1, K_12, J_12, L_12}, //LB48
- {1, B_13, A_13, C_13}, //LB49
- {1, E_13, D_13, F_13}, //LB50
- {1, H_13, G_13, I_13}, //LB51
- {1, K_13, J_13, L_13}, //LB52
- {1, B_14, A_14, C_14}, //LB53
- {1, E_14, D_14, F_14}, //LB54
- {1, H_14, G_14, I_14}, //LB55
- {1, K_14, J_14, L_14}, //LB56
- {1, B_15, A_15, C_15}, //LB57
- {1, E_15, D_15, F_15}, //LB58
- {1, H_15, G_15, I_15}, //LB59
- {1, K_15, J_15, L_15}, //LB60
- {1, B_16, A_16, C_16}, //LB61
- {1, E_16, D_16, F_16}, //LB62
- {1, H_16, G_16, I_16}, //LB63
- {1, K_16, J_16, L_16}, //LB64
+ {1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1
+ {1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2
+ {1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3
+ {1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4
+ {1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5
+ {1, SW5_CS2, SW4_CS2, SW6_CS2}, //LB6
+ {1, SW8_CS2, SW7_CS2, SW9_CS2}, //LB7
+ {1, SW11_CS2, SW10_CS2, SW12_CS2}, //LB8
+ {1, SW2_CS3, SW1_CS3, SW3_CS3}, //LB9
+ {1, SW5_CS3, SW4_CS3, SW6_CS3}, //LB10
+ {1, SW8_CS3, SW7_CS3, SW9_CS3}, //LB11
+ {1, SW11_CS3, SW10_CS3, SW12_CS3}, //LB12
+ {1, SW2_CS4, SW1_CS4, SW3_CS4}, //LB13
+ {1, SW5_CS4, SW4_CS4, SW6_CS4}, //LB14
+ {1, SW8_CS4, SW7_CS4, SW9_CS4}, //LB15
+ {1, SW11_CS4, SW10_CS4, SW12_CS4}, //LB16
+ {1, SW2_CS5, SW1_CS5, SW3_CS5}, //LB17
+ {1, SW5_CS5, SW4_CS5, SW6_CS5}, //LB18
+ {1, SW8_CS5, SW7_CS5, SW9_CS5}, //LB19
+ {1, SW11_CS5, SW10_CS5, SW12_CS5}, //LB20
+ {1, SW2_CS6, SW1_CS6, SW3_CS6}, //LB21
+ {1, SW5_CS6, SW4_CS6, SW6_CS6}, //LB22
+ {1, SW8_CS6, SW7_CS6, SW9_CS6}, //LB23
+ {1, SW11_CS6, SW10_CS6, SW12_CS6}, //LB24
+ {1, SW2_CS7, SW1_CS7, SW3_CS7}, //LB25
+ {1, SW5_CS7, SW4_CS7, SW6_CS7}, //LB26
+ {1, SW8_CS7, SW7_CS7, SW9_CS7}, //LB27
+ {1, SW11_CS7, SW10_CS7, SW12_CS7}, //LB28
+ {1, SW2_CS8, SW1_CS8, SW3_CS8}, //LB29
+ {1, SW5_CS8, SW4_CS8, SW6_CS8}, //LB30
+ {1, SW8_CS8, SW7_CS8, SW9_CS8}, //LB31
+ {1, SW11_CS8, SW10_CS8, SW12_CS8}, //LB32
+ {1, SW2_CS9, SW1_CS9, SW3_CS9}, //LB33
+ {1, SW5_CS9, SW4_CS9, SW6_CS9}, //LB34
+ {1, SW8_CS9, SW7_CS9, SW9_CS9}, //LB35
+ {1, SW11_CS9, SW10_CS9, SW12_CS9}, //LB36
+ {1, SW2_CS10, SW1_CS10, SW3_CS10}, //LB37
+ {1, SW5_CS10, SW4_CS10, SW6_CS10}, //LB38
+ {1, SW8_CS10, SW7_CS10, SW9_CS10}, //LB39
+ {1, SW11_CS10, SW10_CS10, SW12_CS10}, //LB40
+ {1, SW2_CS11, SW1_CS11, SW3_CS11}, //LB41
+ {1, SW5_CS11, SW4_CS11, SW6_CS11}, //LB42
+ {1, SW8_CS11, SW7_CS11, SW9_CS11}, //LB43
+ {1, SW11_CS11, SW10_CS11, SW12_CS11}, //LB44
+ {1, SW2_CS12, SW1_CS12, SW3_CS12}, //LB45
+ {1, SW5_CS12, SW4_CS12, SW6_CS12}, //LB46
+ {1, SW8_CS12, SW7_CS12, SW9_CS12}, //LB47
+ {1, SW11_CS12, SW10_CS12, SW12_CS12}, //LB48
+ {1, SW2_CS13, SW1_CS13, SW3_CS13}, //LB49
+ {1, SW5_CS13, SW4_CS13, SW6_CS13}, //LB50
+ {1, SW8_CS13, SW7_CS13, SW9_CS13}, //LB51
+ {1, SW11_CS13, SW10_CS13, SW12_CS13}, //LB52
+ {1, SW2_CS14, SW1_CS14, SW3_CS14}, //LB53
+ {1, SW5_CS14, SW4_CS14, SW6_CS14}, //LB54
+ {1, SW8_CS14, SW7_CS14, SW9_CS14}, //LB55
+ {1, SW11_CS14, SW10_CS14, SW12_CS14}, //LB56
+ {1, SW2_CS15, SW1_CS15, SW3_CS15}, //LB57
+ {1, SW5_CS15, SW4_CS15, SW6_CS15}, //LB58
+ {1, SW8_CS15, SW7_CS15, SW9_CS15}, //LB59
+ {1, SW11_CS15, SW10_CS15, SW12_CS15}, //LB60
+ {1, SW2_CS16, SW1_CS16, SW3_CS16}, //LB61
+ {1, SW5_CS16, SW4_CS16, SW6_CS16}, //LB62
+ {1, SW8_CS16, SW7_CS16, SW9_CS16}, //LB63
+ {1, SW11_CS16, SW10_CS16, SW12_CS16}, //LB64
};
#endif
diff --git a/keyboards/orthograph/orthograph.c b/keyboards/orthograph/orthograph.c
index 04d25829370..9d824574d10 100644
--- a/keyboards/orthograph/orthograph.c
+++ b/keyboards/orthograph/orthograph.c
@@ -24,105 +24,105 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
-{0, A_6, B_6, C_6},
-{0, A_5, B_5, C_5},
-{0, A_4, B_4, C_4},
-{0, A_3, B_3, C_3},
-{0, A_2, B_2, C_2},
-{0, A_1, B_1, C_1},
+{0, SW1_CS6, SW2_CS6, SW3_CS6},
+{0, SW1_CS5, SW2_CS5, SW3_CS5},
+{0, SW1_CS4, SW2_CS4, SW3_CS4},
+{0, SW1_CS3, SW2_CS3, SW3_CS3},
+{0, SW1_CS2, SW2_CS2, SW3_CS2},
+{0, SW1_CS1, SW2_CS1, SW3_CS1},
-{0, D_6, E_6, F_6},
-{0, D_5, E_5, F_5},
-{0, D_4, E_4, F_4},
-{0, D_3, E_3, F_3},
-{0, D_2, E_2, F_2},
-{0, D_1, E_1, F_1},
+{0, SW4_CS6, SW5_CS6, SW6_CS6},
+{0, SW4_CS5, SW5_CS5, SW6_CS5},
+{0, SW4_CS4, SW5_CS4, SW6_CS4},
+{0, SW4_CS3, SW5_CS3, SW6_CS3},
+{0, SW4_CS2, SW5_CS2, SW6_CS2},
+{0, SW4_CS1, SW5_CS1, SW6_CS1},
-{0, G_6, H_6, I_6},
-{0, G_5, H_5, I_5},
-{0, G_4, H_4, I_4},
-{0, G_3, H_3, I_3},
-{0, G_2, H_2, I_2},
-{0, G_1, H_1, I_1},
+{0, SW7_CS6, SW8_CS6, SW9_CS6},
+{0, SW7_CS5, SW8_CS5, SW9_CS5},
+{0, SW7_CS4, SW8_CS4, SW9_CS4},
+{0, SW7_CS3, SW8_CS3, SW9_CS3},
+{0, SW7_CS2, SW8_CS2, SW9_CS2},
+{0, SW7_CS1, SW8_CS1, SW9_CS1},
-{0, A_14, B_14, C_14},
-{0, A_13, B_13, C_13},
-{0, A_12, B_12, C_12},
-{0, A_11, B_11, C_11},
-{0, A_10, B_10, C_10},
-{0, A_9, B_9, C_9},
+{0, SW1_CS14, SW2_CS14, SW3_CS14},
+{0, SW1_CS13, SW2_CS13, SW3_CS13},
+{0, SW1_CS12, SW2_CS12, SW3_CS12},
+{0, SW1_CS11, SW2_CS11, SW3_CS11},
+{0, SW1_CS10, SW2_CS10, SW3_CS10},
+{0, SW1_CS9, SW2_CS9, SW3_CS9},
-{0, D_14, E_14, F_14},
-{0, D_13, E_13, F_13},
-{0, D_12, E_12, F_12},
-{0, D_11, E_11, F_11},
-{0, D_10, E_10, F_10},
-{0, D_9, E_9, F_9},
+{0, SW4_CS14, SW5_CS14, SW6_CS14},
+{0, SW4_CS13, SW5_CS13, SW6_CS13},
+{0, SW4_CS12, SW5_CS12, SW6_CS12},
+{0, SW4_CS11, SW5_CS11, SW6_CS11},
+{0, SW4_CS10, SW5_CS10, SW6_CS10},
+{0, SW4_CS9, SW5_CS9, SW6_CS9},
-{0, G_14, H_14, I_14},
-{0, G_13, H_13, I_13},
-{0, G_12, H_12, I_12},
-{0, G_11, H_11, I_11},
-{0, G_10, H_10, I_10},
-{0, G_9, H_9, I_9},
+{0, SW7_CS14, SW8_CS14, SW9_CS14},
+{0, SW7_CS13, SW8_CS13, SW9_CS13},
+{0, SW7_CS12, SW8_CS12, SW9_CS12},
+{0, SW7_CS11, SW8_CS11, SW9_CS11},
+{0, SW7_CS10, SW8_CS10, SW9_CS10},
+{0, SW7_CS9, SW8_CS9, SW9_CS9},
//----------------
-{0, A_6, B_6, C_6},
-{0, A_5, B_5, C_5},
-{0, A_4, B_4, C_4},
-{0, A_3, B_3, C_3},
-{0, A_2, B_2, C_2},
-{0, A_1, B_1, C_1},
-{0, A_16, B_16, C_16},
-// {0, A_15, B_15, C_15},
+{0, SW1_CS6, SW2_CS6, SW3_CS6},
+{0, SW1_CS5, SW2_CS5, SW3_CS5},
+{0, SW1_CS4, SW2_CS4, SW3_CS4},
+{0, SW1_CS3, SW2_CS3, SW3_CS3},
+{0, SW1_CS2, SW2_CS2, SW3_CS2},
+{0, SW1_CS1, SW2_CS1, SW3_CS1},
+{0, SW1_CS16, SW2_CS16, SW3_CS16},
+// {0, SW1_CS15, SW2_CS15, SW3_CS15},
-{0, D_6, E_6, F_6},
-{0, D_5, E_5, F_5},
-{0, D_4, E_4, F_4},
-{0, D_3, E_3, F_3},
-{0, D_2, E_2, F_2},
-{0, D_1, E_1, F_1},
-{0, D_16, E_16, F_16},
-{0, D_15, E_15, F_15},
+{0, SW4_CS6, SW5_CS6, SW6_CS6},
+{0, SW4_CS5, SW5_CS5, SW6_CS5},
+{0, SW4_CS4, SW5_CS4, SW6_CS4},
+{0, SW4_CS3, SW5_CS3, SW6_CS3},
+{0, SW4_CS2, SW5_CS2, SW6_CS2},
+{0, SW4_CS1, SW5_CS1, SW6_CS1},
+{0, SW4_CS16, SW5_CS16, SW6_CS16},
+{0, SW4_CS15, SW5_CS15, SW6_CS15},
-{0, G_6, H_6, I_6},
-{0, G_5, H_5, I_5},
-{0, G_4, H_4, I_4},
-{0, G_3, H_3, I_3},
-{0, G_2, H_2, I_2},
-{0, G_1, H_1, I_1},
-{0, G_16, H_16, I_16},
-{0, G_15, H_15, I_15},
+{0, SW7_CS6, SW8_CS6, SW9_CS6},
+{0, SW7_CS5, SW8_CS5, SW9_CS5},
+{0, SW7_CS4, SW8_CS4, SW9_CS4},
+{0, SW7_CS3, SW8_CS3, SW9_CS3},
+{0, SW7_CS2, SW8_CS2, SW9_CS2},
+{0, SW7_CS1, SW8_CS1, SW9_CS1},
+{0, SW7_CS16, SW8_CS16, SW9_CS16},
+{0, SW7_CS15, SW8_CS15, SW9_CS15},
-{0, A_14, B_14, C_14},
-{0, A_13, B_13, C_13},
-{0, A_12, B_12, C_12},
-{0, A_11, B_11, C_11},
-{0, A_10, B_10, C_10},
-{0, A_9, B_9, C_9},
-{0, A_8, B_8, C_8},
-// {0, A_7, B_7, C_7},
+{0, SW1_CS14, SW2_CS14, SW3_CS14},
+{0, SW1_CS13, SW2_CS13, SW3_CS13},
+{0, SW1_CS12, SW2_CS12, SW3_CS12},
+{0, SW1_CS11, SW2_CS11, SW3_CS11},
+{0, SW1_CS10, SW2_CS10, SW3_CS10},
+{0, SW1_CS9, SW2_CS9, SW3_CS9},
+{0, SW1_CS8, SW2_CS8, SW3_CS8},
+// {0, SW1_CS7, SW2_CS7, SW3_CS7},
-{0, D_14, E_14, F_14},
-{0, D_13, E_13, F_13},
-{0, D_12, E_12, F_12},
-{0, D_11, E_11, F_11},
-{0, D_10, E_10, F_10},
-{0, D_9, E_9, F_9},
-{0, D_8, E_8, F_8},
-{0, D_7, E_7, F_7},
+{0, SW4_CS14, SW5_CS14, SW6_CS14},
+{0, SW4_CS13, SW5_CS13, SW6_CS13},
+{0, SW4_CS12, SW5_CS12, SW6_CS12},
+{0, SW4_CS11, SW5_CS11, SW6_CS11},
+{0, SW4_CS10, SW5_CS10, SW6_CS10},
+{0, SW4_CS9, SW5_CS9, SW6_CS9},
+{0, SW4_CS8, SW5_CS8, SW6_CS8},
+{0, SW4_CS7, SW5_CS7, SW6_CS7},
-{0, G_14, H_14, I_14},
-{0, G_13, H_13, I_13},
-{0, G_12, H_12, I_12},
-{0, G_11, H_11, I_11},
-{0, G_10, H_10, I_10},
-{0, G_9, H_9, I_9},
-{0, G_8, H_8, I_8},
-{0, G_7, H_7, I_7}
+{0, SW7_CS14, SW8_CS14, SW9_CS14},
+{0, SW7_CS13, SW8_CS13, SW9_CS13},
+{0, SW7_CS12, SW8_CS12, SW9_CS12},
+{0, SW7_CS11, SW8_CS11, SW9_CS11},
+{0, SW7_CS10, SW8_CS10, SW9_CS10},
+{0, SW7_CS9, SW8_CS9, SW9_CS9},
+{0, SW7_CS8, SW8_CS8, SW9_CS8},
+{0, SW7_CS7, SW8_CS7, SW9_CS7}
};
#endif
diff --git a/keyboards/owlab/voice65/hotswap/hotswap.c b/keyboards/owlab/voice65/hotswap/hotswap.c
index 107952d3706..79179d16616 100644
--- a/keyboards/owlab/voice65/hotswap/hotswap.c
+++ b/keyboards/owlab/voice65/hotswap/hotswap.c
@@ -18,73 +18,73 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* RGB0-ESC ROW0*/
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1-1 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB2-2 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB3-3 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB4-4 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB5-5 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB6-6 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB7-7 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB8-8 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB9-9 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB10-0 */
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB11--- */
- {0, CS39_SW1, CS38_SW1, CS37_SW1}, /* RGB12-+= */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB13-BS */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB14-DEL */
- {0, CS3_SW2, CS2_SW2, CS1_SW2}, /* RGB15-TAB ----ROW1*/
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB16-Q */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB17-W */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB18-E */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB19-R */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB20-T */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB21-Y */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB22-U */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB23-I */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB24-O */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB25-P */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB26-[ */
- {0, CS39_SW2, CS38_SW2, CS37_SW2}, /* RGB27-] */
- {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB28-\ */
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, /* RGB29-PGUP */
- {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* RGB30-CAPS---ROW2*/
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB31-A-- */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB32-S-- */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33-D-- */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB34-F-- */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB35-G-- */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB36-H-- */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB37-J-- */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB38-K-- */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB39-L-- */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB40-;:- */
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB41-''- */
- {0, CS39_SW3, CS38_SW3, CS37_SW3}, /* RGB42-ENTER- */
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, /* RGB43-PGDN */
- {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* RGB44-LSF --ROW3*/
- {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB45-Z -*/
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB46-X -*/
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB47-C -*/
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB48-V -*/
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB49-B -*/
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB50-N -*/
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB51-M -*/
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB52-,< -*/
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB53->. -*/
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB54-? -*/
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB55-RSF -*/
- {0, CS39_SW4, CS38_SW4, CS37_SW4}, /* RGB56-UP -*/
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB57--MO-- */
- {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB58-lct-- row4*/
- {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB59-lwin- */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB60-lalt- */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB61-sp- */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB62-ralt- */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB63-rct- */
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB64-left- */
- {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB65-dn- */
- {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB66-right- */
+ {0, SW1_CS3, SW1_CS2, SW1_CS1}, /* RGB0-ESC ROW0*/
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB1-1 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB2-2 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB3-3 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB4-4 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB5-5 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB6-6 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB7-7 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB8-8 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB9-9 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB10-0 */
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB11--- */
+ {0, SW1_CS39, SW1_CS38, SW1_CS37}, /* RGB12-+= */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB13-BS */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB14-DEL */
+ {0, SW2_CS3, SW2_CS2, SW2_CS1}, /* RGB15-TAB ----ROW1*/
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB16-Q */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB17-W */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB18-E */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB19-R */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB20-T */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB21-Y */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB22-U */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB23-I */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB24-O */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB25-P */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB26-[ */
+ {0, SW2_CS39, SW2_CS38, SW2_CS37}, /* RGB27-] */
+ {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB28-\ */
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, /* RGB29-PGUP */
+ {0, SW3_CS3, SW3_CS2, SW3_CS1}, /* RGB30-CAPS---ROW2*/
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB31-A-- */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB32-S-- */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB33-D-- */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB34-F-- */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB35-G-- */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB36-H-- */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB37-J-- */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB38-K-- */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB39-L-- */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB40-;:- */
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB41-''- */
+ {0, SW3_CS39, SW3_CS38, SW3_CS37}, /* RGB42-ENTER- */
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, /* RGB43-PGDN */
+ {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB44-LSF --ROW3*/
+ {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* RGB45-Z -*/
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB46-X -*/
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB47-C -*/
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB48-V -*/
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB49-B -*/
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB50-N -*/
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB51-M -*/
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB52-,< -*/
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB53->. -*/
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB54-? -*/
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB55-RSF -*/
+ {0, SW4_CS39, SW4_CS38, SW4_CS37}, /* RGB56-UP -*/
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB57--MO-- */
+ {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* RGB58-lct-- row4*/
+ {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB59-lwin- */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB60-lalt- */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB61-sp- */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB62-ralt- */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB63-rct- */
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB64-left- */
+ {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB65-dn- */
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB66-right- */
};
led_config_t g_led_config = { {
diff --git a/keyboards/owlab/voice65/soldered/soldered.c b/keyboards/owlab/voice65/soldered/soldered.c
index eb3b68515a9..23144914fef 100644
--- a/keyboards/owlab/voice65/soldered/soldered.c
+++ b/keyboards/owlab/voice65/soldered/soldered.c
@@ -18,77 +18,77 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS3_SW1, CS2_SW1, CS1_SW1}, /* RGB0-ESC ROW0*/
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB1-1 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB2-2 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB3-3 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB4-4 */
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB5-5 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB6-6 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB7-7 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB8-8 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB9-9 */
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, /* RGB10-0 */
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, /* RGB11--- */
- {0, CS39_SW6, CS38_SW6, CS37_SW6}, /* RGB12-+= */
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, /* RGB13-BS */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB14-BACKSPACE SPLIT */
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, /* RGB15-DEL */
- {0, CS3_SW2, CS2_SW2, CS1_SW2}, /* RGB16-TAB ----ROW1*/
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB17-Q */
- {0, CS9_SW2, CS8_SW2, CS7_SW2}, /* RGB18-W */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB19-E */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB20-R */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB21-T */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB22-Y */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB23-U */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB24-I */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB25-O */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB26-P */
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, /* RGB27-[ */
- {0, CS39_SW7, CS38_SW7, CS37_SW7}, /* RGB28-] */
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, /* RGB29-\ */
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, /* RGB30-PGUP */
- {0, CS3_SW3, CS2_SW3, CS1_SW3}, /* RGB31-CAPS---ROW2*/
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB32-A-- */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB33-S-- */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB34-D-- */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB35-F-- */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB36-G-- */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB37-H-- */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB38-J-- */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB39-K-- */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB40-L-- */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB41-;:- */
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, /* RGB42-''- */
- {0, CS39_SW8, CS38_SW8, CS37_SW8}, /* RGB43-ENTER- */
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, /* RGB44-PGDN */
- {0, CS3_SW4, CS2_SW4, CS1_SW4}, /* RGB45-LSF --ROW3*/
- {0, CS6_SW4, CS5_SW4, CS4_SW4}, /* RGB46-LSF split -*/
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47-Z -*/
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB48-X -*/
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB49-C -*/
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB50-V -*/
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB51-B -*/
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB52-N -*/
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB53-M -*/
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB54-<, -*/
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB55->. -*/
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, /* RGB56-?/ -*/
- {0, CS39_SW9, CS38_SW9, CS37_SW9}, /* RGB57-RSF -*/
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, /* RGB58-UP -*/
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, /* RGB59--MO-- */
- {0, CS3_SW5, CS2_SW5, CS1_SW5}, /* RGB60-lct-- row4*/
- {0, CS6_SW5, CS5_SW5, CS4_SW5}, /* RGB61-lwin- */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB62-lalt- */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB63-sp2.25- */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB64-sp7U6.25U1.25U- */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB65-sp2.75U- */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB66-ralt- */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB67-rctrl- */
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, /* RGB68-left- */
- {0, CS39_SW5, CS38_SW5, CS37_SW5}, /* RGB69-dn- */
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, /* RGB70-right- */
+ {0, SW1_CS3, SW1_CS2, SW1_CS1}, /* RGB0-ESC ROW0*/
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB1-1 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB2-2 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB3-3 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB4-4 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB5-5 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB6-6 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB7-7 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB8-8 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB9-9 */
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, /* RGB10-0 */
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, /* RGB11--- */
+ {0, SW6_CS39, SW6_CS38, SW6_CS37}, /* RGB12-+= */
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, /* RGB13-BS */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB14-BACKSPACE SPLIT */
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, /* RGB15-DEL */
+ {0, SW2_CS3, SW2_CS2, SW2_CS1}, /* RGB16-TAB ----ROW1*/
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB17-Q */
+ {0, SW2_CS9, SW2_CS8, SW2_CS7}, /* RGB18-W */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB19-E */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB20-R */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB21-T */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB22-Y */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB23-U */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB24-I */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB25-O */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB26-P */
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, /* RGB27-[ */
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}, /* RGB28-] */
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, /* RGB29-\ */
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, /* RGB30-PGUP */
+ {0, SW3_CS3, SW3_CS2, SW3_CS1}, /* RGB31-CAPS---ROW2*/
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB32-A-- */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB33-S-- */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB34-D-- */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB35-F-- */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB36-G-- */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB37-H-- */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB38-J-- */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB39-K-- */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB40-L-- */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB41-;:- */
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, /* RGB42-''- */
+ {0, SW8_CS39, SW8_CS38, SW8_CS37}, /* RGB43-ENTER- */
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, /* RGB44-PGDN */
+ {0, SW4_CS3, SW4_CS2, SW4_CS1}, /* RGB45-LSF --ROW3*/
+ {0, SW4_CS6, SW4_CS5, SW4_CS4}, /* RGB46-LSF split -*/
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB47-Z -*/
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB48-X -*/
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB49-C -*/
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB50-V -*/
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB51-B -*/
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB52-N -*/
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB53-M -*/
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB54-<, -*/
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB55->. -*/
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, /* RGB56-?/ -*/
+ {0, SW9_CS39, SW9_CS38, SW9_CS37}, /* RGB57-RSF -*/
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, /* RGB58-UP -*/
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, /* RGB59--MO-- */
+ {0, SW5_CS3, SW5_CS2, SW5_CS1}, /* RGB60-lct-- row4*/
+ {0, SW5_CS6, SW5_CS5, SW5_CS4}, /* RGB61-lwin- */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB62-lalt- */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB63-sp2.25- */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB64-sp7U6.25U1.25U- */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB65-sp2.75U- */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB66-ralt- */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB67-rctrl- */
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, /* RGB68-left- */
+ {0, SW5_CS39, SW5_CS38, SW5_CS37}, /* RGB69-dn- */
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, /* RGB70-right- */
};
led_config_t g_led_config = { {
diff --git a/keyboards/phentech/rpk_001/rpk_001.c b/keyboards/phentech/rpk_001/rpk_001.c
index b24c0c6c0e7..5ccd8d73930 100644
--- a/keyboards/phentech/rpk_001/rpk_001.c
+++ b/keyboards/phentech/rpk_001/rpk_001.c
@@ -14,77 +14,77 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS1_SW1, CS2_SW1, CS3_SW1 }, // 0 Esc
- {0, CS1_SW2, CS2_SW2, CS3_SW2 }, // 1 1
- {0, CS1_SW3, CS2_SW3, CS3_SW3 }, // 2 2
- {0, CS1_SW4, CS2_SW4, CS3_SW4 }, // 3 3
- {0, CS1_SW5, CS2_SW5, CS3_SW5 }, // 4 4
- {0, CS1_SW6, CS2_SW6, CS3_SW6 }, // 5 5
- {0, CS1_SW7, CS2_SW7, CS3_SW7 }, // 6 6
- {0, CS1_SW8, CS2_SW8, CS3_SW8 }, // 7 7
- {0, CS1_SW9, CS2_SW9, CS3_SW9 }, // 8 8
- {0, CS1_SW10, CS2_SW10, CS3_SW10 }, // 9 9
- {0, CS1_SW11, CS2_SW11, CS3_SW11 }, // 10 0
- {0, CS1_SW12, CS2_SW12, CS3_SW12 }, // 11 -
- {0, CS16_SW1, CS17_SW1, CS18_SW1 }, // 12 =
- {0, CS16_SW2, CS17_SW2, CS18_SW2 }, // 13 Backspace
+ {0, SW1_CS1, SW1_CS2, SW1_CS3 }, // 0 Esc
+ {0, SW2_CS1, SW2_CS2, SW2_CS3 }, // 1 1
+ {0, SW3_CS1, SW3_CS2, SW3_CS3 }, // 2 2
+ {0, SW4_CS1, SW4_CS2, SW4_CS3 }, // 3 3
+ {0, SW5_CS1, SW5_CS2, SW5_CS3 }, // 4 4
+ {0, SW6_CS1, SW6_CS2, SW6_CS3 }, // 5 5
+ {0, SW7_CS1, SW7_CS2, SW7_CS3 }, // 6 6
+ {0, SW8_CS1, SW8_CS2, SW8_CS3 }, // 7 7
+ {0, SW9_CS1, SW9_CS2, SW9_CS3 }, // 8 8
+ {0, SW10_CS1, SW10_CS2, SW10_CS3 }, // 9 9
+ {0, SW11_CS1, SW11_CS2, SW11_CS3 }, // 10 0
+ {0, SW12_CS1, SW12_CS2, SW12_CS3 }, // 11 -
+ {0, SW1_CS16, SW1_CS17, SW1_CS18 }, // 12 =
+ {0, SW2_CS16, SW2_CS17, SW2_CS18 }, // 13 Backspace
- {0, CS4_SW1, CS5_SW1, CS6_SW1 }, // 14 Tab
- {0, CS4_SW2, CS5_SW2, CS6_SW2 }, // 15 Q
- {0, CS4_SW3, CS5_SW3, CS6_SW3 }, // 16 W
- {0, CS4_SW4, CS5_SW4, CS6_SW4 }, // 17 E
- {0, CS4_SW5, CS5_SW5, CS6_SW5 }, // 18 R
- {0, CS4_SW6, CS5_SW6, CS6_SW6 }, // 19 T
- {0, CS4_SW7, CS5_SW7, CS6_SW7 }, // 20 Y
- {0, CS4_SW8, CS5_SW8, CS6_SW8 }, // 21 U
- {0, CS4_SW9, CS5_SW9, CS6_SW9 }, // 22 I
- {0, CS4_SW10, CS5_SW10, CS6_SW10 }, // 23 O
- {0, CS4_SW11, CS5_SW11, CS6_SW11 }, // 24 P
- {0, CS4_SW12, CS5_SW12, CS6_SW12 }, // 25 [
- {0, CS16_SW4, CS17_SW4, CS18_SW4 }, // 26 ]
- {0, CS16_SW5, CS17_SW5, CS18_SW5 }, // 27 \|
- {0, CS16_SW3, CS17_SW3, CS18_SW3 }, // 28 Del
+ {0, SW1_CS4, SW1_CS5, SW1_CS6 }, // 14 Tab
+ {0, SW2_CS4, SW2_CS5, SW2_CS6 }, // 15 Q
+ {0, SW3_CS4, SW3_CS5, SW3_CS6 }, // 16 W
+ {0, SW4_CS4, SW4_CS5, SW4_CS6 }, // 17 E
+ {0, SW5_CS4, SW5_CS5, SW5_CS6 }, // 18 R
+ {0, SW6_CS4, SW6_CS5, SW6_CS6 }, // 19 T
+ {0, SW7_CS4, SW7_CS5, SW7_CS6 }, // 20 Y
+ {0, SW8_CS4, SW8_CS5, SW8_CS6 }, // 21 U
+ {0, SW9_CS4, SW9_CS5, SW9_CS6 }, // 22 I
+ {0, SW10_CS4, SW10_CS5, SW10_CS6 }, // 23 O
+ {0, SW11_CS4, SW11_CS5, SW11_CS6 }, // 24 P
+ {0, SW12_CS4, SW12_CS5, SW12_CS6 }, // 25 [
+ {0, SW4_CS16, SW4_CS17, SW4_CS18 }, // 26 ]
+ {0, SW5_CS16, SW5_CS17, SW5_CS18 }, // 27 \|
+ {0, SW3_CS16, SW3_CS17, SW3_CS18 }, // 28 Del
- {0, CS7_SW1, CS8_SW1, CS9_SW1 }, // 29 Caps Lock
- {0, CS7_SW2, CS8_SW2, CS9_SW2 }, // 30 A
- {0, CS7_SW3, CS8_SW3, CS9_SW3 }, // 31 S
- {0, CS7_SW4, CS8_SW4, CS9_SW4 }, // 32 D
- {0, CS7_SW5, CS8_SW5, CS9_SW5 }, // 33 F
- {0, CS7_SW6, CS8_SW6, CS9_SW6 }, // 34 G
- {0, CS7_SW7, CS8_SW7, CS9_SW7 }, // 35 H
- {0, CS7_SW8, CS8_SW8, CS9_SW8 }, // 36 J
- {0, CS7_SW9, CS8_SW9, CS9_SW9 }, // 37 K
- {0, CS7_SW10, CS8_SW10, CS9_SW10 }, // 38 L
- {0, CS7_SW11, CS8_SW11, CS9_SW11 }, // 39 ;
- {0, CS7_SW12, CS8_SW12, CS9_SW12 }, // 40 '
- {0, CS16_SW7, CS17_SW7, CS18_SW7 }, // 41 Enter
- {0, CS16_SW6, CS17_SW6, CS18_SW6 }, // 42 Home
+ {0, SW1_CS7, SW1_CS8, SW1_CS9 }, // 29 Caps Lock
+ {0, SW2_CS7, SW2_CS8, SW2_CS9 }, // 30 A
+ {0, SW3_CS7, SW3_CS8, SW3_CS9 }, // 31 S
+ {0, SW4_CS7, SW4_CS8, SW4_CS9 }, // 32 D
+ {0, SW5_CS7, SW5_CS8, SW5_CS9 }, // 33 F
+ {0, SW6_CS7, SW6_CS8, SW6_CS9 }, // 34 G
+ {0, SW7_CS7, SW7_CS8, SW7_CS9 }, // 35 H
+ {0, SW8_CS7, SW8_CS8, SW8_CS9 }, // 36 J
+ {0, SW9_CS7, SW9_CS8, SW9_CS9 }, // 37 K
+ {0, SW10_CS7, SW10_CS8, SW10_CS9 }, // 38 L
+ {0, SW11_CS7, SW11_CS8, SW11_CS9 }, // 39 ;
+ {0, SW12_CS7, SW12_CS8, SW12_CS9 }, // 40 '
+ {0, SW7_CS16, SW7_CS17, SW7_CS18 }, // 41 Enter
+ {0, SW6_CS16, SW6_CS17, SW6_CS18 }, // 42 Home
- {0, CS10_SW1, CS11_SW1, CS12_SW1 }, // 43 Shift_L
- {0, CS10_SW3, CS11_SW3, CS12_SW3 }, // 44 Z
- {0, CS10_SW4, CS11_SW4, CS12_SW4 }, // 45 X
- {0, CS10_SW5, CS11_SW5, CS12_SW5 }, // 46 C
- {0, CS10_SW6, CS11_SW6, CS12_SW6 }, // 47 V
- {0, CS10_SW7, CS11_SW7, CS12_SW7 }, // 48 B
- {0, CS10_SW8, CS11_SW8, CS12_SW8 }, // 49 N
- {0, CS10_SW9, CS11_SW9, CS12_SW9 }, // 50 M
- {0, CS10_SW10, CS11_SW10, CS12_SW10 }, // 51 ,
- {0, CS10_SW11, CS11_SW11, CS12_SW11 }, // 52 .
- {0, CS10_SW12, CS11_SW12, CS12_SW12 }, // 53 /
- {0, CS16_SW9, CS17_SW9, CS18_SW9 }, // 54 Shift_R
- {0, CS16_SW10, CS17_SW10, CS18_SW10 }, // 55 Up
- {0, CS16_SW8, CS17_SW8, CS18_SW8 }, // 56 END
+ {0, SW1_CS10, SW1_CS11, SW1_CS12 }, // 43 Shift_L
+ {0, SW3_CS10, SW3_CS11, SW3_CS12 }, // 44 Z
+ {0, SW4_CS10, SW4_CS11, SW4_CS12 }, // 45 X
+ {0, SW5_CS10, SW5_CS11, SW5_CS12 }, // 46 C
+ {0, SW6_CS10, SW6_CS11, SW6_CS12 }, // 47 V
+ {0, SW7_CS10, SW7_CS11, SW7_CS12 }, // 48 B
+ {0, SW8_CS10, SW8_CS11, SW8_CS12 }, // 49 N
+ {0, SW9_CS10, SW9_CS11, SW9_CS12 }, // 50 M
+ {0, SW10_CS10, SW10_CS11, SW10_CS12 }, // 51 ,
+ {0, SW11_CS10, SW11_CS11, SW11_CS12 }, // 52 .
+ {0, SW12_CS10, SW12_CS11, SW12_CS12 }, // 53 /
+ {0, SW9_CS16, SW9_CS17, SW9_CS18 }, // 54 Shift_R
+ {0, SW10_CS16, SW10_CS17, SW10_CS18 }, // 55 Up
+ {0, SW8_CS16, SW8_CS17, SW8_CS18 }, // 56 END
- {0, CS13_SW1, CS14_SW1, CS15_SW1 }, // 57 Ctrl_L
- {0, CS13_SW2, CS14_SW2, CS15_SW2 }, // 58 Win_L
- {0, CS13_SW3, CS14_SW3, CS15_SW3 }, // 59 Alt_L
- {0, CS13_SW6, CS14_SW6, CS15_SW6 }, // 60 Space
- {0, CS13_SW9, CS14_SW9, CS15_SW9 }, // 61 Alt_R
- {0, CS13_SW10, CS14_SW10, CS15_SW10 }, // 62 Ctrl_R
- {0, CS13_SW11, CS14_SW11, CS15_SW11 }, // 63 FN
- {0, CS13_SW12, CS14_SW12, CS15_SW12 }, // 64 Left
- {0, CS16_SW12, CS17_SW12, CS18_SW12 }, // 65 Down
- {0, CS16_SW11, CS17_SW11, CS18_SW11 }, // 66 Right
+ {0, SW1_CS13, SW1_CS14, SW1_CS15 }, // 57 Ctrl_L
+ {0, SW2_CS13, SW2_CS14, SW2_CS15 }, // 58 Win_L
+ {0, SW3_CS13, SW3_CS14, SW3_CS15 }, // 59 Alt_L
+ {0, SW6_CS13, SW6_CS14, SW6_CS15 }, // 60 Space
+ {0, SW9_CS13, SW9_CS14, SW9_CS15 }, // 61 Alt_R
+ {0, SW10_CS13, SW10_CS14, SW10_CS15 }, // 62 Ctrl_R
+ {0, SW11_CS13, SW11_CS14, SW11_CS15 }, // 63 FN
+ {0, SW12_CS13, SW12_CS14, SW12_CS15 }, // 64 Left
+ {0, SW12_CS16, SW12_CS17, SW12_CS18 }, // 65 Down
+ {0, SW11_CS16, SW11_CS17, SW11_CS18 }, // 66 Right
};
// clang-format on
diff --git a/keyboards/planck/ez/ez.c b/keyboards/planck/ez/ez.c
index 532558a2941..522fd700338 100644
--- a/keyboards/planck/ez/ez.c
+++ b/keyboards/planck/ez/ez.c
@@ -28,60 +28,60 @@ const is31fl3737_led_t PROGMEM g_is31fl3737_leds[IS31FL3737_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, B_12, A_12, C_12},
- {0, B_11, A_11, C_11},
- {0, B_10, A_10, C_10},
- {0, B_9, A_9, C_9},
- {0, B_8, A_8, C_8},
- {0, B_7, A_7, C_7},
+ {0, SW2_CS12, SW1_CS12, SW3_CS12},
+ {0, SW2_CS11, SW1_CS11, SW3_CS11},
+ {0, SW2_CS10, SW1_CS10, SW3_CS10},
+ {0, SW2_CS9, SW1_CS9, SW3_CS9},
+ {0, SW2_CS8, SW1_CS8, SW3_CS8},
+ {0, SW2_CS7, SW1_CS7, SW3_CS7},
- {0, H_12, G_12, I_12},
- {0, H_11, G_11, I_11},
- {0, H_10, G_10, I_10},
- {0, H_9, G_9, I_9},
- {0, H_8, G_8, I_8},
- {0, H_7, G_7, I_7},
+ {0, SW8_CS12, SW7_CS12, SW9_CS12},
+ {0, SW8_CS11, SW7_CS11, SW9_CS11},
+ {0, SW8_CS10, SW7_CS10, SW9_CS10},
+ {0, SW8_CS9, SW7_CS9, SW9_CS9},
+ {0, SW8_CS8, SW7_CS8, SW9_CS8},
+ {0, SW8_CS7, SW7_CS7, SW9_CS7},
- {0, B_6, A_6, C_6},
- {0, B_5, A_5, C_5},
- {0, B_4, A_4, C_4},
- {0, B_3, A_3, C_3},
- {0, B_2, A_2, C_2},
- {0, B_1, A_1, C_1},
+ {0, SW2_CS6, SW1_CS6, SW3_CS6},
+ {0, SW2_CS5, SW1_CS5, SW3_CS5},
+ {0, SW2_CS4, SW1_CS4, SW3_CS4},
+ {0, SW2_CS3, SW1_CS3, SW3_CS3},
+ {0, SW2_CS2, SW1_CS2, SW3_CS2},
+ {0, SW2_CS1, SW1_CS1, SW3_CS1},
- {0, H_6, G_6, I_6},
- {0, H_5, G_5, I_5},
- {0, H_4, G_4, I_4},
- {0, H_3, G_3, I_3},
- {0, H_2, G_2, I_2},
- {0, H_1, G_1, I_1},
+ {0, SW8_CS6, SW7_CS6, SW9_CS6},
+ {0, SW8_CS5, SW7_CS5, SW9_CS5},
+ {0, SW8_CS4, SW7_CS4, SW9_CS4},
+ {0, SW8_CS3, SW7_CS3, SW9_CS3},
+ {0, SW8_CS2, SW7_CS2, SW9_CS2},
+ {0, SW8_CS1, SW7_CS1, SW9_CS1},
- {0, E_12, D_12, F_12},
- {0, E_11, D_11, F_11},
- {0, E_10, D_10, F_10},
- {0, E_9, D_9, F_9},
- {0, E_8, D_8, F_8},
- {0, E_7, D_7, F_7},
+ {0, SW5_CS12, SW4_CS12, SW6_CS12},
+ {0, SW5_CS11, SW4_CS11, SW6_CS11},
+ {0, SW5_CS10, SW4_CS10, SW6_CS10},
+ {0, SW5_CS9, SW4_CS9, SW6_CS9},
+ {0, SW5_CS8, SW4_CS8, SW6_CS8},
+ {0, SW5_CS7, SW4_CS7, SW6_CS7},
- {0, K_12, J_12, L_12},
- {0, K_11, J_11, L_11},
- {0, K_10, J_10, L_10},
- {0, K_9, J_9, L_9},
- {0, K_8, J_8, L_8},
- {0, K_7, J_7, L_7},
+ {0, SW11_CS12, SW10_CS12, SW12_CS12},
+ {0, SW11_CS11, SW10_CS11, SW12_CS11},
+ {0, SW11_CS10, SW10_CS10, SW12_CS10},
+ {0, SW11_CS9, SW10_CS9, SW12_CS9},
+ {0, SW11_CS8, SW10_CS8, SW12_CS8},
+ {0, SW11_CS7, SW10_CS7, SW12_CS7},
- {0, E_6, D_6, F_6},
- {0, E_5, D_5, F_5},
- {0, E_4, D_4, F_4},
- {0, E_3, D_3, F_3},
- {0, E_2, D_2, F_2},
- {0, E_1, D_1, F_1},
+ {0, SW5_CS6, SW4_CS6, SW6_CS6},
+ {0, SW5_CS5, SW4_CS5, SW6_CS5},
+ {0, SW5_CS4, SW4_CS4, SW6_CS4},
+ {0, SW5_CS3, SW4_CS3, SW6_CS3},
+ {0, SW5_CS2, SW4_CS2, SW6_CS2},
+ {0, SW5_CS1, SW4_CS1, SW6_CS1},
- {0, K_6, J_6, L_6},
- {0, K_5, J_5, L_5},
- {0, K_4, J_4, L_4},
- {0, K_3, J_3, L_3},
- {0, K_2, J_2, L_2},
+ {0, SW11_CS6, SW10_CS6, SW12_CS6},
+ {0, SW11_CS5, SW10_CS5, SW12_CS5},
+ {0, SW11_CS4, SW10_CS4, SW12_CS4},
+ {0, SW11_CS3, SW10_CS3, SW12_CS3},
+ {0, SW11_CS2, SW10_CS2, SW12_CS2},
};
diff --git a/keyboards/playkbtw/pk64rgb/pk64rgb.c b/keyboards/playkbtw/pk64rgb/pk64rgb.c
index 17b8c74b182..b745c82b9d5 100644
--- a/keyboards/playkbtw/pk64rgb/pk64rgb.c
+++ b/keyboards/playkbtw/pk64rgb/pk64rgb.c
@@ -25,74 +25,74 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | | B location
* | | | | */
- {0, A_1, B_1, C_1},
- {0, D_1, E_1, F_1},
- {0, G_1, H_1, I_1},
- {0, J_1, K_1, L_1},
- {0, A_6, B_6, C_6},
- {0, D_6, E_6, F_6},
- {0, G_6, H_6, I_6},
- {0, J_6, K_6, L_6},
- {0, A_11, B_11, C_11},
- {0, D_11, E_11, F_11},
- {0, G_11, H_11, I_11},
- {0, J_11, K_11, L_11},
- {0, A_16, B_16, C_16},
- {0, D_16, E_16, F_16},
+ {0, SW1_CS1, SW2_CS1, SW3_CS1},
+ {0, SW4_CS1, SW5_CS1, SW6_CS1},
+ {0, SW7_CS1, SW8_CS1, SW9_CS1},
+ {0, SW10_CS1, SW11_CS1, SW12_CS1},
+ {0, SW1_CS6, SW2_CS6, SW3_CS6},
+ {0, SW4_CS6, SW5_CS6, SW6_CS6},
+ {0, SW7_CS6, SW8_CS6, SW9_CS6},
+ {0, SW10_CS6, SW11_CS6, SW12_CS6},
+ {0, SW1_CS11, SW2_CS11, SW3_CS11},
+ {0, SW4_CS11, SW5_CS11, SW6_CS11},
+ {0, SW7_CS11, SW8_CS11, SW9_CS11},
+ {0, SW10_CS11, SW11_CS11, SW12_CS11},
+ {0, SW1_CS16, SW2_CS16, SW3_CS16},
+ {0, SW4_CS16, SW5_CS16, SW6_CS16},
- {0, A_2, B_2, C_2},
- {0, D_2, E_2, F_2},
- {0, G_2, H_2, I_2},
- {0, J_2, K_2, L_2},
- {0, A_7, B_7, C_7},
- {0, D_7, E_7, F_7},
- {0, G_7, H_7, I_7},
- {0, J_7, K_7, L_7},
- {0, A_12, B_12, C_12},
- {0, D_12, E_12, F_12},
- {0, G_12, H_12, I_12},
- {0, J_12, K_12, L_12},
- {0, G_16, H_16, I_16},
- {0, J_16, K_16, L_16},
+ {0, SW1_CS2, SW2_CS2, SW3_CS2},
+ {0, SW4_CS2, SW5_CS2, SW6_CS2},
+ {0, SW7_CS2, SW8_CS2, SW9_CS2},
+ {0, SW10_CS2, SW11_CS2, SW12_CS2},
+ {0, SW1_CS7, SW2_CS7, SW3_CS7},
+ {0, SW4_CS7, SW5_CS7, SW6_CS7},
+ {0, SW7_CS7, SW8_CS7, SW9_CS7},
+ {0, SW10_CS7, SW11_CS7, SW12_CS7},
+ {0, SW1_CS12, SW2_CS12, SW3_CS12},
+ {0, SW4_CS12, SW5_CS12, SW6_CS12},
+ {0, SW7_CS12, SW8_CS12, SW9_CS12},
+ {0, SW10_CS12, SW11_CS12, SW12_CS12},
+ {0, SW7_CS16, SW8_CS16, SW9_CS16},
+ {0, SW10_CS16, SW11_CS16, SW12_CS16},
- {0, A_3, B_3, C_3},
- {0, D_3, E_3, F_3},
- {0, G_3, H_3, I_3},
- {0, J_3, K_3, L_3},
- {0, A_8, B_8, C_8},
- {0, D_8, E_8, F_8},
- {0, G_8, H_8, I_8},
- {0, J_8, K_8, L_8},
- {0, A_13, B_13, C_13},
- {0, D_13, E_13, F_13},
- {0, G_13, H_13, I_13},
- {0, J_13, K_13, L_13},
- {0, A_15, B_15, C_15},
+ {0, SW1_CS3, SW2_CS3, SW3_CS3},
+ {0, SW4_CS3, SW5_CS3, SW6_CS3},
+ {0, SW7_CS3, SW8_CS3, SW9_CS3},
+ {0, SW10_CS3, SW11_CS3, SW12_CS3},
+ {0, SW1_CS8, SW2_CS8, SW3_CS8},
+ {0, SW4_CS8, SW5_CS8, SW6_CS8},
+ {0, SW7_CS8, SW8_CS8, SW9_CS8},
+ {0, SW10_CS8, SW11_CS8, SW12_CS8},
+ {0, SW1_CS13, SW2_CS13, SW3_CS13},
+ {0, SW4_CS13, SW5_CS13, SW6_CS13},
+ {0, SW7_CS13, SW8_CS13, SW9_CS13},
+ {0, SW10_CS13, SW11_CS13, SW12_CS13},
+ {0, SW1_CS15, SW2_CS15, SW3_CS15},
- {0, A_4, B_4, C_4},
- {0, D_4, E_4, F_4},
- {0, G_4, H_4, I_4},
- {0, J_4, K_4, L_4},
- {0, A_9, B_9, C_9},
- {0, D_9, E_9, F_9},
- {0, G_9, H_9, I_9},
- {0, J_9, K_9, L_9},
- {0, A_14, B_14, C_14},
- {0, D_14, E_14, F_14},
- {0, G_14, H_14, I_14},
- {0, J_14, K_14, L_14},
- {0, D_15, E_15, F_15},
- {0, G_15, H_15, I_15},
+ {0, SW1_CS4, SW2_CS4, SW3_CS4},
+ {0, SW4_CS4, SW5_CS4, SW6_CS4},
+ {0, SW7_CS4, SW8_CS4, SW9_CS4},
+ {0, SW10_CS4, SW11_CS4, SW12_CS4},
+ {0, SW1_CS9, SW2_CS9, SW3_CS9},
+ {0, SW4_CS9, SW5_CS9, SW6_CS9},
+ {0, SW7_CS9, SW8_CS9, SW9_CS9},
+ {0, SW10_CS9, SW11_CS9, SW12_CS9},
+ {0, SW1_CS14, SW2_CS14, SW3_CS14},
+ {0, SW4_CS14, SW5_CS14, SW6_CS14},
+ {0, SW7_CS14, SW8_CS14, SW9_CS14},
+ {0, SW10_CS14, SW11_CS14, SW12_CS14},
+ {0, SW4_CS15, SW5_CS15, SW6_CS15},
+ {0, SW7_CS15, SW8_CS15, SW9_CS15},
- {0, A_5, B_5, C_5},
- {0, D_5, E_5, F_5},
- {0, G_5, H_5, I_5},
- {0, J_5, K_5, L_5},
- {0, A_10, B_10, C_10},
- {0, D_10, E_10, F_10},
- {0, G_10, H_10, I_10},
- {0, J_10, K_10, L_10},
- {0, J_15, K_15, L_15}
+ {0, SW1_CS5, SW2_CS5, SW3_CS5},
+ {0, SW4_CS5, SW5_CS5, SW6_CS5},
+ {0, SW7_CS5, SW8_CS5, SW9_CS5},
+ {0, SW10_CS5, SW11_CS5, SW12_CS5},
+ {0, SW1_CS10, SW2_CS10, SW3_CS10},
+ {0, SW4_CS10, SW5_CS10, SW6_CS10},
+ {0, SW7_CS10, SW8_CS10, SW9_CS10},
+ {0, SW10_CS10, SW11_CS10, SW12_CS10},
+ {0, SW10_CS15, SW11_CS15, SW12_CS15}
};
led_config_t g_led_config = {{
diff --git a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
index c5b513447b9..e2a85a75c39 100644
--- a/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
+++ b/keyboards/projectd/65/projectd_65_ansi/projectd_65_ansi.c
@@ -25,84 +25,84 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- //{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, Esc
+ //{0, SW4_CS1, SW4_CS2, SW4_CS3}, // 0, Esc
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // 0, Esc
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 1, 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 2, 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 3, 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 4, 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 5, 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 6, 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 7, 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 8, 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 9, 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 10, 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // 11, -
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // 12, =
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // 13, Backspace
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // 14, Del
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // 0, Esc
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 1, 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 2, 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 3, 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 4, 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 5, 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 6, 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 7, 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 8, 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 9, 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 10, 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // 11, -
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // 12, =
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // 13, Backspace
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // 14, Del
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // 15, Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // 16, Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // 17, W
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // 18, E
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // 19, R
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // 20, T
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // 21, Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // 22, U
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // 23, I
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // 24, O
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // 25, P
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // 26, [
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // 27, ]
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // 28, "\\"
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // 29, PGUP
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // 15, Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // 16, Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // 17, W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // 18, E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // 19, R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // 20, T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // 21, Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // 22, U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // 23, I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // 24, O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // 25, P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // 26, [
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // 27, ]
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // 28, "\\"
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // 29, PGUP
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // 30, CapsLock
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // 31, A
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // 32, S
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // 33, D
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // 34, F
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // 35, G
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // 36, H
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // 37, J
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // 38, K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // 39, L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // 40, ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // 41, '
- {0, CS13_SW12, CS14_SW12, CS15_SW12}, // 42, Enter
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // 43, PGDN
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // 30, CapsLock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // 31, A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // 32, S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // 33, D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // 34, F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // 35, G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // 36, H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // 37, J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // 38, K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // 39, L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // 40, ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // 41, '
+ {0, SW12_CS13, SW12_CS14, SW12_CS15}, // 42, Enter
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // 43, PGDN
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // 44, LShift
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // 45, Z
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // 46, X
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // 47, C
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // 48, V
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // 49, B
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // 50, N
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // 51, M
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // 52, ,
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // 53, .
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // 54, /
- {0, CS16_SW8, CS17_SW8, CS18_SW8}, // 55, RShift
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // 56, Up
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // 57, END
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // 44, LShift
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // 45, Z
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // 46, X
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // 47, C
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // 48, V
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // 49, B
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // 50, N
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // 51, M
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // 52, ,
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // 53, .
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // 54, /
+ {0, SW8_CS16, SW8_CS17, SW8_CS18}, // 55, RShift
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // 56, Up
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // 57, END
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // 58, LCtrl
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // 59, LWin
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // 60, LAlt
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // 61, LED71
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // 62, LED72
- {0, CS16_SW4, CS17_SW4, CS18_SW4}, // 63, Space
- {0, CS16_SW7, CS17_SW7, CS18_SW7}, // 64, LED73
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // 65, LED74
- {0, CS16_SW5, CS17_SW5, CS18_SW5}, // 66, RAlt
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // 67, FN
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // 58, LCtrl
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // 59, LWin
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // 60, LAlt
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // 61, LED71
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // 62, LED72
+ {0, SW4_CS16, SW4_CS17, SW4_CS18}, // 63, Space
+ {0, SW7_CS16, SW7_CS17, SW7_CS18}, // 64, LED73
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // 65, LED74
+ {0, SW5_CS16, SW5_CS17, SW5_CS18}, // 66, RAlt
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // 67, FN
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // 68, Left
- {0, CS16_SW11, CS17_SW11, CS18_SW11}, // 69, Down
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // 70, Right
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // 68, Left
+ {0, SW11_CS16, SW11_CS17, SW11_CS18}, // 69, Down
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // 70, Right
};
diff --git a/keyboards/projectd/75/ansi/ansi.c b/keyboards/projectd/75/ansi/ansi.c
index 7dd38569dad..f32bf369a90 100644
--- a/keyboards/projectd/75/ansi/ansi.c
+++ b/keyboards/projectd/75/ansi/ansi.c
@@ -25,101 +25,101 @@ const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- //{0, CS1_SW4, CS2_SW4, CS3_SW4}, // 0, k00, Esc
+ //{0, SW4_CS1, SW4_CS2, SW4_CS3}, // 0, k00, Esc
- {0, CS1_SW1, CS2_SW1, CS3_SW1}, // Esc
- {0, CS1_SW2, CS2_SW2, CS3_SW2}, // F1
- {0, CS1_SW3, CS2_SW3, CS3_SW3}, // F2
- {0, CS1_SW4, CS2_SW4, CS3_SW4}, // F3
- {0, CS1_SW5, CS2_SW5, CS3_SW5}, // F4
- {0, CS1_SW6, CS2_SW6, CS3_SW6}, // F5
- {0, CS1_SW7, CS2_SW7, CS3_SW7}, // F6
- {0, CS1_SW8, CS2_SW8, CS3_SW8}, // F7
- {0, CS1_SW9, CS2_SW9, CS3_SW9}, // F8
- {0, CS1_SW10, CS2_SW10, CS3_SW10}, // F9
- {0, CS1_SW11, CS2_SW11, CS3_SW11}, // F10
- {0, CS1_SW12, CS2_SW12, CS3_SW12}, // F11
- {1, CS1_SW1, CS2_SW1, CS3_SW1}, // F12
- {1, CS4_SW1, CS5_SW1, CS6_SW1}, // Printscreen
- {1, CS4_SW3, CS5_SW3, CS6_SW3}, // Delete
+ {0, SW1_CS1, SW1_CS2, SW1_CS3}, // Esc
+ {0, SW2_CS1, SW2_CS2, SW2_CS3}, // F1
+ {0, SW3_CS1, SW3_CS2, SW3_CS3}, // F2
+ {0, SW4_CS1, SW4_CS2, SW4_CS3}, // F3
+ {0, SW5_CS1, SW5_CS2, SW5_CS3}, // F4
+ {0, SW6_CS1, SW6_CS2, SW6_CS3}, // F5
+ {0, SW7_CS1, SW7_CS2, SW7_CS3}, // F6
+ {0, SW8_CS1, SW8_CS2, SW8_CS3}, // F7
+ {0, SW9_CS1, SW9_CS2, SW9_CS3}, // F8
+ {0, SW10_CS1, SW10_CS2, SW10_CS3}, // F9
+ {0, SW11_CS1, SW11_CS2, SW11_CS3}, // F10
+ {0, SW12_CS1, SW12_CS2, SW12_CS3}, // F11
+ {1, SW1_CS1, SW1_CS2, SW1_CS3}, // F12
+ {1, SW1_CS4, SW1_CS5, SW1_CS6}, // Printscreen
+ {1, SW3_CS4, SW3_CS5, SW3_CS6}, // Delete
- {0, CS4_SW1, CS5_SW1, CS6_SW1}, // `
- {0, CS4_SW2, CS5_SW2, CS6_SW2}, // 1
- {0, CS4_SW3, CS5_SW3, CS6_SW3}, // 2
- {0, CS4_SW4, CS5_SW4, CS6_SW4}, // 3
- {0, CS4_SW5, CS5_SW5, CS6_SW5}, // 4
- {0, CS4_SW6, CS5_SW6, CS6_SW6}, // 5
- {0, CS4_SW7, CS5_SW7, CS6_SW7}, // 6
- {0, CS4_SW8, CS5_SW8, CS6_SW8}, // 7
- {0, CS4_SW9, CS5_SW9, CS6_SW9}, // 8
- {0, CS4_SW10, CS5_SW10, CS6_SW10}, // 9
- {0, CS4_SW11, CS5_SW11, CS6_SW11}, // 0
- {0, CS4_SW12, CS5_SW12, CS6_SW12}, // -
- {1, CS1_SW5, CS2_SW5, CS3_SW5}, // =
- {1, CS1_SW7, CS2_SW7, CS3_SW7}, // Backspace
- {1, CS4_SW5, CS5_SW5, CS6_SW5}, // Home
+ {0, SW1_CS4, SW1_CS5, SW1_CS6}, // `
+ {0, SW2_CS4, SW2_CS5, SW2_CS6}, // 1
+ {0, SW3_CS4, SW3_CS5, SW3_CS6}, // 2
+ {0, SW4_CS4, SW4_CS5, SW4_CS6}, // 3
+ {0, SW5_CS4, SW5_CS5, SW5_CS6}, // 4
+ {0, SW6_CS4, SW6_CS5, SW6_CS6}, // 5
+ {0, SW7_CS4, SW7_CS5, SW7_CS6}, // 6
+ {0, SW8_CS4, SW8_CS5, SW8_CS6}, // 7
+ {0, SW9_CS4, SW9_CS5, SW9_CS6}, // 8
+ {0, SW10_CS4, SW10_CS5, SW10_CS6}, // 9
+ {0, SW11_CS4, SW11_CS5, SW11_CS6}, // 0
+ {0, SW12_CS4, SW12_CS5, SW12_CS6}, // -
+ {1, SW5_CS1, SW5_CS2, SW5_CS3}, // =
+ {1, SW7_CS1, SW7_CS2, SW7_CS3}, // Backspace
+ {1, SW5_CS4, SW5_CS5, SW5_CS6}, // Home
- {0, CS7_SW1, CS8_SW1, CS9_SW1}, // Tab
- {0, CS7_SW2, CS8_SW2, CS9_SW2}, // Q
- {0, CS7_SW3, CS8_SW3, CS9_SW3}, // W
- {0, CS7_SW4, CS8_SW4, CS9_SW4}, // E
- {0, CS7_SW5, CS8_SW5, CS9_SW5}, // R
- {0, CS7_SW6, CS8_SW6, CS9_SW6}, // T
- {0, CS7_SW7, CS8_SW7, CS9_SW7}, // Y
- {0, CS7_SW8, CS8_SW8, CS9_SW8}, // U
- {0, CS7_SW9, CS8_SW9, CS9_SW9}, // I
- {0, CS7_SW10, CS8_SW10, CS9_SW10}, // O
- {0, CS7_SW11, CS8_SW11, CS9_SW11}, // P
- {0, CS7_SW12, CS8_SW12, CS9_SW12}, // [
- {1, CS1_SW8, CS2_SW8, CS3_SW8}, // ]
- {1, CS1_SW9, CS2_SW9, CS3_SW9}, // "\\"
- {1, CS4_SW4, CS5_SW4, CS6_SW4}, // PGUP
+ {0, SW1_CS7, SW1_CS8, SW1_CS9}, // Tab
+ {0, SW2_CS7, SW2_CS8, SW2_CS9}, // Q
+ {0, SW3_CS7, SW3_CS8, SW3_CS9}, // W
+ {0, SW4_CS7, SW4_CS8, SW4_CS9}, // E
+ {0, SW5_CS7, SW5_CS8, SW5_CS9}, // R
+ {0, SW6_CS7, SW6_CS8, SW6_CS9}, // T
+ {0, SW7_CS7, SW7_CS8, SW7_CS9}, // Y
+ {0, SW8_CS7, SW8_CS8, SW8_CS9}, // U
+ {0, SW9_CS7, SW9_CS8, SW9_CS9}, // I
+ {0, SW10_CS7, SW10_CS8, SW10_CS9}, // O
+ {0, SW11_CS7, SW11_CS8, SW11_CS9}, // P
+ {0, SW12_CS7, SW12_CS8, SW12_CS9}, // [
+ {1, SW8_CS1, SW8_CS2, SW8_CS3}, // ]
+ {1, SW9_CS1, SW9_CS2, SW9_CS3}, // "\\"
+ {1, SW4_CS4, SW4_CS5, SW4_CS6}, // PGUP
- {0, CS10_SW1, CS11_SW1, CS12_SW1}, // Caps Lock
- {0, CS10_SW2, CS11_SW2, CS12_SW2}, // A
- {0, CS10_SW3, CS11_SW3, CS12_SW3}, // S
- {0, CS10_SW4, CS11_SW4, CS12_SW4}, // D
- {0, CS10_SW5, CS11_SW5, CS12_SW5}, // F
- {0, CS10_SW6, CS11_SW6, CS12_SW6}, // G
- {0, CS10_SW7, CS11_SW7, CS12_SW7}, // H
- {0, CS10_SW8, CS11_SW8, CS12_SW8}, // J
- {0, CS10_SW9, CS11_SW9, CS12_SW9}, // K
- {0, CS10_SW10, CS11_SW10, CS12_SW10}, // L
- {0, CS10_SW11, CS11_SW11, CS12_SW11}, // ;
- {0, CS10_SW12, CS11_SW12, CS12_SW12}, // '
- {1, CS1_SW11, CS2_SW11, CS3_SW11}, // Enter
- {1, CS4_SW7, CS5_SW7, CS6_SW7}, // PGDN
+ {0, SW1_CS10, SW1_CS11, SW1_CS12}, // Caps Lock
+ {0, SW2_CS10, SW2_CS11, SW2_CS12}, // A
+ {0, SW3_CS10, SW3_CS11, SW3_CS12}, // S
+ {0, SW4_CS10, SW4_CS11, SW4_CS12}, // D
+ {0, SW5_CS10, SW5_CS11, SW5_CS12}, // F
+ {0, SW6_CS10, SW6_CS11, SW6_CS12}, // G
+ {0, SW7_CS10, SW7_CS11, SW7_CS12}, // H
+ {0, SW8_CS10, SW8_CS11, SW8_CS12}, // J
+ {0, SW9_CS10, SW9_CS11, SW9_CS12}, // K
+ {0, SW10_CS10, SW10_CS11, SW10_CS12}, // L
+ {0, SW11_CS10, SW11_CS11, SW11_CS12}, // ;
+ {0, SW12_CS10, SW12_CS11, SW12_CS12}, // '
+ {1, SW11_CS1, SW11_CS2, SW11_CS3}, // Enter
+ {1, SW7_CS4, SW7_CS5, SW7_CS6}, // PGDN
- {0, CS13_SW1, CS14_SW1, CS15_SW1}, // L Shift
- {0, CS13_SW2, CS14_SW2, CS15_SW2}, // Z
- {0, CS13_SW3, CS14_SW3, CS15_SW3}, // X
- {0, CS13_SW4, CS14_SW4, CS15_SW4}, // C
- {0, CS13_SW5, CS14_SW5, CS15_SW5}, // V
- {0, CS13_SW6, CS14_SW6, CS15_SW6}, // B
- {0, CS13_SW7, CS14_SW7, CS15_SW7}, // N
- {0, CS13_SW8, CS14_SW8, CS15_SW8}, // M
- {0, CS13_SW9, CS14_SW9, CS15_SW9}, // ,
- {0, CS13_SW10, CS14_SW10, CS15_SW10}, // .
- {0, CS13_SW11, CS14_SW11, CS15_SW11}, // "/""
- {1, CS4_SW8, CS5_SW8, CS6_SW8}, // R Shift
- {1, CS4_SW9, CS5_SW9, CS6_SW9}, // Up
- {1, CS4_SW6, CS5_SW6, CS6_SW6}, // END
+ {0, SW1_CS13, SW1_CS14, SW1_CS15}, // L Shift
+ {0, SW2_CS13, SW2_CS14, SW2_CS15}, // Z
+ {0, SW3_CS13, SW3_CS14, SW3_CS15}, // X
+ {0, SW4_CS13, SW4_CS14, SW4_CS15}, // C
+ {0, SW5_CS13, SW5_CS14, SW5_CS15}, // V
+ {0, SW6_CS13, SW6_CS14, SW6_CS15}, // B
+ {0, SW7_CS13, SW7_CS14, SW7_CS15}, // N
+ {0, SW8_CS13, SW8_CS14, SW8_CS15}, // M
+ {0, SW9_CS13, SW9_CS14, SW9_CS15}, // ,
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}, // .
+ {0, SW11_CS13, SW11_CS14, SW11_CS15}, // "/""
+ {1, SW8_CS4, SW8_CS5, SW8_CS6}, // R Shift
+ {1, SW9_CS4, SW9_CS5, SW9_CS6}, // Up
+ {1, SW6_CS4, SW6_CS5, SW6_CS6}, // END
- {0, CS16_SW1, CS17_SW1, CS18_SW1}, // L Ctrl
- {0, CS16_SW2, CS17_SW2, CS18_SW2}, // L Win
- {0, CS16_SW3, CS17_SW3, CS18_SW3}, // L Alt
- {0, CS16_SW4, CS17_SW4, CS18_SW4}, // LED1
- {0, CS16_SW5, CS17_SW5, CS18_SW5}, // LED2
- {0, CS16_SW6, CS17_SW6, CS18_SW6}, // Space
- {0, CS16_SW7, CS17_SW7, CS18_SW7}, // LED3
- {0, CS16_SW8, CS17_SW8, CS18_SW8}, // LED4
- {0, CS16_SW9, CS17_SW9, CS18_SW9}, // R Alt
- {0, CS16_SW10, CS17_SW10, CS18_SW10}, // FN
- {0, CS16_SW12, CS17_SW12, CS18_SW12}, // R Ctrl
+ {0, SW1_CS16, SW1_CS17, SW1_CS18}, // L Ctrl
+ {0, SW2_CS16, SW2_CS17, SW2_CS18}, // L Win
+ {0, SW3_CS16, SW3_CS17, SW3_CS18}, // L Alt
+ {0, SW4_CS16, SW4_CS17, SW4_CS18}, // LED1
+ {0, SW5_CS16, SW5_CS17, SW5_CS18}, // LED2
+ {0, SW6_CS16, SW6_CS17, SW6_CS18}, // Space
+ {0, SW7_CS16, SW7_CS17, SW7_CS18}, // LED3
+ {0, SW8_CS16, SW8_CS17, SW8_CS18}, // LED4
+ {0, SW9_CS16, SW9_CS17, SW9_CS18}, // R Alt
+ {0, SW10_CS16, SW10_CS17, SW10_CS18}, // FN
+ {0, SW12_CS16, SW12_CS17, SW12_CS18}, // R Ctrl
- {1, CS4_SW10, CS5_SW10, CS6_SW10}, // Left
- {1, CS4_SW11, CS5_SW11, CS6_SW11}, // Down
- {1, CS10_SW5, CS11_SW5, CS12_SW5}, // Right
+ {1, SW10_CS4, SW10_CS5, SW10_CS6}, // Left
+ {1, SW11_CS4, SW11_CS5, SW11_CS6}, // Down
+ {1, SW5_CS10, SW5_CS11, SW5_CS12}, // Right
};
#endif
diff --git a/keyboards/qwertykeys/qk100/ansi/ansi.c b/keyboards/qwertykeys/qk100/ansi/ansi.c
index 06f7c11fb2d..e1102aab516 100644
--- a/keyboards/qwertykeys/qk100/ansi/ansi.c
+++ b/keyboards/qwertykeys/qk100/ansi/ansi.c
@@ -18,107 +18,107 @@ along with this program. If not, see .
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS2_SW1, CS3_SW1, CS1_SW1}, /* RGB0-ESC ROW0*/
- {0, CS5_SW1, CS6_SW1, CS4_SW1}, /* RGB1-F1 */
- {0, CS8_SW1, CS9_SW1, CS7_SW1}, /* RGB2-F2 */
- {0, CS11_SW1, CS12_SW1, CS10_SW1}, /* RGB3-F3 */
- {0, CS14_SW1, CS15_SW1, CS13_SW1}, /* RGB4-F4 */
- {0, CS17_SW1, CS18_SW1, CS16_SW1}, /* RGB5-F5 */
- {0, CS20_SW1, CS21_SW1, CS19_SW1}, /* RGB6-F6 */
- {0, CS23_SW1, CS24_SW1, CS22_SW1}, /* RGB7-F7 */
- {0, CS26_SW1, CS27_SW1, CS25_SW1}, /* RGB8-F8 */
- {0, CS29_SW1, CS30_SW1, CS28_SW1}, /* RGB9-F9 */
- {0, CS32_SW1, CS33_SW1, CS31_SW1}, /* RGB10-F10 */
- {0, CS35_SW1, CS36_SW1, CS34_SW1}, /* RGB11-F11 */
- {0, CS38_SW1, CS39_SW1, CS37_SW1}, /* RGB12-F12 */
- {0, CS29_SW7, CS30_SW7, CS28_SW7}, /* RGB13-Delete */
- {0, CS32_SW7, CS33_SW7, CS31_SW7}, /* RGB14-End */
- {0, CS35_SW7, CS36_SW7, CS34_SW7}, /* RGB15-Insert */
- {0, CS38_SW7, CS39_SW7, CS37_SW7}, /* RGB16-Home */
- {0, CS2_SW2, CS3_SW2, CS1_SW2}, /* RGB17-~ ----ROW1*/
- {0, CS5_SW2, CS6_SW2, CS4_SW2}, /* RGB18-1 */
- {0, CS8_SW2, CS9_SW2, CS7_SW2}, /* RGB19-2 */
- {0, CS11_SW2, CS12_SW2, CS10_SW2}, /* RGB20-3 */
- {0, CS14_SW2, CS15_SW2, CS13_SW2}, /* RGB21-4 */
- {0, CS17_SW2, CS18_SW2, CS16_SW2}, /* RGB22-5 */
- {0, CS20_SW2, CS21_SW2, CS19_SW2}, /* RGB23-6 */
- {0, CS23_SW2, CS24_SW2, CS22_SW2}, /* RGB24-7 */
- {0, CS26_SW2, CS27_SW2, CS25_SW2}, /* RGB25-8 */
- {0, CS29_SW2, CS30_SW2, CS28_SW2}, /* RGB26-9 */
- {0, CS32_SW2, CS33_SW2, CS31_SW2}, /* RGB27-0 */
- {0, CS35_SW2, CS36_SW2, CS34_SW2}, /* RGB28--- */
- {0, CS38_SW2, CS39_SW2, CS37_SW2}, /* RGB29-+= */
- {0, CS26_SW7, CS27_SW7, CS25_SW7}, /* RGB30-BS */
- {0, CS29_SW8, CS30_SW8, CS28_SW8}, /* RGB31-Num Lock */
- {0, CS32_SW8, CS33_SW8, CS31_SW8}, /* RGB32- / */
- {0, CS35_SW8, CS36_SW8, CS34_SW8}, /* RGB33- * */
- {0, CS38_SW8, CS39_SW8, CS37_SW8}, /* RGB34- - */
- {0, CS2_SW3, CS3_SW3, CS1_SW3}, /* RGB35-TAB ----ROW2*/
- {0, CS5_SW3, CS6_SW3, CS4_SW3}, /* RGB36-Q */
- {0, CS8_SW3, CS9_SW3, CS7_SW3}, /* RGB37-W */
- {0, CS11_SW3, CS12_SW3, CS10_SW3}, /* RGB38-E */
- {0, CS14_SW3, CS15_SW3, CS13_SW3}, /* RGB39-R */
- {0, CS17_SW3, CS18_SW3, CS16_SW3}, /* RGB40-T */
- {0, CS20_SW3, CS21_SW3, CS19_SW3}, /* RGB41-Y */
- {0, CS23_SW3, CS24_SW3, CS22_SW3}, /* RGB42-U */
- {0, CS26_SW3, CS27_SW3, CS25_SW3}, /* RGB43-I */
- {0, CS29_SW3, CS30_SW3, CS28_SW3}, /* RGB44-O */
- {0, CS32_SW3, CS33_SW3, CS31_SW3}, /* RGB45-P */
- {0, CS35_SW3, CS36_SW3, CS34_SW3}, /* RGB46-[ */
- {0, CS38_SW3, CS39_SW3, CS37_SW3}, /* RGB47-] */
- {0, CS26_SW9, CS27_SW9, CS25_SW9}, /* RGB48-\ */
- {0, CS29_SW9, CS30_SW9, CS28_SW9}, /* RGB49-page up */
- {0, CS32_SW9, CS33_SW9, CS31_SW9}, /* RGB50-7 */
- {0, CS35_SW9, CS36_SW9, CS34_SW9}, /* RGB51-8 */
- {0, CS38_SW9, CS39_SW9, CS37_SW9}, /* RGB52-9 */
- {0, CS2_SW4, CS3_SW4, CS1_SW4}, /* RGB53-CAPS---ROW3*/
- {0, CS5_SW4, CS6_SW4, CS4_SW4}, /* RGB54-A-- */
- {0, CS8_SW4, CS9_SW4, CS7_SW4}, /* RGB55-S-- */
- {0, CS11_SW4, CS12_SW4, CS10_SW4}, /* RGB56-D */
- {0, CS14_SW4, CS15_SW4, CS13_SW4}, /* RGB57-F */
- {0, CS17_SW4, CS18_SW4, CS16_SW4}, /* RGB58-G */
- {0, CS20_SW4, CS21_SW4, CS19_SW4}, /* RGB59-H */
- {0, CS23_SW4, CS24_SW4, CS22_SW4}, /* RGB60-J */
- {0, CS26_SW4, CS27_SW4, CS25_SW4}, /* RGB61-K */
- {0, CS29_SW4, CS30_SW4, CS28_SW4}, /* RGB62-L */
- {0, CS32_SW4, CS33_SW4, CS31_SW4}, /* RGB63-;: */
- {0, CS35_SW4, CS36_SW4, CS34_SW4}, /* RGB64-'" */
- {0, CS38_SW4, CS39_SW4, CS37_SW4}, /* RGB65-ENTER */
- {0, CS11_SW7, CS12_SW7, CS10_SW7}, /* RGB66-Page Down */
- {0, CS14_SW7, CS15_SW7, CS13_SW7}, /* RGB67-4 */
- {0, CS17_SW7, CS18_SW7, CS16_SW7}, /* RGB68-5 */
- {0, CS20_SW7, CS21_SW7, CS19_SW7}, /* RGB69-6 */
- {0, CS23_SW7, CS24_SW7, CS22_SW7}, /* RGB70-+ */
- {0, CS2_SW5, CS3_SW5, CS1_SW5}, /* RGB71-LSF --ROW4*/
- {0, CS5_SW5, CS6_SW5, CS4_SW5}, /* RGB72-Z */
- {0, CS8_SW5, CS9_SW5, CS7_SW5}, /* RGB73-X */
- {0, CS11_SW5, CS12_SW5, CS10_SW5}, /* RGB74-C */
- {0, CS14_SW5, CS15_SW5, CS13_SW5}, /* RGB75-V */
- {0, CS17_SW5, CS18_SW5, CS16_SW5}, /* RGB76-B */
- {0, CS20_SW5, CS21_SW5, CS19_SW5}, /* RGB77-N */
- {0, CS23_SW5, CS24_SW5, CS22_SW5}, /* RGB78-M */
- {0, CS26_SW5, CS27_SW5, CS25_SW5}, /* RGB79-,< */
- {0, CS29_SW5, CS30_SW5, CS28_SW5}, /* RGB80->. */
- {0, CS32_SW5, CS33_SW5, CS31_SW5}, /* RGB81-?/ */
- {0, CS35_SW5, CS36_SW5, CS34_SW5}, /* RGB82-RSF */
- {0, CS38_SW5, CS39_SW5, CS37_SW5}, /* RGB83-UP */
- {0, CS14_SW8, CS15_SW8, CS13_SW8}, /* RGB84-1*/
- {0, CS17_SW8, CS18_SW8, CS16_SW8}, /* RGB85-2 */
- {0, CS20_SW8, CS21_SW8, CS19_SW8}, /* RGB86-3 */
- {0, CS23_SW8, CS24_SW8, CS22_SW8}, /* RGB87-Enter */
- {0, CS2_SW6, CS3_SW6, CS1_SW6}, /* RGB88-lct-- ROW5*/
- {0, CS5_SW6, CS6_SW6, CS4_SW6}, /* RGB89-lwin */
- {0, CS8_SW6, CS9_SW6, CS7_SW6}, /* RGB90-lalt */
- {0, CS11_SW6, CS12_SW6, CS10_SW6}, /* RGB91-sp0 */
- {0, CS17_SW6, CS18_SW6, CS16_SW6}, /* RGB92-sp */
- {0, CS26_SW6, CS27_SW6, CS25_SW6}, /* RGB93-sp2 */
- {0, CS29_SW6, CS30_SW6, CS28_SW6}, /* RGB94-ralt */
- {0, CS32_SW6, CS33_SW6, CS31_SW6}, /* RGB95- fn */
- {0, CS35_SW6, CS36_SW6, CS34_SW6}, /* RGB96-left */
- {0, CS38_SW6, CS39_SW6, CS37_SW6}, /* RGB97-down */
- {0, CS11_SW9, CS12_SW9, CS10_SW9}, /* RGB98-right */
- {0, CS14_SW9, CS15_SW9, CS13_SW9}, /* RGB99- 0 */
- {0, CS20_SW9, CS21_SW9, CS19_SW9} /* RGB100- . */
+ {0, SW1_CS2, SW1_CS3, SW1_CS1}, /* RGB0-ESC ROW0*/
+ {0, SW1_CS5, SW1_CS6, SW1_CS4}, /* RGB1-F1 */
+ {0, SW1_CS8, SW1_CS9, SW1_CS7}, /* RGB2-F2 */
+ {0, SW1_CS11, SW1_CS12, SW1_CS10}, /* RGB3-F3 */
+ {0, SW1_CS14, SW1_CS15, SW1_CS13}, /* RGB4-F4 */
+ {0, SW1_CS17, SW1_CS18, SW1_CS16}, /* RGB5-F5 */
+ {0, SW1_CS20, SW1_CS21, SW1_CS19}, /* RGB6-F6 */
+ {0, SW1_CS23, SW1_CS24, SW1_CS22}, /* RGB7-F7 */
+ {0, SW1_CS26, SW1_CS27, SW1_CS25}, /* RGB8-F8 */
+ {0, SW1_CS29, SW1_CS30, SW1_CS28}, /* RGB9-F9 */
+ {0, SW1_CS32, SW1_CS33, SW1_CS31}, /* RGB10-F10 */
+ {0, SW1_CS35, SW1_CS36, SW1_CS34}, /* RGB11-F11 */
+ {0, SW1_CS38, SW1_CS39, SW1_CS37}, /* RGB12-F12 */
+ {0, SW7_CS29, SW7_CS30, SW7_CS28}, /* RGB13-Delete */
+ {0, SW7_CS32, SW7_CS33, SW7_CS31}, /* RGB14-End */
+ {0, SW7_CS35, SW7_CS36, SW7_CS34}, /* RGB15-Insert */
+ {0, SW7_CS38, SW7_CS39, SW7_CS37}, /* RGB16-Home */
+ {0, SW2_CS2, SW2_CS3, SW2_CS1}, /* RGB17-~ ----ROW1*/
+ {0, SW2_CS5, SW2_CS6, SW2_CS4}, /* RGB18-1 */
+ {0, SW2_CS8, SW2_CS9, SW2_CS7}, /* RGB19-2 */
+ {0, SW2_CS11, SW2_CS12, SW2_CS10}, /* RGB20-3 */
+ {0, SW2_CS14, SW2_CS15, SW2_CS13}, /* RGB21-4 */
+ {0, SW2_CS17, SW2_CS18, SW2_CS16}, /* RGB22-5 */
+ {0, SW2_CS20, SW2_CS21, SW2_CS19}, /* RGB23-6 */
+ {0, SW2_CS23, SW2_CS24, SW2_CS22}, /* RGB24-7 */
+ {0, SW2_CS26, SW2_CS27, SW2_CS25}, /* RGB25-8 */
+ {0, SW2_CS29, SW2_CS30, SW2_CS28}, /* RGB26-9 */
+ {0, SW2_CS32, SW2_CS33, SW2_CS31}, /* RGB27-0 */
+ {0, SW2_CS35, SW2_CS36, SW2_CS34}, /* RGB28--- */
+ {0, SW2_CS38, SW2_CS39, SW2_CS37}, /* RGB29-+= */
+ {0, SW7_CS26, SW7_CS27, SW7_CS25}, /* RGB30-BS */
+ {0, SW8_CS29, SW8_CS30, SW8_CS28}, /* RGB31-Num Lock */
+ {0, SW8_CS32, SW8_CS33, SW8_CS31}, /* RGB32- / */
+ {0, SW8_CS35, SW8_CS36, SW8_CS34}, /* RGB33- * */
+ {0, SW8_CS38, SW8_CS39, SW8_CS37}, /* RGB34- - */
+ {0, SW3_CS2, SW3_CS3, SW3_CS1}, /* RGB35-TAB ----ROW2*/
+ {0, SW3_CS5, SW3_CS6, SW3_CS4}, /* RGB36-Q */
+ {0, SW3_CS8, SW3_CS9, SW3_CS7}, /* RGB37-W */
+ {0, SW3_CS11, SW3_CS12, SW3_CS10}, /* RGB38-E */
+ {0, SW3_CS14, SW3_CS15, SW3_CS13}, /* RGB39-R */
+ {0, SW3_CS17, SW3_CS18, SW3_CS16}, /* RGB40-T */
+ {0, SW3_CS20, SW3_CS21, SW3_CS19}, /* RGB41-Y */
+ {0, SW3_CS23, SW3_CS24, SW3_CS22}, /* RGB42-U */
+ {0, SW3_CS26, SW3_CS27, SW3_CS25}, /* RGB43-I */
+ {0, SW3_CS29, SW3_CS30, SW3_CS28}, /* RGB44-O */
+ {0, SW3_CS32, SW3_CS33, SW3_CS31}, /* RGB45-P */
+ {0, SW3_CS35, SW3_CS36, SW3_CS34}, /* RGB46-[ */
+ {0, SW3_CS38, SW3_CS39, SW3_CS37}, /* RGB47-] */
+ {0, SW9_CS26, SW9_CS27, SW9_CS25}, /* RGB48-\ */
+ {0, SW9_CS29, SW9_CS30, SW9_CS28}, /* RGB49-page up */
+ {0, SW9_CS32, SW9_CS33, SW9_CS31}, /* RGB50-7 */
+ {0, SW9_CS35, SW9_CS36, SW9_CS34}, /* RGB51-8 */
+ {0, SW9_CS38, SW9_CS39, SW9_CS37}, /* RGB52-9 */
+ {0, SW4_CS2, SW4_CS3, SW4_CS1}, /* RGB53-CAPS---ROW3*/
+ {0, SW4_CS5, SW4_CS6, SW4_CS4}, /* RGB54-A-- */
+ {0, SW4_CS8, SW4_CS9, SW4_CS7}, /* RGB55-S-- */
+ {0, SW4_CS11, SW4_CS12, SW4_CS10}, /* RGB56-D */
+ {0, SW4_CS14, SW4_CS15, SW4_CS13}, /* RGB57-F */
+ {0, SW4_CS17, SW4_CS18, SW4_CS16}, /* RGB58-G */
+ {0, SW4_CS20, SW4_CS21, SW4_CS19}, /* RGB59-H */
+ {0, SW4_CS23, SW4_CS24, SW4_CS22}, /* RGB60-J */
+ {0, SW4_CS26, SW4_CS27, SW4_CS25}, /* RGB61-K */
+ {0, SW4_CS29, SW4_CS30, SW4_CS28}, /* RGB62-L */
+ {0, SW4_CS32, SW4_CS33, SW4_CS31}, /* RGB63-;: */
+ {0, SW4_CS35, SW4_CS36, SW4_CS34}, /* RGB64-'" */
+ {0, SW4_CS38, SW4_CS39, SW4_CS37}, /* RGB65-ENTER */
+ {0, SW7_CS11, SW7_CS12, SW7_CS10}, /* RGB66-Page Down */
+ {0, SW7_CS14, SW7_CS15, SW7_CS13}, /* RGB67-4 */
+ {0, SW7_CS17, SW7_CS18, SW7_CS16}, /* RGB68-5 */
+ {0, SW7_CS20, SW7_CS21, SW7_CS19}, /* RGB69-6 */
+ {0, SW7_CS23, SW7_CS24, SW7_CS22}, /* RGB70-+ */
+ {0, SW5_CS2, SW5_CS3, SW5_CS1}, /* RGB71-LSF --ROW4*/
+ {0, SW5_CS5, SW5_CS6, SW5_CS4}, /* RGB72-Z */
+ {0, SW5_CS8, SW5_CS9, SW5_CS7}, /* RGB73-X */
+ {0, SW5_CS11, SW5_CS12, SW5_CS10}, /* RGB74-C */
+ {0, SW5_CS14, SW5_CS15, SW5_CS13}, /* RGB75-V */
+ {0, SW5_CS17, SW5_CS18, SW5_CS16}, /* RGB76-B */
+ {0, SW5_CS20, SW5_CS21, SW5_CS19}, /* RGB77-N */
+ {0, SW5_CS23, SW5_CS24, SW5_CS22}, /* RGB78-M */
+ {0, SW5_CS26, SW5_CS27, SW5_CS25}, /* RGB79-,< */
+ {0, SW5_CS29, SW5_CS30, SW5_CS28}, /* RGB80->. */
+ {0, SW5_CS32, SW5_CS33, SW5_CS31}, /* RGB81-?/ */
+ {0, SW5_CS35, SW5_CS36, SW5_CS34}, /* RGB82-RSF */
+ {0, SW5_CS38, SW5_CS39, SW5_CS37}, /* RGB83-UP */
+ {0, SW8_CS14, SW8_CS15, SW8_CS13}, /* RGB84-1*/
+ {0, SW8_CS17, SW8_CS18, SW8_CS16}, /* RGB85-2 */
+ {0, SW8_CS20, SW8_CS21, SW8_CS19}, /* RGB86-3 */
+ {0, SW8_CS23, SW8_CS24, SW8_CS22}, /* RGB87-Enter */
+ {0, SW6_CS2, SW6_CS3, SW6_CS1}, /* RGB88-lct-- ROW5*/
+ {0, SW6_CS5, SW6_CS6, SW6_CS4}, /* RGB89-lwin */
+ {0, SW6_CS8, SW6_CS9, SW6_CS7}, /* RGB90-lalt */
+ {0, SW6_CS11, SW6_CS12, SW6_CS10}, /* RGB91-sp0 */
+ {0, SW6_CS17, SW6_CS18, SW6_CS16}, /* RGB92-sp */
+ {0, SW6_CS26, SW6_CS27, SW6_CS25}, /* RGB93-sp2 */
+ {0, SW6_CS29, SW6_CS30, SW6_CS28}, /* RGB94-ralt */
+ {0, SW6_CS32, SW6_CS33, SW6_CS31}, /* RGB95- fn */
+ {0, SW6_CS35, SW6_CS36, SW6_CS34}, /* RGB96-left */
+ {0, SW6_CS38, SW6_CS39, SW6_CS37}, /* RGB97-down */
+ {0, SW9_CS11, SW9_CS12, SW9_CS10}, /* RGB98-right */
+ {0, SW9_CS14, SW9_CS15, SW9_CS13}, /* RGB99- 0 */
+ {0, SW9_CS20, SW9_CS21, SW9_CS19} /* RGB100- . */
};
bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
diff --git a/keyboards/redragon/k667/k667.c b/keyboards/redragon/k667/k667.c
index a1930f3b85b..b84bfa40c1d 100644
--- a/keyboards/redragon/k667/k667.c
+++ b/keyboards/redragon/k667/k667.c
@@ -18,95 +18,95 @@
#ifdef RGB_MATRIX_ENABLE
const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
- {0, G_1, I_1, H_1},
- {0, G_3, I_3, H_3},
- {0, G_4, I_4, H_4},
- {0, G_5, I_5, H_5},
- {0, G_6, I_6, H_6},
- {0, G_7, I_7, H_7},
- {0, G_8, I_8, H_8},
- {0, G_9, I_9, H_9},
- {0, G_10, I_10, H_10},
- {0, G_11, I_11, H_11},
- {0, G_12, I_12, H_12},
- {0, G_13, I_13, H_13},
- {0, G_14, I_14, H_14},
- {0, G_15, I_15, H_15},
- {0, D_1, F_1, E_1},
- {0, D_2, F_2, E_2},
- {0, D_3, F_3, E_3},
- {0, D_4, F_4, E_4},
- {0, D_5, F_5, E_5},
- {0, D_6, F_6, E_6},
- {0, D_7, F_7, E_7},
- {0, D_8, F_8, E_8},
- {0, D_9, F_9, E_9},
- {0, D_10, F_10, E_10},
- {0, D_11, F_11, E_11},
- {0, D_12, F_12, E_12},
- {0, D_13, F_13, E_13},
- {0, D_14, F_14, E_14},
- {0, D_15, F_15, E_15},
- {0, A_1, C_1, B_1},
- {0, A_2, C_2, B_2},
- {0, A_3, C_3, B_3},
- {0, A_4, C_4, B_4},
- {0, A_5, C_5, B_5},
- {0, A_6, C_6, B_6},
- {0, A_7, C_7, B_7},
- {0, A_8, C_8, B_8},
- {0, A_9, C_9, B_9},
- {0, A_10, C_10, B_10},
- {0, A_11, C_11, B_11},
- {0, A_12, C_12, B_12},
- {0, A_13, C_13, B_13},
- {0, A_14, C_14, B_14},
- {0, A_15, C_15, B_15},
- {1, G_1, I_1, H_1},
- {1, G_2, I_2, H_2},
- {1, G_3, I_3, H_3},
- {1, G_4, I_4, H_4},
- {1, G_5, I_5, H_5},
- {1, G_6, I_6, H_6},
- {1, G_7, I_7, H_7},
- {1, G_8, I_8, H_8},
- {1, G_9, I_9, H_9},
- {1, G_10, I_10, H_10},
- {1, G_11, I_11, H_11},
- {1, G_12, I_12, H_12},
- {1, G_13, I_13, H_13},
- {1, G_14, I_14, H_14},
- {1, G_15, I_15, H_15},
- {1, D_1, F_1, E_1},
- {1, D_2, F_2, E_2},
- {1, D_3, F_3, E_3},
- {1, D_4, F_4, E_4},
- {1, D_5, F_5, E_5},
- {1, D_6, F_6, E_6},
- {1, D_7, F_7, E_7},
- {1, D_8, F_8, E_8},
- {1, D_9, F_9, E_9},
- {1, D_10, F_10, E_10},
- {1, D_11, F_11, E_11},
- {1, D_12, F_12, E_12},
- {1, D_13, F_13, E_13},
- {1, D_14, F_14, E_14},
- {1, D_15, F_15, E_15},
- {1, A_1, C_1, B_1},
- {1, A_2, C_2, B_2},
- {1, A_3, C_3, B_3},
- {1, A_5, C_5, B_5},
- {1, A_6, C_6, B_6},
- {1, A_7, C_7, B_7},
- {1, A_8, C_8, B_8},
- {1, A_9, C_9, B_9},
- {1, A_10, C_10, B_10},
- {1, A_11, C_11, B_11},
- {1, A_12, C_12, B_12},
- {1, A_13, C_13, B_13},
- {1, A_14, C_14, B_14},
- {1, A_15, C_15, B_15},
- {0, G_2, I_2, H_2},
- {1, A_4, C_4, B_4}
+ {0, SW7_CS1, SW9_CS1, SW8_CS1},
+ {0, SW7_CS3, SW9_CS3, SW8_CS3},
+ {0, SW7_CS4, SW9_CS4, SW8_CS4},
+ {0, SW7_CS5, SW9_CS5, SW8_CS5},
+ {0, SW7_CS6, SW9_CS6, SW8_CS6},
+ {0, SW7_CS7, SW9_CS7, SW8_CS7},
+ {0, SW7_CS8, SW9_CS8, SW8_CS8},
+ {0, SW7_CS9, SW9_CS9, SW8_CS9},
+ {0, SW7_CS10, SW9_CS10, SW8_CS10},
+ {0, SW7_CS11, SW9_CS11, SW8_CS11},
+ {0, SW7_CS12, SW9_CS12, SW8_CS12},
+ {0, SW7_CS13, SW9_CS13, SW8_CS13},
+ {0, SW7_CS14, SW9_CS14, SW8_CS14},
+ {0, SW7_CS15, SW9_CS15, SW8_CS15},
+ {0, SW4_CS1, SW6_CS1, SW5_CS1},
+ {0, SW4_CS2, SW6_CS2, SW5_CS2},
+ {0, SW4_CS3, SW6_CS3, SW5_CS3},
+ {0, SW4_CS4, SW6_CS4, SW5_CS4},
+ {0, SW4_CS5, SW6_CS5, SW5_CS5},
+ {0, SW4_CS6, SW6_CS6, SW5_CS6},
+ {0, SW4_CS7, SW6_CS7, SW5_CS7},
+ {0, SW4_CS8, SW6_CS8, SW5_CS8},
+ {0, SW4_CS9, SW6_CS9, SW5_CS9},
+ {0, SW4_CS10, SW6_CS10, SW5_CS10},
+ {0, SW4_CS11, SW6_CS11, SW5_CS11},
+ {0, SW4_CS12, SW6_CS12, SW5_CS12},
+ {0, SW4_CS13, SW6_CS13, SW5_CS13},
+ {0, SW4_CS14, SW6_CS14, SW5_CS14},
+ {0, SW4_CS15, SW6_CS15, SW5_CS15},
+ {0, SW1_CS1, SW3_CS1, SW2_CS1},
+ {0, SW1_CS2, SW3_CS2, SW2_CS2},
+ {0, SW1_CS3, SW3_CS3, SW2_CS3},
+ {0, SW1_CS4, SW3_CS4, SW2_CS4},
+ {0, SW1_CS5, SW3_CS5, SW2_CS5},
+ {0, SW1_CS6, SW3_CS6, SW2_CS6},
+ {0, SW1_CS7, SW3_CS7, SW2_CS7},
+ {0, SW1_CS8, SW3_CS8, SW2_CS8},
+ {0, SW1_CS9, SW3_CS9, SW2_CS9},
+ {0, SW1_CS10, SW3_CS10, SW2_CS10},
+ {0, SW1_CS11, SW3_CS11, SW2_CS11},
+ {0, SW1_CS12, SW3_CS12, SW2_CS12},
+ {0, SW1_CS13, SW3_CS13, SW2_CS13},
+ {0, SW1_CS14, SW3_CS14, SW2_CS14},
+ {0, SW1_CS15, SW3_CS15, SW2_CS15},
+ {1, SW7_CS1, SW9_CS1, SW8_CS1},
+ {1, SW7_CS2, SW9_CS2, SW8_CS2},
+ {1, SW7_CS3, SW9_CS3, SW8_CS3},
+ {1, SW7_CS4, SW9_CS4, SW8_CS4},
+ {1, SW7_CS5, SW9_CS5, SW8_CS5},
+ {1, SW7_CS6, SW9_CS6, SW8_CS6},
+ {1, SW7_CS7, SW9_CS7, SW8_CS7},
+ {1, SW7_CS8, SW9_CS8, SW8_CS8},
+ {1, SW7_CS9, SW9_CS9, SW8_CS9},
+ {1, SW7_CS10, SW9_CS10, SW8_CS10},
+ {1, SW7_CS11, SW9_CS11, SW8_CS11},
+ {1, SW7_CS12, SW9_CS12, SW8_CS12},
+ {1, SW7_CS13, SW9_CS13, SW8_CS13},
+ {1, SW7_CS14, SW9_CS14, SW8_CS14},
+ {1, SW7_CS15, SW9_CS15, SW8_CS15},
+ {1, SW4_CS1, SW6_CS1, SW5_CS1},
+ {1, SW4_CS2, SW6_CS2, SW5_CS2},
+ {1, SW4_CS3, SW6_CS3, SW5_CS3},
+ {1, SW4_CS4, SW6_CS4, SW5_CS4},
+ {1, SW4_CS5, SW6_CS5, SW5_CS5},
+ {1, SW4_CS6, SW6_CS6, SW5_CS6},
+ {1, SW4_CS7, SW6_CS7, SW5_CS7},
+ {1, SW4_CS8, SW6_CS8, SW5_CS8},
+ {1, SW4_CS9, SW6_CS9, SW5_CS9},
+ {1, SW4_CS10, SW6_CS10, SW5_CS10},
+ {1, SW4_CS11, SW6_CS11, SW5_CS11},
+ {1, SW4_CS12, SW6_CS12, SW5_CS12},
+ {1, SW4_CS13, SW6_CS13, SW5_CS13},
+ {1, SW4_CS14, SW6_CS14, SW5_CS14},
+ {1, SW4_CS15, SW6_CS15, SW5_CS15},
+ {1, SW1_CS1, SW3_CS1, SW2_CS1},
+ {1, SW1_CS2, SW3_CS2, SW2_CS2},
+ {1, SW1_CS3, SW3_CS3, SW2_CS3},
+ {1, SW1_CS5, SW3_CS5, SW2_CS5},
+ {1, SW1_CS6, SW3_CS6, SW2_CS6},
+ {1, SW1_CS7, SW3_CS7, SW2_CS7},
+ {1, SW1_CS8, SW3_CS8, SW2_CS8},
+ {1, SW1_CS9, SW3_CS9, SW2_CS9},
+ {1, SW1_CS10, SW3_CS10, SW2_CS10},
+ {1, SW1_CS11, SW3_CS11, SW2_CS11},
+ {1, SW1_CS12, SW3_CS12, SW2_CS12},
+ {1, SW1_CS13, SW3_CS13, SW2_CS13},
+ {1, SW1_CS14, SW3_CS14, SW2_CS14},
+ {1, SW1_CS15, SW3_CS15, SW2_CS15},
+ {0, SW7_CS2, SW9_CS2, SW8_CS2},
+ {1, SW1_CS4, SW3_CS4, SW2_CS4}
};
#endif
diff --git a/keyboards/skyloong/gk61/pro/pro.c b/keyboards/skyloong/gk61/pro/pro.c
index 55fcf3b41f5..06d9ce721d8 100644
--- a/keyboards/skyloong/gk61/pro/pro.c
+++ b/keyboards/skyloong/gk61/pro/pro.c
@@ -13,74 +13,74 @@ const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS1_SW1, CS2_SW1, CS3_SW1},
- {0, CS1_SW2, CS2_SW2, CS3_SW2},
- {0, CS1_SW3, CS2_SW3, CS3_SW3},
- {0, CS1_SW4, CS2_SW4, CS3_SW4},
- {0, CS1_SW5, CS2_SW5, CS3_SW5},
- {0, CS1_SW6, CS2_SW6, CS3_SW6},
- {0, CS1_SW7, CS2_SW7, CS3_SW7},
- {0, CS1_SW8, CS2_SW8, CS3_SW8},
- {0, CS1_SW9, CS2_SW9, CS3_SW9},
- {0, CS1_SW10, CS2_SW10, CS3_SW10},
- {0, CS1_SW11, CS2_SW11, CS3_SW11},
- {0, CS16_SW1, CS17_SW1, CS18_SW1},
- {0, CS16_SW2, CS17_SW2, CS18_SW2},
- {0, CS16_SW3, CS17_SW3, CS18_SW3},
+ {0, SW1_CS1, SW1_CS2, SW1_CS3},
+ {0, SW2_CS1, SW2_CS2, SW2_CS3},
+ {0, SW3_CS1, SW3_CS2, SW3_CS3},
+ {0, SW4_CS1, SW4_CS2, SW4_CS3},
+ {0, SW5_CS1, SW5_CS2, SW5_CS3},
+ {0, SW6_CS1, SW6_CS2, SW6_CS3},
+ {0, SW7_CS1, SW7_CS2, SW7_CS3},
+ {0, SW8_CS1, SW8_CS2, SW8_CS3},
+ {0, SW9_CS1, SW9_CS2, SW9_CS3},
+ {0, SW10_CS1, SW10_CS2, SW10_CS3},
+ {0, SW11_CS1, SW11_CS2, SW11_CS3},
+ {0, SW1_CS16, SW1_CS17, SW1_CS18},
+ {0, SW2_CS16, SW2_CS17, SW2_CS18},
+ {0, SW3_CS16, SW3_CS17, SW3_CS18},
- {0, CS4_SW1, CS5_SW1, CS6_SW1},
- {0, CS4_SW2, CS5_SW2, CS6_SW2},
- {0, CS4_SW3, CS5_SW3, CS6_SW3},
- {0, CS4_SW4, CS5_SW4, CS6_SW4},
- {0, CS4_SW5, CS5_SW5, CS6_SW5},
- {0, CS4_SW6, CS5_SW6, CS6_SW6},
- {0, CS4_SW7, CS5_SW7, CS6_SW7},
- {0, CS4_SW8, CS5_SW8, CS6_SW8},
- {0, CS4_SW9, CS5_SW9, CS6_SW9},
- {0, CS4_SW10, CS5_SW10, CS6_SW10},
- {0, CS4_SW11, CS5_SW11, CS6_SW11},
- {0, CS16_SW4, CS17_SW4, CS18_SW4},
- {0, CS16_SW5, CS17_SW5, CS18_SW5},
- {0, CS16_SW6, CS17_SW6, CS18_SW6},
+ {0, SW1_CS4, SW1_CS5, SW1_CS6},
+ {0, SW2_CS4, SW2_CS5, SW2_CS6},
+ {0, SW3_CS4, SW3_CS5, SW3_CS6},
+ {0, SW4_CS4, SW4_CS5, SW4_CS6},
+ {0, SW5_CS4, SW5_CS5, SW5_CS6},
+ {0, SW6_CS4, SW6_CS5, SW6_CS6},
+ {0, SW7_CS4, SW7_CS5, SW7_CS6},
+ {0, SW8_CS4, SW8_CS5, SW8_CS6},
+ {0, SW9_CS4, SW9_CS5, SW9_CS6},
+ {0, SW10_CS4, SW10_CS5, SW10_CS6},
+ {0, SW11_CS4, SW11_CS5, SW11_CS6},
+ {0, SW4_CS16, SW4_CS17, SW4_CS18},
+ {0, SW5_CS16, SW5_CS17, SW5_CS18},
+ {0, SW6_CS16, SW6_CS17, SW6_CS18},
- {0, CS7_SW1, CS8_SW1, CS9_SW1},
- {0, CS7_SW2, CS8_SW2, CS9_SW2},
- {0, CS7_SW3, CS8_SW3, CS9_SW3},
- {0, CS7_SW4, CS8_SW4, CS9_SW4},
- {0, CS7_SW5, CS8_SW5, CS9_SW5},
- {0, CS7_SW6, CS8_SW6, CS9_SW6},
- {0, CS7_SW7, CS8_SW7, CS9_SW7},
- {0, CS7_SW8, CS8_SW8, CS9_SW8},
- {0, CS7_SW9, CS8_SW9, CS9_SW9},
- {0, CS7_SW10, CS8_SW10, CS9_SW10},
- {0, CS7_SW11, CS8_SW11, CS9_SW11},
- {0, CS16_SW7, CS17_SW7, CS18_SW7},
- {0, CS16_SW8, CS17_SW8, CS18_SW8},
+ {0, SW1_CS7, SW1_CS8, SW1_CS9},
+ {0, SW2_CS7, SW2_CS8, SW2_CS9},
+ {0, SW3_CS7, SW3_CS8, SW3_CS9},
+ {0, SW4_CS7, SW4_CS8, SW4_CS9},
+ {0, SW5_CS7, SW5_CS8, SW5_CS9},
+ {0, SW6_CS7, SW6_CS8, SW6_CS9},
+ {0, SW7_CS7, SW7_CS8, SW7_CS9},
+ {0, SW8_CS7, SW8_CS8, SW8_CS9},
+ {0, SW9_CS7, SW9_CS8, SW9_CS9},
+ {0, SW10_CS7, SW10_CS8, SW10_CS9},
+ {0, SW11_CS7, SW11_CS8, SW11_CS9},
+ {0, SW7_CS16, SW7_CS17, SW7_CS18},
+ {0, SW8_CS16, SW8_CS17, SW8_CS18},
- {0, CS10_SW1, CS11_SW1, CS12_SW1},
- {0, CS10_SW2, CS11_SW2, CS12_SW2},
- {0, CS10_SW3, CS11_SW3, CS12_SW3},
- {0, CS10_SW4, CS11_SW4, CS12_SW4},
- {0, CS10_SW5, CS11_SW5, CS12_SW5},
- {0, CS10_SW6, CS11_SW6, CS12_SW6},
- {0, CS10_SW7, CS11_SW7, CS12_SW7},
- {0, CS10_SW8, CS11_SW8, CS12_SW8},
- {0, CS10_SW9, CS11_SW9, CS12_SW9},
- {0, CS10_SW10, CS11_SW10, CS12_SW10},
- {0, CS10_SW11, CS11_SW11, CS12_SW11},
- {0, CS16_SW9, CS17_SW9, CS18_SW9},
+ {0, SW1_CS10, SW1_CS11, SW1_CS12},
+ {0, SW2_CS10, SW2_CS11, SW2_CS12},
+ {0, SW3_CS10, SW3_CS11, SW3_CS12},
+ {0, SW4_CS10, SW4_CS11, SW4_CS12},
+ {0, SW5_CS10, SW5_CS11, SW5_CS12},
+ {0, SW6_CS10, SW6_CS11, SW6_CS12},
+ {0, SW7_CS10, SW7_CS11, SW7_CS12},
+ {0, SW8_CS10, SW8_CS11, SW8_CS12},
+ {0, SW9_CS10, SW9_CS11, SW9_CS12},
+ {0, SW10_CS10, SW10_CS11, SW10_CS12},
+ {0, SW11_CS10, SW11_CS11, SW11_CS12},
+ {0, SW9_CS16, SW9_CS17, SW9_CS18},
- {0, CS13_SW1, CS14_SW1, CS15_SW1},
- {0, CS13_SW2, CS14_SW2, CS15_SW2},
- {0, CS13_SW3, CS14_SW3, CS15_SW3},
- {0, CS13_SW4, CS14_SW4, CS15_SW4},
- {0, CS13_SW5, CS14_SW5, CS15_SW5},
- {0, CS13_SW5, CS14_SW5, CS15_SW5},
- {0, CS13_SW6, CS14_SW6, CS15_SW6},
- {0, CS13_SW7, CS14_SW7, CS15_SW7},
- {0, CS13_SW8, CS14_SW8, CS15_SW8},
- {0, CS13_SW9, CS14_SW9, CS15_SW9},
- {0, CS13_SW10, CS14_SW10, CS15_SW10}
+ {0, SW1_CS13, SW1_CS14, SW1_CS15},
+ {0, SW2_CS13, SW2_CS14, SW2_CS15},
+ {0, SW3_CS13, SW3_CS14, SW3_CS15},
+ {0, SW4_CS13, SW4_CS14, SW4_CS15},
+ {0, SW5_CS13, SW5_CS14, SW5_CS15},
+ {0, SW5_CS13, SW5_CS14, SW5_CS15},
+ {0, SW6_CS13, SW6_CS14, SW6_CS15},
+ {0, SW7_CS13, SW7_CS14, SW7_CS15},
+ {0, SW8_CS13, SW8_CS14, SW8_CS15},
+ {0, SW9_CS13, SW9_CS14, SW9_CS15},
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}
};
#if defined(RGB_MATRIX_ENABLE) /*&& defined(CAPS_LOCK_INDEX)*/
diff --git a/keyboards/skyloong/gk61/pro_48/pro_48.c b/keyboards/skyloong/gk61/pro_48/pro_48.c
index ffa04f2c056..c5758ffcf4c 100644
--- a/keyboards/skyloong/gk61/pro_48/pro_48.c
+++ b/keyboards/skyloong/gk61/pro_48/pro_48.c
@@ -14,74 +14,74 @@ const is31fl3743a_led_t PROGMEM g_is31fl3743a_leds[IS31FL3743A_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS1_SW1, CS2_SW1, CS3_SW1},
- {0, CS1_SW2, CS2_SW2, CS3_SW2},
- {0, CS1_SW3, CS2_SW3, CS3_SW3},
- {0, CS1_SW4, CS2_SW4, CS3_SW4},
- {0, CS1_SW5, CS2_SW5, CS3_SW5},
- {0, CS1_SW6, CS2_SW6, CS3_SW6},
- {0, CS1_SW7, CS2_SW7, CS3_SW7},
- {0, CS1_SW8, CS2_SW8, CS3_SW8},
- {0, CS1_SW9, CS2_SW9, CS3_SW9},
- {0, CS1_SW10, CS2_SW10, CS3_SW10},
- {0, CS1_SW11, CS2_SW11, CS3_SW11},
- {0, CS16_SW1, CS17_SW1, CS18_SW1},
- {0, CS16_SW2, CS17_SW2, CS18_SW2},
- {0, CS16_SW3, CS17_SW3, CS18_SW3},
+ {0, SW1_CS1, SW1_CS2, SW1_CS3},
+ {0, SW2_CS1, SW2_CS2, SW2_CS3},
+ {0, SW3_CS1, SW3_CS2, SW3_CS3},
+ {0, SW4_CS1, SW4_CS2, SW4_CS3},
+ {0, SW5_CS1, SW5_CS2, SW5_CS3},
+ {0, SW6_CS1, SW6_CS2, SW6_CS3},
+ {0, SW7_CS1, SW7_CS2, SW7_CS3},
+ {0, SW8_CS1, SW8_CS2, SW8_CS3},
+ {0, SW9_CS1, SW9_CS2, SW9_CS3},
+ {0, SW10_CS1, SW10_CS2, SW10_CS3},
+ {0, SW11_CS1, SW11_CS2, SW11_CS3},
+ {0, SW1_CS16, SW1_CS17, SW1_CS18},
+ {0, SW2_CS16, SW2_CS17, SW2_CS18},
+ {0, SW3_CS16, SW3_CS17, SW3_CS18},
- {0, CS4_SW1, CS5_SW1, CS6_SW1},
- {0, CS4_SW2, CS5_SW2, CS6_SW2},
- {0, CS4_SW3, CS5_SW3, CS6_SW3},
- {0, CS4_SW4, CS5_SW4, CS6_SW4},
- {0, CS4_SW5, CS5_SW5, CS6_SW5},
- {0, CS4_SW6, CS5_SW6, CS6_SW6},
- {0, CS4_SW7, CS5_SW7, CS6_SW7},
- {0, CS4_SW8, CS5_SW8, CS6_SW8},
- {0, CS4_SW9, CS5_SW9, CS6_SW9},
- {0, CS4_SW10, CS5_SW10, CS6_SW10},
- {0, CS4_SW11, CS5_SW11, CS6_SW11},
- {0, CS16_SW4, CS17_SW4, CS18_SW4},
- {0, CS16_SW5, CS17_SW5, CS18_SW5},
- {0, CS16_SW6, CS17_SW6, CS18_SW6},
+ {0, SW1_CS4, SW1_CS5, SW1_CS6},
+ {0, SW2_CS4, SW2_CS5, SW2_CS6},
+ {0, SW3_CS4, SW3_CS5, SW3_CS6},
+ {0, SW4_CS4, SW4_CS5, SW4_CS6},
+ {0, SW5_CS4, SW5_CS5, SW5_CS6},
+ {0, SW6_CS4, SW6_CS5, SW6_CS6},
+ {0, SW7_CS4, SW7_CS5, SW7_CS6},
+ {0, SW8_CS4, SW8_CS5, SW8_CS6},
+ {0, SW9_CS4, SW9_CS5, SW9_CS6},
+ {0, SW10_CS4, SW10_CS5, SW10_CS6},
+ {0, SW11_CS4, SW11_CS5, SW11_CS6},
+ {0, SW4_CS16, SW4_CS17, SW4_CS18},
+ {0, SW5_CS16, SW5_CS17, SW5_CS18},
+ {0, SW6_CS16, SW6_CS17, SW6_CS18},
- {0, CS7_SW1, CS8_SW1, CS9_SW1},
- {0, CS7_SW2, CS8_SW2, CS9_SW2},
- {0, CS7_SW3, CS8_SW3, CS9_SW3},
- {0, CS7_SW4, CS8_SW4, CS9_SW4},
- {0, CS7_SW5, CS8_SW5, CS9_SW5},
- {0, CS7_SW6, CS8_SW6, CS9_SW6},
- {0, CS7_SW7, CS8_SW7, CS9_SW7},
- {0, CS7_SW8, CS8_SW8, CS9_SW8},
- {0, CS7_SW9, CS8_SW9, CS9_SW9},
- {0, CS7_SW10, CS8_SW10, CS9_SW10},
- {0, CS7_SW11, CS8_SW11, CS9_SW11},
- {0, CS16_SW7, CS17_SW7, CS18_SW7},
- {0, CS16_SW8, CS17_SW8, CS18_SW8},
+ {0, SW1_CS7, SW1_CS8, SW1_CS9},
+ {0, SW2_CS7, SW2_CS8, SW2_CS9},
+ {0, SW3_CS7, SW3_CS8, SW3_CS9},
+ {0, SW4_CS7, SW4_CS8, SW4_CS9},
+ {0, SW5_CS7, SW5_CS8, SW5_CS9},
+ {0, SW6_CS7, SW6_CS8, SW6_CS9},
+ {0, SW7_CS7, SW7_CS8, SW7_CS9},
+ {0, SW8_CS7, SW8_CS8, SW8_CS9},
+ {0, SW9_CS7, SW9_CS8, SW9_CS9},
+ {0, SW10_CS7, SW10_CS8, SW10_CS9},
+ {0, SW11_CS7, SW11_CS8, SW11_CS9},
+ {0, SW7_CS16, SW7_CS17, SW7_CS18},
+ {0, SW8_CS16, SW8_CS17, SW8_CS18},
- {0, CS10_SW1, CS11_SW1, CS12_SW1},
- {0, CS10_SW2, CS11_SW2, CS12_SW2},
- {0, CS10_SW3, CS11_SW3, CS12_SW3},
- {0, CS10_SW4, CS11_SW4, CS12_SW4},
- {0, CS10_SW5, CS11_SW5, CS12_SW5},
- {0, CS10_SW6, CS11_SW6, CS12_SW6},
- {0, CS10_SW7, CS11_SW7, CS12_SW7},
- {0, CS10_SW8, CS11_SW8, CS12_SW8},
- {0, CS10_SW9, CS11_SW9, CS12_SW9},
- {0, CS10_SW10, CS11_SW10, CS12_SW10},
- {0, CS10_SW11, CS11_SW11, CS12_SW11},
- {0, CS16_SW9, CS17_SW9, CS18_SW9},
+ {0, SW1_CS10, SW1_CS11, SW1_CS12},
+ {0, SW2_CS10, SW2_CS11, SW2_CS12},
+ {0, SW3_CS10, SW3_CS11, SW3_CS12},
+ {0, SW4_CS10, SW4_CS11, SW4_CS12},
+ {0, SW5_CS10, SW5_CS11, SW5_CS12},
+ {0, SW6_CS10, SW6_CS11, SW6_CS12},
+ {0, SW7_CS10, SW7_CS11, SW7_CS12},
+ {0, SW8_CS10, SW8_CS11, SW8_CS12},
+ {0, SW9_CS10, SW9_CS11, SW9_CS12},
+ {0, SW10_CS10, SW10_CS11, SW10_CS12},
+ {0, SW11_CS10, SW11_CS11, SW11_CS12},
+ {0, SW9_CS16, SW9_CS17, SW9_CS18},
- {0, CS13_SW1, CS14_SW1, CS15_SW1},
- {0, CS13_SW2, CS14_SW2, CS15_SW2},
- {0, CS13_SW3, CS14_SW3, CS15_SW3},
- {0, CS13_SW4, CS14_SW4, CS15_SW4},
- {0, CS13_SW5, CS14_SW5, CS15_SW5},
- {0, CS13_SW5, CS14_SW5, CS15_SW5},
- {0, CS13_SW6, CS14_SW6, CS15_SW6},
- {0, CS13_SW7, CS14_SW7, CS15_SW7},
- {0, CS13_SW8, CS14_SW8, CS15_SW8},
- {0, CS13_SW9, CS14_SW9, CS15_SW9},
- {0, CS13_SW10, CS14_SW10, CS15_SW10}
+ {0, SW1_CS13, SW1_CS14, SW1_CS15},
+ {0, SW2_CS13, SW2_CS14, SW2_CS15},
+ {0, SW3_CS13, SW3_CS14, SW3_CS15},
+ {0, SW4_CS13, SW4_CS14, SW4_CS15},
+ {0, SW5_CS13, SW5_CS14, SW5_CS15},
+ {0, SW5_CS13, SW5_CS14, SW5_CS15},
+ {0, SW6_CS13, SW6_CS14, SW6_CS15},
+ {0, SW7_CS13, SW7_CS14, SW7_CS15},
+ {0, SW8_CS13, SW8_CS14, SW8_CS15},
+ {0, SW9_CS13, SW9_CS14, SW9_CS15},
+ {0, SW10_CS13, SW10_CS14, SW10_CS15}
};
bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
diff --git a/keyboards/skyloong/gk61/v1/v1.c b/keyboards/skyloong/gk61/v1/v1.c
index cb362b53596..01e6b6c6ae6 100644
--- a/keyboards/skyloong/gk61/v1/v1.c
+++ b/keyboards/skyloong/gk61/v1/v1.c
@@ -24,78 +24,78 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, C_1, B_1, A_1},
- {0, C_2, B_2, A_2},
- {0, C_3, B_3, A_3},
- {0, C_4, B_4, A_4},
- {0, C_5, B_5, A_5},
- {0, C_6, B_6, A_6},
- {0, C_7, B_7, A_7},
- {0, C_8, B_8, A_8},
- {0, C_9, B_9, A_9},
- {0, C_10, B_10, A_10},
- {0, C_11, B_11, A_11},
- {0, C_12, B_12, A_12},
- {0, C_13, B_13, A_13},
- {0, C_14, B_14, A_14},
+ {0, CB3_CA1, CB2_CA1, CB1_CA1},
+ {0, CB3_CA2, CB2_CA2, CB1_CA2},
+ {0, CB3_CA3, CB2_CA3, CB1_CA3},
+ {0, CB3_CA4, CB2_CA4, CB1_CA4},
+ {0, CB3_CA5, CB2_CA5, CB1_CA5},
+ {0, CB3_CA6, CB2_CA6, CB1_CA6},
+ {0, CB3_CA7, CB2_CA7, CB1_CA7},
+ {0, CB3_CA8, CB2_CA8, CB1_CA8},
+ {0, CB3_CA9, CB2_CA9, CB1_CA9},
+ {0, CB3_CA10, CB2_CA10, CB1_CA10},
+ {0, CB3_CA11, CB2_CA11, CB1_CA11},
+ {0, CB3_CA12, CB2_CA12, CB1_CA12},
+ {0, CB3_CA13, CB2_CA13, CB1_CA13},
+ {0, CB3_CA14, CB2_CA14, CB1_CA14},
- {0, F_1, E_1, D_1},
- {0, F_2, E_2, D_2},
- {0, F_3, E_3, D_3},
- {0, F_4, E_4, D_4},
- {0, F_5, E_5, D_5},
- {0, F_6, E_6, D_6},
- {0, F_7, E_7, D_7},
- {0, F_8, E_8, D_8},
- {0, F_9, E_9, D_9},
- {0, F_10, E_10, D_10},
- {0, F_11, E_11, D_11},
- {0, F_12, E_12, D_12},
- {0, F_13, E_13, D_13},
- {0, F_14, E_14, D_14},
+ {0, CB6_CA1, CB5_CA1, CB4_CA1},
+ {0, CB6_CA2, CB5_CA2, CB4_CA2},
+ {0, CB6_CA3, CB5_CA3, CB4_CA3},
+ {0, CB6_CA4, CB5_CA4, CB4_CA4},
+ {0, CB6_CA5, CB5_CA5, CB4_CA5},
+ {0, CB6_CA6, CB5_CA6, CB4_CA6},
+ {0, CB6_CA7, CB5_CA7, CB4_CA7},
+ {0, CB6_CA8, CB5_CA8, CB4_CA8},
+ {0, CB6_CA9, CB5_CA9, CB4_CA9},
+ {0, CB6_CA10, CB5_CA10, CB4_CA10},
+ {0, CB6_CA11, CB5_CA11, CB4_CA11},
+ {0, CB6_CA12, CB5_CA12, CB4_CA12},
+ {0, CB6_CA13, CB5_CA13, CB4_CA13},
+ {0, CB6_CA14, CB5_CA14, CB4_CA14},
- {0, I_1, H_1, G_1},
- {0, I_2, H_2, G_2},
- {0, I_3, H_3, G_3},
- {0, I_4, H_4, G_4},
- {0, I_5, H_5, G_5},
- {0, I_6, H_6, G_6},
- {0, I_7, H_7, G_7},
- {0, I_8, H_8, G_8},
- {0, I_9, H_9, G_9},
- {0, I_10, H_10, G_10},
- {0, I_11, H_11, G_11},
- {0, I_12, H_12, G_12},
- {0, I_13, H_13, G_13},
+ {0, CB9_CA1, CB8_CA1, CB7_CA1},
+ {0, CB9_CA2, CB8_CA2, CB7_CA2},
+ {0, CB9_CA3, CB8_CA3, CB7_CA3},
+ {0, CB9_CA4, CB8_CA4, CB7_CA4},
+ {0, CB9_CA5, CB8_CA5, CB7_CA5},
+ {0, CB9_CA6, CB8_CA6, CB7_CA6},
+ {0, CB9_CA7, CB8_CA7, CB7_CA7},
+ {0, CB9_CA8, CB8_CA8, CB7_CA8},
+ {0, CB9_CA9, CB8_CA9, CB7_CA9},
+ {0, CB9_CA10, CB8_CA10, CB7_CA10},
+ {0, CB9_CA11, CB8_CA11, CB7_CA11},
+ {0, CB9_CA12, CB8_CA12, CB7_CA12},
+ {0, CB9_CA13, CB8_CA13, CB7_CA13},
- {0, L_1, K_1, J_1},
- {0, L_2, K_2, J_2},
- {0, L_3, K_3, J_3},
- {0, L_4, K_4, J_4},
- {0, L_5, K_5, J_5},
- {0, L_6, K_6, J_6},
- {0, L_7, K_7, J_7},
- {0, L_8, K_8, J_8},
- {0, L_9, K_9, J_9},
- {0, L_10, K_10, J_10},
- {0, L_11, K_11, J_11},
- {0, L_13, K_13, J_13},
+ {0, CB12_CA1, CB11_CA1, CB10_CA1},
+ {0, CB12_CA2, CB11_CA2, CB10_CA2},
+ {0, CB12_CA3, CB11_CA3, CB10_CA3},
+ {0, CB12_CA4, CB11_CA4, CB10_CA4},
+ {0, CB12_CA5, CB11_CA5, CB10_CA5},
+ {0, CB12_CA6, CB11_CA6, CB10_CA6},
+ {0, CB12_CA7, CB11_CA7, CB10_CA7},
+ {0, CB12_CA8, CB11_CA8, CB10_CA8},
+ {0, CB12_CA9, CB11_CA9, CB10_CA9},
+ {0, CB12_CA10, CB11_CA10, CB10_CA10},
+ {0, CB12_CA11, CB11_CA11, CB10_CA11},
+ {0, CB12_CA13, CB11_CA13, CB10_CA13},
- {0, L_15, K_15, J_15},
- {0, L_16, K_16, J_16},
- {0, I_15, H_15, G_15},
- {0, I_16, H_16, G_16},
- {0, F_15, E_15, D_15},
- {0, F_16, E_16, D_16},
- {0, C_15, B_15, A_15},
- {0, C_16, B_16, A_16},
- {0, I_14, H_14, G_14},
- {0, L_12, K_12, J_12},
- {0, L_14, K_14, J_14},
+ {0, CB12_CA15, CB11_CA15, CB10_CA15},
+ {0, CB12_CA16, CB11_CA16, CB10_CA16},
+ {0, CB9_CA15, CB8_CA15, CB7_CA15},
+ {0, CB9_CA16, CB8_CA16, CB7_CA16},
+ {0, CB6_CA15, CB5_CA15, CB4_CA15},
+ {0, CB6_CA16, CB5_CA16, CB4_CA16},
+ {0, CB3_CA15, CB2_CA15, CB1_CA15},
+ {0, CB3_CA16, CB2_CA16, CB1_CA16},
+ {0, CB9_CA14, CB8_CA14, CB7_CA14},
+ {0, CB12_CA12, CB11_CA12, CB10_CA12},
+ {0, CB12_CA14, CB11_CA14, CB10_CA14},
};
diff --git a/keyboards/spaceholdings/nebula68/nebula68.c b/keyboards/spaceholdings/nebula68/nebula68.c
index af51c4805e1..db8a31b8319 100755
--- a/keyboards/spaceholdings/nebula68/nebula68.c
+++ b/keyboards/spaceholdings/nebula68/nebula68.c
@@ -29,134 +29,134 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, B_1, A_1, C_1}, //LA1
- {0, E_1, D_1, F_1}, //LA2
- {0, H_1, G_1, I_1}, //LA3
- {0, K_1, J_1, L_1}, //LA4
- {0, B_2, A_2, C_2}, //LA5
- {0, E_2, D_2, F_2}, //LA6
- {0, H_2, G_2, I_2}, //LA7
- {0, K_2, J_2, L_2}, //LA8
- {0, B_3, A_3, C_3}, //LA9
- {0, E_3, D_3, F_3}, //LA10
- {0, H_3, G_3, I_3}, //LA11
- {0, K_3, J_3, L_3}, //LA12
- {0, B_4, A_4, C_4}, //LA13
- {0, E_4, D_4, F_4}, //LA14
- {0, H_4, G_4, I_4}, //LA15
- {0, K_4, J_4, L_4}, //LA16
- {0, B_5, A_5, C_5}, //LA17
- {0, E_5, D_5, F_5}, //LA18
- {0, H_5, G_5, I_5}, //LA19
- {0, K_5, J_5, L_5}, //LA20
- {0, B_6, A_6, C_6}, //LA21
- {0, E_6, D_6, F_6}, //LA22
- {0, H_6, G_6, I_6}, //LA23
- {0, K_6, J_6, L_6}, //LA24
- {0, B_7, A_7, C_7}, //LA25
- {0, E_7, D_7, F_7}, //LA26
- {0, H_7, G_7, I_7}, //LA27
- {0, K_7, J_7, L_7}, //LA28
- {0, B_8, A_8, C_8}, //LA29
- {0, E_8, D_8, F_8}, //LA30
- {0, H_8, G_8, I_8}, //LA31
- {0, K_8, J_8, L_8}, //LA32
- {0, B_9, A_9, C_9}, //LA33
- {0, E_9, D_9, F_9}, //LA34
- {0, H_9, G_9, I_9}, //LA35
- {0, K_9, J_9, L_9}, //LA36
- {0, B_10, A_10, C_10}, //LA37
- {0, E_10, D_10, F_10}, //LA38
- {0, H_10, G_10, I_10}, //LA39
- {0, K_10, J_10, L_10}, //LA40
- {0, B_11, A_11, C_11}, //LA41
- {0, E_11, D_11, F_11}, //LA42
- {0, H_11, G_11, I_11}, //LA43
- {0, K_11, J_11, L_11}, //LA44
- {0, B_12, A_12, C_12}, //LA45
- {0, E_12, D_12, F_12}, //LA46
- {0, H_12, G_12, I_12}, //LA47
- {0, K_12, J_12, L_12}, //LA48
- {0, B_13, A_13, C_13}, //LA49
- {0, E_13, D_13, F_13}, //LA50
- {0, H_13, G_13, I_13}, //LA51
- {0, K_13, J_13, L_13}, //LA52
- {0, B_14, A_14, C_14}, //LA53
- {0, E_14, D_14, F_14}, //LA54
- {0, H_14, G_14, I_14}, //LA55
- {0, K_14, J_14, L_14}, //LA56
- {0, B_15, A_15, C_15}, //LA57
- {0, E_15, D_15, F_15}, //LA58
- {0, H_15, G_15, I_15}, //LA59
- {0, K_15, J_15, L_15}, //LA60
- {0, B_16, A_16, C_16}, //LA61
- {0, E_16, D_16, F_16}, //LA62
- {0, H_16, G_16, I_16}, //LA63
- {0, K_16, J_16, L_16}, //LA64
+ {0, SW2_CS1, SW1_CS1, SW3_CS1}, //LA1
+ {0, SW5_CS1, SW4_CS1, SW6_CS1}, //LA2
+ {0, SW8_CS1, SW7_CS1, SW9_CS1}, //LA3
+ {0, SW11_CS1, SW10_CS1, SW12_CS1}, //LA4
+ {0, SW2_CS2, SW1_CS2, SW3_CS2}, //LA5
+ {0, SW5_CS2, SW4_CS2, SW6_CS2}, //LA6
+ {0, SW8_CS2, SW7_CS2, SW9_CS2}, //LA7
+ {0, SW11_CS2, SW10_CS2, SW12_CS2}, //LA8
+ {0, SW2_CS3, SW1_CS3, SW3_CS3}, //LA9
+ {0, SW5_CS3, SW4_CS3, SW6_CS3}, //LA10
+ {0, SW8_CS3, SW7_CS3, SW9_CS3}, //LA11
+ {0, SW11_CS3, SW10_CS3, SW12_CS3}, //LA12
+ {0, SW2_CS4, SW1_CS4, SW3_CS4}, //LA13
+ {0, SW5_CS4, SW4_CS4, SW6_CS4}, //LA14
+ {0, SW8_CS4, SW7_CS4, SW9_CS4}, //LA15
+ {0, SW11_CS4, SW10_CS4, SW12_CS4}, //LA16
+ {0, SW2_CS5, SW1_CS5, SW3_CS5}, //LA17
+ {0, SW5_CS5, SW4_CS5, SW6_CS5}, //LA18
+ {0, SW8_CS5, SW7_CS5, SW9_CS5}, //LA19
+ {0, SW11_CS5, SW10_CS5, SW12_CS5}, //LA20
+ {0, SW2_CS6, SW1_CS6, SW3_CS6}, //LA21
+ {0, SW5_CS6, SW4_CS6, SW6_CS6}, //LA22
+ {0, SW8_CS6, SW7_CS6, SW9_CS6}, //LA23
+ {0, SW11_CS6, SW10_CS6, SW12_CS6}, //LA24
+ {0, SW2_CS7, SW1_CS7, SW3_CS7}, //LA25
+ {0, SW5_CS7, SW4_CS7, SW6_CS7}, //LA26
+ {0, SW8_CS7, SW7_CS7, SW9_CS7}, //LA27
+ {0, SW11_CS7, SW10_CS7, SW12_CS7}, //LA28
+ {0, SW2_CS8, SW1_CS8, SW3_CS8}, //LA29
+ {0, SW5_CS8, SW4_CS8, SW6_CS8}, //LA30
+ {0, SW8_CS8, SW7_CS8, SW9_CS8}, //LA31
+ {0, SW11_CS8, SW10_CS8, SW12_CS8}, //LA32
+ {0, SW2_CS9, SW1_CS9, SW3_CS9}, //LA33
+ {0, SW5_CS9, SW4_CS9, SW6_CS9}, //LA34
+ {0, SW8_CS9, SW7_CS9, SW9_CS9}, //LA35
+ {0, SW11_CS9, SW10_CS9, SW12_CS9}, //LA36
+ {0, SW2_CS10, SW1_CS10, SW3_CS10}, //LA37
+ {0, SW5_CS10, SW4_CS10, SW6_CS10}, //LA38
+ {0, SW8_CS10, SW7_CS10, SW9_CS10}, //LA39
+ {0, SW11_CS10, SW10_CS10, SW12_CS10}, //LA40
+ {0, SW2_CS11, SW1_CS11, SW3_CS11}, //LA41
+ {0, SW5_CS11, SW4_CS11, SW6_CS11}, //LA42
+ {0, SW8_CS11, SW7_CS11, SW9_CS11}, //LA43
+ {0, SW11_CS11, SW10_CS11, SW12_CS11}, //LA44
+ {0, SW2_CS12, SW1_CS12, SW3_CS12}, //LA45
+ {0, SW5_CS12, SW4_CS12, SW6_CS12}, //LA46
+ {0, SW8_CS12, SW7_CS12, SW9_CS12}, //LA47
+ {0, SW11_CS12, SW10_CS12, SW12_CS12}, //LA48
+ {0, SW2_CS13, SW1_CS13, SW3_CS13}, //LA49
+ {0, SW5_CS13, SW4_CS13, SW6_CS13}, //LA50
+ {0, SW8_CS13, SW7_CS13, SW9_CS13}, //LA51
+ {0, SW11_CS13, SW10_CS13, SW12_CS13}, //LA52
+ {0, SW2_CS14, SW1_CS14, SW3_CS14}, //LA53
+ {0, SW5_CS14, SW4_CS14, SW6_CS14}, //LA54
+ {0, SW8_CS14, SW7_CS14, SW9_CS14}, //LA55
+ {0, SW11_CS14, SW10_CS14, SW12_CS14}, //LA56
+ {0, SW2_CS15, SW1_CS15, SW3_CS15}, //LA57
+ {0, SW5_CS15, SW4_CS15, SW6_CS15}, //LA58
+ {0, SW8_CS15, SW7_CS15, SW9_CS15}, //LA59
+ {0, SW11_CS15, SW10_CS15, SW12_CS15}, //LA60
+ {0, SW2_CS16, SW1_CS16, SW3_CS16}, //LA61
+ {0, SW5_CS16, SW4_CS16, SW6_CS16}, //LA62
+ {0, SW8_CS16, SW7_CS16, SW9_CS16}, //LA63
+ {0, SW11_CS16, SW10_CS16, SW12_CS16}, //LA64
- {1, B_1, A_1, C_1}, //LB1
- {1, E_1, D_1, F_1}, //LB2
- {1, H_1, G_1, I_1}, //LB3
- {1, K_1, J_1, L_1}, //LB4
- {1, B_2, A_2, C_2}, //LB5
- {1, E_2, D_2, F_2}, //LB6
- {1, H_2, G_2, I_2}, //LB7
- {1, K_2, J_2, L_2}, //LB8
- {1, B_3, A_3, C_3}, //LB9
- {1, E_3, D_3, F_3}, //LB10
- {1, H_3, G_3, I_3}, //LB11
- {1, K_3, J_3, L_3}, //LB12
- {1, B_4, A_4, C_4}, //LB13
- {1, E_4, D_4, F_4}, //LB14
- {1, H_4, G_4, I_4}, //LB15
- {1, K_4, J_4, L_4}, //LB16
- {1, B_5, A_5, C_5}, //LB17
- {1, E_5, D_5, F_5}, //LB18
- {1, H_5, G_5, I_5}, //LB19
- {1, K_5, J_5, L_5}, //LB20
- {1, B_6, A_6, C_6}, //LB21
- {1, E_6, D_6, F_6}, //LB22
- {1, H_6, G_6, I_6}, //LB23
- {1, K_6, J_6, L_6}, //LB24
- {1, B_7, A_7, C_7}, //LB25
- {1, E_7, D_7, F_7}, //LB26
- {1, H_7, G_7, I_7}, //LB27
- {1, K_7, J_7, L_7}, //LB28
- {1, B_8, A_8, C_8}, //LB29
- {1, E_8, D_8, F_8}, //LB30
- {1, H_8, G_8, I_8}, //LB31
- {1, K_8, J_8, L_8}, //LB32
- {1, B_9, A_9, C_9}, //LB33
- {1, E_9, D_9, F_9}, //LB34
- {1, H_9, G_9, I_9}, //LB35
- {1, K_9, J_9, L_9}, //LB36
- {1, B_10, A_10, C_10}, //LB37
- {1, E_10, D_10, F_10}, //LB38
- {1, H_10, G_10, I_10}, //LB39
- {1, K_10, J_10, L_10}, //LB40
- {1, B_11, A_11, C_11}, //LB41
- {1, E_11, D_11, F_11}, //LB42
- {1, H_11, G_11, I_11}, //LB43
- {1, K_11, J_11, L_11}, //LB44
- {1, B_12, A_12, C_12}, //LB45
- {1, E_12, D_12, F_12}, //LB46
- {1, H_12, G_12, I_12}, //LB47
- {1, K_12, J_12, L_12}, //LB48
- {1, B_13, A_13, C_13}, //LB49
- {1, E_13, D_13, F_13}, //LB50
- {1, H_13, G_13, I_13}, //LB51
- {1, K_13, J_13, L_13}, //LB52
- {1, B_14, A_14, C_14}, //LB53
- {1, E_14, D_14, F_14}, //LB54
- {1, H_14, G_14, I_14}, //LB55
- {1, K_14, J_14, L_14}, //LB56
- {1, B_15, A_15, C_15}, //LB57
- {1, E_15, D_15, F_15}, //LB58
- {1, H_15, G_15, I_15}, //LB59
- {1, K_15, J_15, L_15}, //LB60
- {1, B_16, A_16, C_16}, //LB61
- {1, E_16, D_16, F_16}, //LB62
- {1, H_16, G_16, I_16}, //LB63
- {1, K_16, J_16, L_16}, //LB64
+ {1, SW2_CS1, SW1_CS1, SW3_CS1}, //LB1
+ {1, SW5_CS1, SW4_CS1, SW6_CS1}, //LB2
+ {1, SW8_CS1, SW7_CS1, SW9_CS1}, //LB3
+ {1, SW11_CS1, SW10_CS1, SW12_CS1}, //LB4
+ {1, SW2_CS2, SW1_CS2, SW3_CS2}, //LB5
+ {1, SW5_CS2, SW4_CS2, SW6_CS2}, //LB6
+ {1, SW8_CS2, SW7_CS2, SW9_CS2}, //LB7
+ {1, SW11_CS2, SW10_CS2, SW12_CS2}, //LB8
+ {1, SW2_CS3, SW1_CS3, SW3_CS3}, //LB9
+ {1, SW5_CS3, SW4_CS3, SW6_CS3}, //LB10
+ {1, SW8_CS3, SW7_CS3, SW9_CS3}, //LB11
+ {1, SW11_CS3, SW10_CS3, SW12_CS3}, //LB12
+ {1, SW2_CS4, SW1_CS4, SW3_CS4}, //LB13
+ {1, SW5_CS4, SW4_CS4, SW6_CS4}, //LB14
+ {1, SW8_CS4, SW7_CS4, SW9_CS4}, //LB15
+ {1, SW11_CS4, SW10_CS4, SW12_CS4}, //LB16
+ {1, SW2_CS5, SW1_CS5, SW3_CS5}, //LB17
+ {1, SW5_CS5, SW4_CS5, SW6_CS5}, //LB18
+ {1, SW8_CS5, SW7_CS5, SW9_CS5}, //LB19
+ {1, SW11_CS5, SW10_CS5, SW12_CS5}, //LB20
+ {1, SW2_CS6, SW1_CS6, SW3_CS6}, //LB21
+ {1, SW5_CS6, SW4_CS6, SW6_CS6}, //LB22
+ {1, SW8_CS6, SW7_CS6, SW9_CS6}, //LB23
+ {1, SW11_CS6, SW10_CS6, SW12_CS6}, //LB24
+ {1, SW2_CS7, SW1_CS7, SW3_CS7}, //LB25
+ {1, SW5_CS7, SW4_CS7, SW6_CS7}, //LB26
+ {1, SW8_CS7, SW7_CS7, SW9_CS7}, //LB27
+ {1, SW11_CS7, SW10_CS7, SW12_CS7}, //LB28
+ {1, SW2_CS8, SW1_CS8, SW3_CS8}, //LB29
+ {1, SW5_CS8, SW4_CS8, SW6_CS8}, //LB30
+ {1, SW8_CS8, SW7_CS8, SW9_CS8}, //LB31
+ {1, SW11_CS8, SW10_CS8, SW12_CS8}, //LB32
+ {1, SW2_CS9, SW1_CS9, SW3_CS9}, //LB33
+ {1, SW5_CS9, SW4_CS9, SW6_CS9}, //LB34
+ {1, SW8_CS9, SW7_CS9, SW9_CS9}, //LB35
+ {1, SW11_CS9, SW10_CS9, SW12_CS9}, //LB36
+ {1, SW2_CS10, SW1_CS10, SW3_CS10}, //LB37
+ {1, SW5_CS10, SW4_CS10, SW6_CS10}, //LB38
+ {1, SW8_CS10, SW7_CS10, SW9_CS10}, //LB39
+ {1, SW11_CS10, SW10_CS10, SW12_CS10}, //LB40
+ {1, SW2_CS11, SW1_CS11, SW3_CS11}, //LB41
+ {1, SW5_CS11, SW4_CS11, SW6_CS11}, //LB42
+ {1, SW8_CS11, SW7_CS11, SW9_CS11}, //LB43
+ {1, SW11_CS11, SW10_CS11, SW12_CS11}, //LB44
+ {1, SW2_CS12, SW1_CS12, SW3_CS12}, //LB45
+ {1, SW5_CS12, SW4_CS12, SW6_CS12}, //LB46
+ {1, SW8_CS12, SW7_CS12, SW9_CS12}, //LB47
+ {1, SW11_CS12, SW10_CS12, SW12_CS12}, //LB48
+ {1, SW2_CS13, SW1_CS13, SW3_CS13}, //LB49
+ {1, SW5_CS13, SW4_CS13, SW6_CS13}, //LB50
+ {1, SW8_CS13, SW7_CS13, SW9_CS13}, //LB51
+ {1, SW11_CS13, SW10_CS13, SW12_CS13}, //LB52
+ {1, SW2_CS14, SW1_CS14, SW3_CS14}, //LB53
+ {1, SW5_CS14, SW4_CS14, SW6_CS14}, //LB54
+ {1, SW8_CS14, SW7_CS14, SW9_CS14}, //LB55
+ {1, SW11_CS14, SW10_CS14, SW12_CS14}, //LB56
+ {1, SW2_CS15, SW1_CS15, SW3_CS15}, //LB57
+ {1, SW5_CS15, SW4_CS15, SW6_CS15}, //LB58
+ {1, SW8_CS15, SW7_CS15, SW9_CS15}, //LB59
+ {1, SW11_CS15, SW10_CS15, SW12_CS15}, //LB60
+ {1, SW2_CS16, SW1_CS16, SW3_CS16}, //LB61
+ {1, SW5_CS16, SW4_CS16, SW6_CS16}, //LB62
+ {1, SW8_CS16, SW7_CS16, SW9_CS16}, //LB63
+ {1, SW11_CS16, SW10_CS16, SW12_CS16}, //LB64
};
#endif
diff --git a/keyboards/teleport/native/native.c b/keyboards/teleport/native/native.c
index 5d8ccc64752..b53979e27cc 100644
--- a/keyboards/teleport/native/native.c
+++ b/keyboards/teleport/native/native.c
@@ -24,95 +24,95 @@ const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, L_1, K_1, J_1}, // Row 1
- {0, L_2, K_2, J_2},
- {0, L_3, K_3, J_3},
- {0, L_4, K_4, J_4},
- {0, L_5, K_5, J_5},
- {0, L_6, K_6, J_6},
- {0, L_7, K_7, J_7},
- {0, L_8, K_8, J_8},
- {0, L_9, K_9, J_9},
- {0, L_10, K_10, J_10},
- {0, L_11, K_11, J_11},
- {0, L_12, K_12, J_12},
- {0, L_13, K_13, J_13},
- {0, L_14, K_14, J_14},
- {0, L_15, K_15, J_15},
- {0, L_16, K_16, J_16},
+ {0, SW12_CS1, SW11_CS1, SW10_CS1}, // Row 1
+ {0, SW12_CS2, SW11_CS2, SW10_CS2},
+ {0, SW12_CS3, SW11_CS3, SW10_CS3},
+ {0, SW12_CS4, SW11_CS4, SW10_CS4},
+ {0, SW12_CS5, SW11_CS5, SW10_CS5},
+ {0, SW12_CS6, SW11_CS6, SW10_CS6},
+ {0, SW12_CS7, SW11_CS7, SW10_CS7},
+ {0, SW12_CS8, SW11_CS8, SW10_CS8},
+ {0, SW12_CS9, SW11_CS9, SW10_CS9},
+ {0, SW12_CS10, SW11_CS10, SW10_CS10},
+ {0, SW12_CS11, SW11_CS11, SW10_CS11},
+ {0, SW12_CS12, SW11_CS12, SW10_CS12},
+ {0, SW12_CS13, SW11_CS13, SW10_CS13},
+ {0, SW12_CS14, SW11_CS14, SW10_CS14},
+ {0, SW12_CS15, SW11_CS15, SW10_CS15},
+ {0, SW12_CS16, SW11_CS16, SW10_CS16},
- {0, I_1, H_1, G_1}, // Row 2
- {0, I_2, H_2, G_2},
- {0, I_3, H_3, G_3},
- {0, I_4, H_4, G_4},
- {0, I_5, H_5, G_5},
- {0, I_6, H_6, G_6},
- {0, I_7, H_7, G_7},
- {0, I_8, H_8, G_8},
- {0, I_9, H_9, G_9},
- {0, I_10, H_10, G_10},
- {0, I_11, H_11, G_11},
- {0, I_12, H_12, G_12},
- {0, I_13, H_13, G_13},
- {0, I_15, H_15, G_15},
- {0, I_16, H_16, G_16},
+ {0, SW9_CS1, SW8_CS1, SW7_CS1}, // Row 2
+ {0, SW9_CS2, SW8_CS2, SW7_CS2},
+ {0, SW9_CS3, SW8_CS3, SW7_CS3},
+ {0, SW9_CS4, SW8_CS4, SW7_CS4},
+ {0, SW9_CS5, SW8_CS5, SW7_CS5},
+ {0, SW9_CS6, SW8_CS6, SW7_CS6},
+ {0, SW9_CS7, SW8_CS7, SW7_CS7},
+ {0, SW9_CS8, SW8_CS8, SW7_CS8},
+ {0, SW9_CS9, SW8_CS9, SW7_CS9},
+ {0, SW9_CS10, SW8_CS10, SW7_CS10},
+ {0, SW9_CS11, SW8_CS11, SW7_CS11},
+ {0, SW9_CS12, SW8_CS12, SW7_CS12},
+ {0, SW9_CS13, SW8_CS13, SW7_CS13},
+ {0, SW9_CS15, SW8_CS15, SW7_CS15},
+ {0, SW9_CS16, SW8_CS16, SW7_CS16},
- {0, F_1, E_1, D_1}, // Row 3
- {0, F_3, E_3, D_3},
- {0, F_4, E_4, D_4},
- {0, F_5, E_5, D_5},
- {0, F_6, E_6, D_6},
- {0, F_7, E_7, D_7},
- {0, F_8, E_8, D_8},
- {0, F_9, E_9, D_9},
- {0, F_10, E_10, D_10},
- {0, F_11, E_11, D_11},
- {0, F_12, E_12, D_12},
- {0, F_13, E_13, D_13},
- {0, F_14, E_14, D_14},
- {0, F_15, E_15, D_15},
- {0, F_16, E_16, D_16},
+ {0, SW6_CS1, SW5_CS1, SW4_CS1}, // Row 3
+ {0, SW6_CS3, SW5_CS3, SW4_CS3},
+ {0, SW6_CS4, SW5_CS4, SW4_CS4},
+ {0, SW6_CS5, SW5_CS5, SW4_CS5},
+ {0, SW6_CS6, SW5_CS6, SW4_CS6},
+ {0, SW6_CS7, SW5_CS7, SW4_CS7},
+ {0, SW6_CS8, SW5_CS8, SW4_CS8},
+ {0, SW6_CS9, SW5_CS9, SW4_CS9},
+ {0, SW6_CS10, SW5_CS10, SW4_CS10},
+ {0, SW6_CS11, SW5_CS11, SW4_CS11},
+ {0, SW6_CS12, SW5_CS12, SW4_CS12},
+ {0, SW6_CS13, SW5_CS13, SW4_CS13},
+ {0, SW6_CS14, SW5_CS14, SW4_CS14},
+ {0, SW6_CS15, SW5_CS15, SW4_CS15},
+ {0, SW6_CS16, SW5_CS16, SW4_CS16},
- {1, L_1, K_1, J_1}, // Row 4
- {1, L_3, K_3, J_3},
- {1, L_4, K_4, J_4},
- {1, L_5, K_5, J_5},
- {1, L_6, K_6, J_6},
- {1, L_7, K_7, J_7},
- {1, L_8, K_8, J_8},
- {1, L_9, K_9, J_9},
- {1, L_10, K_10, J_10},
- {1, L_11, K_11, J_11},
- {1, L_12, K_12, J_12},
- {1, L_13, K_13, J_13},
- {1, L_14, K_14, J_14},
- {1, L_16, K_16, J_16},
+ {1, SW12_CS1, SW11_CS1, SW10_CS1}, // Row 4
+ {1, SW12_CS3, SW11_CS3, SW10_CS3},
+ {1, SW12_CS4, SW11_CS4, SW10_CS4},
+ {1, SW12_CS5, SW11_CS5, SW10_CS5},
+ {1, SW12_CS6, SW11_CS6, SW10_CS6},
+ {1, SW12_CS7, SW11_CS7, SW10_CS7},
+ {1, SW12_CS8, SW11_CS8, SW10_CS8},
+ {1, SW12_CS9, SW11_CS9, SW10_CS9},
+ {1, SW12_CS10, SW11_CS10, SW10_CS10},
+ {1, SW12_CS11, SW11_CS11, SW10_CS11},
+ {1, SW12_CS12, SW11_CS12, SW10_CS12},
+ {1, SW12_CS13, SW11_CS13, SW10_CS13},
+ {1, SW12_CS14, SW11_CS14, SW10_CS14},
+ {1, SW12_CS16, SW11_CS16, SW10_CS16},
- {1, I_1, H_1, G_1}, // Row 5
- {1, I_2, H_2, G_2},
- {1, I_3, H_3, G_3},
- {1, I_4, H_4, G_4},
- {1, I_5, H_5, G_5},
- {1, I_6, H_6, G_6},
- {1, I_7, H_7, G_7},
- {1, I_8, H_8, G_8},
- {1, I_9, H_9, G_9},
- {1, I_10, H_10, G_10},
- {1, I_11, H_11, G_11},
- {1, I_12, H_12, G_12},
- {1, I_14, H_14, G_14},
- {1, I_15, H_15, G_15},
- {1, I_16, H_16, G_16},
+ {1, SW9_CS1, SW8_CS1, SW7_CS1}, // Row 5
+ {1, SW9_CS2, SW8_CS2, SW7_CS2},
+ {1, SW9_CS3, SW8_CS3, SW7_CS3},
+ {1, SW9_CS4, SW8_CS4, SW7_CS4},
+ {1, SW9_CS5, SW8_CS5, SW7_CS5},
+ {1, SW9_CS6, SW8_CS6, SW7_CS6},
+ {1, SW9_CS7, SW8_CS7, SW7_CS7},
+ {1, SW9_CS8, SW8_CS8, SW7_CS8},
+ {1, SW9_CS9, SW8_CS9, SW7_CS9},
+ {1, SW9_CS10, SW8_CS10, SW7_CS10},
+ {1, SW9_CS11, SW8_CS11, SW7_CS11},
+ {1, SW9_CS12, SW8_CS12, SW7_CS12},
+ {1, SW9_CS14, SW8_CS14, SW7_CS14},
+ {1, SW9_CS15, SW8_CS15, SW7_CS15},
+ {1, SW9_CS16, SW8_CS16, SW7_CS16},
- {1, F_1, E_1, D_1}, // Row 6
- {1, F_2, E_2, D_2},
- {1, F_3, E_3, D_3},
- {1, F_7, E_7, D_7},
- {1, F_11, E_11, D_11},
- {1, F_12, E_12, D_12},
- {1, F_13, E_13, D_13},
- {1, F_14, E_14, D_14},
- {1, F_15, E_15, D_15},
- {1, F_16, E_16, D_16}
+ {1, SW6_CS1, SW5_CS1, SW4_CS1}, // Row 6
+ {1, SW6_CS2, SW5_CS2, SW4_CS2},
+ {1, SW6_CS3, SW5_CS3, SW4_CS3},
+ {1, SW6_CS7, SW5_CS7, SW4_CS7},
+ {1, SW6_CS11, SW5_CS11, SW4_CS11},
+ {1, SW6_CS12, SW5_CS12, SW4_CS12},
+ {1, SW6_CS13, SW5_CS13, SW4_CS13},
+ {1, SW6_CS14, SW5_CS14, SW4_CS14},
+ {1, SW6_CS15, SW5_CS15, SW4_CS15},
+ {1, SW6_CS16, SW5_CS16, SW4_CS16}
};
#endif
\ No newline at end of file
diff --git a/keyboards/tkc/portico68v2/portico68v2.c b/keyboards/tkc/portico68v2/portico68v2.c
index 5c5f65f10d0..0f3c557b2ca 100644
--- a/keyboards/tkc/portico68v2/portico68v2.c
+++ b/keyboards/tkc/portico68v2/portico68v2.c
@@ -19,89 +19,89 @@ along with this program. If not, see .
#ifdef RGB_MATRIX_ENABLE
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB1 */
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, /* RGB2 */
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, /* RGB3 */
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, /* RGB4 */
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, /* RGB5 */
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, /* RGB6 */
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, /* RGB7 */
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, /* RGB8 */
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, /* RGB9 */
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, /* RGB10 */
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, /* RGB11 */
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, /* RGB12 */
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, /* RGB13 */
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, /* RGB14 */
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, /* RGB15 */
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, /* RGB16 */
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, /* RGB17 */
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, /* RGB18 */
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, /* RGB19 */
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, /* RGB20 */
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, /* RGB21 */
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, /* RGB22 */
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, /* RGB23 */
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, /* RGB24 */
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, /* RGB25 */
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, /* RGB26 */
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, /* RGB27 */
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, /* RGB28 */
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, /* RGB29 */
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, /* RGB30 */
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, /* RGB31 */
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, /* RGB32 */
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, /* RGB33 */
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, /* RGB34 */
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, /* RGB35 */
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, /* RGB36 */
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, /* RGB37 */
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, /* RGB38 */
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, /* RGB39 */
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, /* RGB40 */
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, /* RGB41 */
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, /* RGB42 */
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, /* RGB43 */
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, /* RGB44 */
- {0, CS9_SW1, CS8_SW1, CS7_SW1}, /* RGB45 */
- {0, CS9_SW3, CS8_SW3, CS7_SW3}, /* RGB46 */
- {0, CS9_SW4, CS8_SW4, CS7_SW4}, /* RGB47 */
- {0, CS9_SW5, CS8_SW5, CS7_SW5}, /* RGB48 */
- {0, CS9_SW6, CS8_SW6, CS7_SW6}, /* RGB49 */
- {0, CS9_SW7, CS8_SW7, CS7_SW7}, /* RGB50 */
- {0, CS9_SW8, CS8_SW8, CS7_SW8}, /* RGB51 */
- {0, CS9_SW9, CS8_SW9, CS7_SW9}, /* RGB52 */
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, /* RGB53 */
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, /* RGB54 */
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, /* RGB55 */
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, /* RGB56 */
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, /* RGB57 */
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, /* RGB58 */
- {0, CS6_SW1, CS5_SW1, CS4_SW1}, /* RGB59 */
- {0, CS6_SW2, CS5_SW2, CS4_SW2}, /* RGB60 */
- {0, CS6_SW3, CS5_SW3, CS4_SW3}, /* RGB61 */
- {0, CS6_SW7, CS5_SW7, CS4_SW7}, /* RGB62 */
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, /* RGB63 */
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, /* RGB64 */
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, /* RGB65 */
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, /* RGB66 */
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, /* RGB67 */
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, /* RGB1 */
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, /* RGB2 */
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, /* RGB3 */
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, /* RGB4 */
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, /* RGB5 */
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, /* RGB6 */
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, /* RGB7 */
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, /* RGB8 */
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, /* RGB9 */
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, /* RGB10 */
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, /* RGB11 */
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, /* RGB12 */
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, /* RGB13 */
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, /* RGB14 */
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, /* RGB15 */
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, /* RGB16 */
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, /* RGB17 */
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, /* RGB18 */
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, /* RGB19 */
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, /* RGB20 */
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, /* RGB21 */
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, /* RGB22 */
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, /* RGB23 */
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, /* RGB24 */
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, /* RGB25 */
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, /* RGB26 */
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, /* RGB27 */
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, /* RGB28 */
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, /* RGB29 */
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, /* RGB30 */
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, /* RGB31 */
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, /* RGB32 */
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, /* RGB33 */
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, /* RGB34 */
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, /* RGB35 */
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, /* RGB36 */
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, /* RGB37 */
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, /* RGB38 */
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, /* RGB39 */
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, /* RGB40 */
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, /* RGB41 */
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, /* RGB42 */
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, /* RGB43 */
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, /* RGB44 */
+ {0, SW1_CS9, SW1_CS8, SW1_CS7}, /* RGB45 */
+ {0, SW3_CS9, SW3_CS8, SW3_CS7}, /* RGB46 */
+ {0, SW4_CS9, SW4_CS8, SW4_CS7}, /* RGB47 */
+ {0, SW5_CS9, SW5_CS8, SW5_CS7}, /* RGB48 */
+ {0, SW6_CS9, SW6_CS8, SW6_CS7}, /* RGB49 */
+ {0, SW7_CS9, SW7_CS8, SW7_CS7}, /* RGB50 */
+ {0, SW8_CS9, SW8_CS8, SW8_CS7}, /* RGB51 */
+ {0, SW9_CS9, SW9_CS8, SW9_CS7}, /* RGB52 */
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, /* RGB53 */
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, /* RGB54 */
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, /* RGB55 */
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, /* RGB56 */
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, /* RGB57 */
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, /* RGB58 */
+ {0, SW1_CS6, SW1_CS5, SW1_CS4}, /* RGB59 */
+ {0, SW2_CS6, SW2_CS5, SW2_CS4}, /* RGB60 */
+ {0, SW3_CS6, SW3_CS5, SW3_CS4}, /* RGB61 */
+ {0, SW7_CS6, SW7_CS5, SW7_CS4}, /* RGB62 */
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, /* RGB63 */
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, /* RGB64 */
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, /* RGB65 */
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, /* RGB66 */
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, /* RGB67 */
- {0,CS36_SW1,CS35_SW1,CS34_SW1}, /* RGB68 */
- {0,CS36_SW2,CS35_SW2,CS34_SW2}, /* RGB69 */
- {0,CS36_SW3,CS35_SW3,CS34_SW3}, /* RGB70 */
- {0,CS36_SW4,CS35_SW4,CS34_SW4}, /* RGB71 */
- {0,CS36_SW5,CS35_SW5,CS34_SW5}, /* RGB72 */
- {0,CS36_SW6,CS35_SW6,CS34_SW6}, /* RGB73 */
- {0,CS36_SW7,CS35_SW7,CS34_SW7}, /* RGB74 */
- {0,CS36_SW8,CS35_SW8,CS34_SW8}, /* RGB75 */
- {0,CS36_SW9,CS35_SW9,CS34_SW9}, /* RGB76 */
- {0,CS39_SW1,CS38_SW1,CS37_SW1}, /* RGB77 */
- {0,CS39_SW2,CS38_SW2,CS37_SW2}, /* RGB78 */
- {0,CS39_SW3,CS38_SW3,CS37_SW3}, /* RGB79 */
- {0,CS39_SW4,CS38_SW4,CS37_SW4}, /* RGB80 */
- {0,CS39_SW5,CS38_SW5,CS37_SW5}, /* RGB81 */
- {0,CS39_SW6,CS38_SW6,CS37_SW6}, /* RGB82 */
+ {0,SW1_CS36,SW1_CS35,SW1_CS34}, /* RGB68 */
+ {0,SW2_CS36,SW2_CS35,SW2_CS34}, /* RGB69 */
+ {0,SW3_CS36,SW3_CS35,SW3_CS34}, /* RGB70 */
+ {0,SW4_CS36,SW4_CS35,SW4_CS34}, /* RGB71 */
+ {0,SW5_CS36,SW5_CS35,SW5_CS34}, /* RGB72 */
+ {0,SW6_CS36,SW6_CS35,SW6_CS34}, /* RGB73 */
+ {0,SW7_CS36,SW7_CS35,SW7_CS34}, /* RGB74 */
+ {0,SW8_CS36,SW8_CS35,SW8_CS34}, /* RGB75 */
+ {0,SW9_CS36,SW9_CS35,SW9_CS34}, /* RGB76 */
+ {0,SW1_CS39,SW1_CS38,SW1_CS37}, /* RGB77 */
+ {0,SW2_CS39,SW2_CS38,SW2_CS37}, /* RGB78 */
+ {0,SW3_CS39,SW3_CS38,SW3_CS37}, /* RGB79 */
+ {0,SW4_CS39,SW4_CS38,SW4_CS37}, /* RGB80 */
+ {0,SW5_CS39,SW5_CS38,SW5_CS37}, /* RGB81 */
+ {0,SW6_CS39,SW6_CS38,SW6_CS37}, /* RGB82 */
};
led_config_t g_led_config = {
diff --git a/keyboards/tkc/portico75/portico75.c b/keyboards/tkc/portico75/portico75.c
index 0a22a37d4e3..cd6dafe31aa 100644
--- a/keyboards/tkc/portico75/portico75.c
+++ b/keyboards/tkc/portico75/portico75.c
@@ -25,119 +25,119 @@ along with this program. If not, see .
#if defined(RGB_MATRIX_ENABLE) || defined(RGB_BACKLIGHT_PORTICO75)
const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
- {0, CS18_SW1, CS17_SW1, CS16_SW1},
- {0, CS18_SW2, CS17_SW2, CS16_SW2},
- {0, CS18_SW3, CS17_SW3, CS16_SW3},
- {0, CS18_SW4, CS17_SW4, CS16_SW4},
- {0, CS18_SW5, CS17_SW5, CS16_SW5},
- {0, CS18_SW6, CS17_SW6, CS16_SW6},
- {0, CS18_SW7, CS17_SW7, CS16_SW7},
- {0, CS18_SW8, CS17_SW8, CS16_SW8},
- {0, CS18_SW9, CS17_SW9, CS16_SW9},
+ {0, SW1_CS18, SW1_CS17, SW1_CS16},
+ {0, SW2_CS18, SW2_CS17, SW2_CS16},
+ {0, SW3_CS18, SW3_CS17, SW3_CS16},
+ {0, SW4_CS18, SW4_CS17, SW4_CS16},
+ {0, SW5_CS18, SW5_CS17, SW5_CS16},
+ {0, SW6_CS18, SW6_CS17, SW6_CS16},
+ {0, SW7_CS18, SW7_CS17, SW7_CS16},
+ {0, SW8_CS18, SW8_CS17, SW8_CS16},
+ {0, SW9_CS18, SW9_CS17, SW9_CS16},
- {0, CS21_SW1, CS20_SW1, CS19_SW1},
- {0, CS21_SW2, CS20_SW2, CS19_SW2},
- {0, CS21_SW3, CS20_SW3, CS19_SW3},
- {0, CS21_SW4, CS20_SW4, CS19_SW4},
- {0, CS21_SW5, CS20_SW5, CS19_SW5},
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, //Encoder, NO_LED
+ {0, SW1_CS21, SW1_CS20, SW1_CS19},
+ {0, SW2_CS21, SW2_CS20, SW2_CS19},
+ {0, SW3_CS21, SW3_CS20, SW3_CS19},
+ {0, SW4_CS21, SW4_CS20, SW4_CS19},
+ {0, SW5_CS21, SW5_CS20, SW5_CS19},
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, //Encoder, NO_LED
- {0, CS15_SW1, CS14_SW1, CS13_SW1},
- {0, CS15_SW2, CS14_SW2, CS13_SW2},
- {0, CS15_SW3, CS14_SW3, CS13_SW3},
- {0, CS15_SW4, CS14_SW4, CS13_SW4},
- {0, CS15_SW5, CS14_SW5, CS13_SW5},
- {0, CS15_SW6, CS14_SW6, CS13_SW6},
- {0, CS15_SW7, CS14_SW7, CS13_SW7},
- {0, CS15_SW8, CS14_SW8, CS13_SW8},
- {0, CS15_SW9, CS14_SW9, CS13_SW9},
+ {0, SW1_CS15, SW1_CS14, SW1_CS13},
+ {0, SW2_CS15, SW2_CS14, SW2_CS13},
+ {0, SW3_CS15, SW3_CS14, SW3_CS13},
+ {0, SW4_CS15, SW4_CS14, SW4_CS13},
+ {0, SW5_CS15, SW5_CS14, SW5_CS13},
+ {0, SW6_CS15, SW6_CS14, SW6_CS13},
+ {0, SW7_CS15, SW7_CS14, SW7_CS13},
+ {0, SW8_CS15, SW8_CS14, SW8_CS13},
+ {0, SW9_CS15, SW9_CS14, SW9_CS13},
- {0, CS24_SW1, CS23_SW1, CS22_SW1},
- {0, CS24_SW2, CS23_SW2, CS22_SW2},
- {0, CS24_SW3, CS23_SW3, CS22_SW3},
- {0, CS24_SW4, CS23_SW4, CS22_SW4},
- {0, CS24_SW5, CS23_SW5, CS22_SW5},
- {0, CS24_SW6, CS23_SW6, CS22_SW6},
+ {0, SW1_CS24, SW1_CS23, SW1_CS22},
+ {0, SW2_CS24, SW2_CS23, SW2_CS22},
+ {0, SW3_CS24, SW3_CS23, SW3_CS22},
+ {0, SW4_CS24, SW4_CS23, SW4_CS22},
+ {0, SW5_CS24, SW5_CS23, SW5_CS22},
+ {0, SW6_CS24, SW6_CS23, SW6_CS22},
- {0, CS12_SW1, CS11_SW1, CS10_SW1},
- {0, CS12_SW2, CS11_SW2, CS10_SW2},
- {0, CS12_SW3, CS11_SW3, CS10_SW3},
- {0, CS12_SW4, CS11_SW4, CS10_SW4},
- {0, CS12_SW5, CS11_SW5, CS10_SW5},
- {0, CS12_SW6, CS11_SW6, CS10_SW6},
- {0, CS12_SW7, CS11_SW7, CS10_SW7},
- {0, CS12_SW8, CS11_SW8, CS10_SW8},
- {0, CS12_SW9, CS11_SW9, CS10_SW9},
+ {0, SW1_CS12, SW1_CS11, SW1_CS10},
+ {0, SW2_CS12, SW2_CS11, SW2_CS10},
+ {0, SW3_CS12, SW3_CS11, SW3_CS10},
+ {0, SW4_CS12, SW4_CS11, SW4_CS10},
+ {0, SW5_CS12, SW5_CS11, SW5_CS10},
+ {0, SW6_CS12, SW6_CS11, SW6_CS10},
+ {0, SW7_CS12, SW7_CS11, SW7_CS10},
+ {0, SW8_CS12, SW8_CS11, SW8_CS10},
+ {0, SW9_CS12, SW9_CS11, SW9_CS10},
- {0, CS27_SW1, CS26_SW1, CS25_SW1},
- {0, CS27_SW2, CS26_SW2, CS25_SW2},
- {0, CS27_SW3, CS26_SW3, CS25_SW3},
- {0, CS27_SW4, CS26_SW4, CS25_SW4},
- {0, CS27_SW5, CS26_SW5, CS25_SW5},
- {0, CS27_SW6, CS26_SW6, CS25_SW6},
+ {0, SW1_CS27, SW1_CS26, SW1_CS25},
+ {0, SW2_CS27, SW2_CS26, SW2_CS25},
+ {0, SW3_CS27, SW3_CS26, SW3_CS25},
+ {0, SW4_CS27, SW4_CS26, SW4_CS25},
+ {0, SW5_CS27, SW5_CS26, SW5_CS25},
+ {0, SW6_CS27, SW6_CS26, SW6_CS25},
- {0, CS9_SW1, CS8_SW1, CS7_SW1},
- {0, CS9_SW2, CS8_SW2, CS7_SW2},
- {0, CS9_SW3, CS8_SW3, CS7_SW3},
- {0, CS9_SW4, CS8_SW4, CS7_SW4},
- {0, CS9_SW5, CS8_SW5, CS7_SW5},
- {0, CS9_SW6, CS8_SW6, CS7_SW6},
- {0, CS9_SW7, CS8_SW7, CS7_SW7},
- {0, CS9_SW8, CS8_SW8, CS7_SW8},
- {0, CS9_SW9, CS8_SW9, CS7_SW9},
+ {0, SW1_CS9, SW1_CS8, SW1_CS7},
+ {0, SW2_CS9, SW2_CS8, SW2_CS7},
+ {0, SW3_CS9, SW3_CS8, SW3_CS7},
+ {0, SW4_CS9, SW4_CS8, SW4_CS7},
+ {0, SW5_CS9, SW5_CS8, SW5_CS7},
+ {0, SW6_CS9, SW6_CS8, SW6_CS7},
+ {0, SW7_CS9, SW7_CS8, SW7_CS7},
+ {0, SW8_CS9, SW8_CS8, SW8_CS7},
+ {0, SW9_CS9, SW9_CS8, SW9_CS7},
- {0, CS30_SW1, CS29_SW1, CS28_SW1},
- {0, CS30_SW2, CS29_SW2, CS28_SW2},
- {0, CS30_SW3, CS29_SW3, CS28_SW3},
- {0, CS30_SW4, CS29_SW4, CS28_SW4},
+ {0, SW1_CS30, SW1_CS29, SW1_CS28},
+ {0, SW2_CS30, SW2_CS29, SW2_CS28},
+ {0, SW3_CS30, SW3_CS29, SW3_CS28},
+ {0, SW4_CS30, SW4_CS29, SW4_CS28},
- {0, CS6_SW1, CS5_SW1, CS4_SW1},
- {0, CS6_SW2, CS5_SW2, CS4_SW2},
- {0, CS6_SW3, CS5_SW3, CS4_SW3},
- {0, CS6_SW4, CS5_SW4, CS4_SW4},
- {0, CS6_SW5, CS5_SW5, CS4_SW5},
- {0, CS6_SW6, CS5_SW6, CS4_SW6},
- {0, CS6_SW7, CS5_SW7, CS4_SW7},
- {0, CS6_SW8, CS5_SW8, CS4_SW8},
- {0, CS6_SW9, CS5_SW9, CS4_SW9},
+ {0, SW1_CS6, SW1_CS5, SW1_CS4},
+ {0, SW2_CS6, SW2_CS5, SW2_CS4},
+ {0, SW3_CS6, SW3_CS5, SW3_CS4},
+ {0, SW4_CS6, SW4_CS5, SW4_CS4},
+ {0, SW5_CS6, SW5_CS5, SW5_CS4},
+ {0, SW6_CS6, SW6_CS5, SW6_CS4},
+ {0, SW7_CS6, SW7_CS5, SW7_CS4},
+ {0, SW8_CS6, SW8_CS5, SW8_CS4},
+ {0, SW9_CS6, SW9_CS5, SW9_CS4},
- {0, CS33_SW1, CS32_SW1, CS31_SW1},
- {0, CS33_SW2, CS32_SW2, CS31_SW2},
- {0, CS33_SW3, CS32_SW3, CS31_SW3},
- {0, CS33_SW4, CS32_SW4, CS31_SW4},
+ {0, SW1_CS33, SW1_CS32, SW1_CS31},
+ {0, SW2_CS33, SW2_CS32, SW2_CS31},
+ {0, SW3_CS33, SW3_CS32, SW3_CS31},
+ {0, SW4_CS33, SW4_CS32, SW4_CS31},
- {0, CS3_SW1, CS2_SW1, CS1_SW1},
- {0, CS3_SW2, CS2_SW2, CS1_SW2},
- {0, CS3_SW3, CS2_SW3, CS1_SW3},
- {0, CS3_SW6, CS2_SW6, CS1_SW6},
- {0, CS3_SW8, CS2_SW8, CS1_SW8},
- {0, CS3_SW9, CS2_SW9, CS1_SW9},
+ {0, SW1_CS3, SW1_CS2, SW1_CS1},
+ {0, SW2_CS3, SW2_CS2, SW2_CS1},
+ {0, SW3_CS3, SW3_CS2, SW3_CS1},
+ {0, SW6_CS3, SW6_CS2, SW6_CS1},
+ {0, SW8_CS3, SW8_CS2, SW8_CS1},
+ {0, SW9_CS3, SW9_CS2, SW9_CS1},
- {0, CS36_SW1, CS35_SW1, CS34_SW1},
- {0, CS36_SW2, CS35_SW2, CS34_SW2},
- {0, CS36_SW3, CS35_SW3, CS34_SW3},
+ {0, SW1_CS36, SW1_CS35, SW1_CS34},
+ {0, SW2_CS36, SW2_CS35, SW2_CS34},
+ {0, SW3_CS36, SW3_CS35, SW3_CS34},
/*UNDERGLOW*/
- {0, CS39_SW1, CS38_SW1, CS37_SW1},
- {0, CS39_SW2, CS38_SW2, CS37_SW2},
- {0, CS39_SW3, CS38_SW3, CS37_SW3},
- {0, CS39_SW4, CS38_SW4, CS37_SW4},
- {0, CS39_SW5, CS38_SW5, CS37_SW5},
- {0, CS39_SW6, CS38_SW6, CS37_SW6},
- {0, CS39_SW7, CS38_SW7, CS37_SW7},
- {0, CS39_SW8, CS38_SW8, CS37_SW8},
- {0, CS39_SW9, CS38_SW9, CS37_SW9},
+ {0, SW1_CS39, SW1_CS38, SW1_CS37},
+ {0, SW2_CS39, SW2_CS38, SW2_CS37},
+ {0, SW3_CS39, SW3_CS38, SW3_CS37},
+ {0, SW4_CS39, SW4_CS38, SW4_CS37},
+ {0, SW5_CS39, SW5_CS38, SW5_CS37},
+ {0, SW6_CS39, SW6_CS38, SW6_CS37},
+ {0, SW7_CS39, SW7_CS38, SW7_CS37},
+ {0, SW8_CS39, SW8_CS38, SW8_CS37},
+ {0, SW9_CS39, SW9_CS38, SW9_CS37},
- {0, CS36_SW4, CS35_SW4, CS34_SW4},
- {0, CS36_SW5, CS35_SW5, CS34_SW5},
- {0, CS36_SW6, CS35_SW6, CS34_SW6},
- {0, CS36_SW7, CS35_SW7, CS34_SW7},
- {0, CS36_SW8, CS35_SW8, CS34_SW8},
- {0, CS36_SW9, CS35_SW9, CS34_SW9},
+ {0, SW4_CS36, SW4_CS35, SW4_CS34},
+ {0, SW5_CS36, SW5_CS35, SW5_CS34},
+ {0, SW6_CS36, SW6_CS35, SW6_CS34},
+ {0, SW7_CS36, SW7_CS35, SW7_CS34},
+ {0, SW8_CS36, SW8_CS35, SW8_CS34},
+ {0, SW9_CS36, SW9_CS35, SW9_CS34},
- {0, CS33_SW5, CS32_SW5, CS31_SW5},
- {0, CS33_SW6, CS32_SW6, CS31_SW6},
- {0, CS33_SW7, CS32_SW7, CS31_SW7},
+ {0, SW5_CS33, SW5_CS32, SW5_CS31},
+ {0, SW6_CS33, SW6_CS32, SW6_CS31},
+ {0, SW7_CS33, SW7_CS32, SW7_CS31},
};
#endif
diff --git a/keyboards/wilba_tech/wt60_a/wt60_a.c b/keyboards/wilba_tech/wt60_a/wt60_a.c
index fe566ce3fc4..04657835c9d 100644
--- a/keyboards/wilba_tech/wt60_a/wt60_a.c
+++ b/keyboards/wilba_tech/wt60_a/wt60_a.c
@@ -9,112 +9,112 @@
#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT60_A)
const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
- {0, A_1},
- {0, A_2},
- {0, A_3},
- {0, A_4},
- {0, A_5},
- {0, A_6},
- {0, A_7},
- {0, A_8},
+ {0, SW1_CS1},
+ {0, SW1_CS2},
+ {0, SW1_CS3},
+ {0, SW1_CS4},
+ {0, SW1_CS5},
+ {0, SW1_CS6},
+ {0, SW1_CS7},
+ {0, SW1_CS8},
- {0, B_1},
- {0, B_2},
- {0, B_3},
- {0, B_4},
- {0, B_5},
- {0, B_6},
- {0, B_7},
- {0, B_8},
+ {0, SW2_CS1},
+ {0, SW2_CS2},
+ {0, SW2_CS3},
+ {0, SW2_CS4},
+ {0, SW2_CS5},
+ {0, SW2_CS6},
+ {0, SW2_CS7},
+ {0, SW2_CS8},
- {0, C_1},
- {0, C_2},
- {0, C_3},
- {0, C_4},
- {0, C_5},
- {0, C_6},
- {0, C_7},
- {0, C_8},
+ {0, SW3_CS1},
+ {0, SW3_CS2},
+ {0, SW3_CS3},
+ {0, SW3_CS4},
+ {0, SW3_CS5},
+ {0, SW3_CS6},
+ {0, SW3_CS7},
+ {0, SW3_CS8},
- {0, D_1},
- {0, D_2},
- {0, D_3},
- {0, D_4},
- {0, D_5},
- {0, D_6},
- {0, D_7},
- {0, D_8},
+ {0, SW4_CS1},
+ {0, SW4_CS2},
+ {0, SW4_CS3},
+ {0, SW4_CS4},
+ {0, SW4_CS5},
+ {0, SW4_CS6},
+ {0, SW4_CS7},
+ {0, SW4_CS8},
- {0, E_1},
- {0, E_2},
- {0, E_3},
- {0, E_4},
- {0, E_5},
- {0, E_6},
- {0, E_7},
- {0, E_8},
+ {0, SW5_CS1},
+ {0, SW5_CS2},
+ {0, SW5_CS3},
+ {0, SW5_CS4},
+ {0, SW5_CS5},
+ {0, SW5_CS6},
+ {0, SW5_CS7},
+ {0, SW5_CS8},
- {0, F_1},
- {0, F_2},
- {0, F_3},
- {0, F_4},
- {0, F_5},
- {0, F_6},
- {0, F_7},
- {0, F_8},
+ {0, SW6_CS1},
+ {0, SW6_CS2},
+ {0, SW6_CS3},
+ {0, SW6_CS4},
+ {0, SW6_CS5},
+ {0, SW6_CS6},
+ {0, SW6_CS7},
+ {0, SW6_CS8},
- {0, G_1},
- {0, G_2},
- {0, G_3},
- {0, G_4},
- {0, G_5},
- {0, G_6},
- {0, G_7},
- {0, G_8},
+ {0, SW7_CS1},
+ {0, SW7_CS2},
+ {0, SW7_CS3},
+ {0, SW7_CS4},
+ {0, SW7_CS5},
+ {0, SW7_CS6},
+ {0, SW7_CS7},
+ {0, SW7_CS8},
- {0, H_1},
- {0, H_2},
- {0, H_3},
- {0, H_4},
- {0, H_5},
- {0, H_6},
- {0, H_7},
- {0, H_8},
+ {0, SW8_CS1},
+ {0, SW8_CS2},
+ {0, SW8_CS3},
+ {0, SW8_CS4},
+ {0, SW8_CS5},
+ {0, SW8_CS6},
+ {0, SW8_CS7},
+ {0, SW8_CS8},
- {0, I_1},
- {0, I_2},
- {0, I_3},
- {0, I_4},
- {0, I_5},
- {0, I_6},
- {0, I_7},
- {0, I_8},
+ {0, SW9_CS1},
+ {0, SW9_CS2},
+ {0, SW9_CS3},
+ {0, SW9_CS4},
+ {0, SW9_CS5},
+ {0, SW9_CS6},
+ {0, SW9_CS7},
+ {0, SW9_CS8},
- {0, J_1},
- {0, J_2},
- {0, J_3},
- {0, J_4},
- {0, J_5},
- {0, J_6},
- {0, J_7},
- {0, J_8},
+ {0, SW10_CS1},
+ {0, SW10_CS2},
+ {0, SW10_CS3},
+ {0, SW10_CS4},
+ {0, SW10_CS5},
+ {0, SW10_CS6},
+ {0, SW10_CS7},
+ {0, SW10_CS8},
- {0, K_1},
- {0, K_2},
- {0, K_3},
- {0, K_4},
- {0, K_5},
- {0, K_6},
- {0, K_7},
- {0, K_8},
+ {0, SW11_CS1},
+ {0, SW11_CS2},
+ {0, SW11_CS3},
+ {0, SW11_CS4},
+ {0, SW11_CS5},
+ {0, SW11_CS6},
+ {0, SW11_CS7},
+ {0, SW11_CS8},
- {0, L_1},
- {0, L_2},
- {0, L_3},
- {0, L_4},
- {0, L_5},
- {0, L_6},
- {0, L_7},
- {0, L_8}
+ {0, SW12_CS1},
+ {0, SW12_CS2},
+ {0, SW12_CS3},
+ {0, SW12_CS4},
+ {0, SW12_CS5},
+ {0, SW12_CS6},
+ {0, SW12_CS7},
+ {0, SW12_CS8}
};
#endif
diff --git a/keyboards/wilba_tech/wt65_a/wt65_a.c b/keyboards/wilba_tech/wt65_a/wt65_a.c
index 4ac6e622dbd..398525c2391 100644
--- a/keyboards/wilba_tech/wt65_a/wt65_a.c
+++ b/keyboards/wilba_tech/wt65_a/wt65_a.c
@@ -9,112 +9,112 @@
#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT65_A)
const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
- {0, A_1},
- {0, A_2},
- {0, A_3},
- {0, A_4},
- {0, A_5},
- {0, A_6},
- {0, A_7},
- {0, A_8},
+ {0, SW1_CS1},
+ {0, SW1_CS2},
+ {0, SW1_CS3},
+ {0, SW1_CS4},
+ {0, SW1_CS5},
+ {0, SW1_CS6},
+ {0, SW1_CS7},
+ {0, SW1_CS8},
- {0, B_1},
- {0, B_2},
- {0, B_3},
- {0, B_4},
- {0, B_5},
- {0, B_6},
- {0, B_7},
- {0, B_8},
+ {0, SW2_CS1},
+ {0, SW2_CS2},
+ {0, SW2_CS3},
+ {0, SW2_CS4},
+ {0, SW2_CS5},
+ {0, SW2_CS6},
+ {0, SW2_CS7},
+ {0, SW2_CS8},
- {0, C_1},
- {0, C_2},
- {0, C_3},
- {0, C_4},
- {0, C_5},
- {0, C_6},
- {0, C_7},
- {0, C_8},
+ {0, SW3_CS1},
+ {0, SW3_CS2},
+ {0, SW3_CS3},
+ {0, SW3_CS4},
+ {0, SW3_CS5},
+ {0, SW3_CS6},
+ {0, SW3_CS7},
+ {0, SW3_CS8},
- {0, D_1},
- {0, D_2},
- {0, D_3},
- {0, D_4},
- {0, D_5},
- {0, D_6},
- {0, D_7},
- {0, D_8},
+ {0, SW4_CS1},
+ {0, SW4_CS2},
+ {0, SW4_CS3},
+ {0, SW4_CS4},
+ {0, SW4_CS5},
+ {0, SW4_CS6},
+ {0, SW4_CS7},
+ {0, SW4_CS8},
- {0, E_1},
- {0, E_2},
- {0, E_3},
- {0, E_4},
- {0, E_5},
- {0, E_6},
- {0, E_7},
- {0, E_8},
+ {0, SW5_CS1},
+ {0, SW5_CS2},
+ {0, SW5_CS3},
+ {0, SW5_CS4},
+ {0, SW5_CS5},
+ {0, SW5_CS6},
+ {0, SW5_CS7},
+ {0, SW5_CS8},
- {0, F_1},
- {0, F_2},
- {0, F_3},
- {0, F_4},
- {0, F_5},
- {0, F_6},
- {0, F_7},
- {0, F_8},
+ {0, SW6_CS1},
+ {0, SW6_CS2},
+ {0, SW6_CS3},
+ {0, SW6_CS4},
+ {0, SW6_CS5},
+ {0, SW6_CS6},
+ {0, SW6_CS7},
+ {0, SW6_CS8},
- {0, G_1},
- {0, G_2},
- {0, G_3},
- {0, G_4},
- {0, G_5},
- {0, G_6},
- {0, G_7},
- {0, G_8},
+ {0, SW7_CS1},
+ {0, SW7_CS2},
+ {0, SW7_CS3},
+ {0, SW7_CS4},
+ {0, SW7_CS5},
+ {0, SW7_CS6},
+ {0, SW7_CS7},
+ {0, SW7_CS8},
- {0, H_1},
- {0, H_2},
- {0, H_3},
- {0, H_4},
- {0, H_5},
- {0, H_6},
- {0, H_7},
- {0, H_8},
+ {0, SW8_CS1},
+ {0, SW8_CS2},
+ {0, SW8_CS3},
+ {0, SW8_CS4},
+ {0, SW8_CS5},
+ {0, SW8_CS6},
+ {0, SW8_CS7},
+ {0, SW8_CS8},
- {0, I_1},
- {0, I_2},
- {0, I_3},
- {0, I_4},
- {0, I_5},
- {0, I_6},
- {0, I_7},
- {0, I_8},
+ {0, SW9_CS1},
+ {0, SW9_CS2},
+ {0, SW9_CS3},
+ {0, SW9_CS4},
+ {0, SW9_CS5},
+ {0, SW9_CS6},
+ {0, SW9_CS7},
+ {0, SW9_CS8},
- {0, J_1},
- {0, J_2},
- {0, J_3},
- {0, J_4},
- {0, J_5},
- {0, J_6},
- {0, J_7},
- {0, J_8},
+ {0, SW10_CS1},
+ {0, SW10_CS2},
+ {0, SW10_CS3},
+ {0, SW10_CS4},
+ {0, SW10_CS5},
+ {0, SW10_CS6},
+ {0, SW10_CS7},
+ {0, SW10_CS8},
- {0, K_1},
- {0, K_2},
- {0, K_3},
- {0, K_4},
- {0, K_5},
- {0, K_6},
- {0, K_7},
- {0, K_8},
+ {0, SW11_CS1},
+ {0, SW11_CS2},
+ {0, SW11_CS3},
+ {0, SW11_CS4},
+ {0, SW11_CS5},
+ {0, SW11_CS6},
+ {0, SW11_CS7},
+ {0, SW11_CS8},
- {0, L_1},
- {0, L_2},
- {0, L_3},
- {0, L_4},
- {0, L_5},
- {0, L_6},
- {0, L_7},
- {0, L_8}
+ {0, SW12_CS1},
+ {0, SW12_CS2},
+ {0, SW12_CS3},
+ {0, SW12_CS4},
+ {0, SW12_CS5},
+ {0, SW12_CS6},
+ {0, SW12_CS7},
+ {0, SW12_CS8}
};
#endif
diff --git a/keyboards/wilba_tech/wt65_b/wt65_b.c b/keyboards/wilba_tech/wt65_b/wt65_b.c
index 139ddca921b..2e2385ace29 100644
--- a/keyboards/wilba_tech/wt65_b/wt65_b.c
+++ b/keyboards/wilba_tech/wt65_b/wt65_b.c
@@ -9,112 +9,112 @@
#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT65_B)
const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
- {0, A_1},
- {0, A_2},
- {0, A_3},
- {0, A_4},
- {0, A_5},
- {0, A_6},
- {0, A_7},
- {0, A_8},
+ {0, SW1_CS1},
+ {0, SW1_CS2},
+ {0, SW1_CS3},
+ {0, SW1_CS4},
+ {0, SW1_CS5},
+ {0, SW1_CS6},
+ {0, SW1_CS7},
+ {0, SW1_CS8},
- {0, B_1},
- {0, B_2},
- {0, B_3},
- {0, B_4},
- {0, B_5},
- {0, B_6},
- {0, B_7},
- {0, B_8},
+ {0, SW2_CS1},
+ {0, SW2_CS2},
+ {0, SW2_CS3},
+ {0, SW2_CS4},
+ {0, SW2_CS5},
+ {0, SW2_CS6},
+ {0, SW2_CS7},
+ {0, SW2_CS8},
- {0, C_1},
- {0, C_2},
- {0, C_3},
- {0, C_4},
- {0, C_5},
- {0, C_6},
- {0, C_7},
- {0, C_8},
+ {0, SW3_CS1},
+ {0, SW3_CS2},
+ {0, SW3_CS3},
+ {0, SW3_CS4},
+ {0, SW3_CS5},
+ {0, SW3_CS6},
+ {0, SW3_CS7},
+ {0, SW3_CS8},
- {0, D_1},
- {0, D_2},
- {0, D_3},
- {0, D_4},
- {0, D_5},
- {0, D_6},
- {0, D_7},
- {0, D_8},
+ {0, SW4_CS1},
+ {0, SW4_CS2},
+ {0, SW4_CS3},
+ {0, SW4_CS4},
+ {0, SW4_CS5},
+ {0, SW4_CS6},
+ {0, SW4_CS7},
+ {0, SW4_CS8},
- {0, E_1},
- {0, E_2},
- {0, E_3},
- {0, E_4},
- {0, E_5},
- {0, E_6},
- {0, E_7},
- {0, E_8},
+ {0, SW5_CS1},
+ {0, SW5_CS2},
+ {0, SW5_CS3},
+ {0, SW5_CS4},
+ {0, SW5_CS5},
+ {0, SW5_CS6},
+ {0, SW5_CS7},
+ {0, SW5_CS8},
- {0, F_1},
- {0, F_2},
- {0, F_3},
- {0, F_4},
- {0, F_5},
- {0, F_6},
- {0, F_7},
- {0, F_8},
+ {0, SW6_CS1},
+ {0, SW6_CS2},
+ {0, SW6_CS3},
+ {0, SW6_CS4},
+ {0, SW6_CS5},
+ {0, SW6_CS6},
+ {0, SW6_CS7},
+ {0, SW6_CS8},
- {0, G_1},
- {0, G_2},
- {0, G_3},
- {0, G_4},
- {0, G_5},
- {0, G_6},
- {0, G_7},
- {0, G_8},
+ {0, SW7_CS1},
+ {0, SW7_CS2},
+ {0, SW7_CS3},
+ {0, SW7_CS4},
+ {0, SW7_CS5},
+ {0, SW7_CS6},
+ {0, SW7_CS7},
+ {0, SW7_CS8},
- {0, H_1},
- {0, H_2},
- {0, H_3},
- {0, H_4},
- {0, H_5},
- {0, H_6},
- {0, H_7},
- {0, H_8},
+ {0, SW8_CS1},
+ {0, SW8_CS2},
+ {0, SW8_CS3},
+ {0, SW8_CS4},
+ {0, SW8_CS5},
+ {0, SW8_CS6},
+ {0, SW8_CS7},
+ {0, SW8_CS8},
- {0, I_1},
- {0, I_2},
- {0, I_3},
- {0, I_4},
- {0, I_5},
- {0, I_6},
- {0, I_7},
- {0, I_8},
+ {0, SW9_CS1},
+ {0, SW9_CS2},
+ {0, SW9_CS3},
+ {0, SW9_CS4},
+ {0, SW9_CS5},
+ {0, SW9_CS6},
+ {0, SW9_CS7},
+ {0, SW9_CS8},
- {0, J_1},
- {0, J_2},
- {0, J_3},
- {0, J_4},
- {0, J_5},
- {0, J_6},
- {0, J_7},
- {0, J_8},
+ {0, SW10_CS1},
+ {0, SW10_CS2},
+ {0, SW10_CS3},
+ {0, SW10_CS4},
+ {0, SW10_CS5},
+ {0, SW10_CS6},
+ {0, SW10_CS7},
+ {0, SW10_CS8},
- {0, K_1},
- {0, K_2},
- {0, K_3},
- {0, K_4},
- {0, K_5},
- {0, K_6},
- {0, K_7},
- {0, K_8},
+ {0, SW11_CS1},
+ {0, SW11_CS2},
+ {0, SW11_CS3},
+ {0, SW11_CS4},
+ {0, SW11_CS5},
+ {0, SW11_CS6},
+ {0, SW11_CS7},
+ {0, SW11_CS8},
- {0, L_1},
- {0, L_2},
- {0, L_3},
- {0, L_4},
- {0, L_5},
- {0, L_6},
- {0, L_7},
- {0, L_8}
+ {0, SW12_CS1},
+ {0, SW12_CS2},
+ {0, SW12_CS3},
+ {0, SW12_CS4},
+ {0, SW12_CS5},
+ {0, SW12_CS6},
+ {0, SW12_CS7},
+ {0, SW12_CS8}
};
#endif
diff --git a/keyboards/wilba_tech/wt75_a/wt75_a.c b/keyboards/wilba_tech/wt75_a/wt75_a.c
index 8b64397b958..111e6c3a2c1 100644
--- a/keyboards/wilba_tech/wt75_a/wt75_a.c
+++ b/keyboards/wilba_tech/wt75_a/wt75_a.c
@@ -9,112 +9,112 @@
#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_A)
const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
- {0, A_1},
- {0, A_2},
- {0, A_3},
- {0, A_4},
- {0, A_5},
- {0, A_6},
- {0, A_7},
- {0, A_8},
+ {0, SW1_CS1},
+ {0, SW1_CS2},
+ {0, SW1_CS3},
+ {0, SW1_CS4},
+ {0, SW1_CS5},
+ {0, SW1_CS6},
+ {0, SW1_CS7},
+ {0, SW1_CS8},
- {0, B_1},
- {0, B_2},
- {0, B_3},
- {0, B_4},
- {0, B_5},
- {0, B_6},
- {0, B_7},
- {0, B_8},
+ {0, SW2_CS1},
+ {0, SW2_CS2},
+ {0, SW2_CS3},
+ {0, SW2_CS4},
+ {0, SW2_CS5},
+ {0, SW2_CS6},
+ {0, SW2_CS7},
+ {0, SW2_CS8},
- {0, C_1},
- {0, C_2},
- {0, C_3},
- {0, C_4},
- {0, C_5},
- {0, C_6},
- {0, C_7},
- {0, C_8},
+ {0, SW3_CS1},
+ {0, SW3_CS2},
+ {0, SW3_CS3},
+ {0, SW3_CS4},
+ {0, SW3_CS5},
+ {0, SW3_CS6},
+ {0, SW3_CS7},
+ {0, SW3_CS8},
- {0, D_1},
- {0, D_2},
- {0, D_3},
- {0, D_4},
- {0, D_5},
- {0, D_6},
- {0, D_7},
- {0, D_8},
+ {0, SW4_CS1},
+ {0, SW4_CS2},
+ {0, SW4_CS3},
+ {0, SW4_CS4},
+ {0, SW4_CS5},
+ {0, SW4_CS6},
+ {0, SW4_CS7},
+ {0, SW4_CS8},
- {0, E_1},
- {0, E_2},
- {0, E_3},
- {0, E_4},
- {0, E_5},
- {0, E_6},
- {0, E_7},
- {0, E_8},
+ {0, SW5_CS1},
+ {0, SW5_CS2},
+ {0, SW5_CS3},
+ {0, SW5_CS4},
+ {0, SW5_CS5},
+ {0, SW5_CS6},
+ {0, SW5_CS7},
+ {0, SW5_CS8},
- {0, F_1},
- {0, F_2},
- {0, F_3},
- {0, F_4},
- {0, F_5},
- {0, F_6},
- {0, F_7},
- {0, F_8},
+ {0, SW6_CS1},
+ {0, SW6_CS2},
+ {0, SW6_CS3},
+ {0, SW6_CS4},
+ {0, SW6_CS5},
+ {0, SW6_CS6},
+ {0, SW6_CS7},
+ {0, SW6_CS8},
- {0, G_1},
- {0, G_2},
- {0, G_3},
- {0, G_4},
- {0, G_5},
- {0, G_6},
- {0, G_7},
- {0, G_8},
+ {0, SW7_CS1},
+ {0, SW7_CS2},
+ {0, SW7_CS3},
+ {0, SW7_CS4},
+ {0, SW7_CS5},
+ {0, SW7_CS6},
+ {0, SW7_CS7},
+ {0, SW7_CS8},
- {0, H_1},
- {0, H_2},
- {0, H_3},
- {0, H_4},
- {0, H_5},
- {0, H_6},
- {0, H_7},
- {0, H_8},
+ {0, SW8_CS1},
+ {0, SW8_CS2},
+ {0, SW8_CS3},
+ {0, SW8_CS4},
+ {0, SW8_CS5},
+ {0, SW8_CS6},
+ {0, SW8_CS7},
+ {0, SW8_CS8},
- {0, I_1},
- {0, I_2},
- {0, I_3},
- {0, I_4},
- {0, I_5},
- {0, I_6},
- {0, I_7},
- {0, I_8},
+ {0, SW9_CS1},
+ {0, SW9_CS2},
+ {0, SW9_CS3},
+ {0, SW9_CS4},
+ {0, SW9_CS5},
+ {0, SW9_CS6},
+ {0, SW9_CS7},
+ {0, SW9_CS8},
- {0, J_1},
- {0, J_2},
- {0, J_3},
- {0, J_4},
- {0, J_5},
- {0, J_6},
- {0, J_7},
- {0, J_8},
+ {0, SW10_CS1},
+ {0, SW10_CS2},
+ {0, SW10_CS3},
+ {0, SW10_CS4},
+ {0, SW10_CS5},
+ {0, SW10_CS6},
+ {0, SW10_CS7},
+ {0, SW10_CS8},
- {0, K_1},
- {0, K_2},
- {0, K_3},
- {0, K_4},
- {0, K_5},
- {0, K_6},
- {0, K_7},
- {0, K_8},
+ {0, SW11_CS1},
+ {0, SW11_CS2},
+ {0, SW11_CS3},
+ {0, SW11_CS4},
+ {0, SW11_CS5},
+ {0, SW11_CS6},
+ {0, SW11_CS7},
+ {0, SW11_CS8},
- {0, L_1},
- {0, L_2},
- {0, L_3},
- {0, L_4},
- {0, L_5},
- {0, L_6},
- {0, L_7},
- {0, L_8}
+ {0, SW12_CS1},
+ {0, SW12_CS2},
+ {0, SW12_CS3},
+ {0, SW12_CS4},
+ {0, SW12_CS5},
+ {0, SW12_CS6},
+ {0, SW12_CS7},
+ {0, SW12_CS8}
};
#endif
diff --git a/keyboards/wilba_tech/wt75_b/wt75_b.c b/keyboards/wilba_tech/wt75_b/wt75_b.c
index 9095bf5d6f0..5a4b7de39f0 100644
--- a/keyboards/wilba_tech/wt75_b/wt75_b.c
+++ b/keyboards/wilba_tech/wt75_b/wt75_b.c
@@ -9,112 +9,112 @@
#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_B)
const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
- {0, A_1},
- {0, A_2},
- {0, A_3},
- {0, A_4},
- {0, A_5},
- {0, A_6},
- {0, A_7},
- {0, A_8},
+ {0, SW1_CS1},
+ {0, SW1_CS2},
+ {0, SW1_CS3},
+ {0, SW1_CS4},
+ {0, SW1_CS5},
+ {0, SW1_CS6},
+ {0, SW1_CS7},
+ {0, SW1_CS8},
- {0, B_1},
- {0, B_2},
- {0, B_3},
- {0, B_4},
- {0, B_5},
- {0, B_6},
- {0, B_7},
- {0, B_8},
+ {0, SW2_CS1},
+ {0, SW2_CS2},
+ {0, SW2_CS3},
+ {0, SW2_CS4},
+ {0, SW2_CS5},
+ {0, SW2_CS6},
+ {0, SW2_CS7},
+ {0, SW2_CS8},
- {0, C_1},
- {0, C_2},
- {0, C_3},
- {0, C_4},
- {0, C_5},
- {0, C_6},
- {0, C_7},
- {0, C_8},
+ {0, SW3_CS1},
+ {0, SW3_CS2},
+ {0, SW3_CS3},
+ {0, SW3_CS4},
+ {0, SW3_CS5},
+ {0, SW3_CS6},
+ {0, SW3_CS7},
+ {0, SW3_CS8},
- {0, D_1},
- {0, D_2},
- {0, D_3},
- {0, D_4},
- {0, D_5},
- {0, D_6},
- {0, D_7},
- {0, D_8},
+ {0, SW4_CS1},
+ {0, SW4_CS2},
+ {0, SW4_CS3},
+ {0, SW4_CS4},
+ {0, SW4_CS5},
+ {0, SW4_CS6},
+ {0, SW4_CS7},
+ {0, SW4_CS8},
- {0, E_1},
- {0, E_2},
- {0, E_3},
- {0, E_4},
- {0, E_5},
- {0, E_6},
- {0, E_7},
- {0, E_8},
+ {0, SW5_CS1},
+ {0, SW5_CS2},
+ {0, SW5_CS3},
+ {0, SW5_CS4},
+ {0, SW5_CS5},
+ {0, SW5_CS6},
+ {0, SW5_CS7},
+ {0, SW5_CS8},
- {0, F_1},
- {0, F_2},
- {0, F_3},
- {0, F_4},
- {0, F_5},
- {0, F_6},
- {0, F_7},
- {0, F_8},
+ {0, SW6_CS1},
+ {0, SW6_CS2},
+ {0, SW6_CS3},
+ {0, SW6_CS4},
+ {0, SW6_CS5},
+ {0, SW6_CS6},
+ {0, SW6_CS7},
+ {0, SW6_CS8},
- {0, G_1},
- {0, G_2},
- {0, G_3},
- {0, G_4},
- {0, G_5},
- {0, G_6},
- {0, G_7},
- {0, G_8},
+ {0, SW7_CS1},
+ {0, SW7_CS2},
+ {0, SW7_CS3},
+ {0, SW7_CS4},
+ {0, SW7_CS5},
+ {0, SW7_CS6},
+ {0, SW7_CS7},
+ {0, SW7_CS8},
- {0, H_1},
- {0, H_2},
- {0, H_3},
- {0, H_4},
- {0, H_5},
- {0, H_6},
- {0, H_7},
- {0, H_8},
+ {0, SW8_CS1},
+ {0, SW8_CS2},
+ {0, SW8_CS3},
+ {0, SW8_CS4},
+ {0, SW8_CS5},
+ {0, SW8_CS6},
+ {0, SW8_CS7},
+ {0, SW8_CS8},
- {0, I_1},
- {0, I_2},
- {0, I_3},
- {0, I_4},
- {0, I_5},
- {0, I_6},
- {0, I_7},
- {0, I_8},
+ {0, SW9_CS1},
+ {0, SW9_CS2},
+ {0, SW9_CS3},
+ {0, SW9_CS4},
+ {0, SW9_CS5},
+ {0, SW9_CS6},
+ {0, SW9_CS7},
+ {0, SW9_CS8},
- {0, J_1},
- {0, J_2},
- {0, J_3},
- {0, J_4},
- {0, J_5},
- {0, J_6},
- {0, J_7},
- {0, J_8},
+ {0, SW10_CS1},
+ {0, SW10_CS2},
+ {0, SW10_CS3},
+ {0, SW10_CS4},
+ {0, SW10_CS5},
+ {0, SW10_CS6},
+ {0, SW10_CS7},
+ {0, SW10_CS8},
- {0, K_1},
- {0, K_2},
- {0, K_3},
- {0, K_4},
- {0, K_5},
- {0, K_6},
- {0, K_7},
- {0, K_8},
+ {0, SW11_CS1},
+ {0, SW11_CS2},
+ {0, SW11_CS3},
+ {0, SW11_CS4},
+ {0, SW11_CS5},
+ {0, SW11_CS6},
+ {0, SW11_CS7},
+ {0, SW11_CS8},
- {0, L_1},
- {0, L_2},
- {0, L_3},
- {0, L_4},
- {0, L_5},
- {0, L_6},
- {0, L_7},
- {0, L_8}
+ {0, SW12_CS1},
+ {0, SW12_CS2},
+ {0, SW12_CS3},
+ {0, SW12_CS4},
+ {0, SW12_CS5},
+ {0, SW12_CS6},
+ {0, SW12_CS7},
+ {0, SW12_CS8}
};
#endif
diff --git a/keyboards/wilba_tech/wt75_c/wt75_c.c b/keyboards/wilba_tech/wt75_c/wt75_c.c
index c3446b2af67..741bfb95948 100644
--- a/keyboards/wilba_tech/wt75_c/wt75_c.c
+++ b/keyboards/wilba_tech/wt75_c/wt75_c.c
@@ -9,112 +9,112 @@
#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT75_C)
const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
- {0, A_1},
- {0, A_2},
- {0, A_3},
- {0, A_4},
- {0, A_5},
- {0, A_6},
- {0, A_7},
- {0, A_8},
+ {0, SW1_CS1},
+ {0, SW1_CS2},
+ {0, SW1_CS3},
+ {0, SW1_CS4},
+ {0, SW1_CS5},
+ {0, SW1_CS6},
+ {0, SW1_CS7},
+ {0, SW1_CS8},
- {0, B_1},
- {0, B_2},
- {0, B_3},
- {0, B_4},
- {0, B_5},
- {0, B_6},
- {0, B_7},
- {0, B_8},
+ {0, SW2_CS1},
+ {0, SW2_CS2},
+ {0, SW2_CS3},
+ {0, SW2_CS4},
+ {0, SW2_CS5},
+ {0, SW2_CS6},
+ {0, SW2_CS7},
+ {0, SW2_CS8},
- {0, C_1},
- {0, C_2},
- {0, C_3},
- {0, C_4},
- {0, C_5},
- {0, C_6},
- {0, C_7},
- {0, C_8},
+ {0, SW3_CS1},
+ {0, SW3_CS2},
+ {0, SW3_CS3},
+ {0, SW3_CS4},
+ {0, SW3_CS5},
+ {0, SW3_CS6},
+ {0, SW3_CS7},
+ {0, SW3_CS8},
- {0, D_1},
- {0, D_2},
- {0, D_3},
- {0, D_4},
- {0, D_5},
- {0, D_6},
- {0, D_7},
- {0, D_8},
+ {0, SW4_CS1},
+ {0, SW4_CS2},
+ {0, SW4_CS3},
+ {0, SW4_CS4},
+ {0, SW4_CS5},
+ {0, SW4_CS6},
+ {0, SW4_CS7},
+ {0, SW4_CS8},
- {0, E_1},
- {0, E_2},
- {0, E_3},
- {0, E_4},
- {0, E_5},
- {0, E_6},
- {0, E_7},
- {0, E_8},
+ {0, SW5_CS1},
+ {0, SW5_CS2},
+ {0, SW5_CS3},
+ {0, SW5_CS4},
+ {0, SW5_CS5},
+ {0, SW5_CS6},
+ {0, SW5_CS7},
+ {0, SW5_CS8},
- {0, F_1},
- {0, F_2},
- {0, F_3},
- {0, F_4},
- {0, F_5},
- {0, F_6},
- {0, F_7},
- {0, F_8},
+ {0, SW6_CS1},
+ {0, SW6_CS2},
+ {0, SW6_CS3},
+ {0, SW6_CS4},
+ {0, SW6_CS5},
+ {0, SW6_CS6},
+ {0, SW6_CS7},
+ {0, SW6_CS8},
- {0, G_1},
- {0, G_2},
- {0, G_3},
- {0, G_4},
- {0, G_5},
- {0, G_6},
- {0, G_7},
- {0, G_8},
+ {0, SW7_CS1},
+ {0, SW7_CS2},
+ {0, SW7_CS3},
+ {0, SW7_CS4},
+ {0, SW7_CS5},
+ {0, SW7_CS6},
+ {0, SW7_CS7},
+ {0, SW7_CS8},
- {0, H_1},
- {0, H_2},
- {0, H_3},
- {0, H_4},
- {0, H_5},
- {0, H_6},
- {0, H_7},
- {0, H_8},
+ {0, SW8_CS1},
+ {0, SW8_CS2},
+ {0, SW8_CS3},
+ {0, SW8_CS4},
+ {0, SW8_CS5},
+ {0, SW8_CS6},
+ {0, SW8_CS7},
+ {0, SW8_CS8},
- {0, I_1},
- {0, I_2},
- {0, I_3},
- {0, I_4},
- {0, I_5},
- {0, I_6},
- {0, I_7},
- {0, I_8},
+ {0, SW9_CS1},
+ {0, SW9_CS2},
+ {0, SW9_CS3},
+ {0, SW9_CS4},
+ {0, SW9_CS5},
+ {0, SW9_CS6},
+ {0, SW9_CS7},
+ {0, SW9_CS8},
- {0, J_1},
- {0, J_2},
- {0, J_3},
- {0, J_4},
- {0, J_5},
- {0, J_6},
- {0, J_7},
- {0, J_8},
+ {0, SW10_CS1},
+ {0, SW10_CS2},
+ {0, SW10_CS3},
+ {0, SW10_CS4},
+ {0, SW10_CS5},
+ {0, SW10_CS6},
+ {0, SW10_CS7},
+ {0, SW10_CS8},
- {0, K_1},
- {0, K_2},
- {0, K_3},
- {0, K_4},
- {0, K_5},
- {0, K_6},
- {0, K_7},
- {0, K_8},
+ {0, SW11_CS1},
+ {0, SW11_CS2},
+ {0, SW11_CS3},
+ {0, SW11_CS4},
+ {0, SW11_CS5},
+ {0, SW11_CS6},
+ {0, SW11_CS7},
+ {0, SW11_CS8},
- {0, L_1},
- {0, L_2},
- {0, L_3},
- {0, L_4},
- {0, L_5},
- {0, L_6},
- {0, L_7},
- {0, L_8}
+ {0, SW12_CS1},
+ {0, SW12_CS2},
+ {0, SW12_CS3},
+ {0, SW12_CS4},
+ {0, SW12_CS5},
+ {0, SW12_CS6},
+ {0, SW12_CS7},
+ {0, SW12_CS8}
};
#endif
diff --git a/keyboards/wilba_tech/wt80_a/wt80_a.c b/keyboards/wilba_tech/wt80_a/wt80_a.c
index cf29760b62a..4acf56994df 100644
--- a/keyboards/wilba_tech/wt80_a/wt80_a.c
+++ b/keyboards/wilba_tech/wt80_a/wt80_a.c
@@ -9,112 +9,112 @@
#if defined(LED_MATRIX_ENABLE) || defined(MONO_BACKLIGHT_WT80_A)
const is31fl3736_led_t PROGMEM g_is31fl3736_leds[IS31FL3736_LED_COUNT] = {
- {0, A_1},
- {0, A_2},
- {0, A_3},
- {0, A_4},
- {0, A_5},
- {0, A_6},
- {0, A_7},
- {0, A_8},
+ {0, SW1_CS1},
+ {0, SW1_CS2},
+ {0, SW1_CS3},
+ {0, SW1_CS4},
+ {0, SW1_CS5},
+ {0, SW1_CS6},
+ {0, SW1_CS7},
+ {0, SW1_CS8},
- {0, B_1},
- {0, B_2},
- {0, B_3},
- {0, B_4},
- {0, B_5},
- {0, B_6},
- {0, B_7},
- {0, B_8},
+ {0, SW2_CS1},
+ {0, SW2_CS2},
+ {0, SW2_CS3},
+ {0, SW2_CS4},
+ {0, SW2_CS5},
+ {0, SW2_CS6},
+ {0, SW2_CS7},
+ {0, SW2_CS8},
- {0, C_1},
- {0, C_2},
- {0, C_3},
- {0, C_4},
- {0, C_5},
- {0, C_6},
- {0, C_7},
- {0, C_8},
+ {0, SW3_CS1},
+ {0, SW3_CS2},
+ {0, SW3_CS3},
+ {0, SW3_CS4},
+ {0, SW3_CS5},
+ {0, SW3_CS6},
+ {0, SW3_CS7},
+ {0, SW3_CS8},
- {0, D_1},
- {0, D_2},
- {0, D_3},
- {0, D_4},
- {0, D_5},
- {0, D_6},
- {0, D_7},
- {0, D_8},
+ {0, SW4_CS1},
+ {0, SW4_CS2},
+ {0, SW4_CS3},
+ {0, SW4_CS4},
+ {0, SW4_CS5},
+ {0, SW4_CS6},
+ {0, SW4_CS7},
+ {0, SW4_CS8},
- {0, E_1},
- {0, E_2},
- {0, E_3},
- {0, E_4},
- {0, E_5},
- {0, E_6},
- {0, E_7},
- {0, E_8},
+ {0, SW5_CS1},
+ {0, SW5_CS2},
+ {0, SW5_CS3},
+ {0, SW5_CS4},
+ {0, SW5_CS5},
+ {0, SW5_CS6},
+ {0, SW5_CS7},
+ {0, SW5_CS8},
- {0, F_1},
- {0, F_2},
- {0, F_3},
- {0, F_4},
- {0, F_5},
- {0, F_6},
- {0, F_7},
- {0, F_8},
+ {0, SW6_CS1},
+ {0, SW6_CS2},
+ {0, SW6_CS3},
+ {0, SW6_CS4},
+ {0, SW6_CS5},
+ {0, SW6_CS6},
+ {0, SW6_CS7},
+ {0, SW6_CS8},
- {0, G_1},
- {0, G_2},
- {0, G_3},
- {0, G_4},
- {0, G_5},
- {0, G_6},
- {0, G_7},
- {0, G_8},
+ {0, SW7_CS1},
+ {0, SW7_CS2},
+ {0, SW7_CS3},
+ {0, SW7_CS4},
+ {0, SW7_CS5},
+ {0, SW7_CS6},
+ {0, SW7_CS7},
+ {0, SW7_CS8},
- {0, H_1},
- {0, H_2},
- {0, H_3},
- {0, H_4},
- {0, H_5},
- {0, H_6},
- {0, H_7},
- {0, H_8},
+ {0, SW8_CS1},
+ {0, SW8_CS2},
+ {0, SW8_CS3},
+ {0, SW8_CS4},
+ {0, SW8_CS5},
+ {0, SW8_CS6},
+ {0, SW8_CS7},
+ {0, SW8_CS8},
- {0, I_1},
- {0, I_2},
- {0, I_3},
- {0, I_4},
- {0, I_5},
- {0, I_6},
- {0, I_7},
- {0, I_8},
+ {0, SW9_CS1},
+ {0, SW9_CS2},
+ {0, SW9_CS3},
+ {0, SW9_CS4},
+ {0, SW9_CS5},
+ {0, SW9_CS6},
+ {0, SW9_CS7},
+ {0, SW9_CS8},
- {0, J_1},
- {0, J_2},
- {0, J_3},
- {0, J_4},
- {0, J_5},
- {0, J_6},
- {0, J_7},
- {0, J_8},
+ {0, SW10_CS1},
+ {0, SW10_CS2},
+ {0, SW10_CS3},
+ {0, SW10_CS4},
+ {0, SW10_CS5},
+ {0, SW10_CS6},
+ {0, SW10_CS7},
+ {0, SW10_CS8},
- {0, K_1},
- {0, K_2},
- {0, K_3},
- {0, K_4},
- {0, K_5},
- {0, K_6},
- {0, K_7},
- {0, K_8},
+ {0, SW11_CS1},
+ {0, SW11_CS2},
+ {0, SW11_CS3},
+ {0, SW11_CS4},
+ {0, SW11_CS5},
+ {0, SW11_CS6},
+ {0, SW11_CS7},
+ {0, SW11_CS8},
- {0, L_1},
- {0, L_2},
- {0, L_3},
- {0, L_4},
- {0, L_5},
- {0, L_6},
- {0, L_7},
- {0, L_8}
+ {0, SW12_CS1},
+ {0, SW12_CS2},
+ {0, SW12_CS3},
+ {0, SW12_CS4},
+ {0, SW12_CS5},
+ {0, SW12_CS6},
+ {0, SW12_CS7},
+ {0, SW12_CS8}
};
#endif
diff --git a/keyboards/xelus/pachi/rgb/rev1/rev1.c b/keyboards/xelus/pachi/rgb/rev1/rev1.c
index b5786f9c3c3..b45dded891e 100644
--- a/keyboards/xelus/pachi/rgb/rev1/rev1.c
+++ b/keyboards/xelus/pachi/rgb/rev1/rev1.c
@@ -29,131 +29,131 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS39_SW1, CS38_SW1, CS37_SW1}, //A1
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, //A2
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, //A3
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, //A4
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, //A5
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, //A6
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, //A7
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, //A8
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, //A9
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, //A10
- {0, CS9_SW1 , CS8_SW1 , CS7_SW1 }, //A11
- {0, CS6_SW1 , CS5_SW1 , CS4_SW1 }, //A12
- {0, CS3_SW1 , CS2_SW1 , CS1_SW1 }, //A13
+ {0, SW1_CS39, SW1_CS38, SW1_CS37}, //A1
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, //A2
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, //A3
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, //A4
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, //A5
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, //A6
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, //A7
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, //A8
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, //A9
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, //A10
+ {0, SW1_CS9 , SW1_CS8 , SW1_CS7 }, //A11
+ {0, SW1_CS6 , SW1_CS5 , SW1_CS4 }, //A12
+ {0, SW1_CS3 , SW1_CS2 , SW1_CS1 }, //A13
- {0, CS39_SW2, CS38_SW2, CS37_SW2}, //B1
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, //B2
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, //B3
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, //B4
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, //B5
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, //B6
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, //B7
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, //B8
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, //B9
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, //B10
- {0, CS9_SW2 , CS8_SW2 , CS7_SW2 }, //B11
- {0, CS6_SW2 , CS5_SW2 , CS4_SW2 }, //B12
- {0, CS3_SW2 , CS2_SW2 , CS1_SW2 }, //B13
+ {0, SW2_CS39, SW2_CS38, SW2_CS37}, //B1
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, //B2
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, //B3
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, //B4
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, //B5
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, //B6
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, //B7
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, //B8
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, //B9
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, //B10
+ {0, SW2_CS9 , SW2_CS8 , SW2_CS7 }, //B11
+ {0, SW2_CS6 , SW2_CS5 , SW2_CS4 }, //B12
+ {0, SW2_CS3 , SW2_CS2 , SW2_CS1 }, //B13
- {0, CS39_SW3, CS38_SW3, CS37_SW3}, //C1
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, //C2
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, //C3
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, //C4
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, //C5
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, //C6
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, //C7
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, //C8
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, //C9
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, //C10
- {0, CS9_SW3 , CS8_SW3 , CS7_SW3 }, //C11
- {0, CS6_SW3 , CS5_SW3 , CS4_SW3 }, //C12
- {0, CS3_SW3 , CS2_SW3 , CS1_SW3 }, //C13
+ {0, SW3_CS39, SW3_CS38, SW3_CS37}, //C1
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, //C2
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, //C3
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, //C4
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, //C5
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, //C6
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, //C7
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, //C8
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, //C9
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, //C10
+ {0, SW3_CS9 , SW3_CS8 , SW3_CS7 }, //C11
+ {0, SW3_CS6 , SW3_CS5 , SW3_CS4 }, //C12
+ {0, SW3_CS3 , SW3_CS2 , SW3_CS1 }, //C13
- {0, CS39_SW4, CS38_SW4, CS37_SW4}, //D1
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, //D2
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, //D3
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, //D4
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, //D5
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, //D6
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, //D7
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D8
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D9
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D10
- {0, CS9_SW4 , CS8_SW4 , CS7_SW4 }, //D11
- {0, CS6_SW4 , CS5_SW4 , CS4_SW4 }, //D12
- {0, CS3_SW4 , CS2_SW4 , CS1_SW4 }, //D13
+ {0, SW4_CS39, SW4_CS38, SW4_CS37}, //D1
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, //D2
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, //D3
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, //D4
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, //D5
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, //D6
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, //D7
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, //D8
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, //D9
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, //D10
+ {0, SW4_CS9 , SW4_CS8 , SW4_CS7 }, //D11
+ {0, SW4_CS6 , SW4_CS5 , SW4_CS4 }, //D12
+ {0, SW4_CS3 , SW4_CS2 , SW4_CS1 }, //D13
- {0, CS39_SW5, CS38_SW5, CS37_SW5}, //E1
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, //E2
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, //E3
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, //E4
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, //E5
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, //E6
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, //E7
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, //E8
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, //E9
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, //E10
- {0, CS9_SW5 , CS8_SW5 , CS7_SW5 }, //E11
- {0, CS6_SW5 , CS5_SW5 , CS4_SW5 }, //E12
- {0, CS3_SW5 , CS2_SW5 , CS1_SW5 }, //E13
+ {0, SW5_CS39, SW5_CS38, SW5_CS37}, //E1
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, //E2
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, //E3
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, //E4
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, //E5
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, //E6
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, //E7
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, //E8
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, //E9
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, //E10
+ {0, SW5_CS9 , SW5_CS8 , SW5_CS7 }, //E11
+ {0, SW5_CS6 , SW5_CS5 , SW5_CS4 }, //E12
+ {0, SW5_CS3 , SW5_CS2 , SW5_CS1 }, //E13
- {0, CS39_SW6, CS38_SW6, CS37_SW6}, //F1
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, //F2
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, //F3
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, //F4
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, //F5
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, //F6
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, //F7
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, //F8
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, //F9
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, //F10
- {0, CS9_SW6 , CS8_SW6 , CS7_SW6 }, //F11
- {0, CS6_SW6 , CS5_SW6 , CS4_SW6 }, //F12
- {0, CS3_SW6 , CS2_SW6 , CS1_SW6 }, //F13
+ {0, SW6_CS39, SW6_CS38, SW6_CS37}, //F1
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, //F2
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, //F3
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, //F4
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, //F5
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, //F6
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, //F7
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, //F8
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, //F9
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, //F10
+ {0, SW6_CS9 , SW6_CS8 , SW6_CS7 }, //F11
+ {0, SW6_CS6 , SW6_CS5 , SW6_CS4 }, //F12
+ {0, SW6_CS3 , SW6_CS2 , SW6_CS1 }, //F13
- {0, CS39_SW7, CS38_SW7, CS37_SW7}, //G1
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, //G2
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, //G3
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, //G4
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, //G5
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, //G6
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, //G7
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, //G8
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, //G9
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, //G10
- {0, CS9_SW7 , CS8_SW7 , CS7_SW7 }, //G11
- {0, CS6_SW7 , CS5_SW7 , CS4_SW7 }, //G12
- {0, CS3_SW7 , CS2_SW7 , CS1_SW7 }, //G13
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}, //G1
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, //G2
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, //G3
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, //G4
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, //G5
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, //G6
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, //G7
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, //G8
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, //G9
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, //G10
+ {0, SW7_CS9 , SW7_CS8 , SW7_CS7 }, //G11
+ {0, SW7_CS6 , SW7_CS5 , SW7_CS4 }, //G12
+ {0, SW7_CS3 , SW7_CS2 , SW7_CS1 }, //G13
- {0, CS39_SW8, CS38_SW8, CS37_SW8}, //H1
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, //H2
- {0, CS33_SW8, CS32_SW8, CS31_SW8}, //H3
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, //H4
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, //H5
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, //H6
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, //H7
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, //H8
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, //H9
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, //H10
- {0, CS9_SW8 , CS8_SW8 , CS7_SW8 }, //H11
- {0, CS6_SW8 , CS5_SW8 , CS4_SW8 }, //H12
- {0, CS3_SW8 , CS2_SW8 , CS1_SW8 }, //H13
+ {0, SW8_CS39, SW8_CS38, SW8_CS37}, //H1
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, //H2
+ {0, SW8_CS33, SW8_CS32, SW8_CS31}, //H3
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, //H4
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, //H5
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, //H6
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, //H7
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, //H8
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, //H9
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, //H10
+ {0, SW8_CS9 , SW8_CS8 , SW8_CS7 }, //H11
+ {0, SW8_CS6 , SW8_CS5 , SW8_CS4 }, //H12
+ {0, SW8_CS3 , SW8_CS2 , SW8_CS1 }, //H13
- {0, CS39_SW9, CS38_SW9, CS37_SW9}, //I1
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, //I2
- {0, CS33_SW9, CS32_SW9, CS31_SW9}, //I3
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, //I4
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, //I5
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, //I6
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, //I7
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, //I8
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, //I9
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, //I10
- {0, CS9_SW9 , CS8_SW9 , CS7_SW9 }, //I11
- {0, CS6_SW9 , CS5_SW9 , CS4_SW9 }, //I12
- {0, CS3_SW9 , CS2_SW9 , CS1_SW9 } //I13
+ {0, SW9_CS39, SW9_CS38, SW9_CS37}, //I1
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, //I2
+ {0, SW9_CS33, SW9_CS32, SW9_CS31}, //I3
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, //I4
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, //I5
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, //I6
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, //I7
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, //I8
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, //I9
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, //I10
+ {0, SW9_CS9 , SW9_CS8 , SW9_CS7 }, //I11
+ {0, SW9_CS6 , SW9_CS5 , SW9_CS4 }, //I12
+ {0, SW9_CS3 , SW9_CS2 , SW9_CS1 } //I13
};
__attribute__ ((weak))
diff --git a/keyboards/xelus/pachi/rgb/rev2/rev2.c b/keyboards/xelus/pachi/rgb/rev2/rev2.c
index f38d2c67b51..f595e889c3b 100644
--- a/keyboards/xelus/pachi/rgb/rev2/rev2.c
+++ b/keyboards/xelus/pachi/rgb/rev2/rev2.c
@@ -29,131 +29,131 @@ const is31fl3741_led_t PROGMEM g_is31fl3741_leds[IS31FL3741_LED_COUNT] = {
* | | G location
* | | | B location
* | | | | */
- {0, CS39_SW1, CS38_SW1, CS37_SW1}, //A1
- {0, CS36_SW1, CS35_SW1, CS34_SW1}, //A2
- {0, CS33_SW1, CS32_SW1, CS31_SW1}, //A3
- {0, CS30_SW1, CS29_SW1, CS28_SW1}, //A4
- {0, CS27_SW1, CS26_SW1, CS25_SW1}, //A5
- {0, CS24_SW1, CS23_SW1, CS22_SW1}, //A6
- {0, CS21_SW1, CS20_SW1, CS19_SW1}, //A7
- {0, CS18_SW1, CS17_SW1, CS16_SW1}, //A8
- {0, CS15_SW1, CS14_SW1, CS13_SW1}, //A9
- {0, CS12_SW1, CS11_SW1, CS10_SW1}, //A10
- {0, CS9_SW1 , CS8_SW1 , CS7_SW1 }, //A11
- {0, CS6_SW1 , CS5_SW1 , CS4_SW1 }, //A12
- {0, CS3_SW1 , CS2_SW1 , CS1_SW1 }, //A13
+ {0, SW1_CS39, SW1_CS38, SW1_CS37}, //A1
+ {0, SW1_CS36, SW1_CS35, SW1_CS34}, //A2
+ {0, SW1_CS33, SW1_CS32, SW1_CS31}, //A3
+ {0, SW1_CS30, SW1_CS29, SW1_CS28}, //A4
+ {0, SW1_CS27, SW1_CS26, SW1_CS25}, //A5
+ {0, SW1_CS24, SW1_CS23, SW1_CS22}, //A6
+ {0, SW1_CS21, SW1_CS20, SW1_CS19}, //A7
+ {0, SW1_CS18, SW1_CS17, SW1_CS16}, //A8
+ {0, SW1_CS15, SW1_CS14, SW1_CS13}, //A9
+ {0, SW1_CS12, SW1_CS11, SW1_CS10}, //A10
+ {0, SW1_CS9 , SW1_CS8 , SW1_CS7 }, //A11
+ {0, SW1_CS6 , SW1_CS5 , SW1_CS4 }, //A12
+ {0, SW1_CS3 , SW1_CS2 , SW1_CS1 }, //A13
- {0, CS39_SW2, CS38_SW2, CS37_SW2}, //B1
- {0, CS36_SW2, CS35_SW2, CS34_SW2}, //B2
- {0, CS33_SW2, CS32_SW2, CS31_SW2}, //B3
- {0, CS30_SW2, CS29_SW2, CS28_SW2}, //B4
- {0, CS27_SW2, CS26_SW2, CS25_SW2}, //B5
- {0, CS24_SW2, CS23_SW2, CS22_SW2}, //B6
- {0, CS21_SW2, CS20_SW2, CS19_SW2}, //B7
- {0, CS18_SW2, CS17_SW2, CS16_SW2}, //B8
- {0, CS15_SW2, CS14_SW2, CS13_SW2}, //B9
- {0, CS12_SW2, CS11_SW2, CS10_SW2}, //B10
- {0, CS9_SW2 , CS8_SW2 , CS7_SW2 }, //B11
- {0, CS6_SW2 , CS5_SW2 , CS4_SW2 }, //B12
- {0, CS3_SW2 , CS2_SW2 , CS1_SW2 }, //B13
+ {0, SW2_CS39, SW2_CS38, SW2_CS37}, //B1
+ {0, SW2_CS36, SW2_CS35, SW2_CS34}, //B2
+ {0, SW2_CS33, SW2_CS32, SW2_CS31}, //B3
+ {0, SW2_CS30, SW2_CS29, SW2_CS28}, //B4
+ {0, SW2_CS27, SW2_CS26, SW2_CS25}, //B5
+ {0, SW2_CS24, SW2_CS23, SW2_CS22}, //B6
+ {0, SW2_CS21, SW2_CS20, SW2_CS19}, //B7
+ {0, SW2_CS18, SW2_CS17, SW2_CS16}, //B8
+ {0, SW2_CS15, SW2_CS14, SW2_CS13}, //B9
+ {0, SW2_CS12, SW2_CS11, SW2_CS10}, //B10
+ {0, SW2_CS9 , SW2_CS8 , SW2_CS7 }, //B11
+ {0, SW2_CS6 , SW2_CS5 , SW2_CS4 }, //B12
+ {0, SW2_CS3 , SW2_CS2 , SW2_CS1 }, //B13
- {0, CS39_SW3, CS38_SW3, CS37_SW3}, //C1
- {0, CS36_SW3, CS35_SW3, CS34_SW3}, //C2
- {0, CS33_SW3, CS32_SW3, CS31_SW3}, //C3
- {0, CS30_SW3, CS29_SW3, CS28_SW3}, //C4
- {0, CS27_SW3, CS26_SW3, CS25_SW3}, //C5
- {0, CS24_SW3, CS23_SW3, CS22_SW3}, //C6
- {0, CS21_SW3, CS20_SW3, CS19_SW3}, //C7
- {0, CS18_SW3, CS17_SW3, CS16_SW3}, //C8
- {0, CS15_SW3, CS14_SW3, CS13_SW3}, //C9
- {0, CS12_SW3, CS11_SW3, CS10_SW3}, //C10
- {0, CS9_SW3 , CS8_SW3 , CS7_SW3 }, //C11
- {0, CS6_SW3 , CS5_SW3 , CS4_SW3 }, //C12
- {0, CS3_SW3 , CS2_SW3 , CS1_SW3 }, //C13
+ {0, SW3_CS39, SW3_CS38, SW3_CS37}, //C1
+ {0, SW3_CS36, SW3_CS35, SW3_CS34}, //C2
+ {0, SW3_CS33, SW3_CS32, SW3_CS31}, //C3
+ {0, SW3_CS30, SW3_CS29, SW3_CS28}, //C4
+ {0, SW3_CS27, SW3_CS26, SW3_CS25}, //C5
+ {0, SW3_CS24, SW3_CS23, SW3_CS22}, //C6
+ {0, SW3_CS21, SW3_CS20, SW3_CS19}, //C7
+ {0, SW3_CS18, SW3_CS17, SW3_CS16}, //C8
+ {0, SW3_CS15, SW3_CS14, SW3_CS13}, //C9
+ {0, SW3_CS12, SW3_CS11, SW3_CS10}, //C10
+ {0, SW3_CS9 , SW3_CS8 , SW3_CS7 }, //C11
+ {0, SW3_CS6 , SW3_CS5 , SW3_CS4 }, //C12
+ {0, SW3_CS3 , SW3_CS2 , SW3_CS1 }, //C13
- {0, CS39_SW4, CS38_SW4, CS37_SW4}, //D1
- {0, CS36_SW4, CS35_SW4, CS34_SW4}, //D2
- {0, CS33_SW4, CS32_SW4, CS31_SW4}, //D3
- {0, CS30_SW4, CS29_SW4, CS28_SW4}, //D4
- {0, CS27_SW4, CS26_SW4, CS25_SW4}, //D5
- {0, CS24_SW4, CS23_SW4, CS22_SW4}, //D6
- {0, CS21_SW4, CS20_SW4, CS19_SW4}, //D7
- {0, CS18_SW4, CS17_SW4, CS16_SW4}, //D8
- {0, CS15_SW4, CS14_SW4, CS13_SW4}, //D9
- {0, CS12_SW4, CS11_SW4, CS10_SW4}, //D10
- {0, CS9_SW4 , CS8_SW4 , CS7_SW4 }, //D11
- {0, CS6_SW4 , CS5_SW4 , CS4_SW4 }, //D12
- {0, CS3_SW4 , CS2_SW4 , CS1_SW4 }, //D13
+ {0, SW4_CS39, SW4_CS38, SW4_CS37}, //D1
+ {0, SW4_CS36, SW4_CS35, SW4_CS34}, //D2
+ {0, SW4_CS33, SW4_CS32, SW4_CS31}, //D3
+ {0, SW4_CS30, SW4_CS29, SW4_CS28}, //D4
+ {0, SW4_CS27, SW4_CS26, SW4_CS25}, //D5
+ {0, SW4_CS24, SW4_CS23, SW4_CS22}, //D6
+ {0, SW4_CS21, SW4_CS20, SW4_CS19}, //D7
+ {0, SW4_CS18, SW4_CS17, SW4_CS16}, //D8
+ {0, SW4_CS15, SW4_CS14, SW4_CS13}, //D9
+ {0, SW4_CS12, SW4_CS11, SW4_CS10}, //D10
+ {0, SW4_CS9 , SW4_CS8 , SW4_CS7 }, //D11
+ {0, SW4_CS6 , SW4_CS5 , SW4_CS4 }, //D12
+ {0, SW4_CS3 , SW4_CS2 , SW4_CS1 }, //D13
- {0, CS39_SW5, CS38_SW5, CS37_SW5}, //E1
- {0, CS36_SW5, CS35_SW5, CS34_SW5}, //E2
- {0, CS33_SW5, CS32_SW5, CS31_SW5}, //E3
- {0, CS30_SW5, CS29_SW5, CS28_SW5}, //E4
- {0, CS27_SW5, CS26_SW5, CS25_SW5}, //E5
- {0, CS24_SW5, CS23_SW5, CS22_SW5}, //E6
- {0, CS21_SW5, CS20_SW5, CS19_SW5}, //E7
- {0, CS18_SW5, CS17_SW5, CS16_SW5}, //E8
- {0, CS15_SW5, CS14_SW5, CS13_SW5}, //E9
- {0, CS12_SW5, CS11_SW5, CS10_SW5}, //E10
- {0, CS9_SW5 , CS8_SW5 , CS7_SW5 }, //E11
- {0, CS6_SW5 , CS5_SW5 , CS4_SW5 }, //E12
- {0, CS3_SW5 , CS2_SW5 , CS1_SW5 }, //E13
+ {0, SW5_CS39, SW5_CS38, SW5_CS37}, //E1
+ {0, SW5_CS36, SW5_CS35, SW5_CS34}, //E2
+ {0, SW5_CS33, SW5_CS32, SW5_CS31}, //E3
+ {0, SW5_CS30, SW5_CS29, SW5_CS28}, //E4
+ {0, SW5_CS27, SW5_CS26, SW5_CS25}, //E5
+ {0, SW5_CS24, SW5_CS23, SW5_CS22}, //E6
+ {0, SW5_CS21, SW5_CS20, SW5_CS19}, //E7
+ {0, SW5_CS18, SW5_CS17, SW5_CS16}, //E8
+ {0, SW5_CS15, SW5_CS14, SW5_CS13}, //E9
+ {0, SW5_CS12, SW5_CS11, SW5_CS10}, //E10
+ {0, SW5_CS9 , SW5_CS8 , SW5_CS7 }, //E11
+ {0, SW5_CS6 , SW5_CS5 , SW5_CS4 }, //E12
+ {0, SW5_CS3 , SW5_CS2 , SW5_CS1 }, //E13
- {0, CS39_SW6, CS38_SW6, CS37_SW6}, //F1
- {0, CS36_SW6, CS35_SW6, CS34_SW6}, //F2
- {0, CS33_SW6, CS32_SW6, CS31_SW6}, //F3
- {0, CS30_SW6, CS29_SW6, CS28_SW6}, //F4
- {0, CS27_SW6, CS26_SW6, CS25_SW6}, //F5
- {0, CS24_SW6, CS23_SW6, CS22_SW6}, //F6
- {0, CS21_SW6, CS20_SW6, CS19_SW6}, //F7
- {0, CS18_SW6, CS17_SW6, CS16_SW6}, //F8
- {0, CS15_SW6, CS14_SW6, CS13_SW6}, //F9
- {0, CS12_SW6, CS11_SW6, CS10_SW6}, //F10
- {0, CS9_SW6 , CS8_SW6 , CS7_SW6 }, //F11
- {0, CS6_SW6 , CS5_SW6 , CS4_SW6 }, //F12
- {0, CS3_SW6 , CS2_SW6 , CS1_SW6 }, //F13
+ {0, SW6_CS39, SW6_CS38, SW6_CS37}, //F1
+ {0, SW6_CS36, SW6_CS35, SW6_CS34}, //F2
+ {0, SW6_CS33, SW6_CS32, SW6_CS31}, //F3
+ {0, SW6_CS30, SW6_CS29, SW6_CS28}, //F4
+ {0, SW6_CS27, SW6_CS26, SW6_CS25}, //F5
+ {0, SW6_CS24, SW6_CS23, SW6_CS22}, //F6
+ {0, SW6_CS21, SW6_CS20, SW6_CS19}, //F7
+ {0, SW6_CS18, SW6_CS17, SW6_CS16}, //F8
+ {0, SW6_CS15, SW6_CS14, SW6_CS13}, //F9
+ {0, SW6_CS12, SW6_CS11, SW6_CS10}, //F10
+ {0, SW6_CS9 , SW6_CS8 , SW6_CS7 }, //F11
+ {0, SW6_CS6 , SW6_CS5 , SW6_CS4 }, //F12
+ {0, SW6_CS3 , SW6_CS2 , SW6_CS1 }, //F13
- {0, CS39_SW7, CS38_SW7, CS37_SW7}, //G1
- {0, CS36_SW7, CS35_SW7, CS34_SW7}, //G2
- {0, CS33_SW7, CS32_SW7, CS31_SW7}, //G3
- {0, CS30_SW7, CS29_SW7, CS28_SW7}, //G4
- {0, CS27_SW7, CS26_SW7, CS25_SW7}, //G5
- {0, CS24_SW7, CS23_SW7, CS22_SW7}, //G6
- {0, CS21_SW7, CS20_SW7, CS19_SW7}, //G7
- {0, CS18_SW7, CS17_SW7, CS16_SW7}, //G8
- {0, CS15_SW7, CS14_SW7, CS13_SW7}, //G9
- {0, CS12_SW7, CS11_SW7, CS10_SW7}, //G10
- {0, CS9_SW7 , CS8_SW7 , CS7_SW7 }, //G11
- {0, CS6_SW7 , CS5_SW7 , CS4_SW7 }, //G12
- {0, CS3_SW7 , CS2_SW7 , CS1_SW7 }, //G13
+ {0, SW7_CS39, SW7_CS38, SW7_CS37}, //G1
+ {0, SW7_CS36, SW7_CS35, SW7_CS34}, //G2
+ {0, SW7_CS33, SW7_CS32, SW7_CS31}, //G3
+ {0, SW7_CS30, SW7_CS29, SW7_CS28}, //G4
+ {0, SW7_CS27, SW7_CS26, SW7_CS25}, //G5
+ {0, SW7_CS24, SW7_CS23, SW7_CS22}, //G6
+ {0, SW7_CS21, SW7_CS20, SW7_CS19}, //G7
+ {0, SW7_CS18, SW7_CS17, SW7_CS16}, //G8
+ {0, SW7_CS15, SW7_CS14, SW7_CS13}, //G9
+ {0, SW7_CS12, SW7_CS11, SW7_CS10}, //G10
+ {0, SW7_CS9 , SW7_CS8 , SW7_CS7 }, //G11
+ {0, SW7_CS6 , SW7_CS5 , SW7_CS4 }, //G12
+ {0, SW7_CS3 , SW7_CS2 , SW7_CS1 }, //G13
- {0, CS39_SW8, CS38_SW8, CS37_SW8}, //H1
- {0, CS36_SW8, CS35_SW8, CS34_SW8}, //H2
- {0, CS33_SW8, CS32_SW8, CS31_SW8}, //H3
- {0, CS30_SW8, CS29_SW8, CS28_SW8}, //H4
- {0, CS27_SW8, CS26_SW8, CS25_SW8}, //H5
- {0, CS24_SW8, CS23_SW8, CS22_SW8}, //H6
- {0, CS21_SW8, CS20_SW8, CS19_SW8}, //H7
- {0, CS18_SW8, CS17_SW8, CS16_SW8}, //H8
- {0, CS15_SW8, CS14_SW8, CS13_SW8}, //H9
- {0, CS12_SW8, CS11_SW8, CS10_SW8}, //H10
- {0, CS9_SW8 , CS8_SW8 , CS7_SW8 }, //H11
- {0, CS6_SW8 , CS5_SW8 , CS4_SW8 }, //H12
- {0, CS3_SW8 , CS2_SW8 , CS1_SW8 }, //H13
+ {0, SW8_CS39, SW8_CS38, SW8_CS37}, //H1
+ {0, SW8_CS36, SW8_CS35, SW8_CS34}, //H2
+ {0, SW8_CS33, SW8_CS32, SW8_CS31}, //H3
+ {0, SW8_CS30, SW8_CS29, SW8_CS28}, //H4
+ {0, SW8_CS27, SW8_CS26, SW8_CS25}, //H5
+ {0, SW8_CS24, SW8_CS23, SW8_CS22}, //H6
+ {0, SW8_CS21, SW8_CS20, SW8_CS19}, //H7
+ {0, SW8_CS18, SW8_CS17, SW8_CS16}, //H8
+ {0, SW8_CS15, SW8_CS14, SW8_CS13}, //H9
+ {0, SW8_CS12, SW8_CS11, SW8_CS10}, //H10
+ {0, SW8_CS9 , SW8_CS8 , SW8_CS7 }, //H11
+ {0, SW8_CS6 , SW8_CS5 , SW8_CS4 }, //H12
+ {0, SW8_CS3 , SW8_CS2 , SW8_CS1 }, //H13
- {0, CS39_SW9, CS38_SW9, CS37_SW9}, //I1
- {0, CS36_SW9, CS35_SW9, CS34_SW9}, //I2
- {0, CS33_SW9, CS32_SW9, CS31_SW9}, //I3
- {0, CS30_SW9, CS29_SW9, CS28_SW9}, //I4
- {0, CS27_SW9, CS26_SW9, CS25_SW9}, //I5
- {0, CS24_SW9, CS23_SW9, CS22_SW9}, //I6
- {0, CS21_SW9, CS20_SW9, CS19_SW9}, //I7
- {0, CS18_SW9, CS17_SW9, CS16_SW9}, //I8
- {0, CS15_SW9, CS14_SW9, CS13_SW9}, //I9
- {0, CS12_SW9, CS11_SW9, CS10_SW9}, //I10
- {0, CS9_SW9 , CS8_SW9 , CS7_SW9 }, //I11
- {0, CS6_SW9 , CS5_SW9 , CS4_SW9 }, //I12
- {0, CS3_SW9 , CS2_SW9 , CS1_SW9 } //I13
+ {0, SW9_CS39, SW9_CS38, SW9_CS37}, //I1
+ {0, SW9_CS36, SW9_CS35, SW9_CS34}, //I2
+ {0, SW9_CS33, SW9_CS32, SW9_CS31}, //I3
+ {0, SW9_CS30, SW9_CS29, SW9_CS28}, //I4
+ {0, SW9_CS27, SW9_CS26, SW9_CS25}, //I5
+ {0, SW9_CS24, SW9_CS23, SW9_CS22}, //I6
+ {0, SW9_CS21, SW9_CS20, SW9_CS19}, //I7
+ {0, SW9_CS18, SW9_CS17, SW9_CS16}, //I8
+ {0, SW9_CS15, SW9_CS14, SW9_CS13}, //I9
+ {0, SW9_CS12, SW9_CS11, SW9_CS10}, //I10
+ {0, SW9_CS9 , SW9_CS8 , SW9_CS7 }, //I11
+ {0, SW9_CS6 , SW9_CS5 , SW9_CS4 }, //I12
+ {0, SW9_CS3 , SW9_CS2 , SW9_CS1 } //I13
};
__attribute__ ((weak))