Migrate `g_led_config` to DD (K2) (#25602)

8 files changed, 398 insertions, 130 deletions

diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
index a4432cd4ce..5359d2b30b 100644
--- a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
@@ -121,37 +121,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
     {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { __,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
-        { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46 },
-        { 47, 48, 49, 50, 51, 52, 53, __, 54, 55, 56, 57, 58, 59, 60, 61 },
-        { 62, 63, __, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76 },
-        { 77, 78, 79, 80, 81, __, __, 82, 83, 84, __, __, __, 85, 86, 87 },
-    },
-    {
-        // LED Index to Physical Position
-                {19,0},  {34,0},  {46,0},  {60,1},  {72,3},  {87,6},  {99,8},   {120,8},  {132,6},  {147,3},  {159,1},  {173,0},  {185,0},  {201,1},            {219,1},
-        {5,14}, {24,14}, {36,14}, {48,13}, {62,15}, {74,17}, {86,20}, {98,22},  {115,22}, {127,20}, {139,17}, {151,15}, {165,13}, {177,14}, {195,14},           {220,13},
-        {4,24}, {24,24}, {40,24}, {53,24}, {65,27}, {77,29}, {89,31}, {112,33}, {124,31}, {136,29}, {148,27}, {160,24}, {174,24}, {186,24}, {201,24},           {222,25},
-        {2,34}, {23,34}, {40,34}, {54,35}, {66,37}, {78,39}, {90,42}, {118,43}, {130,40}, {142,38}, {154,36}, {167,35}, {179,35},           {199,35},           {224,36},
-        {0,45}, {24,45},          {44,45}, {57,46}, {69,48}, {81,51}, {93,53},  {111,54}, {123,52}, {135,50}, {147,48}, {159,46}, {173,45}, {190,45}, {210,47},
-        {0,55}, {18,55}, {33,55},          {56,57}, {77,61}, {97,64},                     {124,63},           {147,59},                     {198,58}, {210,58}, {222,58},
-    },
-    {
-        // RGB LED Index to Flag
-           1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        1, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        1, 1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-        1, 1, 1,    1, 4, 1,       4,    1,       1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/ansi_encoder/keyboard.json b/keyboards/keychron/q10/ansi_encoder/keyboard.json
index f47136edf7..6cfb637b0d 100644
--- a/keyboards/keychron/q10/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q10/ansi_encoder/keyboard.json
@@ -27,6 +27,98 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 1], "x": 19, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 34, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 46, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 60, "y": 1, "flags": 1},
+            {"matrix": [0, 5], "x": 72, "y": 3, "flags": 1},
+            {"matrix": [0, 6], "x": 87, "y": 6, "flags": 1},
+            {"matrix": [0, 7], "x": 99, "y": 8, "flags": 1},
+            {"matrix": [0, 8], "x": 120, "y": 8, "flags": 1},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 1},
+            {"matrix": [0, 10], "x": 147, "y": 3, "flags": 1},
+            {"matrix": [0, 11], "x": 159, "y": 1, "flags": 1},
+            {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 185, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 201, "y": 1, "flags": 1},
+            {"matrix": [0, 15], "x": 219, "y": 1, "flags": 1},
+            {"matrix": [1, 0], "x": 5, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 1},
+            {"matrix": [1, 2], "x": 36, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 62, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 74, "y": 17, "flags": 4},
+            {"matrix": [1, 6], "x": 86, "y": 20, "flags": 4},
+            {"matrix": [1, 7], "x": 98, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 115, "y": 22, "flags": 4},
+            {"matrix": [1, 9], "x": 127, "y": 20, "flags": 4},
+            {"matrix": [1, 10], "x": 139, "y": 17, "flags": 4},
+            {"matrix": [1, 11], "x": 151, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 165, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 177, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 195, "y": 14, "flags": 1},
+            {"matrix": [1, 15], "x": 220, "y": 13, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 24, "flags": 1},
+            {"matrix": [2, 1], "x": 24, "y": 24, "flags": 1},
+            {"matrix": [2, 2], "x": 40, "y": 24, "flags": 4},
+            {"matrix": [2, 3], "x": 53, "y": 24, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 77, "y": 29, "flags": 4},
+            {"matrix": [2, 6], "x": 89, "y": 31, "flags": 4},
+            {"matrix": [2, 7], "x": 112, "y": 33, "flags": 4},
+            {"matrix": [2, 8], "x": 124, "y": 31, "flags": 4},
+            {"matrix": [2, 9], "x": 136, "y": 29, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 160, "y": 24, "flags": 4},
+            {"matrix": [2, 12], "x": 174, "y": 24, "flags": 4},
+            {"matrix": [2, 13], "x": 186, "y": 24, "flags": 4},
+            {"matrix": [2, 14], "x": 201, "y": 24, "flags": 4},
+            {"matrix": [2, 15], "x": 222, "y": 25, "flags": 1},
+            {"matrix": [3, 0], "x": 2, "y": 34, "flags": 1},
+            {"matrix": [3, 1], "x": 23, "y": 34, "flags": 8},
+            {"matrix": [3, 2], "x": 40, "y": 34, "flags": 4},
+            {"matrix": [3, 3], "x": 54, "y": 35, "flags": 4},
+            {"matrix": [3, 4], "x": 66, "y": 37, "flags": 4},
+            {"matrix": [3, 5], "x": 78, "y": 39, "flags": 4},
+            {"matrix": [3, 6], "x": 90, "y": 42, "flags": 4},
+            {"matrix": [3, 8], "x": 118, "y": 43, "flags": 4},
+            {"matrix": [3, 9], "x": 130, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 36, "flags": 4},
+            {"matrix": [3, 12], "x": 167, "y": 35, "flags": 4},
+            {"matrix": [3, 13], "x": 179, "y": 35, "flags": 4},
+            {"matrix": [3, 14], "x": 199, "y": 35, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 36, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 45, "flags": 1},
+            {"matrix": [4, 1], "x": 24, "y": 45, "flags": 1},
+            {"matrix": [4, 3], "x": 44, "y": 45, "flags": 4},
+            {"matrix": [4, 4], "x": 57, "y": 46, "flags": 4},
+            {"matrix": [4, 5], "x": 69, "y": 48, "flags": 4},
+            {"matrix": [4, 6], "x": 81, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 93, "y": 53, "flags": 4},
+            {"matrix": [4, 8], "x": 111, "y": 54, "flags": 4},
+            {"matrix": [4, 9], "x": 123, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 135, "y": 50, "flags": 4},
+            {"matrix": [4, 11], "x": 147, "y": 48, "flags": 4},
+            {"matrix": [4, 12], "x": 159, "y": 46, "flags": 4},
+            {"matrix": [4, 13], "x": 173, "y": 45, "flags": 4},
+            {"matrix": [4, 14], "x": 190, "y": 45, "flags": 1},
+            {"matrix": [4, 15], "x": 210, "y": 47, "flags": 1},
+            {"matrix": [5, 0], "x": 0, "y": 55, "flags": 1},
+            {"matrix": [5, 1], "x": 18, "y": 55, "flags": 1},
+            {"matrix": [5, 2], "x": 33, "y": 55, "flags": 1},
+            {"matrix": [5, 3], "x": 56, "y": 57, "flags": 1},
+            {"matrix": [5, 4], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 7], "x": 97, "y": 64, "flags": 1},
+            {"matrix": [5, 8], "x": 124, "y": 63, "flags": 4},
+            {"matrix": [5, 9], "x": 147, "y": 59, "flags": 1},
+            {"matrix": [5, 13], "x": 198, "y": 58, "flags": 1},
+            {"matrix": [5, 14], "x": 210, "y": 58, "flags": 1},
+            {"matrix": [5, 15], "x": 222, "y": 58, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_89": {
             "layout": [
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.c b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
index 9ff43263b2..c857c854ac 100644
--- a/keyboards/keychron/q10/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
@@ -122,37 +122,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB6_CA2,  CB4_CA2,  CB5_CA2},  // Down
     {1, CB6_CA1,  CB4_CA1,  CB5_CA1},  // Right
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { __,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14 },
-        { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
-        { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 59, 45 },
-        { 46, 47, 48, 49, 50, 51, 52, __, 53, 54, 55, 56, 57, 58, 60, 61 },
-        { 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77 },
-        { 78, 79, 80, 81, 82, __, __, 83, 84, 85, __, __, __, 86, 87, 88 },
-    },
-    {
-        // LED Index to Physical Position
-                {0,0},    {19,0},  {34,0},  {60,1},  {72,3},   {87,6},   {99,8},  {120,8},  {132,6},  {147,3},  {159,1},  {173,0},  {185,0},  {201,1},            {219,1},
-        {5,14}, {24,14}, {36,14}, {48,13}, {62,15}, {74,17},  {86,20},  {98,22}, {115,22}, {127,20}, {139,17}, {151,15}, {165,13}, {177,14}, {195,14},           {220,15},
-        {4,24}, {24,24}, {40,24}, {53,24}, {65,27}, {77,29},  {89,31}, {112,33}, {124,31}, {136,29}, {148,27}, {160,24}, {176,24}, {189,24},                     {222,25},
-        {2,34}, {23,34}, {40,34}, {54,35}, {66,37}, {78,39},  {90,42}, {118,43}, {130,40}, {142,38}, {154,36}, {167,35}, {179,35}, {192,35}, {208,31},           {224,36},
-        {0,45}, {18,45}, {31,45}, {44,45}, {57,46}, {69,48},  {81,51},  {93,53}, {111,54}, {123,52}, {135,50}, {147,48}, {159,46}, {173,45}, {190,45}, {210,47},
-        {0,55}, {18,55}, {33,55},          {56,57}, {77,61},  {97,64},                     {124,63},           {147,59},                     {198,58}, {210,58}, {222,58},
-    },
-    {
-        // RGB LED Index to Flag
-           1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        1, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
-        1, 1, 1,    1, 4, 1,       4,    1,       1, 1, 1,
-    }
-};
-
 #endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/iso_encoder/keyboard.json b/keyboards/keychron/q10/iso_encoder/keyboard.json
