Added q3 pre v2 and q3 v1 iso version

36 files changed, 2530 insertions, 207 deletions

diff --git a/keyboards/keychron/q3_pro/ansi_encoder/info.json b/keyboards/keychron/q3_pro/ansi_encoder/info.json
deleted file mode 100644
index 50b57d199e..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "usb": {
-    	"pid": "0x0630",
-    	"device_version": "1.0.0"
-    },
-    "layouts": {
-        "LAYOUT_ansi_92": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0.25},
-
-                {"matrix":[0,1], "x":1.25, "y":0},
-                {"matrix":[0,2], "x":3.25, "y":0},
-                {"matrix":[0,3], "x":4.25, "y":0},
-                {"matrix":[0,4], "x":5.25, "y":0},
-                {"matrix":[0,5], "x":6.25, "y":0},
-                {"matrix":[0,6], "x":7.75, "y":0},
-                {"matrix":[0,7], "x":8.75, "y":0},
-                {"matrix":[0,8], "x":9.75, "y":0},
-                {"matrix":[0,9], "x":10.75, "y":0},
-                {"matrix":[0,10], "x":12.25, "y":0},
-                {"matrix":[0,11], "x":13.25, "y":0},
-                {"matrix":[0,12], "x":14.25, "y":0},
-                {"matrix":[0,13], "x":15.25, "y":0},
-                {"matrix":[0,14], "x":16.5, "y":0},
-                {"matrix":[0,15], "x":17.5, "y":0},
-                {"matrix":[0,16], "x":18.5, "y":0},
-
-                {"matrix":[1,0], "x":1.25, "y":1.25},
-                {"matrix":[1,1], "x":2.25, "y":1.25},
-                {"matrix":[1,2], "x":3.25, "y":1.25},
-                {"matrix":[1,3], "x":4.25, "y":1.25},
-                {"matrix":[1,4], "x":5.25, "y":1.25},
-                {"matrix":[1,5], "x":6.25, "y":1.25},
-                {"matrix":[1,6], "x":7.25, "y":1.25},
-                {"matrix":[1,7], "x":8.25, "y":1.25},
-                {"matrix":[1,8], "x":9.25, "y":1.25},
-                {"matrix":[1,9], "x":10.25, "y":1.25},
-                {"matrix":[1,10], "x":11.25, "y":1.25},
-                {"matrix":[1,11], "x":12.25, "y":1.25},
-                {"matrix":[1,12], "x":13.25, "y":1.25},
-                {"matrix":[1,13], "x":14.25, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":16.5, "y":1.25},
-                {"matrix":[1,15], "x":17.5, "y":1.25},
-                {"matrix":[1,16], "x":18.5, "y":1.25},
-
-                {"matrix":[1,17], "x":0, "y":1.5},
-
-                {"matrix":[2,0], "x":1.25, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":2.75, "y":2.25},
-                {"matrix":[2,2], "x":3.75, "y":2.25},
-                {"matrix":[2,3], "x":4.75, "y":2.25},
-                {"matrix":[2,4], "x":5.75, "y":2.25},
-                {"matrix":[2,5], "x":6.75, "y":2.25},
-                {"matrix":[2,6], "x":7.75, "y":2.25},
-                {"matrix":[2,7], "x":8.75, "y":2.25},
-                {"matrix":[2,8], "x":9.75, "y":2.25},
-                {"matrix":[2,9], "x":10.75, "y":2.25},
-                {"matrix":[2,10], "x":11.75, "y":2.25},
-                {"matrix":[2,11], "x":12.75, "y":2.25},
-                {"matrix":[2,12], "x":13.75, "y":2.25},
-                {"matrix":[2,13], "x":14.75, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":16.5, "y":2.25},
-                {"matrix":[2,15], "x":17.5, "y":2.25},
-                {"matrix":[2,16], "x":18.5, "y":2.25},
-
-                {"matrix":[3,17], "x":0, "y":2.75},
-
-                {"matrix":[3,0], "x":1.25, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":3, "y":3.25},
-                {"matrix":[3,2], "x":4, "y":3.25},
-                {"matrix":[3,3], "x":5, "y":3.25},
-                {"matrix":[3,4], "x":6, "y":3.25},
-                {"matrix":[3,5], "x":7, "y":3.25},
-                {"matrix":[3,6], "x":8, "y":3.25},
-                {"matrix":[3,7], "x":9, "y":3.25},
-                {"matrix":[3,8], "x":10, "y":3.25},
-                {"matrix":[3,9], "x":11, "y":3.25},
-                {"matrix":[3,10], "x":12, "y":3.25},
-                {"matrix":[3,11], "x":13, "y":3.25},
-                {"matrix":[3,13], "x":14, "y":3.25, "w":2.25},
-
-                {"matrix":[4,17], "x":0, "y":4},
-
-                {"matrix":[4,0], "x":1.25, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":3.5, "y":4.25},
-                {"matrix":[4,3], "x":4.5, "y":4.25},
-                {"matrix":[4,4], "x":5.5, "y":4.25},
-                {"matrix":[4,5], "x":6.5, "y":4.25},
-                {"matrix":[4,6], "x":7.5, "y":4.25},
-                {"matrix":[4,7], "x":8.5, "y":4.25},
-                {"matrix":[4,8], "x":9.5, "y":4.25},
-                {"matrix":[4,9], "x":10.5, "y":4.25},
-                {"matrix":[4,10], "x":11.5, "y":4.25},
-                {"matrix":[4,11], "x":12.5, "y":4.25},
-                {"matrix":[4,13], "x":13.5, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":17.5, "y":4.25},
-
-                {"matrix":[5,17], "x":0, "y":5.25},
-
-                {"matrix":[5,0], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":3.75, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":5, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":15, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":16.5, "y":5.25},
-                {"matrix":[5,15], "x":17.5, "y":5.25},
-                {"matrix":[5,16], "x":18.5, "y":5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
deleted file mode 100644
index f886ea2e8e..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3_pro/ansi_encoder_v1/ansi_encoder_v1.c
index 79a02ccfc5..08052a4316 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/ansi_encoder_v1.c
@@ -25,7 +25,6 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_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},
@@ -123,36 +122,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_1,    D_1,    E_1},
     {1, I_2,    G_2,    H_2},
 };
-
-#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, __ },
-        { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, __, 64, __, __, __, 51 },
-        { 66, __, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, __, 77, __, 78, __, 65 },
-        { 80, 81, 82, __, __, __, 83, __, __, __, 84, 85, 86, 87, 88, 89, 90, 79 },
-    },
-    {
-        // LED Index to Physical Position
-                {21,0},           {44,0},  {56,0},  {68,0},  {79,0},  {96,0},  {108,0},  {120,0},  {131,0},  {149,0},  {160,0},  {172,0},  {183,0},  {201,0},  {212,0},  {224,0},
-                {21,17}, {32,17}, {44,17}, {55,17}, {67,17}, {79,17}, {90,17}, {102,17}, {114,17}, {125,17}, {137,17}, {149,17}, {160,17}, {178,17}, {201,17}, {212,17}, {224,17},
-        {0,23}, {23,29}, {38,29}, {50,29}, {61,29}, {73,29}, {85,29}, {96,29}, {108,29}, {119,29}, {131,29}, {143,29}, {154,29}, {166,29}, {180,29}, {201,29}, {212,29}, {224,29},
-        {0,37}, {25,40}, {41,40}, {53,40}, {64,40}, {76,40}, {87,40}, {99,40}, {111,40}, {122,40}, {134,40}, {146,40}, {157,40},           {176,40},
-        {0,50}, {28,52},          {47,52}, {58,52}, {70,52}, {82,52}, {93,52}, {105,52}, {116,52}, {128,52}, {140,52}, {151,52},           {173,52},           {212,52},
-        {0,64}, {22,63}, {37,63}, {51,63},                            {95,63},                               {138,63}, {153,63}, {167,63}, {182,63}, {201,63}, {212,63}, {224,63},
-    },
-    {
-        // RGB LED Index to Flag
-           1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-           4, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
-        4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
-        4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        4, 1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        4, 1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1,
-    }
-};
 #endif
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/config.h b/keyboards/keychron/q3_pro/ansi_encoder_v1/config.h
index c111b5c6c0..371dcbb729 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/config.h
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/config.h
@@ -17,16 +17,17 @@
 #pragma once
 
 #ifdef RGB_MATRIX_ENABLE
-/* RGB Matrix driver configuration */
+/* RGB Matrix Driver Configuration */
 #    define DRIVER_COUNT 2
-
 #    define DRIVER_ADDR_1 0b1110111
 #    define DRIVER_ADDR_2 0b1110100
+
+/* RGB Matrix Configuration */
 #    define DRIVER_1_LED_COUNT 47
 #    define DRIVER_2_LED_COUNT 44
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
 
-/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
+/* Use the first 9 channels of led driver */
 #    define PHASE_CHANNEL MSKPHASE_9CHANNEL
 
 /* Set LED driver current */
@@ -38,6 +39,7 @@
 
 /* Allow shutdown of led driver to save power */
 #    define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
+
 /* Turn off backlight on low brightness to save power */
 #    define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
 
@@ -47,7 +49,10 @@
  * For full list of effects, see:
  * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
  */
-
 #    define RGB_MATRIX_KEYPRESSES
 #    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
 #endif // RGB_MATRIX_ENABLE
+
+/* Specifed (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v1/info.json b/keyboards/keychron/q3_pro/ansi_encoder_v1/info.json
new file mode 100644
index 0000000000..81d4640229
--- /dev/null
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/info.json
@@ -0,0 +1,234 @@
+{
+    "usb": {
+    	"pid": "0x0630",
+    	"device_version": "1.0.0"
+    },
+    "matrix_size": {
+        "rows": 6,
+        "cols": 18
+    },
+    "matrix_pins": {
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+        "custom": true,
+        "custom_lite": true
+    },
+    "diode_direction": "ROW2COL",
+    "encoder": {
+        "rotary": [
+            {
+                "pin_a": "A10",
+                "pin_b": "A0",
+                "resolution": 4
+            }
+        ]
+    },
+    "layouts": {
+        "LAYOUT_ansi_92": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0.25},
+
+                {"matrix":[0,1], "x":1.25, "y":0},
+                {"matrix":[0,2], "x":3.25, "y":0},
+                {"matrix":[0,3], "x":4.25, "y":0},
+                {"matrix":[0,4], "x":5.25, "y":0},
+                {"matrix":[0,5], "x":6.25, "y":0},
+                {"matrix":[0,6], "x":7.75, "y":0},
+                {"matrix":[0,7], "x":8.75, "y":0},
+                {"matrix":[0,8], "x":9.75, "y":0},
+                {"matrix":[0,9], "x":10.75, "y":0},
+                {"matrix":[0,10], "x":12.25, "y":0},
+                {"matrix":[0,11], "x":13.25, "y":0},
+                {"matrix":[0,12], "x":14.25, "y":0},
+                {"matrix":[0,13], "x":15.25, "y":0},
+                {"matrix":[0,14], "x":16.5, "y":0},
+                {"matrix":[0,15], "x":17.5, "y":0},
+                {"matrix":[0,16], "x":18.5, "y":0},
+
+                {"matrix":[1,0], "x":1.25, "y":1.25},
+                {"matrix":[1,1], "x":2.25, "y":1.25},
+                {"matrix":[1,2], "x":3.25, "y":1.25},
+                {"matrix":[1,3], "x":4.25, "y":1.25},
+                {"matrix":[1,4], "x":5.25, "y":1.25},
+                {"matrix":[1,5], "x":6.25, "y":1.25},
+                {"matrix":[1,6], "x":7.25, "y":1.25},
+                {"matrix":[1,7], "x":8.25, "y":1.25},
+                {"matrix":[1,8], "x":9.25, "y":1.25},
+                {"matrix":[1,9], "x":10.25, "y":1.25},
+                {"matrix":[1,10], "x":11.25, "y":1.25},
+                {"matrix":[1,11], "x":12.25, "y":1.25},
+                {"matrix":[1,12], "x":13.25, "y":1.25},
+                {"matrix":[1,13], "x":14.25, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":16.5, "y":1.25},
+                {"matrix":[1,15], "x":17.5, "y":1.25},
+                {"matrix":[1,16], "x":18.5, "y":1.25},
+
+                {"matrix":[1,17], "x":0, "y":1.5},
+
+                {"matrix":[2,0], "x":1.25, "y":2.25, "w":1.5},
+                {"matrix":[2,1], "x":2.75, "y":2.25},
+                {"matrix":[2,2], "x":3.75, "y":2.25},
+                {"matrix":[2,3], "x":4.75, "y":2.25},
+                {"matrix":[2,4], "x":5.75, "y":2.25},
+                {"matrix":[2,5], "x":6.75, "y":2.25},
+                {"matrix":[2,6], "x":7.75, "y":2.25},
+                {"matrix":[2,7], "x":8.75, "y":2.25},
+                {"matrix":[2,8], "x":9.75, "y":2.25},
+                {"matrix":[2,9], "x":10.75, "y":2.25},
+                {"matrix":[2,10], "x":11.75, "y":2.25},
+                {"matrix":[2,11], "x":12.75, "y":2.25},
+                {"matrix":[2,12], "x":13.75, "y":2.25},
+                {"matrix":[2,13], "x":14.75, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":16.5, "y":2.25},
+                {"matrix":[2,15], "x":17.5, "y":2.25},
+                {"matrix":[2,16], "x":18.5, "y":2.25},
+
+                {"matrix":[3,17], "x":0, "y":2.75},
+
+                {"matrix":[3,0], "x":1.25, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":3, "y":3.25},
+                {"matrix":[3,2], "x":4, "y":3.25},
+                {"matrix":[3,3], "x":5, "y":3.25},
+                {"matrix":[3,4], "x":6, "y":3.25},
+                {"matrix":[3,5], "x":7, "y":3.25},
+                {"matrix":[3,6], "x":8, "y":3.25},
+                {"matrix":[3,7], "x":9, "y":3.25},
+                {"matrix":[3,8], "x":10, "y":3.25},
+                {"matrix":[3,9], "x":11, "y":3.25},
+                {"matrix":[3,10], "x":12, "y":3.25},
+                {"matrix":[3,11], "x":13, "y":3.25},
+                {"matrix":[3,13], "x":14, "y":3.25, "w":2.25},
+
+                {"matrix":[4,17], "x":0, "y":4},
+
+                {"matrix":[4,0], "x":1.25, "y":4.25, "w":2.25},
+                {"matrix":[4,2], "x":3.5, "y":4.25},
+                {"matrix":[4,3], "x":4.5, "y":4.25},
+                {"matrix":[4,4], "x":5.5, "y":4.25},
+                {"matrix":[4,5], "x":6.5, "y":4.25},
+                {"matrix":[4,6], "x":7.5, "y":4.25},
+                {"matrix":[4,7], "x":8.5, "y":4.25},
+                {"matrix":[4,8], "x":9.5, "y":4.25},
+                {"matrix":[4,9], "x":10.5, "y":4.25},
+                {"matrix":[4,10], "x":11.5, "y":4.25},
+                {"matrix":[4,11], "x":12.5, "y":4.25},
+                {"matrix":[4,13], "x":13.5, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":17.5, "y":4.25},
+
+                {"matrix":[5,17], "x":0, "y":5.25},
+
+                {"matrix":[5,0], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5,1], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5,2], "x":3.75, "y":5.25, "w":1.25},
+                {"matrix":[5,6], "x":5, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":15, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":16.5, "y":5.25},
+                {"matrix":[5,15], "x":17.5, "y":5.25},
+                {"matrix":[5,16], "x":18.5, "y":5.25}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 1],  "flags":1, "x":21,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":44,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":56,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":68,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":79,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":96,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":108, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":120, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":131, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":149, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":160, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":172, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":183, "y":0},
+            {"matrix":[0, 14], "flags":1, "x":201, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":212, "y":0},
+            {"matrix":[0, 16], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":21,  "y":17},
+            {"matrix":[1, 1],  "flags":8, "x":32,  "y":17},
+            {"matrix":[1, 2],  "flags":8, "x":44,  "y":17},
+            {"matrix":[1, 3],  "flags":8, "x":55,  "y":17},
+            {"matrix":[1, 4],  "flags":4, "x":67,  "y":17},
+            {"matrix":[1, 5],  "flags":4, "x":79,  "y":17},
+            {"matrix":[1, 6],  "flags":4, "x":90,  "y":17},
+            {"matrix":[1, 7],  "flags":4, "x":102, "y":17},
+            {"matrix":[1, 8],  "flags":4, "x":114, "y":17},
+            {"matrix":[1, 9],  "flags":4, "x":125, "y":17},
+            {"matrix":[1, 10], "flags":4, "x":137, "y":17},
+            {"matrix":[1, 11], "flags":4, "x":149, "y":17},
+            {"matrix":[1, 12], "flags":4, "x":160, "y":17},
+            {"matrix":[1, 13], "flags":1, "x":178, "y":17},
+            {"matrix":[1, 14], "flags":1, "x":201, "y":17},
+            {"matrix":[1, 15], "flags":1, "x":212, "y":17},
+            {"matrix":[1, 16], "flags":1, "x":224, "y":17},
+
+            {"matrix":[1, 17], "flags":4, "x":0,   "y":23},
+            {"matrix":[2, 0],  "flags":1, "x":25,  "y":29},
+            {"matrix":[2, 1],  "flags":4, "x":41,  "y":29},
+            {"matrix":[2, 2],  "flags":4, "x":53,  "y":29},
+            {"matrix":[2, 3],  "flags":4, "x":64,  "y":29},
+            {"matrix":[2, 4],  "flags":4, "x":76,  "y":29},
+            {"matrix":[2, 5],  "flags":4, "x":87,  "y":29},
+            {"matrix":[2, 6],  "flags":4, "x":99,  "y":29},
+            {"matrix":[2, 7],  "flags":4, "x":111, "y":29},
+            {"matrix":[2, 8],  "flags":4, "x":122, "y":29},
+            {"matrix":[2, 9],  "flags":4, "x":131, "y":29},
+            {"matrix":[2, 10], "flags":4, "x":143, "y":29},
+            {"matrix":[2, 11], "flags":4, "x":154, "y":29},
+            {"matrix":[2, 12], "flags":4, "x":166, "y":29},
+            {"matrix":[2, 13], "flags":1, "x":180, "y":29},
+            {"matrix":[2, 14], "flags":1, "x":201, "y":29},
+            {"matrix":[2, 15], "flags":1, "x":212, "y":29},
+            {"matrix":[2, 16], "flags":1, "x":224, "y":29},
+
+            {"matrix":[3, 17], "flags":4, "x":0,   "y":37},
+            {"matrix":[3, 0],  "flags":8, "x":25,  "y":40},
+            {"matrix":[3, 1],  "flags":4, "x":41,  "y":40},
+            {"matrix":[3, 2],  "flags":4, "x":53,  "y":40},
+            {"matrix":[3, 3],  "flags":4, "x":64,  "y":40},
+            {"matrix":[3, 4],  "flags":4, "x":76,  "y":40},
+            {"matrix":[3, 5],  "flags":4, "x":87,  "y":40},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":40},
+            {"matrix":[3, 7],  "flags":4, "x":111, "y":40},
+            {"matrix":[3, 8],  "flags":4, "x":122, "y":40},
+            {"matrix":[3, 9],  "flags":4, "x":134, "y":40},
+            {"matrix":[3, 10], "flags":4, "x":146, "y":40},
+            {"matrix":[3, 11], "flags":4, "x":157, "y":40},
+            {"matrix":[3, 13], "flags":1, "x":176, "y":40},
+
+            {"matrix":[4, 17], "flags":4, "x":0,   "y":50},
+            {"matrix":[4, 0],  "flags":1, "x":28,  "y":52},
+            {"matrix":[4, 2],  "flags":4, "x":47,  "y":52},
+            {"matrix":[4, 3],  "flags":4, "x":58,  "y":52},
+            {"matrix":[4, 4],  "flags":4, "x":70,  "y":52},
+            {"matrix":[4, 5],  "flags":4, "x":82,  "y":52},
+            {"matrix":[4, 6],  "flags":4, "x":93,  "y":52},
+            {"matrix":[4, 7],  "flags":4, "x":105, "y":52},
+            {"matrix":[4, 8],  "flags":4, "x":116, "y":52},
+            {"matrix":[4, 9],  "flags":4, "x":128, "y":52},
+            {"matrix":[4, 10], "flags":4, "x":140, "y":52},
+            {"matrix":[4, 11], "flags":4, "x":151, "y":52},
+            {"matrix":[4, 13], "flags":1, "x":173, "y":52},
+            {"matrix":[4, 15], "flags":1, "x":212, "y":52},
+
+            {"matrix":[5, 17], "flags":4, "x":0,   "y":64},
+            {"matrix":[5, 0],  "flags":1, "x":22,  "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":37,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":51,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":95,  "y":64},
+            {"matrix":[5, 10], "flags":1, "x":138, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":153, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":167, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":182, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":201, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":212, "y":64},
+            {"matrix":[5, 16], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/default/keymap.c
index 2a8a218ef7..307c1783c1 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/default/keymap.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q3_pro.h"
 #include QMK_KEYBOARD_H
 
 // clang-format off
@@ -22,7 +21,7 @@ enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/default/rules.mk
index ee32568148..ee32568148 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/rules.mk
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/default/rules.mk
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/keymap.c
index 3193dfa5fa..534326a3b2 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/keymap.c
@@ -14,17 +14,16 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q3_pro.h"
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_ansi_92(
         KC_MUTE,  KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  RGB_MOD,
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/rules.mk
index f1adcab005..f1adcab005 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/keymaps/via/rules.mk
diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v1/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_v1/rules.mk
new file mode 100644
index 0000000000..d609c1b199
--- /dev/null
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v1/rules.mk
@@ -0,0 +1 @@
+SRC += matrix_v1.c
diff --git a/keyboards/keychron/q3_pro/ansi_encoder_v2/ansi_encoder_v2.c b/keyboards/keychron/q3_pro/ansi_encoder_v2/ansi_encoder_v2.c
new file mode 100755
index 0000000000..e5685ac4b5
--- /dev/null
+++ b/keyboards/keychron/q3_pro/ansi_encoder_v2/ansi_encoder_v2.c
@@ -0,0 +1,121 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       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, C_4,    A_4,    B_4},  // 16
+
+    {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},