Added q8 pro iso version

11 files changed, 832 insertions, 7 deletions

diff --git a/keyboards/keychron/q8_pro/iso_encoder/config.h b/keyboards/keychron/q8_pro/iso_encoder/config.h
new file mode 100755
index 0000000000..417eb01303
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/config.h
@@ -0,0 +1,50 @@
+/* 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 29
+#    define DRIVER_2_LED_TOTAL 40
+#    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 CAPS_LOCK_INDEX 28
+#    define LOW_BAT_IND_INDEX 62
+
+// 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 \
+        { 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40 }
+#endif
diff --git a/keyboards/keychron/q8_pro/iso_encoder/info.json b/keyboards/keychron/q8_pro/iso_encoder/info.json
new file mode 100755
index 0000000000..f1b172f4f2
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/info.json
@@ -0,0 +1,163 @@
+{
+     "usb": {
+    	"pid": "0x0681",
+    	"device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_70_iso": {
+            "layout": [
+                {"matrix":[0,0], "x":0.75, "y":0.15},
+                {"matrix":[0,1], "x":1.75, "y":0.15},
+                {"matrix":[0,2], "x":2.75, "y":0},
+                {"matrix":[0,3], "x":3.85, "y":-0.15},
+                {"matrix":[0,4], "x":4.85, "y":-0.15},
+                {"matrix":[0,5], "x":5.85, "y":-0.15},
+                {"matrix":[0,6], "x":6.85, "y":-0.15},
+                {"matrix":[0,7], "x":8.35, "y":1.65},
+                {"matrix":[0,8], "x":9.35, "y":1.65},
+                {"matrix":[0,9], "x":10.35, "y":1.65},
+                {"matrix":[0,10], "x":11.35, "y":1.65},
+                {"matrix":[0,11], "x":12.6, "y":0},
+                {"matrix":[0,12], "x":13.6, "y":0.3},
+                {"matrix":[0,13], "x":14.6, "y":0.3, "w":2},
+                {"matrix":[0,14], "x":17.1, "y":0},
+
+                {"matrix":[1,0], "x":0.5, "y":1.3, "w":1.5},
+                {"matrix":[1,1], "x":2, "y":1.3},
+                {"matrix":[1,2], "x":3.35, "y":0.85},
+                {"matrix":[1,3], "x":4.35, "y":0.85},
+                {"matrix":[1,4], "x":5.35, "y":0.85},
+                {"matrix":[1,5], "x":6.35, "y":0.85},
+                {"matrix":[1,6], "x":7.9, "y":2.65},
+                {"matrix":[1,7], "x":8.9, "y":2.65},
+                {"matrix":[1,8], "x":9.9, "y":2.65},
+                {"matrix":[1,9], "x":10.9, "y":2.65},
+                {"matrix":[1,10], "x":11.9, "y":2.65},
+                {"matrix":[1,11], "x":13.5, "y":1.3},
+                {"matrix":[1,12], "x":14.5, "y":1.3},
+                {"matrix":[1,14], "x":17.3, "y":1.4},
+
+                {"matrix":[2,0], "x":0.25, "y":2.3, "w":1.75},
+                {"matrix":[2,1], "x":2, "y":2.3},
+                {"matrix":[2,2], "x":3.55, "y":1.85},
+                {"matrix":[2,3], "x":4.55, "y":1.85},
+                {"matrix":[2,4], "x":5.55, "y":1.85},
+                {"matrix":[2,5], "x":6.55, "y":1.85},
+                {"matrix":[2,7], "x":8.25, "y":3.65},
+                {"matrix":[2,8], "x":9.25, "y":3.65},
+                {"matrix":[2,9], "x":10.25, "y":3.65},
+                {"matrix":[2,10], "x":11.25, "y":3.65},
+                {"matrix":[2,11], "x":12.75, "y":2.3},
+                {"matrix":[2,12], "x":13.75, "y":2.3},
+                {"matrix":[2,13], "x":14.75, "y":2.3},
+                {"matrix":[1,13], "x":15.75, "y":1.3, "w":1.25, "h":2},
+                {"matrix":[2,14], "x":17.5, "y":2.4},
+
+                {"matrix":[3,0], "x":0, "y":3.3, "w":1.25},
+                {"matrix":[3,1], "x":1.25, "y":3.3},
+                {"matrix":[3,2], "x":2.25, "y":3.3},
+                {"matrix":[3,3], "x":3.9, "y":2.85},
+                {"matrix":[3,4], "x":4.9, "y":2.85},
+                {"matrix":[3,5], "x":5.9, "y":2.85},
+                {"matrix":[3,6], "x":6.9, "y":2.85},
+                {"matrix":[3,7], "x":7.8, "y":4.65},
+                {"matrix":[3,8], "x":8.8, "y":4.65},
+                {"matrix":[3,9], "x":9.8, "y":4.65},
+                {"matrix":[3,10], "x":10.8, "y":4.65},
+                {"matrix":[3,11], "x":11.8, "y":4.65},
+                {"matrix":[3,12], "x":13.4, "y":3.3},
+                {"matrix":[3,13], "x":14.4, "y":3.3, "w":1.75},
+                {"matrix":[3,14], "x":16.4, "y":3.55},
+
+                {"matrix":[4,0], "x":0, "y":4.3, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4.3, "w":1.25},
+                {"matrix":[4,2], "x":4, "y":3.85, "w":1.25},
+                {"matrix":[4,3], "x":5.25, "y":3.85, "w":2.25},
+                {"matrix":[4,6], "x":7.5, "y":3.85},
+                {"matrix":[4,7], "x":7.8, "y":5.65},
+                {"matrix":[4,8], "x":8.8, "y":5.65, "w":2.75},
+                {"matrix":[4,9], "x":11.55, "y":5.65},
+                {"matrix":[4,12], "x":15.4, "y":4.55},
+                {"matrix":[4,13], "x":16.4, "y":4.55},
+                {"matrix":[4,14], "x":17.4, "y":4.55}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":7,   "y":1},
+            {"matrix":[0, 1],  "flags":4, "x":20,  "y":1},
+            {"matrix":[0, 2],  "flags":4, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":4, "x":48,  "y":3},
+            {"matrix":[0, 4],  "flags":4, "x":61,  "y":6},
+            {"matrix":[0, 5],  "flags":4, "x":74,  "y":8},
+            {"matrix":[0, 6],  "flags":4, "x":87,  "y":11},
+            {"matrix":[0, 7],  "flags":4, "x":106, "y":11},
+            {"matrix":[0, 8],  "flags":4, "x":119, "y":8},
+            {"matrix":[0, 9],  "flags":4, "x":132, "y":6},
+            {"matrix":[0, 10], "flags":4, "x":145, "y":3},
+            {"matrix":[0, 11], "flags":4, "x":160, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":173, "y":1},
+            {"matrix":[0, 13], "flags":1, "x":193, "y":1},
+
+            {"matrix":[1, 0],  "flags":1, "x":7,   "y":14},
+            {"matrix":[1, 1],  "flags":8, "x":24,  "y":14},
+            {"matrix":[1, 2],  "flags":8, "x":39,  "y":14},
+            {"matrix":[1, 3],  "flags":8, "x":52,  "y":17},
+            {"matrix":[1, 4],  "flags":4, "x":65,  "y":20},
+            {"matrix":[1, 5],  "flags":4, "x":78,  "y":22},
+            {"matrix":[1, 6],  "flags":4, "x":103, "y":25},
+            {"matrix":[1, 7],  "flags":4, "x":116, "y":22},
+            {"matrix":[1, 8],  "flags":4, "x":129, "y":20},
+            {"matrix":[1, 9],  "flags":4, "x":142, "y":17},
+            {"matrix":[1, 10], "flags":4, "x":155, "y":14},
+            {"matrix":[1, 11], "flags":4, "x":172, "y":14},
+            {"matrix":[1, 12], "flags":4, "x":183, "y":14},
+            {"matrix":[1, 14], "flags":1, "x":222, "y":16},
+
+            {"matrix":[2, 0],  "flags":8, "x":6,   "y":27},
+            {"matrix":[2, 1],  "flags":4, "x":24,  "y":27},
+            {"matrix":[2, 2],  "flags":4, "x":39,  "y":28},
+            {"matrix":[2, 3],  "flags":4, "x":52,  "y":30},
+            {"matrix":[2, 4],  "flags":4, "x":65,  "y":33},
+            {"matrix":[2, 5],  "flags":4, "x":78,  "y":36},
+            {"matrix":[2, 7],  "flags":4, "x":109, "y":37},
+            {"matrix":[2, 8],  "flags":4, "x":122, "y":34},
+            {"matrix":[2, 9],  "flags":4, "x":135, "y":32},
+            {"matrix":[2, 10], "flags":4, "x":148, "y":29},
+            {"matrix":[2, 11], "flags":4, "x":162, "y":27},
+            {"matrix":[2, 12], "flags":4, "x":176, "y":27},
+            {"matrix":[2, 13], "flags":1, "x":189, "y":27},
+            {"matrix":[1, 13], "flags":1, "x":207, "y":22},
+            {"matrix":[2, 14], "flags":1, "x":224, "y":29},
+
+            {"matrix":[3, 0],  "flags":1, "x":0,   "y":40},
+            {"matrix":[3, 1],  "flags":1, "x":15,  "y":40},
+            {"matrix":[3, 2],  "flags":4, "x":28,  "y":40},
+            {"matrix":[3, 3],  "flags":4, "x":43,  "y":42},
+            {"matrix":[3, 4],  "flags":4, "x":56,  "y":44},
+            {"matrix":[3, 5],  "flags":4, "x":69,  "y":47},
+            {"matrix":[3, 6],  "flags":4, "x":82,  "y":50},
+            {"matrix":[3, 7],  "flags":4, "x":102, "y":52},
+            {"matrix":[3, 8],  "flags":4, "x":115, "y":49},
+            {"matrix":[3, 9],  "flags":4, "x":128, "y":46},
+            {"matrix":[3, 10], "flags":4, "x":141, "y":44},
+            {"matrix":[3, 11], "flags":4, "x":154, "y":41},
+            {"matrix":[3, 12], "flags":4, "x":169, "y":40},
+            {"matrix":[3, 13], "flags":1, "x":187, "y":40},
+            {"matrix":[3, 14], "flags":1, "x":209, "y":43},
+
+            {"matrix":[4, 0],  "flags":1, "x":0,   "y":53},
+            {"matrix":[4, 1],  "flags":1, "x":17,  "y":53},
+            {"matrix":[4, 2],  "flags":1, "x":42,  "y":55},
+            {"matrix":[4, 3],  "flags":4, "x":65,  "y":60},
+            {"matrix":[4, 6],  "flags":1, "x":86,  "y":64},
+            {"matrix":[4, 7],  "flags":1, "x":104, "y":64},
+            {"matrix":[4, 8],  "flags":4, "x":129, "y":59},
+            {"matrix":[4, 9],  "flags":1, "x":153, "y":54},
+            {"matrix":[4, 12], "flags":1, "x":196, "y":56},
+            {"matrix":[4, 13], "flags":1, "x":209, "y":56},
+            {"matrix":[4, 14], "flags":1, "x":222, "y":56}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q8_pro/iso_encoder/iso_encoder.c b/keyboards/keychron/q8_pro/iso_encoder/iso_encoder.c
new file mode 100755
index 0000000000..a00d479816
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/iso_encoder.c
@@ -0,0 +1,102 @@
+/* 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_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_14,   G_14,   H_14},
+    {0, I_15,   G_15,   H_15},
+
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_16,   D_16,   E_16},
+
+    {1, C_15,   A_15,   B_15},
+    {1, C_14,   A_14,   B_14},
+    {1, C_13,   A_13,   B_13},
+    {1, C_12,   A_12,   B_12},
+    {1, C_11,   A_11,   B_11},
+    {1, C_10,   A_10,   B_10},
+    {1, C_8,    A_8,    B_8},
+    {1, C_7,    A_7,    B_7},
+    {1, C_6,    A_6,    B_6},
+    {1, C_5,    A_5,    B_5},
+    {1, C_4,    A_4,    B_4},
+    {1, C_3,    A_3,    B_3},
+    {1, C_2,    A_2,    B_2},
+    {0, F_15,   D_15,   E_15},
+    {1, C_1,    A_1,    B_1},
+
+    {1, I_15,   G_15,   H_15},
+    {1, I_14,   G_14,   H_14},
+    {1, I_13,   G_13,   H_13},
+    {1, I_12,   G_12,   H_12},
+    {1, I_11,   G_11,   H_11},
+    {1, I_10,   G_10,   H_10},
+    {1, I_9,    G_9,    H_9},
+    {1, I_8,    G_8,    H_8},
+    {1, I_7,    G_7,    H_7},
+    {1, I_6,    G_6,    H_6},
+    {1, I_5,    G_5,    H_5},
+    {1, I_4,    G_4,    H_4},
+    {1, I_3,    G_3,    H_3},
+    {1, I_2,    G_2,    H_2},
+    {1, I_1,    G_1,    H_1},
+
+    {1, F_15,   D_15,   E_15},
+    {1, F_14,   D_14,   E_14},
+    {1, F_13,   D_13,   E_13},
+    {1, F_12,   D_12,   E_12},
+    {1, F_9,    D_9,    E_9},
+    {1, F_8,    D_8,    E_8},
+    {1, F_7,    D_7,    E_7},
+    {1, F_6,    D_6,    E_6},
+    {1, F_3,    D_3,    E_3},
+    {1, F_2,    D_2,    E_2},
+    {1, F_1,    D_1,    E_1}
+};
+#endif
diff --git a/keyboards/keychron/q8_pro/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q8_pro/iso_encoder/keymaps/default/keymap.c
new file mode 100755
index 0000000000..e5f73ff802
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+/* 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 QMK_KEYBOARD_H
+
+// clang-format off
+enum layers{
+  MAC_BASE,
+  WIN_BASE,
+  MAC_FN1,
+  WIN_FN1,
+  FN2,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_70_iso(
+        KC_ESC,  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_MUTE,
+        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_DEL,
+        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_NUHS, KC_ENT,   KC_HOME,
+        KC_LSFT, KC_NUBS,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,        KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LOPTN, KC_LCMMD,          KC_SPC,           MO(MAC_FN1), MO(FN2),           KC_SPC,            KC_RCMMD,           KC_LEFT, KC_DOWN,  KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_70_iso(
+        KC_ESC,  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_MUTE,
+        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_DEL,
+        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_NUHS, KC_ENT,   KC_HOME,
+        KC_LSFT, KC_NUBS,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,        KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,  KC_LALT,           KC_SPC,           MO(WIN_FN1), MO(FN2),           KC_SPC,            KC_RALT,            KC_LEFT, KC_DOWN,  KC_RGHT),
+
+    [MAC_FN1] = LAYOUT_70_iso(
+        KC_GRV,  KC_BRID,  KC_BRIU,  KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI,     KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,           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,     _______,  NK_TOGG, _______, _______,  _______,  _______,  _______, _______,
+        _______, _______,  _______,           _______,          _______,     _______,           _______,           _______,            _______, _______,  _______),
+
+    [WIN_FN1] = LAYOUT_70_iso(
+        KC_GRV,  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,
+        _______, 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,     _______,  NK_TOGG, _______, _______,  _______,  _______,  _______, _______,
+        _______, _______,  _______,           _______,          _______,     _______,           _______,           _______,            _______, _______,  _______),
+
+    [FN2] = LAYOUT_70_iso(
+        KC_TILD, KC_F1,    KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,           _______,
+        _______, _______,  _______,  _______, _______, _______, _______,     _______,  _______, _______, _______,  _______,  _______,                     _______,
+        _______, _______,  _______,  _______, _______, _______,              _______,  _______, _______, _______,  _______,  _______,  _______, _______,  _______,
+        _______, _______,  _______,  _______, _______, _______, BAT_LVL,     BAT_LVL,  _______, _______, _______,  _______,  _______,  _______, _______,
+        _______, _______,  _______,           _______,          _______,     _______,           _______,           _______,            _______, _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [FN2]      = {ENCODER_CCW_CW(_______, _______)},
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q8_pro/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q8_pro/iso_encoder/keymaps/default/rules.mk
new file mode 100755
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/keymap.c
new file mode 100755
index 0000000000..b797889321
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+/* 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 QMK_KEYBOARD_H
+
+// clang-format off
+enum layers{
+  MAC_BASE,
+  WIN_BASE,
+  MAC_FN1,
+  WIN_FN1,
+  FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [MAC_BASE] = LAYOUT_70_iso(
+        KC_ESC,  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_MUTE,
+        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_DEL,
+        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_NUHS, KC_ENT,   KC_HOME,
+        KC_LSFT, KC_NUBS,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,        KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LOPTN, KC_LCMMD,          KC_SPC,           MO(MAC_FN1), MO(FN2),           KC_SPC,            KC_RCMMD,           KC_LEFT, KC_DOWN,  KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_70_iso(
+        KC_ESC,  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_MUTE,
+        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_DEL,
+        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_NUHS, KC_ENT,   KC_HOME,
+        KC_LSFT, KC_NUBS,  KC_Z,     KC_X,    KC_C,    KC_V,    KC_B,        KC_B,     KC_N,    KC_M,    KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT, KC_UP,
+        KC_LCTL, KC_LWIN,  KC_LALT,           KC_SPC,           MO(WIN_FN1), MO(FN2),           KC_SPC,            KC_RALT,            KC_LEFT, KC_DOWN,  KC_RGHT),
+
+    [MAC_FN1] = LAYOUT_70_iso(
+        KC_GRV,  KC_BRID,  KC_BRIU,  KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI,     KC_MPRV,  KC_MPLY, KC_MNXT, KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,           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,     _______,  NK_TOGG, _______, _______,  _______,  _______,  _______, _______,
+        _______, _______,  _______,           _______,          _______,     _______,           _______,           _______,            _______, _______,  _______),
+
+    [WIN_FN1] = LAYOUT_70_iso(
+        KC_GRV,  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,
+        _______, 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,     _______,  NK_TOGG, _______, _______,  _______,  _______,  _______, _______,
+        _______, _______,  _______,           _______,          _______,     _______,           _______,           _______,            _______, _______,  _______),
+
+    [FN2] = LAYOUT_70_iso(
+        KC_TILD, KC_F1,    KC_F2,    KC_F3,   KC_F4,   KC_F5,   KC_F6,       KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,   KC_F12,   _______,           _______,
+        _______, _______,  _______,  _______, _______, _______, _______,     _______,  _______, _______, _______,  _______,  _______,                     _______,
+        _______, _______,  _______,  _______, _______, _______,              _______,  _______, _______, _______,  _______,  _______,  _______, _______,  _______,
+        _______, _______,  _______,  _______, _______, _______, BAT_LVL,     BAT_LVL,  _______, _______, _______,  _______,  _______,  _______, _______,
+        _______, _______,  _______,           _______,          _______,     _______,           _______,           _______,            _______, _______,  _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+    [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+    [MAC_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [WIN_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+    [FN2]      = {ENCODER_CCW_CW(_______, _______)},
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk
new file mode 100755
index 0000000000..b8562c8f4e
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5
diff --git a/keyboards/keychron/q8_pro/iso_encoder/rules.mk b/keyboards/keychron/q8_pro/iso_encoder/rules.mk
new file mode 100755
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/keychron/q8_pro/iso_encoder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/q8_pro/readme.md b/keyboards/keychron/q8_pro/readme.md
index 477d9223ff..f3ac8e65c7 100755
--- a/keyboards/keychron/q8_pro/readme.md
+++ b/keyboards/keychron/q8_pro/readme.md
@@ -11,10 +11,12 @@ A customizable 65% Alice keyboard.
 Make example for this keyboard (after setting up your build environment):
 
     make keychron/q8_pro/ansi_encoder:default
+    make keychron/q8_pro/iso_encoder:default
 
 Flashing example for this keyboard:
 
     make keychron/q8_pro/ansi_encoder:default:flash
+    make keychron/q8_pro/iso_encoder:default:flash
 
 **Reset Key**: Connect the USB cable, toggle mode switch to "Off", hold down the *Esc* key or reset button underneath space bar, then toggle then switch to "Cable".
 
diff --git a/keyboards/keychron/q8_pro/rules.mk b/keyboards/keychron/q8_pro/rules.mk
index 97c575dfd9..98cf5c564b 100755
--- a/keyboards/keychron/q8_pro/rules.mk
+++ b/keyboards/keychron/q8_pro/rules.mk
@@ -1,15 +1,8 @@
-# Build Options
-#   change yes to no to disable
-#
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 OPT_DEFS += -DKC_BLUETOOTH_ENABLE
 
-CUSTOM_MATRIX = lite
-
 SRC += matrix.c
 
 include keyboards/keychron/bluetooth/bluetooth.mk
-
-DEFAULT_FOLDER = keychron/q8_pro/ansi_encoder
diff --git a/keyboards/keychron/q8_pro/via_json/q8_pro_iso_encoder.json b/keyboards/keychron/q8_pro/via_json/q8_pro_iso_encoder.json
new file mode 100755
index 0000000000..cf390138d2
--- /dev/null
+++ b/keyboards/keychron/q8_pro/via_json/q8_pro_iso_encoder.json
@@ -0,0 +1,364 @@
+{
+  "name": "Keychron Q8 Pro ISO Knob",
+  "vendorId": "0x3434",
+  "productId": "0x0681",
+  "keycodes": ["qmk_lighting"],
+  "menus": [
+    {
+      "label": "Lighting",
+      "content": [
+        {
+          "label": "Backlight",
+          "content": [
+            {
+              "label": "Brightness",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+            },
+            {
+              "label": "Effect",
+              "type": "dropdown",
+              "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+              "options": [
+                ["None", 0],
+                ["Solid Color", 1],
+                ["Breathing", 2],
+                ["Band Spiral Val", 3],
+                ["Cycle All", 4],
+                ["Cycle Left Right", 5],
+                ["Cycle Up Down", 6],
+                ["Rainbow Moving Chevron", 7],
+                ["Cycle Out In", 8],
+                ["Cycle Out In Dual", 9],
+                ["Cycle Pinwheel", 10],
+                ["Cycle Spiral", 11],
+                ["Dual Beacon", 12],
+                ["Rainbow Beacon", 13],
+                ["Jellybean Raindrops", 14],
+                ["Pixel Rain", 15],
+                ["Typing Heatmap", 16],
+                ["Digital Rain", 17],
+                ["Reactive Simple", 18],
+                ["Reactive Multiwide", 19],
+                ["Reactive Multinexus", 20],
+                ["Splash", 21],
+                ["Solid Splash", 22]
+              ]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+              "label": "Effect Speed",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+              "label": "Color",
+              "type": "color",
+              "content": ["id_qmk_rgb_matrix_color", 3, 4]
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "customKeycodes": [
+    {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
+    {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
+    {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
+    {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
+    {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
+    {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
+    {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},
+    {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"},
+    {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"},
+    {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"},
+    {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"},
+    {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"},
+    {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"}
+  ],
+  "matrix": {"rows": 5, "cols": 15},
+  "layouts": {
+    "keymap": [
+      [
+        {
+          "x": 2.75
+        },
+        "0,2",
+        {
+          "x": 8.85
+        },
+        "0,11",
+        {
+          "x": 3.5,
+          "c": "#aaaaaa"
+        },
+        "0,14\n\n\n\n\n\n\n\n\ne0"
+      ],
+      [
+        {
+          "y": -0.85,
+          "x": 0.75,
+          "c": "#777777"
+        },
+        "0,0\nESC",
+        {
+          "c": "#cccccc"
+        },
+        "0,1"
+      ],
+      [
+        {
+          "y": -0.85,
+          "x": 13.6
+        },
+        "0,12",
+        {
+          "c": "#aaaaaa",
+          "w": 2
+        },
+        "0,13"
+      ],
+      [
+        {
+          "x": 0.5,
+          "w": 1.5
+        },
+        "1,0",
+        {
+          "c": "#cccccc"
+        },
+        "1,1",
+        {
+          "x": 10.5
+        },
+        "1,11"
+      ],
+      [
+        {
+          "y": -1,
+          "x": 14.5
+        },
+        "1,12",
+        {
+          "x": 0.25,
+          "c": "#777777",
+          "w": 1.25,
+          "h": 2,
+          "w2": 1.5,
+          "h2": 1,
+          "x2": -0.25
+        },
+        "1,13"
+      ],
+      [
+        {
+          "y": -0.9,
+          "x": 17.3,
+          "c": "#aaaaaa"
+        },
+        "1,14"
+      ],
+      [
+        {
+          "y": -0.1,
+          "x": 0.25,
+          "w": 1.75
+        },
+        "2,0",
+        {
+          "c": "#cccccc"
+        },
+        "2,1",
+        {
+          "x": 9.75
+        },
+        "2,11",
+        "2,12",
+        {
+          "c": "#aaaaaa"
+        },
+        "2,13"
+      ],
+      [
+        {
+          "y": -0.9,
+          "x": 17.5
+        },
+        "2,14"
+      ],
+      [
+        {
+          "y": -0.1,
+          "w": 1.25
+        },
+        "3,0",
+        "3,1",
+        {
+          "c": "#cccccc"
+        },
+        "3,2",
+        {
+          "x": 10.15
+        },
+        "3,12",
+        {
+          "c": "#aaaaaa",
+          "w": 1.75
+        },
+        "3,13"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 16.4,
+          "c": "#777777"
+        },
+        "3,14"
+      ],
+      [
+        {
+          "y": -0.25,
+          "c": "#aaaaaa",
+          "w": 1.25
+        },
+        "4,0",
+        {
+          "w": 1.25
+        },
+        "4,1"
+      ],
+      [
+        {
+          "y": -0.75,
+          "x": 15.4,
+          "c": "#777777"
+        },
+        "4,12",
+        "4,13",
+        "4,14"
+      ],
+      [
+        {
+          "r": 6,
+          "y": -5.7,
+          "x": 3.85,
+          "c": "#cccccc"
+        },
+        "0,3",
+        "0,4",
+        {
+          "c": "#aaaaaa"
+        },
+        "0,5",
+        "0,6"
+      ],
+      [
+        {
+          "x": 3.35,
+          "c": "#cccccc"
+        },
+        "1,2",
+        "1,3",
+        "1,4",
+        "1,5"
+      ],
+      [<