index 5ec70d1a14..b83015971f 100644
--- a/keyboards/keychron/q10/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q10/iso_encoder/keyboard.json
@@ -27,6 +27,99 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 1], "x": 0, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 19, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 34, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 60, "y": 1, "flags": 1},
+            {"matrix": [0, 5], "x": 72, "y": 3, "flags": 1},
+            {"matrix": [0, 6], "x": 87, "y": 6, "flags": 1},
+            {"matrix": [0, 7], "x": 99, "y": 8, "flags": 1},
+            {"matrix": [0, 8], "x": 120, "y": 8, "flags": 1},
+            {"matrix": [0, 9], "x": 132, "y": 6, "flags": 1},
+            {"matrix": [0, 10], "x": 147, "y": 3, "flags": 1},
+            {"matrix": [0, 11], "x": 159, "y": 1, "flags": 1},
+            {"matrix": [0, 12], "x": 173, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 185, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 201, "y": 1, "flags": 1},
+            {"matrix": [0, 15], "x": 219, "y": 1, "flags": 1},
+            {"matrix": [1, 0], "x": 5, "y": 14, "flags": 1},
+            {"matrix": [1, 1], "x": 24, "y": 14, "flags": 1},
+            {"matrix": [1, 2], "x": 36, "y": 14, "flags": 4},
+            {"matrix": [1, 3], "x": 48, "y": 13, "flags": 4},
+            {"matrix": [1, 4], "x": 62, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 74, "y": 17, "flags": 4},
+            {"matrix": [1, 6], "x": 86, "y": 20, "flags": 4},
+            {"matrix": [1, 7], "x": 98, "y": 22, "flags": 4},
+            {"matrix": [1, 8], "x": 115, "y": 22, "flags": 4},
+            {"matrix": [1, 9], "x": 127, "y": 20, "flags": 4},
+            {"matrix": [1, 10], "x": 139, "y": 17, "flags": 4},
+            {"matrix": [1, 11], "x": 151, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 165, "y": 13, "flags": 4},
+            {"matrix": [1, 13], "x": 177, "y": 14, "flags": 4},
+            {"matrix": [1, 14], "x": 195, "y": 14, "flags": 1},
+            {"matrix": [1, 15], "x": 220, "y": 15, "flags": 1},
+            {"matrix": [2, 0], "x": 4, "y": 24, "flags": 1},
+            {"matrix": [2, 1], "x": 24, "y": 24, "flags": 1},
+            {"matrix": [2, 2], "x": 40, "y": 24, "flags": 4},
+            {"matrix": [2, 3], "x": 53, "y": 24, "flags": 4},
+            {"matrix": [2, 4], "x": 65, "y": 27, "flags": 4},
+            {"matrix": [2, 5], "x": 77, "y": 29, "flags": 4},
+            {"matrix": [2, 6], "x": 89, "y": 31, "flags": 4},
+            {"matrix": [2, 7], "x": 112, "y": 33, "flags": 4},
+            {"matrix": [2, 8], "x": 124, "y": 31, "flags": 4},
+            {"matrix": [2, 9], "x": 136, "y": 29, "flags": 4},
+            {"matrix": [2, 10], "x": 148, "y": 27, "flags": 4},
+            {"matrix": [2, 11], "x": 160, "y": 24, "flags": 4},
+            {"matrix": [2, 12], "x": 176, "y": 24, "flags": 4},
+            {"matrix": [2, 13], "x": 189, "y": 24, "flags": 4},
+            {"matrix": [2, 15], "x": 222, "y": 25, "flags": 1},
+            {"matrix": [3, 0], "x": 2, "y": 34, "flags": 1},
+            {"matrix": [3, 1], "x": 23, "y": 34, "flags": 8},
+            {"matrix": [3, 2], "x": 40, "y": 34, "flags": 4},
+            {"matrix": [3, 3], "x": 54, "y": 35, "flags": 4},
+            {"matrix": [3, 4], "x": 66, "y": 37, "flags": 4},
+            {"matrix": [3, 5], "x": 78, "y": 39, "flags": 4},
+            {"matrix": [3, 6], "x": 90, "y": 42, "flags": 4},
+            {"matrix": [3, 8], "x": 118, "y": 43, "flags": 4},
+            {"matrix": [3, 9], "x": 130, "y": 40, "flags": 4},
+            {"matrix": [3, 10], "x": 142, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 154, "y": 36, "flags": 4},
+            {"matrix": [3, 12], "x": 167, "y": 35, "flags": 4},
+            {"matrix": [3, 13], "x": 179, "y": 35, "flags": 4},
+            {"matrix": [2, 14], "x": 192, "y": 35, "flags": 4},
+            {"matrix": [3, 14], "x": 208, "y": 31, "flags": 1},
+            {"matrix": [3, 15], "x": 224, "y": 36, "flags": 1},
+            {"matrix": [4, 0], "x": 0, "y": 45, "flags": 1},
+            {"matrix": [4, 1], "x": 18, "y": 45, "flags": 1},
+            {"matrix": [4, 2], "x": 31, "y": 45, "flags": 4},
+            {"matrix": [4, 3], "x": 44, "y": 45, "flags": 4},
+            {"matrix": [4, 4], "x": 57, "y": 46, "flags": 4},
+            {"matrix": [4, 5], "x": 69, "y": 48, "flags": 4},
+            {"matrix": [4, 6], "x": 81, "y": 51, "flags": 4},
+            {"matrix": [4, 7], "x": 93, "y": 53, "flags": 4},
+            {"matrix": [4, 8], "x": 111, "y": 54, "flags": 4},
+            {"matrix": [4, 9], "x": 123, "y": 52, "flags": 4},
+            {"matrix": [4, 10], "x": 135, "y": 50, "flags": 4},
+            {"matrix": [4, 11], "x": 147, "y": 48, "flags": 4},
+            {"matrix": [4, 12], "x": 159, "y": 46, "flags": 4},
+            {"matrix": [4, 13], "x": 173, "y": 45, "flags": 4},
+            {"matrix": [4, 14], "x": 190, "y": 45, "flags": 1},
+            {"matrix": [4, 15], "x": 210, "y": 47, "flags": 1},
+            {"matrix": [5, 0], "x": 0, "y": 55, "flags": 1},
+            {"matrix": [5, 1], "x": 18, "y": 55, "flags": 1},
+            {"matrix": [5, 2], "x": 33, "y": 55, "flags": 1},
+            {"matrix": [5, 3], "x": 56, "y": 57, "flags": 1},
+            {"matrix": [5, 4], "x": 77, "y": 61, "flags": 4},
+            {"matrix": [5, 7], "x": 97, "y": 64, "flags": 1},
+            {"matrix": [5, 8], "x": 124, "y": 63, "flags": 4},
+            {"matrix": [5, 9], "x": 147, "y": 59, "flags": 1},
+            {"matrix": [5, 13], "x": 198, "y": 58, "flags": 1},
+            {"matrix": [5, 14], "x": 210, "y": 58, "flags": 1},
+            {"matrix": [5, 15], "x": 222, "y": 58, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_90": {
             "layout": [
diff --git a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
index ba32f58fc6..35e8414be6 100644
--- a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
@@ -135,36 +135,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB12_CA6,    CB10_CA6,    CB11_CA6},  // Down
     {1, CB12_CA7,    CB10_CA7,    CB11_CA7},  // Right
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,  16,  17, __,  0,  1 },
-        { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  35,  36, 18, 19, 20 },
-        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,  54,  55, 37, 38, 39 },
-        { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 76,  71,  72, 56, 57, 58 },
-        { 77, __, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, __,  88,  89, 73, 74, 75 },
-        { 92, 93, 94, __, __, 21, 95, 40, __, 96, 97, 98, 99, 100, 101, 90,  2, 91 },
-    },
-    {
-        // LED Index to Physical Position
-                {11,0},  {23,0},  {34,0},  {49,0},  {63,0},  {75,0},  {86,0},  {98,0},   {112,0},  {123,0},  {135,0},  {146,0},  {161,0},  {172,0},  {184,0},  {195,0},  {209,0},            {224,0},
-        {0,15}, {11,15}, {23,15}, {34,15}, {49,15}, {60,15}, {72,15}, {83,15}, {95,15},  {106,15}, {118,15}, {129,15}, {141,15}, {152,15}, {164,15}, {175,15}, {186,15}, {204,15},           {224,15},
-        {0,26}, {11,26}, {23,26}, {34,32}, {52,26}, {66,26}, {78,26}, {89,26}, {101,26}, {112,26}, {123,26}, {135,26}, {146,26}, {158,26}, {169,26}, {181,26}, {192,26}, {207,26},           {224,26},
-        {0,38}, {11,38}, {23,38},          {53,38}, {69,38}, {81,38}, {92,38}, {103,38}, {115,38}, {126,38}, {138,38}, {149,38}, {161,38}, {172,38}, {184,38},           {202,38},           {224,38},
-        {0,49}, {11,49}, {23,49}, {34,55}, {56,49},          {75,49}, {86,49}, {98,49},  {109,49}, {121,49}, {132,49}, {144,49}, {155,49}, {166,49}, {178,49},           {194,49}, {213,52},
-        {6,61},          {23,61},          {50,61}, {65,61}, {79,61},                              {122,61},                               {163,61}, {175,61}, {186,61}, {201,64}, {213,64}, {224,64},
-    },
-    {
-        // RGB LED Index to Flag
-           1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        8, 4, 4, 4,  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        4, 4, 4, 4,  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        4, 4, 4,     8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        4, 4, 4, 4,  1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
-        4,    4,     1, 1, 1,          4,          1, 4, 1, 1, 1, 1,
-    }
-};
 #endif
