Add q6 pro iso

20 files changed, 1169 insertions, 199 deletions

diff --git a/keyboards/keychron/q6_pro/ansi_encoder/config.h b/keyboards/keychron/q6_pro/ansi_encoder/config.h
index c31a7acb10..1434cc669c 100755
--- a/keyboards/keychron/q6_pro/ansi_encoder/config.h
+++ b/keyboards/keychron/q6_pro/ansi_encoder/config.h
@@ -34,6 +34,7 @@
 /* Turn off backllit if brightness value is low */
 #    define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
 
+/* Indication led */
 #    define NUM_LOCK_INDEX 37
 #    define CAPS_LOCK_INDEX 62
 #    define LOW_BAT_IND_INDEX 98
@@ -47,5 +48,4 @@
 /* Set LED driver current */
 #    define CKLED2001_CURRENT_TUNE \
         { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
-
 #endif
diff --git a/keyboards/keychron/q6_pro/ansi_encoder/info.json b/keyboards/keychron/q6_pro/ansi_encoder/info.json
index 70d32029e4..1e2440e21e 100755
--- a/keyboards/keychron/q6_pro/ansi_encoder/info.json
+++ b/keyboards/keychron/q6_pro/ansi_encoder/info.json
@@ -3,6 +3,126 @@
     	"pid": "0x0660",
     	"device_version": "1.0.0"
     },
