Add k7 pro iso version

17 files changed, 896 insertions, 10 deletions

diff --git a/keyboards/keychron/k7_pro/info.json b/keyboards/keychron/k7_pro/info.json
index 848b868163..ebf7e8e216 100644
--- a/keyboards/keychron/k7_pro/info.json
+++ b/keyboards/keychron/k7_pro/info.json
@@ -27,6 +27,9 @@
         "custom": true,
         "custom_lite": true
     },
+    "dynamic_keymap": {
+        "layer_count": 5
+    },
     "layouts": {
         "LAYOUT_ansi_68": {
             "layout": [
@@ -103,6 +106,83 @@
                 {"matrix":[4,14], "x":14, "y":5},
                 {"matrix":[4,15], "x":15, "y":5}
             ]
+        },
+        "LAYOUT_69_iso": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1, "y":0},
+                {"matrix":[0,2], "x":2, "y":0},
+                {"matrix":[0,3], "x":3, "y":0},
+                {"matrix":[0,4], "x":4, "y":0},
+                {"matrix":[0,5], "x":5, "y":0},
+                {"matrix":[0,6], "x":6, "y":0},
+                {"matrix":[0,7], "x":7, "y":0},
+                {"matrix":[0,8], "x":8, "y":0},
+                {"matrix":[0,9], "x":9, "y":0},
+                {"matrix":[0,10], "x":10, "y":0},
+                {"matrix":[0,11], "x":11, "y":0},
+                {"matrix":[0,12], "x":12, "y":0},
+                {"matrix":[0,13], "x":13, "y":0, "w":2},
+                {"matrix":[0,15], "x":15, "y":0},
+
+                {"matrix":[1,0], "x":0, "y":1, "w":1.5},
+                {"matrix":[1,1], "x":1.5, "y":1},
+                {"matrix":[1,2], "x":2.5, "y":1},
+                {"matrix":[1,3], "x":3.5, "y":1},
+                {"matrix":[1,4], "x":4.5, "y":1},
+                {"matrix":[1,5], "x":5.5, "y":1},
+                {"matrix":[1,6], "x":6.5, "y":1},
+                {"matrix":[1,7], "x":7.5, "y":1},
+                {"matrix":[1,8], "x":8.5, "y":1},
+                {"matrix":[1,9], "x":9.5, "y":1},
+                {"matrix":[1,10], "x":10.5, "y":1},
+                {"matrix":[1,11], "x":11.5, "y":1},
+                {"matrix":[1,12], "x":12.5, "y":1},
+                {"matrix":[1,15], "x":15, "y":1},
+
+                {"matrix":[2,0], "x":0, "y":2, "w":1.75},
+                {"matrix":[2,1], "x":1.75, "y":2},
+                {"matrix":[2,2], "x":2.75, "y":2},
+                {"matrix":[2,3], "x":3.75, "y":2},
+                {"matrix":[2,4], "x":4.75, "y":2},
+                {"matrix":[2,5], "x":5.75, "y":2},
+                {"matrix":[2,6], "x":6.75, "y":2},
+                {"matrix":[2,7], "x":7.75, "y":2},
+                {"matrix":[2,8], "x":8.75, "y":2},
+                {"matrix":[2,9], "x":9.75, "y":2},
+                {"matrix":[2,10], "x":10.75, "y":2},
+                {"matrix":[2,11], "x":11.75, "y":2},
+                {"matrix":[2,13], "x":12.75, "y":2},
+                {"matrix":[1,13], "x":13.75, "y":1, "w":1.25, "h":2},
+                {"matrix":[2,15], "x":15, "y":2},
+
+                {"matrix":[3,0], "x":0, "y":3, "w":1.25},
+                {"matrix":[3,1], "x":1.25, "y":3},
+                {"matrix":[3,2], "x":2.25, "y":3},
+                {"matrix":[3,3], "x":3.25, "y":3},
+                {"matrix":[3,4], "x":4.25, "y":3},
+                {"matrix":[3,5], "x":5.25, "y":3},
+                {"matrix":[3,6], "x":6.25, "y":3},
+                {"matrix":[3,7], "x":7.25, "y":3},
+                {"matrix":[3,8], "x":8.25, "y":3},
+                {"matrix":[3,9], "x":9.25, "y":3},
+                {"matrix":[3,10], "x":10.25, "y":3},
+                {"matrix":[3,11], "x":11.25, "y":3},
+                {"matrix":[3,13], "x":12.25, "y":3, "w":1.75},
+                {"matrix":[3,14], "x":14, "y":3},
+                {"matrix":[3,15], "x":15, "y":3},
+
+                {"matrix":[4,0], "x":0, "y":4, "w":1.25},
+                {"matrix":[4,1], "x":1.25, "y":4, "w":1.25},
+                {"matrix":[4,2], "x":2.5, "y":4, "w":1.25},
+                {"matrix":[4,6], "x":3.75, "y":4, "w":6.25},
+                {"matrix":[4,10], "x":10, "y":4},
+                {"matrix":[4,11], "x":11, "y":4},
+                {"matrix":[4,12], "x":12, "y":4},
+                {"matrix":[4,13], "x":13, "y":4},
+                {"matrix":[4,14], "x":14, "y":4},
+                {"matrix":[4,15], "x":15, "y":4}
+            ]
         }
     }
 }