diff --git a/keyboards/keychron/q12/ansi_encoder/keyboard.json b/keyboards/keychron/q12/ansi_encoder/keyboard.json
index d2f90cb8ac..faf8b5527e 100644
--- a/keyboards/keychron/q12/ansi_encoder/keyboard.json
+++ b/keyboards/keychron/q12/ansi_encoder/keyboard.json
@@ -24,6 +24,112 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 16], "x": 11, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 23, "y": 0, "flags": 1},
+            {"matrix": [5, 16], "x": 34, "y": 0, "flags": 1},
+            {"matrix": [0, 0], "x": 49, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 63, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 75, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 86, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 98, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 112, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 123, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 135, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 146, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 161, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 172, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 184, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 195, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 209, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 15], "x": 0, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 11, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 23, "y": 15, "flags": 4},
+            {"matrix": [5, 5], "x": 34, "y": 15, "flags": 4},
+            {"matrix": [1, 0], "x": 49, "y": 15, "flags": 4},
+            {"matrix": [1, 1], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 83, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 95, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 106, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 118, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 129, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 141, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 152, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 164, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 175, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 186, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 204, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 15], "x": 0, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 11, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 23, "y": 26, "flags": 4},
+            {"matrix": [5, 7], "x": 34, "y": 32, "flags": 4},
+            {"matrix": [2, 0], "x": 52, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 78, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 89, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 101, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 112, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 123, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 135, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 146, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 158, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 181, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 192, "y": 26, "flags": 4},
+            {"matrix": [2, 13], "x": 207, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+            {"matrix": [3, 15], "x": 0, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 11, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 23, "y": 38, "flags": 4},
+            {"matrix": [3, 0], "x": 53, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 81, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 92, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 103, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 115, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 126, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 138, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 149, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 161, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 172, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 184, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 202, "y": 38, "flags": 1},
+            {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+            {"matrix": [4, 15], "x": 0, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 11, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 23, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 34, "y": 55, "flags": 4},
+            {"matrix": [4, 0], "x": 56, "y": 49, "flags": 1},
+            {"matrix": [4, 2], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 86, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 98, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 109, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 121, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 132, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 144, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 155, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 166, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 178, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 194, "y": 49, "flags": 1},
+            {"matrix": [4, 14], "x": 213, "y": 52, "flags": 1},
+            {"matrix": [5, 15], "x": 6, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 23, "y": 61, "flags": 4},
+            {"matrix": [5, 0], "x": 50, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 65, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 79, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 122, "y": 61, "flags": 4},
+            {"matrix": [5, 9], "x": 163, "y": 61, "flags": 1},
+            {"matrix": [5, 10], "x": 175, "y": 61, "flags": 4},
+            {"matrix": [5, 11], "x": 186, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 201, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 213, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 224, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_ansi_103": {
             "layout": [
diff --git a/keyboards/keychron/q12/iso_encoder/iso_encoder.c b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
index f9513e7f41..058a5d2ff4 100644
--- a/keyboards/keychron/q12/iso_encoder/iso_encoder.c
+++ b/keyboards/keychron/q12/iso_encoder/iso_encoder.c
@@ -138,36 +138,4 @@ const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = {
     {1, CB12_CA6,    CB10_CA6,    CB11_CA6},  // Down
     {1, CB12_CA7,    CB10_CA7,    CB11_CA7},  // Right
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        {  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,   16,  17, __,  0,  1 },
-        { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,   35,  36, 18, 19, 20 },
-        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,   71,  54, 37, 38, 39 },
-        { 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 76,   70,  72, 55, 56, 57 },
-        { 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, __,   89,  90, 73, 74, 75 },
-        { 93, 94, 95, __, __, 21, 96, 40, __, 97, 98, 99, 100, 101, 102, 91,  2, 92 },
-    },
-    {
-        // LED Index to Physical Position
-                {11,0},  {23,0},  {34,0},  {49,0},  {63,0},  {75,0},  {86,0},  {98,0},   {112,0},  {123,0},  {135,0},  {146,0},  {160,0},  {172,0},  {183,0},  {194,0},  {209,0},            {224,0},
-        {0,15}, {11,15}, {23,15}, {34,15}, {49,15}, {60,15}, {72,15}, {83,15}, {95,15},  {106,15}, {117,15}, {129,15}, {140,15}, {152,15}, {163,15}, {175,15}, {186,15}, {204,15},           {224,15},
-        {0,26}, {11,26}, {23,26}, {34,32}, {52,26}, {66,26}, {77,26}, {89,26}, {100,26}, {112,26}, {123,26}, {135,26}, {146,26}, {158,26}, {169,26}, {180,26}, {192,26},                     {224,26},
-        {0,38}, {11,38}, {23,38},          {53,38}, {69,38}, {80,38}, {92,38}, {103,38}, {115,38}, {126,38}, {137,38}, {149,38}, {160,38}, {172,38}, {183,38}, {195,38}, {210,34},           {224,38},
-        {0,49}, {11,49}, {23,49}, {34,55}, {50,49}, {63,49}, {75,49}, {86,49}, {97,49},  {109,49}, {120,49}, {132,49}, {143,49}, {155,49}, {166,49}, {177,49}, {193,49},           {212,52},
-        {6,61},          {23,61},          {50,61}, {65,61}, {79,61},                              {122,61},                               {163,61}, {174,61}, {186,61}, {201,64}, {212,64}, {223,64},
-    },
-    {
-        // RGB LED Index to Flag
-           1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
-        8, 4, 4, 4,  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        4, 4, 4, 4,  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,       1,
-        4, 4, 4,     8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
-        4, 4, 4, 4,  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        4,    4,     1, 1, 1,          4,          1, 4, 1, 1, 1, 1,
-    }
-};
 #endif
diff --git a/keyboards/keychron/q12/iso_encoder/keyboard.json b/keyboards/keychron/q12/iso_encoder/keyboard.json
index 29e24a1491..d5105ac2b3 100644
--- a/keyboards/keychron/q12/iso_encoder/keyboard.json
+++ b/keyboards/keychron/q12/iso_encoder/keyboard.json
@@ -24,6 +24,113 @@
         "encoder": true,
         "dip_switch": true
     },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix": [0, 16], "x": 11, "y": 0, "flags": 1},
+            {"matrix": [0, 17], "x": 23, "y": 0, "flags": 1},
+            {"matrix": [5, 16], "x": 34, "y": 0, "flags": 1},
+            {"matrix": [0, 0], "x": 49, "y": 0, "flags": 1},
+            {"matrix": [0, 1], "x": 63, "y": 0, "flags": 1},
+            {"matrix": [0, 2], "x": 75, "y": 0, "flags": 1},
+            {"matrix": [0, 3], "x": 86, "y": 0, "flags": 1},
+            {"matrix": [0, 4], "x": 98, "y": 0, "flags": 1},
+            {"matrix": [0, 5], "x": 112, "y": 0, "flags": 1},
+            {"matrix": [0, 6], "x": 123, "y": 0, "flags": 1},
+            {"matrix": [0, 7], "x": 135, "y": 0, "flags": 1},
+            {"matrix": [0, 8], "x": 146, "y": 0, "flags": 1},
+            {"matrix": [0, 9], "x": 160, "y": 0, "flags": 1},
+            {"matrix": [0, 10], "x": 172, "y": 0, "flags": 1},
+            {"matrix": [0, 11], "x": 183, "y": 0, "flags": 1},
+            {"matrix": [0, 12], "x": 194, "y": 0, "flags": 1},
+            {"matrix": [0, 13], "x": 209, "y": 0, "flags": 1},
+            {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1},
+            {"matrix": [1, 15], "x": 0, "y": 15, "flags": 8},
+            {"matrix": [1, 16], "x": 11, "y": 15, "flags": 4},
+            {"matrix": [1, 17], "x": 23, "y": 15, "flags": 4},
+            {"matrix": [5, 5], "x": 34, "y": 15, "flags": 4},
+            {"matrix": [1, 0], "x": 49, "y": 15, "flags": 4},
+            {"matrix": [1, 1], "x": 60, "y": 15, "flags": 4},
+            {"matrix": [1, 2], "x": 72, "y": 15, "flags": 4},
+            {"matrix": [1, 3], "x": 83, "y": 15, "flags": 4},
+            {"matrix": [1, 4], "x": 95, "y": 15, "flags": 4},
+            {"matrix": [1, 5], "x": 106, "y": 15, "flags": 4},
+            {"matrix": [1, 6], "x": 117, "y": 15, "flags": 4},
+            {"matrix": [1, 7], "x": 129, "y": 15, "flags": 4},
+            {"matrix": [1, 8], "x": 140, "y": 15, "flags": 4},
+            {"matrix": [1, 9], "x": 152, "y": 15, "flags": 4},
+            {"matrix": [1, 10], "x": 163, "y": 15, "flags": 4},
+            {"matrix": [1, 11], "x": 175, "y": 15, "flags": 4},
+            {"matrix": [1, 12], "x": 186, "y": 15, "flags": 4},
+            {"matrix": [1, 13], "x": 204, "y": 15, "flags": 1},
+            {"matrix": [1, 14], "x": 224, "y": 15, "flags": 1},
+            {"matrix": [2, 15], "x": 0, "y": 26, "flags": 4},
+            {"matrix": [2, 16], "x": 11, "y": 26, "flags": 4},
+            {"matrix": [2, 17], "x": 23, "y": 26, "flags": 4},
+            {"matrix": [5, 7], "x": 34, "y": 32, "flags": 4},
+            {"matrix": [2, 0], "x": 52, "y": 26, "flags": 1},
+            {"matrix": [2, 1], "x": 66, "y": 26, "flags": 4},
+            {"matrix": [2, 2], "x": 77, "y": 26, "flags": 4},
+            {"matrix": [2, 3], "x": 89, "y": 26, "flags": 4},
+            {"matrix": [2, 4], "x": 100, "y": 26, "flags": 4},
+            {"matrix": [2, 5], "x": 112, "y": 26, "flags": 4},
+            {"matrix": [2, 6], "x": 123, "y": 26, "flags": 4},
+            {"matrix": [2, 7], "x": 135, "y": 26, "flags": 4},
+            {"matrix": [2, 8], "x": 146, "y": 26, "flags": 4},
+            {"matrix": [2, 9], "x": 158, "y": 26, "flags": 4},
+            {"matrix": [2, 10], "x": 169, "y": 26, "flags": 4},
+            {"matrix": [2, 11], "x": 180, "y": 26, "flags": 4},
+            {"matrix": [2, 12], "x": 192, "y": 26, "flags": 4},
+            {"matrix": [2, 14], "x": 224, "y": 26, "flags": 1},
+            {"matrix": [3, 15], "x": 0, "y": 38, "flags": 4},
+            {"matrix": [3, 16], "x": 11, "y": 38, "flags": 4},
+            {"matrix": [3, 17], "x": 23, "y": 38, "flags": 4},
+            {"matrix": [3, 0], "x": 53, "y": 38, "flags": 8},
+            {"matrix": [3, 1], "x": 69, "y": 38, "flags": 4},
+            {"matrix": [3, 2], "x": 80, "y": 38, "flags": 4},
+            {"matrix": [3, 3], "x": 92, "y": 38, "flags": 4},
+            {"matrix": [3, 4], "x": 103, "y": 38, "flags": 4},
+            {"matrix": [3, 5], "x": 115, "y": 38, "flags": 4},
+            {"matrix": [3, 6], "x": 126, "y": 38, "flags": 4},
+            {"matrix": [3, 7], "x": 137, "y": 38, "flags": 4},
+            {"matrix": [3, 8], "x": 149, "y": 38, "flags": 4},
+            {"matrix": [3, 9], "x": 160, "y": 38, "flags": 4},
+            {"matrix": [3, 10], "x": 172, "y": 38, "flags": 4},
+            {"matrix": [3, 11], "x": 183, "y": 38, "flags": 4},
+            {"matrix": [3, 13], "x": 195, "y": 38, "flags": 4},
+            {"matrix": [2, 13], "x": 210, "y": 34, "flags": 1},
+            {"matrix": [3, 14], "x": 224, "y": 38, "flags": 1},
+            {"matrix": [4, 15], "x": 0, "y": 49, "flags": 4},
+            {"matrix": [4, 16], "x": 11, "y": 49, "flags": 4},
+            {"matrix": [4, 17], "x": 23, "y": 49, "flags": 4},
+            {"matrix": [3, 12], "x": 34, "y": 55, "flags": 4},
+            {"matrix": [4, 0], "x": 50, "y": 49, "flags": 1},
+            {"matrix": [4, 1], "x": 63, "y": 49, "flags": 4},
+            {"matrix": [4, 2], "x": 75, "y": 49, "flags": 4},
+            {"matrix": [4, 3], "x": 86, "y": 49, "flags": 4},
+            {"matrix": [4, 4], "x": 97, "y": 49, "flags": 4},
+            {"matrix": [4, 5], "x": 109, "y": 49, "flags": 4},
+            {"matrix": [4, 6], "x": 120, "y": 49, "flags": 4},
+            {"matrix": [4, 7], "x": 132, "y": 49, "flags": 4},
+            {"matrix": [4, 8], "x": 143, "y": 49, "flags": 4},
+            {"matrix": [4, 9], "x": 155, "y": 49, "flags": 4},
+            {"matrix": [4, 10], "x": 166, "y": 49, "flags": 4},
+            {"matrix": [4, 11], "x": 177, "y": 49, "flags": 4},
+            {"matrix": [4, 13], "x": 193, "y": 49, "flags": 4},
+            {"matrix": [4, 14], "x": 212, "y": 52, "flags": 1},
+            {"matrix": [5, 15], "x": 6, "y": 61, "flags": 4},
+            {"matrix": [5, 17], "x": 23, "y": 61, "flags": 4},
+            {"matrix": [5, 0], "x": 50, "y": 61, "flags": 1},
+            {"matrix": [5, 1], "x": 65, "y": 61, "flags": 1},
+            {"matrix": [5, 2], "x": 79, "y": 61, "flags": 1},
+            {"matrix": [5, 6], "x": 122, "y": 61, "flags": 4},
+            {"matrix": [5, 9], "x": 163, "y": 61, "flags": 1},
+            {"matrix": [5, 10], "x": 174, "y": 61, "flags": 4},
+            {"matrix": [5, 11], "x": 186, "y": 61, "flags": 1},
+            {"matrix": [5, 12], "x": 201, "y": 64, "flags": 1},
+            {"matrix": [5, 13], "x": 212, "y": 64, "flags": 1},
+            {"matrix": [5, 14], "x": 223, "y": 64, "flags": 1}
+        ]
+    },
     "layouts": {
         "LAYOUT_iso_104": {
             "layout": [