LED drivers: update keyboard LED configs (#23073)

* IS31FL3733: update keyboard LED config

* IS31FL3736: update keyboard LED config

* IS31FL3737: update keyboard LED config

* IS31FL3741: update keyboard LED config

* IS31FL3743A: update keyboard LED config

* AW20216S: update keyboard LED config

* SNLED27351: update keyboard LED config

keyboards/4pplet/perk60_iso/rev_a/rev_a.c

@@ -18,68 +18,68 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #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

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}
 };

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
 
 };
 

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
 

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

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},
-
-    {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, A_1,   B_1,   C_1},
-    {2, G_8,   H_8,   I_8},
-
-    {2, A_2,   B_2,   C_2},
-    {2, G_7,   H_7,   I_7},
-
-    {2, A_3,   B_3,   C_3},
-    {2, G_6,   H_6,   I_6},
-
-    {2, A_4,   B_4,   C_4},
-    {2, G_5,   H_5,   I_5},
-
-    {2, A_5,   B_5,   C_5},
-    {2, G_4,   H_4,   I_4},
-
-    {2, A_6,   B_6,   C_6},
-    {2, G_3,   H_3,   I_3},
-
-    {2, A_7,   B_7,   C_7},
-    {2, G_2,   H_2,   I_2},
-
-    {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},
+    {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, 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, CB1_CA1,   CB2_CA1,   CB3_CA1},
+    {2, CB7_CA8,   CB8_CA8,   CB9_CA8},
+
+    {2, CB1_CA2,   CB2_CA2,   CB3_CA2},
+    {2, CB7_CA7,   CB8_CA7,   CB9_CA7},
+
+    {2, CB1_CA3,   CB2_CA3,   CB3_CA3},
+    {2, CB7_CA6,   CB8_CA6,   CB9_CA6},
+
+    {2, CB1_CA4,   CB2_CA4,   CB3_CA4},
+    {2, CB7_CA5,   CB8_CA5,   CB9_CA5},
+
+    {2, CB1_CA5,   CB2_CA5,   CB3_CA5},
+    {2, CB7_CA4,   CB8_CA4,   CB9_CA4},
+
+    {2, CB1_CA6,   CB2_CA6,   CB3_CA6},
+    {2, CB7_CA3,   CB8_CA3,   CB9_CA3},
+
+    {2, CB1_CA7,   CB2_CA7,   CB3_CA7},
+    {2, CB7_CA2,   CB8_CA2,   CB9_CA2},
+
+    {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

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},
 
 };
 

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 = {

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 = {

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) {

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, 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, 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, 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, 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, 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, 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
-
-    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
-    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, k00, Esc
+
+    {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, 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, 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, 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, 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, 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, SW10_CS10, SW10_CS11, SW10_CS12}, //  84, kb0, Z1
+    {1, SW11_CS10, SW11_CS11, SW11_CS12}, //  85, kb1, Z2
 };
 
 #endif

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, 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, 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, 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, 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, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, Esc
+
+    {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, 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, 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, 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

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

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

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

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

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 },
     // <enc gap>
-    { 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

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) {

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 = {{

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 = {{

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 */

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 = { {

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 = {

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 = {

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 = {

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 = {

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 = { {

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) {

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) {

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 = { {

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 = { {

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 = { {

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},
 };
 
 

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 = {

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

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

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

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

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 = {{

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

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

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

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

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

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 = {

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 = {

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},
-
-    {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, 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, 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, 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, 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, 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, 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},
-
-    {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},
+    {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, 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, 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 = {

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

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
 

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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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

keyboards/input_club/k_type/k_type.c

@@ -21,133 +21,133 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    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, 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 },
+    { 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, 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 },
 
     // 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, 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, 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, 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, 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, SW5_CS14, SW4_CS14, SW6_CS14 },
+    { 1, SW5_CS15, SW4_CS15, SW6_CS15 },
+    { 1, SW5_CS16, SW4_CS16, SW6_CS16 },
+
+    { 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, 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 = {

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, 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, 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, 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, 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, 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, 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
-
-    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
-    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+    //{0, SW4_CS1,   SW4_CS2,   SW4_CS3},   //   0, k00, Esc
+
+    {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, 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, 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, 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, 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, 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, SW10_CS10, SW10_CS11, SW10_CS12}, //  84, kb0, Z1
+    {1, SW11_CS10, SW11_CS11, SW11_CS12}, //  85, kb1, Z2
 };
 
 #endif

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

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 = {

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 = {

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 = { {

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, 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, 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, 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, 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_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, 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, 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, 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, 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}
 
 };
 

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 = {

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
 

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

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

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

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

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, 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, F_6,    D_6,    E_6}, // 8
-    {0, I_6,    G_6,    H_6}, // 9
-    {0, L_6,    J_6,    K_6}, // 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, F_2,    D_2,    E_2}, // 15
-    {0, I_2,    G_2,    H_2}, // 16
-    {0, L_2,    J_2,    K_2}, // 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_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, 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, CB6_CA6,    CB4_CA6,    CB5_CA6}, // 8
+    {0, CB9_CA6,    CB7_CA6,    CB8_CA6}, // 9
+    {0, CB12_CA6,    CB10_CA6,    CB11_CA6}, // 10
+
+    {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, CB6_CA2,    CB4_CA2,    CB5_CA2}, // 15
+    {0, CB9_CA2,    CB7_CA2,    CB8_CA2}, // 16
+    {0, CB12_CA2,    CB10_CA2,    CB11_CA2}, // 17
+
+    {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

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, 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, 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, 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, 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, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_9,    D_9,    E_9},
+    {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, 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, 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, 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, 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, CB6_CA6,    CB4_CA6,    CB5_CA6},
+    {0, CB6_CA7,    CB4_CA7,    CB5_CA7},
+    {0, CB6_CA9,    CB4_CA9,    CB5_CA9},
 };
 #endif // RGB_MATRIX_ENABLE

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

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

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

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

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

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

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}
 
 };
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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