diff --git a/keyboards/keychron/k7_pro/iso/rgb/config.h b/keyboards/keychron/k7_pro/iso/rgb/config.h
new file mode 100755
index 0000000000..d36d2ca123
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/rgb/config.h
@@ -0,0 +1,54 @@
+/* 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
+
+/* RGB Matrix Configuration */
+#    define RGB_MATRIX_LED_COUNT 69
+
+/* Set to infinit, which is use in USB mode by default
+ */
+#    define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+/* 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 48
+
+/* Indication led */
+#    define DIM_CAPS_LOCK
+#    define CAPS_LOCK_INDEX 29
+#    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_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+/* Use first 9 channels of LED driver */
+#    define PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* Set LED driver current */
+#    define CKLED2001_CURRENT_TUNE \
+        { 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18 }
+#endif
diff --git a/keyboards/keychron/k7_pro/iso/rgb/info.json b/keyboards/keychron/k7_pro/iso/rgb/info.json
new file mode 100755
index 0000000000..00029b7842
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/rgb/info.json
@@ -0,0 +1,110 @@
+{
+    "usb": {
+    	"pid": "0x0271",
+    	"device_version": "1.0.1"
+    },
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":4, "x":14,  "y":0},
+            {"matrix":[0, 2],  "flags":4, "x":29,  "y":0},
+            {"matrix":[0, 3],  "flags":4, "x":44,  "y":0},
+            {"matrix":[0, 4],  "flags":4, "x":59,  "y":0},
+            {"matrix":[0, 5],  "flags":4, "x":74,  "y":0},
+            {"matrix":[0, 6],  "flags":4, "x":89,  "y":0},
+            {"matrix":[0, 7],  "flags":4, "x":104, "y":0},
+            {"matrix":[0, 8],  "flags":4, "x":119, "y":0},
+            {"matrix":[0, 9],  "flags":4, "x":134, "y":0},
+            {"matrix":[0, 10], "flags":4, "x":149, "y":0},
+            {"matrix":[0, 11], "flags":4, "x":164, "y":0},
+            {"matrix":[0, 12], "flags":4, "x":179, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":201, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":3,   "y":16},
+            {"matrix":[1, 1],  "flags":4, "x":22,  "y":16},
+            {"matrix":[1, 2],  "flags":4, "x":37,  "y":16},
+            {"matrix":[1, 3],  "flags":4, "x":52,  "y":16},
+            {"matrix":[1, 4],  "flags":4, "x":67,  "y":16},
+            {"matrix":[1, 5],  "flags":4, "x":82,  "y":16},
+            {"matrix":[1, 6],  "flags":4, "x":97,  "y":16},
+            {"matrix":[1, 7],  "flags":4, "x":112, "y":16},
+            {"matrix":[1, 8],  "flags":4, "x":126, "y":16},
+            {"matrix":[1, 9],  "flags":4, "x":141, "y":16},
+            {"matrix":[1, 10], "flags":4, "x":156, "y":16},
+            {"matrix":[1, 11], "flags":4, "x":171, "y":16},
+            {"matrix":[1, 12], "flags":4, "x":186, "y":16},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":16},
+
+            {"matrix":[2, 0],  "flags":8, "x":5,   "y":32},
+            {"matrix":[2, 1],  "flags":4, "x":26,  "y":32},
+            {"matrix":[2, 2],  "flags":4, "x":41,  "y":32},
+            {"matrix":[2, 3],  "flags":4, "x":55,  "y":32},
+            {"matrix":[2, 4],  "flags":4, "x":70,  "y":32},
+            {"matrix":[2, 5],  "flags":4, "x":85,  "y":32},
+            {"matrix":[2, 6],  "flags":4, "x":100, "y":32},
+            {"matrix":[2, 7],  "flags":4, "x":115, "y":32},
+            {"matrix":[2, 8],  "flags":4, "x":130, "y":32},
+            {"matrix":[2, 9],  "flags":4, "x":145, "y":32},
+            {"matrix":[2, 10], "flags":4, "x":160, "y":32},
+            {"matrix":[2, 11], "flags":4, "x":175, "y":32},
+            {"matrix":[2, 13], "flags":4, "x":190, "y":32},
+            {"matrix":[1, 13], "flags":1, "x":207, "y":24},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":32},
+
+            {"matrix":[3, 0],  "flags":1, "x":9,   "y":48},
+            {"matrix":[3, 1],  "flags":4, "x":19,  "y":48},
+            {"matrix":[3, 2],  "flags":4, "x":33,  "y":48},
+            {"matrix":[3, 3],  "flags":4, "x":48,  "y":48},
+            {"matrix":[3, 4],  "flags":4, "x":63,  "y":48},
+            {"matrix":[3, 5],  "flags":4, "x":78,  "y":48},
+            {"matrix":[3, 6],  "flags":4, "x":93,  "y":48},
+            {"matrix":[3, 7],  "flags":4, "x":108, "y":48},
+            {"matrix":[3, 8],  "flags":4, "x":123, "y":48},
+            {"matrix":[3, 9],  "flags":4, "x":138, "y":48},
+            {"matrix":[3, 10], "flags":4, "x":153, "y":48},
+            {"matrix":[3, 11], "flags":4, "x":168, "y":48},
+            {"matrix":[3, 13], "flags":1, "x":188, "y":48},
+            {"matrix":[3, 14], "flags":1, "x":210, "y":48},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":48},
+
+            {"matrix":[4, 0],  "flags":1, "x":1,   "y":64},
+            {"matrix":[4, 1],  "flags":1, "x":20,  "y":64},
+            {"matrix":[4, 2],  "flags":1, "x":39,  "y":64},
+            {"matrix":[4, 6],  "flags":4, "x":95,  "y":64},
+            {"matrix":[4, 10], "flags":1, "x":149, "y":64},
+            {"matrix":[4, 11], "flags":4, "x":164, "y":64},
+            {"matrix":[4, 12], "flags":4, "x":179, "y":64},
+            {"matrix":[4, 13], "flags":1, "x":194, "y":64},
+            {"matrix":[4, 14], "flags":1, "x":210, "y":64},
+            {"matrix":[4, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/k7_pro/iso/rgb/keymaps/default/keymap.c b/keyboards/keychron/k7_pro/iso/rgb/keymaps/default/keymap.c
new file mode 100755
index 0000000000..5230c219e1
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/rgb/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* 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_69_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_DEL,
+        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_HOME,
+        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_PGUP,
+        KC_LSFT,  KC_NUBS,  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_PGDN,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_69_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_DEL,
+        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_HOME,
+        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_PGUP,
+        KC_LSFT,  KC_NUBS,  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_PGDN,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN1] = LAYOUT_69_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,  _______,            _______,
+        _______,  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_69_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,  _______,            _______,
+        _______,  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_69_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,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/k7_pro/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k7_pro/iso/rgb/keymaps/via/keymap.c
new file mode 100755
index 0000000000..67bb0a928f
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/rgb/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2021 @ 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_69_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_DEL,
+        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_HOME,
+        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_PGUP,
+        KC_LSFT,  KC_NUBS,  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_PGDN,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD,MO(MAC_FN1),MO(FN2), KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_BASE] = LAYOUT_69_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_DEL,
+        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_HOME,
+        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_PGUP,
+        KC_LSFT,  KC_NUBS,  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_PGDN,
+        KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                 KC_RALT, MO(WIN_FN1),MO(FN2), KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN1] = LAYOUT_69_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,  _______,            _______,
+        _______,  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_69_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,  _______,            _______,
+        _______,  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_69_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,  _______,  _______,  _______,  _______,  _______,            _______,  _______,  _______,
+        _______,  _______,  _______,                                _______,                                _______,  _______,  _______,  _______,  _______,  _______),
+};
diff --git a/keyboards/keychron/k7_pro/iso/rgb/keymaps/via/rules.mk b/keyboards/keychron/k7_pro/iso/rgb/keymaps/via/rules.mk
new file mode 100755
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/k7_pro/iso/rgb/rgb.c b/keyboards/keychron/k7_pro/iso/rgb/rgb.c
new file mode 100755
index 0000000000..bb4d6d5b72
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/rgb/rgb.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 IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_16,   D_16,   E_16},
+
+    {0, A_1,    C_1,    B_1},
+    {0, A_2,    C_2,    B_2},
+    {0, A_3,    C_3,    B_3},
+    {0, A_4,    C_4,    B_4},
+    {0, A_5,    C_5,    B_5},
+    {0, A_6,    C_6,    B_6},
+    {0, A_7,    C_7,    B_7},
+    {0, A_8,    C_8,    B_8},
+    {0, A_9,    C_9,    B_9},
+    {0, A_10,   C_10,   B_10},
+    {0, A_11,   C_11,   B_11},
+    {0, A_12,   C_12,   B_12},
+    {0, A_13,   C_13,   B_13},
+    {0, A_16,   C_16,   B_16},
+
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {0, A_14,   C_14,   B_14},
+    {1, I_16,   G_16,   H_16},
+
+    {1, C_1,    A_1,    B_1},
+    {1, C_2,    A_2,    B_2},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_5,    A_5,    B_5},
+    {1, C_6,    A_6,    B_6},
+    {1, C_7,    A_7,    B_7},
+    {1, C_8,    A_8,    B_8},
+    {1, C_9,    A_9,    B_9},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_14,   A_14,   B_14},
+    {1, C_15,   A_15,   B_15},
+    {1, C_16,   A_16,   B_16},
+
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_7,    D_7,    E_7},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+    {1, F_16,   D_16,   E_16},
+};
+#endif
diff --git a/keyboards/keychron/k7_pro/iso/rgb/rules.mk b/keyboards/keychron/k7_pro/iso/rgb/rules.mk
new file mode 100755
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/rgb/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/k7_pro/iso/white/config.h b/keyboards/keychron/k7_pro/iso/white/config.h
new file mode 100755
index 0000000000..a1dae494a4
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/white/config.h
@@ -0,0 +1,54 @@
+/* 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 LED_MATRIX_ENABLE
+/* LED matrix Driver Configuration */
+#    define DRIVER_COUNT 1
+#    define DRIVER_ADDR_1 0b1110100
+
+/* LED matrix Configuration */
+#    define LED_MATRIX_LED_COUNT 69
+
+/* Set to infinit, which is use in USB mode by default */
+#    define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE
+
+/* Allow shutdown of led driver to save power */
+#    define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE
+
+/* Turn off backlight on low brightness to save power */
+#    define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
+
+/* Indication led */
+#    define DIM_CAPS_LOCK
+#    define CAPS_LOCK_INDEX 29
+#    define LOW_BAT_IND_INDEX 62
+
+// LED Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
+// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES)
+#    define LED_MATRIX_KEYPRESSES
+#    define LED_MATRIX_KEYRELEASES
+
+/* Use first 6 channels of LED driver */
+#    define PHASE_CHANNEL MSKPHASE_5CHANNEL
+
+/* 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/k7_pro/iso/white/info.json b/keyboards/keychron/k7_pro/iso/white/info.json
new file mode 100755
index 0000000000..10315c2744
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/white/info.json
@@ -0,0 +1,105 @@
+{
+    "usb": {
+    	"pid": "0x0274",
+    	"device_version": "1.0.1"
+    },
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
+        },
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":4, "x":14,  "y":0},
+            {"matrix":[0, 2],  "flags":4, "x":29,  "y":0},
+            {"matrix":[0, 3],  "flags":4, "x":44,  "y":0},
+            {"matrix":[0, 4],  "flags":4, "x":59,  "y":0},
+            {"matrix":[0, 5],  "flags":4, "x":74,  "y":0},
+            {"matrix":[0, 6],  "flags":4, "x":89,  "y":0},
+            {"matrix":[0, 7],  "flags":4, "x":104, "y":0},
+            {"matrix":[0, 8],  "flags":4, "x":119, "y":0},
+            {"matrix":[0, 9],  "flags":4, "x":134, "y":0},
+            {"matrix":[0, 10], "flags":4, "x":149, "y":0},
+            {"matrix":[0, 11], "flags":4, "x":164, "y":0},
+            {"matrix":[0, 12], "flags":4, "x":179, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":201, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":3,   "y":16},
+            {"matrix":[1, 1],  "flags":4, "x":22,  "y":16},
+            {"matrix":[1, 2],  "flags":4, "x":37,  "y":16},
+            {"matrix":[1, 3],  "flags":4, "x":52,  "y":16},
+            {"matrix":[1, 4],  "flags":4, "x":67,  "y":16},
+            {"matrix":[1, 5],  "flags":4, "x":82,  "y":16},
+            {"matrix":[1, 6],  "flags":4, "x":97,  "y":16},
+            {"matrix":[1, 7],  "flags":4, "x":112, "y":16},
+            {"matrix":[1, 8],  "flags":4, "x":126, "y":16},
+            {"matrix":[1, 9],  "flags":4, "x":141, "y":16},
+            {"matrix":[1, 10], "flags":4, "x":156, "y":16},
+            {"matrix":[1, 11], "flags":4, "x":171, "y":16},
+            {"matrix":[1, 12], "flags":4, "x":186, "y":16},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":16},
+
+            {"matrix":[2, 0],  "flags":8, "x":5,   "y":32},
+            {"matrix":[2, 1],  "flags":4, "x":26,  "y":32},
+            {"matrix":[2, 2],  "flags":4, "x":41,  "y":32},
+            {"matrix":[2, 3],  "flags":4, "x":55,  "y":32},
+            {"matrix":[2, 4],  "flags":4, "x":70,  "y":32},
+            {"matrix":[2, 5],  "flags":4, "x":85,  "y":32},
+            {"matrix":[2, 6],  "flags":4, "x":100, "y":32},
+            {"matrix":[2, 7],  "flags":4, "x":115, "y":32},
+            {"matrix":[2, 8],  "flags":4, "x":130, "y":32},
+            {"matrix":[2, 9],  "flags":4, "x":145, "y":32},
+            {"matrix":[2, 10], "flags":4, "x":160, "y":32},
+            {"matrix":[2, 11], "flags":4, "x":175, "y":32},
+            {"matrix":[2, 13], "flags":4, "x":190, "y":32},
+            {"matrix":[1, 13], "flags":1, "x":207, "y":24},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":32},
+
+            {"matrix":[3, 0],  "flags":1, "x":9,   "y":48},
+            {"matrix":[3, 1],  "flags":4, "x":19,  "y":48},
+            {"matrix":[3, 2],  "flags":4, "x":33,  "y":48},
+            {"matrix":[3, 3],  "flags":4, "x":48,  "y":48},
+            {"matrix":[3, 4],  "flags":4, "x":63,  "y":48},
+            {"matrix":[3, 5],  "flags":4, "x":78,  "y":48},
+            {"matrix":[3, 6],  "flags":4, "x":93,  "y":48},
+            {"matrix":[3, 7],  "flags":4, "x":108, "y":48},
+            {"matrix":[3, 8],  "flags":4, "x":123, "y":48},
+            {"matrix":[3, 9],  "flags":4, "x":138, "y":48},
+            {"matrix":[3, 10], "flags":4, "x":153, "y":48},
+            {"matrix":[3, 11], "flags":4, "x":168, "y":48},
+            {"matrix":[3, 13], "flags":1, "x":188, "y":48},
+            {"matrix":[3, 14], "flags":1, "x":210, "y":48},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":48},
+
+            {"matrix":[4, 0],  "flags":1, "x":1,   "y":64},
+            {"matrix":[4, 1],  "flags":1, "x":20,  "y":64},
+            {"matrix":[4, 2],  "flags":1, "x":39,  "y":64},
+            {"matrix":[4, 6],  "flags":4, "x":95,  "y":64},
+            {"matrix":[4, 10], "flags":1, "x":149, "y":64},
+            {"matrix":[4, 11], "flags":4, "x":164, "y":64},
+            {"matrix":[4, 12], "flags":4, "x":179, "y":64},
+            {"matrix":[4, 13], "flags":1, "x":194, "y":64},
+            {"matrix":[4, 14], "flags":1, "x":210, "y":64},
+            {"matrix":[4, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/k7_pro/iso/white/keymaps/default/keymap.c b/keyboards/keychron/k7_pro/iso/white/keymaps/default/keymap.c
new file mode 100755
index 0000000000..a937521f45
--- /dev/null
+++ b/keyboards/keychron/k7_pro/iso/white/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* 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.