+    "layouts": {
+        "LAYOUT_109_ansi": {
+            "layout": [
+                {"matrix":[0, 0], "x":0, "y":0},
+                {"matrix":[0, 1], "x":1.25, "y":0},
+                {"matrix":[0, 2], "x":2.25, "y":0},
+                {"matrix":[0, 3], "x":3.25, "y":0},
+                {"matrix":[0, 4], "x":4.25, "y":0},
+                {"matrix":[0, 5], "x":5.5, "y":0},
+                {"matrix":[0, 6], "x":6.5, "y":0},
+                {"matrix":[0, 7], "x":7.5, "y":0},
+                {"matrix":[0, 8], "x":8.5, "y":0},
+                {"matrix":[0, 9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,17], "x":18.5, "y":0},
+                {"matrix":[0,18], "x":19.5, "y":0},
+                {"matrix":[0,19], "x":20.5, "y":0},
+                {"matrix":[0,20], "x":21.5, "y":0},
+
+                {"matrix":[1, 0], "x":0, "y":1.25},
+                {"matrix":[1, 1], "x":1, "y":1.25},
+                {"matrix":[1, 2], "x":2, "y":1.25},
+                {"matrix":[1, 3], "x":3, "y":1.25},
+                {"matrix":[1, 4], "x":4, "y":1.25},
+                {"matrix":[1, 5], "x":5, "y":1.25},
+                {"matrix":[1, 6], "x":6, "y":1.25},
+                {"matrix":[1, 7], "x":7, "y":1.25},
+                {"matrix":[1, 8], "x":8, "y":1.25},
+                {"matrix":[1, 9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[1,19], "x":20.5, "y":1.25},
+                {"matrix":[1,20], "x":21.5, "y":1.25},
+
+                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2, 1], "x":1.5, "y":2.25},
+                {"matrix":[2, 2], "x":2.5, "y":2.25},
+                {"matrix":[2, 3], "x":3.5, "y":2.25},
+                {"matrix":[2, 4], "x":4.5, "y":2.25},
+                {"matrix":[2, 5], "x":5.5, "y":2.25},
+                {"matrix":[2, 6], "x":6.5, "y":2.25},
+                {"matrix":[2, 7], "x":7.5, "y":2.25},
+                {"matrix":[2, 8], "x":8.5, "y":2.25},
+                {"matrix":[2, 9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[2,19], "x":20.5, "y":2.25},
+                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
+
+                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3, 1], "x":1.75, "y":3.25},
+                {"matrix":[3, 2], "x":2.75, "y":3.25},
+                {"matrix":[3, 3], "x":3.75, "y":3.25},
+                {"matrix":[3, 4], "x":4.75, "y":3.25},
+                {"matrix":[3, 5], "x":5.75, "y":3.25},
+                {"matrix":[3, 6], "x":6.75, "y":3.25},
+                {"matrix":[3, 7], "x":7.75, "y":3.25},
+                {"matrix":[3, 8], "x":8.75, "y":3.25},
+                {"matrix":[3, 9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,19], "x":20.5, "y":3.25},
+
+                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4, 2], "x":2.25, "y":4.25},
+                {"matrix":[4, 3], "x":3.25, "y":4.25},
+                {"matrix":[4, 4], "x":4.25, "y":4.25},
+                {"matrix":[4, 5], "x":5.25, "y":4.25},
+                {"matrix":[4, 6], "x":6.25, "y":4.25},
+                {"matrix":[4, 7], "x":7.25, "y":4.25},
+                {"matrix":[4, 8], "x":8.25, "y":4.25},
+                {"matrix":[4, 9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+                {"matrix":[4,15], "x":16.25, "y":4.25},
+                {"matrix":[4,17], "x":18.5, "y":4.25},
+                {"matrix":[4,18], "x":19.5, "y":4.25},
+                {"matrix":[4,19], "x":20.5, "y":4.25},
+                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
+
+                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
+                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
+                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
+                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+                {"matrix":[5,14], "x":15.25, "y":5.25},
+                {"matrix":[5,15], "x":16.25, "y":5.25},
+                {"matrix":[5,16], "x":17.25, "y":5.25},
+                {"matrix":[5,18], "x":18.5, "y":5.25, "w":2},
+                {"matrix":[5,19], "x":20.5, "y":5.25}
+            ]
+        }
+    },
     "rgb_matrix": {
         "layout": [
             {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
@@ -39,7 +159,7 @@
             {"matrix":[1, 10], "flags":4, "x":104, "y":15},
             {"matrix":[1, 11], "flags":4, "x":115, "y":15},
             {"matrix":[1, 12], "flags":4, "x":125, "y":15},
-            {"matrix":[1, 13], "flags":4, "x":141, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":141, "y":15},
             {"matrix":[1, 14], "flags":1, "x":159, "y":15},
             {"matrix":[1, 15], "flags":1, "x":169, "y":15},
             {"matrix":[1, 16], "flags":1, "x":180, "y":15},
@@ -52,7 +172,7 @@
             {"matrix":[2, 1],  "flags":4, "x":16,  "y":27},
             {"matrix":[2, 2],  "flags":4, "x":26,  "y":27},
             {"matrix":[2, 3],  "flags":4, "x":36,  "y":27},
-            {"matrix":[2, 4],  "flags":1, "x":47,  "y":27},
+            {"matrix":[2, 4],  "flags":4, "x":47,  "y":27},
             {"matrix":[2, 5],  "flags":4, "x":57,  "y":27},
             {"matrix":[2, 6],  "flags":4, "x":68,  "y":27},
             {"matrix":[2, 7],  "flags":4, "x":78,  "y":27},
@@ -61,7 +181,7 @@
             {"matrix":[2, 10], "flags":4, "x":109, "y":27},
             {"matrix":[2, 11], "flags":4, "x":120, "y":27},
             {"matrix":[2, 12], "flags":4, "x":130, "y":27},
-            {"matrix":[2, 13], "flags":4, "x":143, "y":27},
+            {"matrix":[2, 13], "flags":1, "x":143, "y":27},
             {"matrix":[2, 14], "flags":1, "x":159, "y":27},
             {"matrix":[2, 15], "flags":1, "x":169, "y":27},
             {"matrix":[2, 16], "flags":1, "x":180, "y":27},
@@ -111,7 +231,7 @@
             {"matrix":[5,  6], "flags":4, "x":66,  "y":64},
             {"matrix":[5, 10], "flags":1, "x":105, "y":64},
             {"matrix":[5, 11], "flags":1, "x":118, "y":64},
-            {"matrix":[5, 12], "flags":4, "x":131, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":131, "y":64},
             {"matrix":[5, 13], "flags":1, "x":145, "y":64},
             {"matrix":[5, 14], "flags":1, "x":159, "y":64},
             {"matrix":[5, 15], "flags":1, "x":169, "y":64},
diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c
index c5277f5593..237cafbd58 100755
--- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/default/keymap.c
@@ -21,32 +21,32 @@ enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT(
+    [MAC_BASE] = LAYOUT_109_ansi(
         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_MUTE,    KC_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,    KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                   KC_P4,    KC_P5,    KC_P6,
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,              KC_UP,              KC_P1,    KC_P2,    KC_P3,    KC_PENT,
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
-    [MAC_FN] = LAYOUT(
+    [MAC_FN] = LAYOUT_109_ansi(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
         _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                  _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______         ),
-    [WIN_BASE] = LAYOUT(
+    [WIN_BASE] = LAYOUT_109_ansi(
         KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     KC_MUTE,    KC_PSCR,  KC_CTANA, RGB_MOD,  _______,  _______,  _______,  _______,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,    KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                   KC_P4,    KC_P5,    KC_P6,
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,              KC_UP,              KC_P1,    KC_P2,    KC_P3,    KC_PENT,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
-    [WIN_FN] = LAYOUT(
+    [WIN_FN] = LAYOUT_109_ansi(
         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
         _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c
index c5277f5593..237cafbd58 100755
--- a/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q6_pro/ansi_encoder/keymaps/via/keymap.c
@@ -21,32 +21,32 @@ enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT(
+    [MAC_BASE] = LAYOUT_109_ansi(
         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_MUTE,    KC_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,    KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                   KC_P4,    KC_P5,    KC_P6,
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,              KC_UP,              KC_P1,    KC_P2,    KC_P3,    KC_PENT,
         KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
-    [MAC_FN] = LAYOUT(
+    [MAC_FN] = LAYOUT_109_ansi(
         _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
         _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
         _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,                                  _______,  _______,  _______,
         _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,              _______,            _______,  _______,  _______,  _______,
         _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,            _______         ),
-    [WIN_BASE] = LAYOUT(
+    [WIN_BASE] = LAYOUT_109_ansi(
         KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,     KC_MUTE,    KC_PSCR,  KC_CTANA, RGB_MOD,  _______,  _______,  _______,  _______,
         KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,    KC_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,    KC_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,                                   KC_P4,    KC_P5,    KC_P6,
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,              KC_UP,              KC_P1,    KC_P2,    KC_P3,    KC_PENT,
         KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,    KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,              KC_PDOT         ),
-    [WIN_FN] = LAYOUT(
+    [WIN_FN] = LAYOUT_109_ansi(
         _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    RGB_TOG,    _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,
         _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
         RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,
diff --git a/keyboards/keychron/q6_pro/config.h b/keyboards/keychron/q6_pro/config.h
index f7b7305458..2d8b8e11c4 100755
--- a/keyboards/keychron/q6_pro/config.h
+++ b/keyboards/keychron/q6_pro/config.h
@@ -18,10 +18,10 @@
 
 /* turn off effects when suspended */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define LED_DISABLE_WHEN_USB_SUSPENDED
 
 /* DIP switch */
-#define DIP_SWITCH_PINS { A8 }
+#define DIP_SWITCH_PINS \
+    { A8 }
 
 /* Increase I2C speed to 1000 KHz */
 #define I2C1_TIMINGR_PRESC 0U
diff --git a/keyboards/keychron/q6_pro/info.json b/keyboards/keychron/q6_pro/info.json
index b94b557345..9235c9aa70 100755
--- a/keyboards/keychron/q6_pro/info.json
+++ b/keyboards/keychron/q6_pro/info.json
@@ -5,6 +5,9 @@
     "maintainer": "lalalademaxiya1",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
+    "usb": {
+        "vid": "0x3434"
+    },
     "features": {
         "bootmagic": true,
         "command": false,
@@ -44,140 +47,16 @@
             "solid_splash": true
         }
     },
-    "bluetooth": {
-        "driver": "custom"
-    },
-    "usb": {
-        "vid": "0x3434"
-    },
     "matrix_pins": {
         "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
-        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
+        "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+        "custom": true,
+        "custom_lite": true
     },
     "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A0", "pin_b": "A10"}
         ]
-    },
-    "layouts": {
-        "LAYOUT": {
-            "layout": [
-                {"matrix":[0, 0], "x":0, "y":0},
-                {"matrix":[0, 1], "x":1.25, "y":0},
-                {"matrix":[0, 2], "x":2.25, "y":0},
-                {"matrix":[0, 3], "x":3.25, "y":0},
-                {"matrix":[0, 4], "x":4.25, "y":0},
-                {"matrix":[0, 5], "x":5.5, "y":0},
-                {"matrix":[0, 6], "x":6.5, "y":0},
-                {"matrix":[0, 7], "x":7.5, "y":0},
-                {"matrix":[0, 8], "x":8.5, "y":0},
-                {"matrix":[0, 9], "x":9.75, "y":0},
-                {"matrix":[0,10], "x":10.75, "y":0},
-                {"matrix":[0,11], "x":11.75, "y":0},
-                {"matrix":[0,12], "x":12.75, "y":0},
-                {"matrix":[0,13], "x":14, "y":0},
-                {"matrix":[0,14], "x":15.25, "y":0},
-                {"matrix":[0,15], "x":16.25, "y":0},
-                {"matrix":[0,16], "x":17.25, "y":0},
-                {"matrix":[0,17], "x":18.5, "y":0},
-                {"matrix":[0,18], "x":19.5, "y":0},
-                {"matrix":[0,19], "x":20.5, "y":0},
-                {"matrix":[0,20], "x":21.5, "y":0},
-
-                {"matrix":[1, 0], "x":0, "y":1.25},
-                {"matrix":[1, 1], "x":1, "y":1.25},
-                {"matrix":[1, 2], "x":2, "y":1.25},
-                {"matrix":[1, 3], "x":3, "y":1.25},
-                {"matrix":[1, 4], "x":4, "y":1.25},
-                {"matrix":[1, 5], "x":5, "y":1.25},
-                {"matrix":[1, 6], "x":6, "y":1.25},
-                {"matrix":[1, 7], "x":7, "y":1.25},
-                {"matrix":[1, 8], "x":8, "y":1.25},
-                {"matrix":[1, 9], "x":9, "y":1.25},
-                {"matrix":[1,10], "x":10, "y":1.25},
-                {"matrix":[1,11], "x":11, "y":1.25},
-                {"matrix":[1,12], "x":12, "y":1.25},
-                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":15.25, "y":1.25},
-                {"matrix":[1,15], "x":16.25, "y":1.25},
-                {"matrix":[1,16], "x":17.25, "y":1.25},
-                {"matrix":[1,17], "x":18.5, "y":1.25},
-                {"matrix":[1,18], "x":19.5, "y":1.25},
-                {"matrix":[1,19], "x":20.5, "y":1.25},
-                {"matrix":[1,20], "x":21.5, "y":1.25},
-
-                {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5},
-                {"matrix":[2, 1], "x":1.5, "y":2.25},
-                {"matrix":[2, 2], "x":2.5, "y":2.25},
-                {"matrix":[2, 3], "x":3.5, "y":2.25},
-                {"matrix":[2, 4], "x":4.5, "y":2.25},
-                {"matrix":[2, 5], "x":5.5, "y":2.25},
-                {"matrix":[2, 6], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":7.5, "y":2.25},
-                {"matrix":[2, 8], "x":8.5, "y":2.25},
-                {"matrix":[2, 9], "x":9.5, "y":2.25},
-                {"matrix":[2,10], "x":10.5, "y":2.25},
-                {"matrix":[2,11], "x":11.5, "y":2.25},
-                {"matrix":[2,12], "x":12.5, "y":2.25},
-                {"matrix":[2,13], "x":13.5, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":15.25, "y":2.25},
-                {"matrix":[2,15], "x":16.25, "y":2.25},
-                {"matrix":[2,16], "x":17.25, "y":2.25},
-                {"matrix":[2,17], "x":18.5, "y":2.25},
-                {"matrix":[2,18], "x":19.5, "y":2.25},
-                {"matrix":[2,19], "x":20.5, "y":2.25},
-                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
-
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.75},
-                {"matrix":[3, 1], "x":1.75, "y":3.25},
-                {"matrix":[3, 2], "x":2.75, "y":3.25},
-                {"matrix":[3, 3], "x":3.75, "y":3.25},
-                {"matrix":[3, 4], "x":4.75, "y":3.25},
-                {"matrix":[3, 5], "x":5.75, "y":3.25},
-                {"matrix":[3, 6], "x":6.75, "y":3.25},
-                {"matrix":[3, 7], "x":7.75, "y":3.25},
-                {"matrix":[3, 8], "x":8.75, "y":3.25},
-                {"matrix":[3, 9], "x":9.75, "y":3.25},
-                {"matrix":[3,10], "x":10.75, "y":3.25},
-                {"matrix":[3,11], "x":11.75, "y":3.25},
-                {"matrix":[3,13], "x":12.75, "y":3.25, "w":2.25},
-                {"matrix":[3,17], "x":18.5, "y":3.25},
-                {"matrix":[3,18], "x":19.5, "y":3.25},
-                {"matrix":[3,19], "x":20.5, "y":3.25},
-
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":2.25},
-                {"matrix":[4, 2], "x":2.25, "y":4.25},
-                {"matrix":[4, 3], "x":3.25, "y":4.25},
-                {"matrix":[4, 4], "x":4.25, "y":4.25},
-                {"matrix":[4, 5], "x":5.25, "y":4.25},
-                {"matrix":[4, 6], "x":6.25, "y":4.25},
-                {"matrix":[4, 7], "x":7.25, "y":4.25},
-                {"matrix":[4, 8], "x":8.25, "y":4.25},
-                {"matrix":[4, 9], "x":9.25, "y":4.25},
-                {"matrix":[4,10], "x":10.25, "y":4.25},
-                {"matrix":[4,11], "x":11.25, "y":4.25},
-                {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":16.25, "y":4.25},
-                {"matrix":[4,17], "x":18.5, "y":4.25},
-                {"matrix":[4,18], "x":19.5, "y":4.25},
-                {"matrix":[4,19], "x":20.5, "y":4.25},
-                {"matrix":[4,20], "x":21.5, "y":4.25, "h":2},
-
-                {"matrix":[5, 0], "x":0, "y":5.25, "w":1.25},
-                {"matrix":[5, 1], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5, 2], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5, 6], "x":3.75, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":15.25, "y":5.25},
-                {"matrix":[5,15], "x":16.25, "y":5.25},
-                {"matrix":[5,16], "x":17.25, "y":5.25},
-                {"matrix":[5,18], "x":18.5, "y":5.25, "w":2},
-                {"matrix":[5,19], "x":20.5, "y":5.25}
-            ]
-        }
     }
 }
diff --git a/keyboards/keychron/q6_pro/iso_encoder/config.h b/keyboards/keychron/q6_pro/iso_encoder/config.h
new file mode 100755
index 0000000000..8369f62a98
--- /dev/null
+++ b/keyboards/keychron/q6_pro/iso_encoder/config.h
@@ -0,0 +1,51 @@
+/* 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/>.
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+/* RGB Matrix Driver Configuration */
+#    define DRIVER_COUNT 2
+#    define DRIVER_ADDR_1 0b1110111
+#    define DRIVER_ADDR_2 0b1110100
+#    define DRIVER_1_LED_TOTAL 59
+#    define DRIVER_2_LED_TOTAL 50
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Set to infinit, which is use in USB mode by default */
+#    define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+
+/* Allow to shutdown driver to save power */
+#    define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
+
+/* Turn off backllit if brightness value is low */
+#    define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
+
+/* Indication led */
+#    define NUM_LOCK_INDEX 37
+#    define CAPS_LOCK_INDEX 61
+#    define LOW_BAT_IND_INDEX 99
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_KEYPRESSES
+
+/* Set LED driver current */
+#    define CKLED2001_CURRENT_TUNE \
+        { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
+#endif
diff --git a/keyboards/keychron/q6_pro/iso_encoder/info.json b/keyboards/keychron/q6_pro/iso_encoder/info.json
new file mode 100755
index 0000000000..c0feb6f218
--- /dev/null
+++ b/keyboards/keychron/q6_pro/iso_encoder/info.json
@@ -0,0 +1,245 @@
+{
+     "usb": {
+    	"pid": "0x0661",
+    	"device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_110_iso": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1.25, "y":0},
+                {"matrix":[0,2], "x":2.25, "y":0},
+                {"matrix":[0,3], "x":3.25, "y":0},
+                {"matrix":[0,4], "x":4.25, "y":0},
+                {"matrix":[0,5], "x":5.5, "y":0},
+                {"matrix":[0,6], "x":6.5, "y":0},
+                {"matrix":[0,7], "x":7.5, "y":0},
+                {"matrix":[0,8], "x":8.5, "y":0},
+                {"matrix":[0,9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,14], "x":15.25, "y":0},
+                {"matrix":[0,15], "x":16.25, "y":0},
+                {"matrix":[0,16], "x":17.25, "y":0},
+                {"matrix":[0,17], "x":18.5, "y":0},
+                {"matrix":[0,18], "x":19.5, "y":0},
+                {"matrix":[0,19], "x":20.5, "y":0},
+                {"matrix":[0,20], "x":21.5, "y":0},
+
+                {"matrix":[1,0], "x":0, "y":1.25},
+                {"matrix":[1,1], "x":1, "y":1.25},
+                {"matrix":[1,2], "x":2, "y":1.25},
+                {"matrix":[1,3], "x":3, "y":1.25},
+                {"matrix":[1,4], "x":4, "y":1.25},
+                {"matrix":[1,5], "x":5, "y":1.25},
+                {"matrix":[1,6], "x":6, "y":1.25},
+                {"matrix":[1,7], "x":7, "y":1.25},
+                {"matrix":[1,8], "x":8, "y":1.25},
+                {"matrix":[1,9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":15.25, "y":1.25},
+                {"matrix":[1,15], "x":16.25, "y":1.25},
+                {"matrix":[1,16], "x":17.25, "y":1.25},
+                {"matrix":[1,17], "x":18.5, "y":1.25},
+                {"matrix":[1,18], "x":19.5, "y":1.25},
+                {"matrix":[1,19], "x":20.5, "y":1.25},
+                {"matrix":[1,20], "x":21.5, "y":1.25},
+
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2,1], "x":1.5, "y":2.25},
+                {"matrix":[2,2], "x":2.5, "y":2.25},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,7], "x":7.5, "y":2.25},
+                {"matrix":[2,8], "x":8.5, "y":2.25},
+                {"matrix":[2,9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,14], "x":15.25, "y":2.25},
+                {"matrix":[2,15], "x":16.25, "y":2.25},
+                {"matrix":[2,16], "x":17.25, "y":2.25},
+                {"matrix":[2,17], "x":18.5, "y":2.25},
+                {"matrix":[2,18], "x":19.5, "y":2.25},
+                {"matrix":[2,19], "x":20.5, "y":2.25},
+                {"matrix":[2,20], "x":21.5, "y":2.25, "h":2},
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3.25},
+                {"matrix":[3,2], "x":2.75, "y":3.25},
+                {"matrix":[3,3], "x":3.75, "y":3.25},
+                {"matrix":[3,4], "x":4.75, "y":3.25},
+                {"matrix":[3,5], "x":5.75, "y":3.25},
+                {"matrix":[3,6], "x":6.75, "y":3.25},
+                {"matrix":[3,7], "x":7.75, "y":3.25},
+                {"matrix":[3,8], "x":8.75, "y":3.25},
+                {"matrix":[3,9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[3,17], "x":18.5, "y":3.25},
+                {"matrix":[3,18], "x":19.5, "y":3.25},
+                {"matrix":[3,19], "x":20.5, "y":3.25},
+
+                {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4.25},
+                {"matrix":[4,2], "x":2.25, "y":4.25},
+                {"matrix":[4,3], "x":3.25, "y":4.25},
+                {"matrix":[4,4