diff --git a/keyboards/keychron/q10_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q10_pro/ansi_encoder/ansi_encoder.c
new file mode 100644
index 0000000000..24632992fe
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,123 @@
+/* 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 .
+ */
+
+#include "quantum.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to snled27351manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, C_2, A_2, B_2}, // ESC
+ {0, C_3, A_3, B_3}, // F1
+ {0, C_4, A_4, B_4}, // F2
+ {0, C_5, A_5, B_5}, // F3
+ {0, C_6, A_6, B_6}, // F4
+ {0, C_7, A_7, B_7}, // F5
+ {0, C_8, A_8, B_8}, // F6
+ {0, C_9, A_9, B_9}, // F7
+ {0, C_10, A_10, B_10}, // F8
+ {0, C_11, A_11, B_11}, // F9
+ {0, C_12, A_12, B_12}, // F10
+ {0, C_13, A_13, B_13}, // F11
+ {0, C_14, A_14, B_14}, // F12
+ {0, C_15, A_15, B_15}, // INS
+ {0, C_16, A_16, B_16}, // DEL
+
+ {0, I_1, G_1, H_1}, // M1
+ {0, I_2, G_2, H_2}, // `~
+ {0, I_3, G_3, H_3}, // 1!
+ {0, I_4, G_4, H_4}, // 2@
+ {0, I_5, G_5, H_5}, // 3#
+ {0, I_6, G_6, H_6}, // 4$
+ {0, I_7, G_7, H_7}, // 5%
+ {0, I_8, G_8, H_8}, // 6^
+ {0, I_9, G_9, H_9}, // 7&
+ {0, I_10, G_10, H_10}, // 8*
+ {0, I_11, G_11, H_11}, // 9(
+ {0, I_12, G_12, H_12}, // 0)
+ {0, I_13, G_13, H_13}, // -_
+ {0, I_14, G_14, H_14}, // =+
+ {0, I_15, G_15, H_15}, // BackSpace
+ {0, I_16, G_16, H_16}, // PgUp
+
+ {0, F_1, D_1, E_1}, // M2
+ {0, F_2, D_2, E_2}, // TAB
+ {0, F_3, D_3, E_3}, // Q
+ {0, F_4, D_4, E_4}, // W
+ {0, F_5, D_5, E_5}, // E
+ {0, F_6, D_6, E_6}, // R
+ {0, F_7, D_7, E_7}, // T
+ {0, F_8, D_8, E_8}, // Y
+ {0, F_9, D_9, E_9}, // U
+ {0, F_10, D_10, E_10}, // I
+ {0, F_11, D_11, E_11}, // O
+ {0, F_12, D_12, E_12}, // P
+ {0, F_13, D_13, E_13}, // [
+ {0, F_14, D_14, E_14}, // ]
+ {0, F_15, D_15, E_15}, // |
+ {0, F_16, D_16, E_16}, // PgDn
+
+ {1, C_16, A_16, B_16}, // M3
+ {1, C_15, A_15, B_15}, // CapsLock
+ {1, C_14, A_14, B_14}, // A
+ {1, C_13, A_13, B_13}, // S
+ {1, C_12, A_12, B_12}, // D
+ {1, C_11, A_11, B_11}, // F
+ {1, C_10, A_10, B_10}, // G
+ {1, C_8, A_8, B_8}, // H
+ {1, C_7, A_7, B_7}, // J
+ {1, C_6, A_6, B_6}, // K
+ {1, C_5, A_5, B_5}, // L
+ {1, C_4, A_4, B_4}, // ;
+ {1, C_3, A_3, B_3}, // '
+ {1, C_2, A_2, B_2}, // Enter
+ {1, C_1, A_1, B_1}, // Home
+
+ {1, I_16, G_16, H_16}, // M4
+ {1, I_15, G_15, H_15}, // Shift_L
+ {1, I_13, G_13, H_13}, // Z
+ {1, I_12, G_12, H_12}, // X
+ {1, I_11, G_11, H_11}, // C
+ {1, I_10, G_10, H_10}, // V
+ {1, I_9, G_9, H_9}, // B
+ {1, I_8, G_8, H_8}, // B
+ {1, I_7, G_7, H_7}, // N
+ {1, I_6, G_6, H_6}, // M
+ {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}, // Shift_R
+ {1, I_1, G_1, H_1}, // Up
+
+ {1, F_16, D_16, E_16}, // M5
+ {1, F_15, D_15, E_15}, // Ctrl_L
+ {1, F_14, D_14, E_14}, // Win_L
+ {1, F_13, D_13, E_13}, // Alt_L
+ {1, F_12, D_12, E_12}, // Space
+ {1, F_9, D_9, E_9}, // Fn
+ {1, F_8, D_8, E_8}, // Space
+ {1, F_7, D_7, E_7}, // Alt_R
+ {1, F_6, D_6, E_6}, // Ctrl_R
+ {1, F_3, D_3, E_3}, // Left
+ {1, F_2, D_2, E_2}, // Down
+ {1, F_1, D_1, E_1}, // Right
+};
+#endif
diff --git a/keyboards/keychron/q10_pro/ansi_encoder/config.h b/keyboards/keychron/q10_pro/ansi_encoder/config.h
new file mode 100644
index 0000000000..27bf234b17
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/config.h
@@ -0,0 +1,59 @@
+/* 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 .
+ */
+
+#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 DRIVER_1_LED_TOTAL 47
+# define DRIVER_2_LED_TOTAL 42
+# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Increase I2C speed to 1000 KHz */
+# define I2C1_TIMINGR_PRESC 0U
+# define I2C1_TIMINGR_SCLDEL 3U
+# define I2C1_TIMINGR_SDADEL 0U
+# define I2C1_TIMINGR_SCLH 15U
+# define I2C1_TIMINGR_SCLL 51U
+
+/* Use the first 9 channels of led driver */
+# define PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* Set LED driver current */
+# define SNLED27351_CURRENT_TUNE \
+ { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
+
+/* 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 32
+
+/* Indication led */
+# define CAPS_LOCK_INDEX 48
+# define LOW_BAT_IND_INDEX 81
+
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
diff --git a/keyboards/keychron/q10_pro/ansi_encoder/info.json b/keyboards/keychron/q10_pro/ansi_encoder/info.json
new file mode 100644
index 0000000000..9d648d64f7
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/info.json
@@ -0,0 +1,205 @@
+{
+ "usb": {
+ "pid": "0x06A0",
+ "device_version": "1.0.1"
+ },
+ "layouts": {
+ "LAYOUT_90_ansi": {
+ "layout": [
+ {"matrix":[0,0], "x":0.5, "y":0},
+ {"matrix":[0,1], "x":2, "y":0},
+ {"matrix":[0,2], "x":3.25, "y":0},
+ {"matrix":[0,3], "x":4.25, "y":0},
+ {"matrix":[0,4], "x":5.4, "y":-0.55},
+ {"matrix":[0,5], "x":6.4, "y":-0.55},
+ {"matrix":[0,6], "x":7.65, "y":-0.55},
+ {"matrix":[0,7], "x":8.65, "y":-0.55},
+ {"matrix":[0,8], "x":10.05, "y":1.45},
+ {"matrix":[0,9], "x":11.05, "y":1.45},
+ {"matrix":[0,10], "x":12.3, "y":1.45},
+ {"matrix":[0,11], "x":13.3, "y":1.45},
+ {"matrix":[0,12], "x":14.6, "y":0},
+ {"matrix":[0,13], "x":15.6, "y":0},
+ {"matrix":[0,14], "x":17.05, "y":0},
+ {"matrix":[0,15], "x":18.5, "y":0},
+
+ {"matrix":[1,0], "x":0.75, "y":1.25},
+ {"matrix":[1,1], "x":2.25, "y":1.25},
+ {"matrix":[1,2], "x":3.25, "y":1.25},
+ {"matrix":[1,3], "x":4.25, "y":1.25},
+ {"matrix":[1,4], "x":5.55, "y":0.7},
+ {"matrix":[1,5], "x":6.55, "y":0.7},
+ {"matrix":[1,6], "x":7.55, "y":0.7},
+ {"matrix":[1,7], "x":8.55, "y":0.7},
+ {"matrix":[1,8], "x":9.4, "y":2.7},
+ {"matrix":[1,9], "x":10.4, "y":2.7},
+ {"matrix":[1,10], "x":11.4, "y":2.7},
+ {"matrix":[1,11], "x":12.4, "y":2.7},
+ {"matrix":[1,12], "x":13.9, "y":1.25},
+ {"matrix":[1,13], "x":14.9, "y":1.25},
+ {"matrix":[1,14], "x":15.9, "y":1.25, "w":2},
+ {"matrix":[1,15], "x":18.5, "y":1.25},
+
+ {"matrix":[2,0], "x":0.5, "y":2.25},
+ {"matrix":[2,1], "x":2, "y":2.25, "w":1.5},
+ {"matrix":[2,2], "x":3.5, "y":2.25},
+ {"matrix":[2,3], "x":4.9, "y":1.7},
+ {"matrix":[2,4], "x":5.9, "y":1.7},
+ {"matrix":[2,5], "x":6.9, "y":1.7},
+ {"matrix":[2,6], "x":7.9, "y":1.7},
+ {"matrix":[2,7], "x":8.9, "y":3.7},
+ {"matrix":[2,8], "x":9.9, "y":3.7},
+ {"matrix":[2,9], "x":10.9, "y":3.7},
+ {"matrix":[2,10], "x":11.9, "y":3.7},
+ {"matrix":[2,11], "x":12.9, "y":3.7},
+ {"matrix":[2,12], "x":14.4, "y":2.25},
+ {"matrix":[2,13], "x":15.4, "y":2.25},
+ {"matrix":[2,14], "x":16.4, "y":2.25, "w":1.75},
+ {"matrix":[2,15], "x":18.65, "y":2.25},
+
+ {"matrix":[3,0], "x":0.25, "y":3.25},
+ {"matrix":[3,1], "x":1.75, "y":3.25, "w":1.75},
+ {"matrix":[3,2], "x":3.5, "y":3.25},
+ {"matrix":[3,3], "x":5, "y":2.7},
+ {"matrix":[3,4], "x":6, "y":2.7},
+ {"matrix":[3,5], "x":7, "y":2.7},
+ {"matrix":[3,6], "x":8, "y":2.7},
+ {"matrix":[3,8], "x":9.4, "y":4.7},
+ {"matrix":[3,9], "x":10.4, "y":4.7},
+ {"matrix":[3,10], "x":11.4, "y":4.7},
+ {"matrix":[3,11], "x":12.4, "y":4.7},
+ {"matrix":[3,12], "x":14, "y":3.25},
+ {"matrix":[3,13], "x":15, "y":3.25},
+ {"matrix":[3,14], "x":16, "y":3.25, "w":2.25},
+ {"matrix":[3,15], "x":18.75, "y":3.25},
+
+ {"matrix":[4,0], "x":0, "y":4.25},
+ {"matrix":[4,1], "x":1.5, "y":4.25, "w":2.25},
+ {"matrix":[4,3], "x":3.75, "y":4.25},
+ {"matrix":[4,4], "x":5.35, "y":3.7},
+ {"matrix":[4,5], "x":6.35, "y":3.7},
+ {"matrix":[4,6], "x":7.35, "y":3.7},
+ {"matrix":[4,7], "x":8.35, "y":3.7},
+ {"matrix":[4,8], "x":8.85, "y":5.7},
+ {"matrix":[4,9], "x":9.85, "y":5.7},
+ {"matrix":[4,10], "x":10.85, "y":5.7},
+ {"matrix":[4,11], "x":11.85, "y":5.7},
+ {"matrix":[4,12], "x":12.85, "y":5.7},
+ {"matrix":[4,13], "x":14.5, "y":4.25},
+ {"matrix":[4,14], "x":15.5, "y":4.25, "w":1.75},
+ {"matrix":[4,15], "x":17.5, "y":4.5},
+
+ {"matrix":[5,0], "x":0, "y":5.25},
+ {"matrix":[5,1], "x":1.5, "y":5.25, "w":1.25},
+ {"matrix":[5,2], "x":2.75, "y":5.25, "w":1.25},
+ {"matrix":[5,3], "x":5.35, "y":4.7, "w":1.25},
+ {"matrix":[5,4], "x":6.6, "y":4.7, "w":2.25},
+ {"matrix":[5,7], "x":8.85, "y":4.7},
+ {"matrix":[5,8], "x":8.85, "y":6.7, "w":2.55},
+ {"matrix":[5,9], "x":11.4, "y":6.7},
+ {"matrix":[5,10], "x":12.4, "y":6.7},
+ {"matrix":[5,13], "x":16.5, "y":5.5},
+ {"matrix":[5,14], "x":17.5, "y":5.5},
+ {"matrix":[5,15], "x":18.5, "y":5.5}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "layout": [
+ {"matrix":[0, 1], "flags":1, "x":19, "y":0},
+ {"matrix":[0, 2], "flags":1, "x":34, "y":0},
+ {"matrix":[0, 3], "flags":1, "x":46, "y":0},
+ {"matrix":[0, 4], "flags":1, "x":60, "y":1},
+ {"matrix":[0, 5], "flags":1, "x":72, "y":3},
+ {"matrix":[0, 6], "flags":1, "x":87, "y":6},
+ {"matrix":[0, 7], "flags":1, "x":99, "y":8},
+ {"matrix":[0, 8], "flags":1, "x":120, "y":8},
+ {"matrix":[0, 9], "flags":1, "x":132, "y":6},
+ {"matrix":[0, 10], "flags":1, "x":147, "y":3},
+ {"matrix":[0, 11], "flags":1, "x":159, "y":1},
+ {"matrix":[0, 12], "flags":1, "x":173, "y":0},
+ {"matrix":[0, 13], "flags":1, "x":185, "y":0},
+ {"matrix":[0, 14], "flags":1, "x":203, "y":0},
+ {"matrix":[0, 15], "flags":1, "x":221, "y":0},
+
+ {"matrix":[1, 0], "flags":4, "x":5, "y":14},
+ {"matrix":[1, 1], "flags":4, "x":24, "y":14},
+ {"matrix":[1, 2], "flags":8, "x":36, "y":14},
+ {"matrix":[1, 3], "flags":8, "x":48, "y":13},
+ {"matrix":[1, 4], "flags":8, "x":62, "y":15},
+ {"matrix":[1, 5], "flags":4, "x":74, "y":17},
+ {"matrix":[1, 6], "flags":4, "x":86, "y":20},
+ {"matrix":[1, 7], "flags":4, "x":98, "y":22},
+ {"matrix":[1, 8], "flags":4, "x":115, "y":22},
+ {"matrix":[1, 9], "flags":4, "x":127, "y":20},
+ {"matrix":[1, 10], "flags":4, "x":139, "y":17},
+ {"matrix":[1, 11], "flags":4, "x":151, "y":15},
+ {"matrix":[1, 12], "flags":4, "x":165, "y":13},
+ {"matrix":[1, 13], "flags":4, "x":177, "y":14},
+ {"matrix":[1, 14], "flags":1, "x":195, "y":14},
+ {"matrix":[1, 15], "flags":1, "x":220, "y":13},
+
+ {"matrix":[2, 0], "flags":4, "x":4, "y":24},
+ {"matrix":[2, 1], "flags":1, "x":24, "y":24},
+ {"matrix":[2, 2], "flags":4, "x":40, "y":24},
+ {"matrix":[2, 3], "flags":4, "x":53, "y":24},
+ {"matrix":[2, 4], "flags":4, "x":65, "y":27},
+ {"matrix":[2, 5], "flags":4, "x":77, "y":29},
+ {"matrix":[2, 6], "flags":4, "x":89, "y":31},
+ {"matrix":[2, 7], "flags":4, "x":112, "y":33},
+ {"matrix":[2, 8], "flags":4, "x":124, "y":31},
+ {"matrix":[2, 9], "flags":4, "x":136, "y":29},
+ {"matrix":[2, 10], "flags":4, "x":148, "y":27},
+ {"matrix":[2, 11], "flags":4, "x":160, "y":24},
+ {"matrix":[2, 12], "flags":4, "x":174, "y":24},
+ {"matrix":[2, 13], "flags":4, "x":186, "y":24},
+ {"matrix":[2, 14], "flags":4, "x":201, "y":24},
+ {"matrix":[2, 15], "flags":1, "x":224, "y":24},
+
+ {"matrix":[3, 0], "flags":4, "x":2, "y":34},
+ {"matrix":[3, 1], "flags":8, "x":23, "y":34},
+ {"matrix":[3, 2], "flags":4, "x":40, "y":34},
+ {"matrix":[3, 3], "flags":4, "x":54, "y":35},
+ {"matrix":[3, 4], "flags":4, "x":66, "y":37},
+ {"matrix":[3, 5], "flags":4, "x":78, "y":39},
+ {"matrix":[3, 6], "flags":4, "x":90, "y":42},
+ {"matrix":[3, 8], "flags":4, "x":118, "y":43},
+ {"matrix":[3, 9], "flags":4, "x":130, "y":40},
+ {"matrix":[3, 10], "flags":4, "x":142, "y":38},
+ {"matrix":[3, 11], "flags":4, "x":154, "y":36},
+ {"matrix":[3, 12], "flags":4, "x":167, "y":35},
+ {"matrix":[3, 13], "flags":4, "x":179, "y":35},
+ {"matrix":[3, 14], "flags":1, "x":199, "y":35},
+ {"matrix":[3, 15], "flags":4, "x":224, "y":35},
+
+ {"matrix":[4, 0], "flags":4, "x":0, "y":45},
+ {"matrix":[4, 1], "flags":1, "x":24, "y":45},
+ {"matrix":[4, 3], "flags":4, "x":44, "y":45},
+ {"matrix":[4, 4], "flags":4, "x":57, "y":46},
+ {"matrix":[4, 5], "flags":4, "x":69, "y":48},
+ {"matrix":[4, 6], "flags":4, "x":81, "y":51},
+ {"matrix":[4, 7], "flags":4, "x":93, "y":53},
+ {"matrix":[4, 8], "flags":4, "x":111, "y":54},
+ {"matrix":[4, 9], "flags":4, "x":123, "y":52},
+ {"matrix":[4, 10], "flags":4, "x":135, "y":50},
+ {"matrix":[4, 11], "flags":4, "x":147, "y":48},
+ {"matrix":[4, 12], "flags":4, "x":159, "y":46},
+ {"matrix":[4, 13], "flags":4, "x":173, "y":45},
+ {"matrix":[4, 14], "flags":1, "x":190, "y":45},
+ {"matrix":[4, 15], "flags":1, "x":210, "y":47},
+
+ {"matrix":[5, 0], "flags":4, "x":0, "y":55},
+ {"matrix":[5, 1], "flags":1, "x":18, "y":55},
+ {"matrix":[5, 2], "flags":1, "x":33, "y":55},
+ {"matrix":[5, 3], "flags":1, "x":56, "y":57},
+ {"matrix":[5, 4], "flags":4, "x":77, "y":61},
+ {"matrix":[5, 7], "flags":1, "x":97, "y":64},
+ {"matrix":[5, 8], "flags":4, "x":124, "y":63},
+ {"matrix":[5, 9], "flags":1, "x":147, "y":59},
+ {"matrix":[5, 10], "flags":1, "x":159, "y":56},
+ {"matrix":[5, 13], "flags":1, "x":198, "y":58},
+ {"matrix":[5, 14], "flags":1, "x":210, "y":58},
+ {"matrix":[5, 15], "flags":1, "x":222, "y":58}
+ ]
+ }
+}
diff --git a/keyboards/keychron/q10_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..210b328351
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_90_ansi(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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_HOME,
+ MC_4, KC_LSFT, 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,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_90_ansi(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_90_ansi(
+ KC_MUTE, 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_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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_HOME,
+ MC_4, KC_LSFT, 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,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_90_ansi(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q10_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..e064b5ad95
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_90_ansi(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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_HOME,
+ MC_4, KC_LSFT, 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,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_90_ansi(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_90_ansi(
+ KC_MUTE, 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_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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_HOME,
+ MC_4, KC_LSFT, 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,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_90_ansi(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q10_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10_pro/ansi_encoder/rules.mk b/keyboards/keychron/q10_pro/ansi_encoder/rules.mk
new file mode 100644
index 0000000000..a77dc6c674
--- /dev/null
+++ b/keyboards/keychron/q10_pro/ansi_encoder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/q10_pro/config.h b/keyboards/keychron/q10_pro/config.h
new file mode 100644
index 0000000000..b3f295e738
--- /dev/null
+++ b/keyboards/keychron/q10_pro/config.h
@@ -0,0 +1,84 @@
+/* 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 .
+ */
+
+#pragma once
+
+/* Disable RGB lighting when PC is in suspend */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* DIP switch for Mac/win OS switch */
+#define DIP_SWITCH_PINS \
+ { A8 }
+
+/* Encoder Configuration */
+#ifdef ENCODER_ENABLE
+# define ENCODER_DEFAULT_POS 0x3
+#endif
+
+#ifdef KC_BLUETOOTH_ENABLE
+/* Hardware configuration */
+# define USB_BT_MODE_SELECT_PIN C15
+
+# define CKBT51_RESET_PIN A9
+# define CKBT51_INT_INPUT_PIN A5
+# define BLUETOOTH_INT_INPUT_PIN A6
+
+# define USB_POWER_SENSE_PIN B1
+# define USB_POWER_CONNECTED_LEVEL 0
+
+# define HOST_DEVICES_COUNT 3
+
+# if defined(RGB_MATRIX_ENABLE)
+
+# define LED_DRIVER_SHUTDOWN_PIN C14
+
+# define HOST_LED_MATRIX_LIST \
+ { 17, 18, 19 }
+
+# define BAT_LEVEL_LED_LIST \
+ { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
+
+/* Backlit disable timeout when keyboard is disconnected(unit: second) */
+# define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40
+
+/* Backlit disable timeout when keyboard is connected(unit: second) */
+# define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600
+# endif
+
+/* Keep USB connection in blueooth mode */
+# define KEEP_USB_CONNECTION_IN_BLUETOOTH_MODE
+
+/* Enable bluetooth NKRO */
+# define BLUETOOTH_NKRO_ENABLE
+
+/* Raw hid command for factory test and bluetooth DFU */
+# define RAW_HID_CMD 0xAA ... 0xAB
+#else
+/* Raw hid command for factory test */
+# define RAW_HID_CMD 0xAB
+#endif
+
+/* Emulated EEPROM configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
+/* HC595 Driver configuration */
+#define HC595_END_INDEX 15
+
+/* Factory test keys */
+#define FN_KEY1 MO(1)
+#define FN_KEY2 MO(3)
diff --git a/keyboards/keychron/q10_pro/halconf.h b/keyboards/keychron/q10_pro/halconf.h
new file mode 100644
index 0000000000..8d8e138e4e
--- /dev/null
+++ b/keyboards/keychron/q10_pro/halconf.h
@@ -0,0 +1,29 @@
+/* Copyright 2023 QMK
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define _CHIBIOS_HAL_CONF_VER_8_0_
+
+#define HAL_USE_I2C TRUE
+
+#ifdef KC_BLUETOOTH_ENABLE
+# define PAL_USE_CALLBACKS TRUE
+# define HAL_USE_SERIAL TRUE
+# define HAL_USE_RTC TRUE
+#endif
+
+#include_next
diff --git a/keyboards/keychron/q10_pro/info.json b/keyboards/keychron/q10_pro/info.json
new file mode 100644
index 0000000000..a92ea5b417
--- /dev/null
+++ b/keyboards/keychron/q10_pro/info.json
@@ -0,0 +1,64 @@
+{
+ "keyboard_name": "Keychron Q10 Pro",
+ "manufacturer": "Keychron",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "processor": "STM32L432",
+ "bootloader": "stm32-dfu",
+ "usb": {
+ "vid": "0x3434"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "dip_switch": true,
+ "encoder": true,
+ "raw": true
+ },
+ "rgb_matrix": {
+ "driver": "snled27351",
+ "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
+ }
+ },
+ "matrix_pins": {
+ "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+ "rows": ["B5", "B4", "B3", "A15", "A14", "A13"],
+ "custom": true,
+ "custom_lite": true
+ },
+ "diode_direction": "ROW2COL",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A0", "pin_b": "A10"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [0, 1]
+ }
+}
diff --git a/keyboards/keychron/q10_pro/iso_encoder/config.h b/keyboards/keychron/q10_pro/iso_encoder/config.h
new file mode 100644
index 0000000000..15522566c2
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/config.h
@@ -0,0 +1,59 @@
+/* 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 .
+ */
+
+#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 DRIVER_1_LED_TOTAL 47
+# define DRIVER_2_LED_TOTAL 43
+# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Increase I2C speed to 1000 KHz */
+# define I2C1_TIMINGR_PRESC 0U
+# define I2C1_TIMINGR_SCLDEL 3U
+# define I2C1_TIMINGR_SDADEL 0U
+# define I2C1_TIMINGR_SCLH 15U
+# define I2C1_TIMINGR_SCLL 51U
+
+/* Use the first 9 channels of led driver */
+# define PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* Set LED driver current */
+# define SNLED27351_CURRENT_TUNE \
+ { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
+
+/* 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 32
+
+/* Indication led */
+# define CAPS_LOCK_INDEX 47
+# define LOW_BAT_IND_INDEX 82
+
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
diff --git a/keyboards/keychron/q10_pro/iso_encoder/info.json b/keyboards/keychron/q10_pro/iso_encoder/info.json
new file mode 100644
index 0000000000..77025cf993
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/info.json
@@ -0,0 +1,207 @@
+{
+ "usb": {
+ "pid": "0x06A1",
+ "device_version": "1.0.1"
+ },
+ "layouts": {
+ "LAYOUT_91_iso": {
+ "layout": [
+ {"matrix":[0,0], "x":0.5, "y":0},
+ {"matrix":[0,1], "x":2, "y":0},
+ {"matrix":[0,2], "x":3.25, "y":0},
+ {"matrix":[0,3], "x":4.25, "y":0},
+ {"matrix":[0,4], "x":5.4, "y":-0.55},
+ {"matrix":[0,5], "x":6.4, "y":-0.55},
+ {"matrix":[0,6], "x":7.65, "y":-0.55},
+ {"matrix":[0,7], "x":8.65, "y":-0.55},
+ {"matrix":[0,8], "x":10.05, "y":1.45},
+ {"matrix":[0,9], "x":11.05, "y":1.45},
+ {"matrix":[0,10], "x":12.3, "y":1.45},
+ {"matrix":[0,11], "x":13.3, "y":1.45},
+ {"matrix":[0,12], "x":14.6, "y":0},
+ {"matrix":[0,13], "x":15.6, "y":0},
+ {"matrix":[0,14], "x":17.05, "y":0},
+ {"matrix":[0,15], "x":18.5, "y":0},
+
+ {"matrix":[1,0], "x":0.75, "y":1.25},
+ {"matrix":[1,1], "x":2.25, "y":1.25},
+ {"matrix":[1,2], "x":3.25, "y":1.25},
+ {"matrix":[1,3], "x":4.25, "y":1.25},
+ {"matrix":[1,4], "x":5.55, "y":0.7},
+ {"matrix":[1,5], "x":6.55, "y":0.7},
+ {"matrix":[1,6], "x":7.55, "y":0.7},
+ {"matrix":[1,7], "x":8.55, "y":0.7},
+ {"matrix":[1,8], "x":9.4, "y":2.7},
+ {"matrix":[1,9], "x":10.4, "y":2.7},
+ {"matrix":[1,10], "x":11.4, "y":2.7},
+ {"matrix":[1,11], "x":12.4, "y":2.7},
+ {"matrix":[1,12], "x":13.9, "y":1.25},
+ {"matrix":[1,13], "x":14.9, "y":1.25},
+ {"matrix":[1,14], "x":15.9, "y":1.25, "w":2},
+ {"matrix":[1,15], "x":18.5, "y":1.25},
+
+ {"matrix":[2,0], "x":0.5, "y":2.25},
+ {"matrix":[2,1], "x":2, "y":2.25, "w":1.5},
+ {"matrix":[2,2], "x":3.5, "y":2.25},
+ {"matrix":[2,3], "x":4.9, "y":1.7},
+ {"matrix":[2,4], "x":5.9, "y":1.7},
+ {"matrix":[2,5], "x":6.9, "y":1.7},
+ {"matrix":[2,6], "x":7.9, "y":1.7},
+ {"matrix":[2,7], "x":8.9, "y":3.7},
+ {"matrix":[2,8], "x":9.9, "y":3.7},
+ {"matrix":[2,9], "x":10.9, "y":3.7},
+ {"matrix":[2,10], "x":11.9, "y":3.7},
+ {"matrix":[2,11], "x":12.9, "y":3.7},
+ {"matrix":[2,12], "x":14.75, "y":2.25},
+ {"matrix":[2,13], "x":15.75, "y":2.25},
+ {"matrix":[2,15], "x":18.65, "y":2.25},
+
+ {"matrix":[3,0], "x":0.25, "y":3.25},
+ {"matrix":[3,1], "x":1.75, "y":3.25, "w":1.75},
+ {"matrix":[3,2], "x":3.5, "y":3.25},
+ {"matrix":[3,3], "x":5, "y":2.7},
+ {"matrix":[3,4], "x":6, "y":2.7},
+ {"matrix":[3,5], "x":7, "y":2.7},
+ {"matrix":[3,6], "x":8, "y":2.7},
+ {"matrix":[3,8], "x":9.4, "y":4.7},
+ {"matrix":[3,9], "x":10.4, "y":4.7},
+ {"matrix":[3,10], "x":11.4, "y":4.7},
+ {"matrix":[3,11], "x":12.4, "y":4.7},
+ {"matrix":[3,12], "x":14, "y":3.25},
+ {"matrix":[3,13], "x":15, "y":3.25},
+ {"matrix":[3,14], "x":16, "y":3.25},
+ {"matrix":[2,14], "x":17, "y":2.25, "w":1.25, "h":2},
+ {"matrix":[3,15], "x":18.75, "y":3.25},
+
+ {"matrix":[4,0], "x":0, "y":4.25},
+ {"matrix":[4,1], "x":1.5, "y":4.25, "w":1.25},
+ {"matrix":[4,2], "x":2.75, "y":4.25},
+ {"matrix":[4,3], "x":3.75, "y":4.25},
+ {"matrix":[4,4], "x":5.35, "y":3.7},
+ {"matrix":[4,5], "x":6.35, "y":3.7},
+ {"matrix":[4,6], "x":7.35, "y":3.7},
+ {"matrix":[4,7], "x":8.35, "y":3.7},
+ {"matrix":[4,8], "x":8.85, "y":5.7},
+ {"matrix":[4,9], "x":9.85, "y":5.7},
+ {"matrix":[4,10], "x":10.85, "y":5.7},
+ {"matrix":[4,11], "x":11.85, "y":5.7},
+ {"matrix":[4,12], "x":12.85, "y":5.7},
+ {"matrix":[4,13], "x":14.5, "y":4.25},
+ {"matrix":[4,14], "x":15.5, "y":4.25, "w":1.75},
+ {"matrix":[4,15], "x":17.5, "y":4.5},
+
+ {"matrix":[5,0], "x":0, "y":5.25},
+ {"matrix":[5,1], "x":1.5, "y":5.25, "w":1.25},
+ {"matrix":[5,2], "x":2.75, "y":5.25, "w":1.25},
+ {"matrix":[5,3], "x":5.35, "y":4.7, "w":1.25},
+ {"matrix":[5,4], "x":6.6, "y":4.7, "w":2.25},
+ {"matrix":[5,7], "x":8.85, "y":4.7},
+ {"matrix":[5,8], "x":8.85, "y":6.7, "w":2.55},
+ {"matrix":[5,9], "x":11.4, "y":6.7},
+ {"matrix":[5,10], "x":12.4, "y":6.7},
+ {"matrix":[5,13], "x":16.5, "y":5.5},
+ {"matrix":[5,14], "x":17.5, "y":5.5},
+ {"matrix":[5,15], "x":18.5, "y":5.5}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "layout": [
+ {"matrix":[0, 1], "flags":1, "x":19, "y":0},
+ {"matrix":[0, 2], "flags":1, "x":34, "y":0},
+ {"matrix":[0, 3], "flags":1, "x":46, "y":0},
+ {"matrix":[0, 4], "flags":1, "x":60, "y":1},
+ {"matrix":[0, 5], "flags":1, "x":72, "y":3},
+ {"matrix":[0, 6], "flags":1, "x":87, "y":6},
+ {"matrix":[0, 7], "flags":1, "x":99, "y":8},
+ {"matrix":[0, 8], "flags":1, "x":120, "y":8},
+ {"matrix":[0, 9], "flags":1, "x":132, "y":6},
+ {"matrix":[0, 10], "flags":1, "x":147, "y":3},
+ {"matrix":[0, 11], "flags":1, "x":159, "y":1},
+ {"matrix":[0, 12], "flags":1, "x":173, "y":0},
+ {"matrix":[0, 13], "flags":1, "x":185, "y":0},
+ {"matrix":[0, 14], "flags":1, "x":203, "y":0},
+ {"matrix":[0, 15], "flags":1, "x":221, "y":0},
+
+ {"matrix":[1, 0], "flags":4, "x":5, "y":14},
+ {"matrix":[1, 1], "flags":1, "x":24, "y":14},
+ {"matrix":[1, 2], "flags":8, "x":36, "y":14},
+ {"matrix":[1, 3], "flags":8, "x":48, "y":13},
+ {"matrix":[1, 4], "flags":8, "x":62, "y":15},
+ {"matrix":[1, 5], "flags":4, "x":74, "y":17},
+ {"matrix":[1, 6], "flags":4, "x":86, "y":20},
+ {"matrix":[1, 7], "flags":4, "x":98, "y":22},
+ {"matrix":[1, 8], "flags":4, "x":115, "y":22},
+ {"matrix":[1, 9], "flags":4, "x":127, "y":20},
+ {"matrix":[1, 10], "flags":4, "x":139, "y":17},
+ {"matrix":[1, 11], "flags":4, "x":151, "y":15},
+ {"matrix":[1, 12], "flags":4, "x":165, "y":13},
+ {"matrix":[1, 13], "flags":4, "x":177, "y":14},
+ {"matrix":[1, 14], "flags":1, "x":195, "y":14},
+ {"matrix":[1, 15], "flags":1, "x":220, "y":14},
+
+ {"matrix":[2, 0], "flags":4, "x":4, "y":24},
+ {"matrix":[2, 1], "flags":1, "x":24, "y":24},
+ {"matrix":[2, 2], "flags":4, "x":40, "y":24},
+ {"matrix":[2, 3], "flags":4, "x":54, "y":24},
+ {"matrix":[2, 4], "flags":4, "x":65, "y":27},
+ {"matrix":[2, 5], "flags":4, "x":77, "y":29},
+ {"matrix":[2, 6], "flags":4, "x":89, "y":31},
+ {"matrix":[2, 7], "flags":4, "x":112, "y":33},
+ {"matrix":[2, 8], "flags":4, "x":124, "y":31},
+ {"matrix":[2, 9], "flags":4, "x":136, "y":29},
+ {"matrix":[2, 10], "flags":4, "x":148, "y":27},
+ {"matrix":[2, 11], "flags":4, "x":160, "y":24},
+ {"matrix":[2, 12], "flags":4, "x":176, "y":24},
+ {"matrix":[2, 13], "flags":4, "x":189, "y":24},
+ {"matrix":[2, 15], "flags":1, "x":222, "y":24},
+
+ {"matrix":[3, 0], "flags":4, "x":2, "y":34},
+ {"matrix":[3, 1], "flags":8, "x":23, "y":34},
+ {"matrix":[3, 2], "flags":4, "x":40, "y":34},
+ {"matrix":[3, 3], "flags":4, "x":54, "y":35},
+ {"matrix":[3, 4], "flags":4, "x":66, "y":37},
+ {"matrix":[3, 5], "flags":4, "x":78, "y":39},
+ {"matrix":[3, 6], "flags":4, "x":90, "y":42},
+ {"matrix":[3, 8], "flags":4, "x":118, "y":43},
+ {"matrix":[3, 9], "flags":4, "x":130, "y":40},
+ {"matrix":[3, 10], "flags":4, "x":142, "y":38},
+ {"matrix":[3, 11], "flags":4, "x":154, "y":36},
+ {"matrix":[3, 12], "flags":4, "x":167, "y":35},
+ {"matrix":[3, 13], "flags":4, "x":180, "y":35},
+ {"matrix":[3, 14], "flags":1, "x":192, "y":35},
+ {"matrix":[2, 14], "flags":1, "x":208, "y":31},
+ {"matrix":[3, 15], "flags":1, "x":224, "y":35},
+
+ {"matrix":[4, 0], "flags":4, "x":0, "y":45},
+ {"matrix":[4, 1], "flags":1, "x":18, "y":45},
+ {"matrix":[4, 2], "flags":1, "x":31, "y":45},
+ {"matrix":[4, 3], "flags":4, "x":44, "y":45},
+ {"matrix":[4, 4], "flags":4, "x":57, "y":46},
+ {"matrix":[4, 5], "flags":4, "x":69, "y":48},
+ {"matrix":[4, 6], "flags":4, "x":81, "y":51},
+ {"matrix":[4, 7], "flags":4, "x":93, "y":53},
+ {"matrix":[4, 8], "flags":4, "x":111, "y":54},
+ {"matrix":[4, 9], "flags":4, "x":123, "y":52},
+ {"matrix":[4, 10], "flags":4, "x":135, "y":50},
+ {"matrix":[4, 11], "flags":4, "x":147, "y":48},
+ {"matrix":[4, 12], "flags":4, "x":159, "y":46},
+ {"matrix":[4, 13], "flags":4, "x":173, "y":45},
+ {"matrix":[4, 14], "flags":1, "x":190, "y":45},
+ {"matrix":[4, 15], "flags":1, "x":210, "y":47},
+
+ {"matrix":[5, 0], "flags":4, "x":0, "y":55},
+ {"matrix":[5, 1], "flags":1, "x":18, "y":55},
+ {"matrix":[5, 2], "flags":1, "x":33, "y":55},
+ {"matrix":[5, 3], "flags":1, "x":56, "y":57},
+ {"matrix":[5, 4], "flags":4, "x":77, "y":61},
+ {"matrix":[5, 7], "flags":1, "x":97, "y":64},
+ {"matrix":[5, 8], "flags":4, "x":124, "y":63},
+ {"matrix":[5, 9], "flags":1, "x":147, "y":59},
+ {"matrix":[5, 10], "flags":1, "x":159, "y":56},
+ {"matrix":[5, 13], "flags":1, "x":198, "y":58},
+ {"matrix":[5, 14], "flags":1, "x":210, "y":58},
+ {"matrix":[5, 15], "flags":1, "x":222, "y":58}
+ ]
+ }
+}
diff --git a/keyboards/keychron/q10_pro/iso_encoder/iso_encoder.c b/keyboards/keychron/q10_pro/iso_encoder/iso_encoder.c
new file mode 100644
index 0000000000..33236dc808
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/iso_encoder.c
@@ -0,0 +1,124 @@
+/* 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 .
+ */
+
+#include "quantum.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to snled27351manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, C_2, A_2, B_2}, // ESC
+ {0, C_3, A_3, B_3}, // F1
+ {0, C_4, A_4, B_4}, // F2
+ {0, C_5, A_5, B_5}, // F3
+ {0, C_6, A_6, B_6}, // F4
+ {0, C_7, A_7, B_7}, // F5
+ {0, C_8, A_8, B_8}, // F6
+ {0, C_9, A_9, B_9}, // F7
+ {0, C_10, A_10, B_10}, // F8
+ {0, C_11, A_11, B_11}, // F9
+ {0, C_12, A_12, B_12}, // F10
+ {0, C_13, A_13, B_13}, // F11
+ {0, C_14, A_14, B_14}, // F12
+ {0, C_15, A_15, B_15}, // INS
+ {0, C_16, A_16, B_16}, // DEL
+
+ {0, I_1, G_1, H_1}, // M1
+ {0, I_2, G_2, H_2}, // `~
+ {0, I_3, G_3, H_3}, // 1!
+ {0, I_4, G_4, H_4}, // 2@
+ {0, I_5, G_5, H_5}, // 3#
+ {0, I_6, G_6, H_6}, // 4$
+ {0, I_7, G_7, H_7}, // 5%
+ {0, I_8, G_8, H_8}, // 6^
+ {0, I_9, G_9, H_9}, // 7&
+ {0, I_10, G_10, H_10}, // 8*
+ {0, I_11, G_11, H_11}, // 9(
+ {0, I_12, G_12, H_12}, // 0)
+ {0, I_13, G_13, H_13}, // -_
+ {0, I_14, G_14, H_14}, // =+
+ {0, I_15, G_15, H_15}, // BackSpace
+ {0, I_16, G_16, H_16}, // PgUp
+
+ {0, F_1, D_1, E_1}, // M2
+ {0, F_2, D_2, E_2}, // TAB
+ {0, F_3, D_3, E_3}, // Q
+ {0, F_4, D_4, E_4}, // W
+ {0, F_5, D_5, E_5}, // E
+ {0, F_6, D_6, E_6}, // R
+ {0, F_7, D_7, E_7}, // T
+ {0, F_8, D_8, E_8}, // Y
+ {0, F_9, D_9, E_9}, // U
+ {0, F_10, D_10, E_10}, // I
+ {0, F_11, D_11, E_11}, // O
+ {0, F_12, D_12, E_12}, // P
+ {0, F_13, D_13, E_13}, // [
+ {0, F_14, D_14, E_14}, // ]
+ {0, F_16, D_16, E_16}, // PgDn
+
+ {1, C_16, A_16, B_16}, // M3
+ {1, C_15, A_15, B_15}, // CapsLock
+ {1, C_14, A_14, B_14}, // A
+ {1, C_13, A_13, B_13}, // S
+ {1, C_12, A_12, B_12}, // D
+ {1, C_11, A_11, B_11}, // F
+ {1, C_10, A_10, B_10}, // G
+ {1, C_8, A_8, B_8}, // H
+ {1, C_7, A_7, B_7}, // J
+ {1, C_6, A_6, B_6}, // K
+ {1, C_5, A_5, B_5}, // L
+ {1, C_4, A_4, B_4}, // ;
+ {1, C_3, A_3, B_3}, // '
+ {1, C_2, A_2, B_2}, // Enter
+ {0, F_15, D_15, E_15}, // |
+ {1, C_1, A_1, B_1}, // Home
+
+ {1, I_16, G_16, H_16}, // M4
+ {1, I_15, G_15, H_15}, // Shift_L
+ {1, I_14, G_14, H_14}, // KC_NUBS
+ {1, I_13, G_13, H_13}, // Z
+ {1, I_12, G_12, H_12}, // X
+ {1, I_11, G_11, H_11}, // C
+ {1, I_10, G_10, H_10}, // V
+ {1, I_9, G_9, H_9}, // B
+ {1, I_8, G_8, H_8}, // B
+ {1, I_7, G_7, H_7}, // N
+ {1, I_6, G_6, H_6}, // M
+ {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}, // Shift_R
+ {1, I_1, G_1, H_1}, // Up
+
+ {1, F_16, D_16, E_16}, // M5
+ {1, F_15, D_15, E_15}, // Ctrl_L
+ {1, F_14, D_14, E_14}, // Win_L
+ {1, F_13, D_13, E_13}, // Alt_L
+ {1, F_12, D_12, E_12}, // Space
+ {1, F_9, D_9, E_9}, // Fn
+ {1, F_8, D_8, E_8}, // Space
+ {1, F_7, D_7, E_7}, // Alt_R
+ {1, F_6, D_6, E_6}, // Ctrl_R
+ {1, F_3, D_3, E_3}, // Left
+ {1, F_2, D_2, E_2}, // Down
+ {1, F_1, D_1, E_1}, // Right
+};
+#endif
diff --git a/keyboards/keychron/q10_pro/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q10_pro/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..f1c40e162d
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_91_iso(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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,
+ MC_4, 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,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_91_iso(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_91_iso(
+ KC_MUTE, 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_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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,
+ MC_4, 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,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_91_iso(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q10_pro/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q10_pro/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10_pro/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10_pro/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..34302db075
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_91_iso(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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,
+ MC_4, 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,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_91_iso(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_91_iso(
+ KC_MUTE, 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_INS, KC_DEL,
+ MC_1, 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_PGUP,
+ MC_2, 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_PGDN,
+ MC_3, 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,
+ MC_4, 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,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_91_iso(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q10_pro/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q10_pro/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10_pro/iso_encoder/rules.mk b/keyboards/keychron/q10_pro/iso_encoder/rules.mk
new file mode 100644
index 0000000000..a77dc6c674
--- /dev/null
+++ b/keyboards/keychron/q10_pro/iso_encoder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/q10_pro/mcuconf.h b/keyboards/keychron/q10_pro/mcuconf.h
new file mode 100644
index 0000000000..882d6bd568
--- /dev/null
+++ b/keyboards/keychron/q10_pro/mcuconf.h
@@ -0,0 +1,36 @@
+/* Copyright 2023 QMK
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include_next
+
+/* Set HCLK to 48 MHz as tradeoff of USB lowest clockand and
+ * lower power comsumption for bluetooth. Will use dynamic
+ * clock when STM32L4 is supported in ChibiOS */
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 2
+
+#undef STM32_PLLN_VALUE
+#define STM32_PLLN_VALUE 12
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#ifdef KC_BLUETOOTH_ENABLE
+# undef STM32_SERIAL_USE_USART2
+# define STM32_SERIAL_USE_USART2 TRUE
+#endif
diff --git a/keyboards/keychron/q10_pro/q10_pro.c b/keyboards/keychron/q10_pro/q10_pro.c
new file mode 100644
index 0000000000..a9299c3969
--- /dev/null
+++ b/keyboards/keychron/q10_pro/q10_pro.c
@@ -0,0 +1,332 @@
+/* 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 .
+ */
+
+#include "q10_pro.h"
+#ifdef KC_BLUETOOTH_ENABLE
+# include "ckbt51.h"
+# include "bluetooth.h"
+# include "indicator.h"
+# include "transport.h"
+# include "battery.h"
+# include "bat_level_animation.h"
+# include "lpm.h"
+#endif
+
+#ifdef ENABLE_FACTORY_TEST
+# include "factory_test.h"
+#endif
+
+typedef struct PACKED {
+ uint8_t len;
+ uint8_t keycode[3];
+} key_combination_t;
+
+static uint32_t factory_timer_buffer = 0;
+static uint32_t siri_timer_buffer = 0;
+static uint8_t mac_keycode[4] = {KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD};
+
+key_combination_t key_comb_list[4] = {
+ {2, {KC_LWIN, KC_TAB}}, // Task (win)
+ {2, {KC_LWIN, KC_E}}, // Files (win)
+ {3, {KC_LSFT, KC_LGUI, KC_4}}, // Snapshot (mac)
+ {2, {KC_LWIN, KC_C}} // Cortana (win)
+};
+
+#ifdef KC_BLUETOOTH_ENABLE
+bool firstDisconnect = true;
+bool bt_factory_reset = false;
+static virtual_timer_t pairing_key_timer;
+extern uint8_t g_pwm_buffer[DRIVER_COUNT][192];
+
+static void pairing_key_timer_cb(void *arg) {
+ bluetooth_pairing_ex(*(uint8_t *)arg, NULL);
+}
+#endif
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+ if (index == 0) {
+#ifdef INVERT_OS_SWITCH_STATE
+ default_layer_set(1UL << (!active ? 2 : 0));
+#else
+ default_layer_set(1UL << (active ? 2 : 0));
+#endif
+ }
+ dip_switch_update_user(index, active);
+
+ return true;
+}
+
+#ifdef KC_BLUETOOTH_ENABLE
+bool process_record_kb_bt(uint16_t keycode, keyrecord_t *record) {
+#else
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+#endif
+ static uint8_t host_idx = 0;
+
+ switch (keycode) {
+ case KC_MICT:
+ if (record->event.pressed) {
+ register_code(KC_MISSION_CONTROL);
+ } else {
+ unregister_code(KC_MISSION_CONTROL);
+ }
+ return false; // Skip all further processing of this key
+ case KC_LAPA:
+ if (record->event.pressed) {
+ register_code(KC_LAUNCHPAD);
+ } else {
+ unregister_code(KC_LAUNCHPAD);
+ }
+ return false; // Skip all further processing of this key
+ case KC_LOPTN:
+ case KC_ROPTN:
+ case KC_LCMMD:
+ case KC_RCMMD:
+ if (record->event.pressed) {
+ register_code(mac_keycode[keycode - KC_LOPTN]);
+ } else {
+ unregister_code(mac_keycode[keycode - KC_LOPTN]);
+ }
+ return false; // Skip all further processing of this key)
+ case KC_TASK:
+ case KC_FILE:
+ case KC_SNAP:
+ case KC_CTANA:
+ if (record->event.pressed) {
+ for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++)
+ register_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+ } else {
+ for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++)
+ unregister_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+ }
+ return false; // Skip all further processing of this key
+ case KC_SIRI:
+ if (record->event.pressed && siri_timer_buffer == 0) {
+ register_code(KC_LGUI);
+ register_code(KC_SPACE);
+ siri_timer_buffer = sync_timer_read32() == 0 ? 1 : sync_timer_read32();
+ }
+ return false; // Skip all further processing of this key
+#ifdef KC_BLUETOOTH_ENABLE
+ case BT_HST1 ... BT_HST3:
+ if (get_transport() == TRANSPORT_BLUETOOTH) {
+ if (record->event.pressed) {
+ host_idx = keycode - BT_HST1 + 1;
+ chVTSet(&pairing_key_timer, TIME_MS2I(2000), (vtfunc_t)pairing_key_timer_cb, &host_idx);
+ bluetooth_connect_ex(host_idx, 0);
+ } else {
+ host_idx = 0;
+ chVTReset(&pairing_key_timer);
+ }
+ }
+ break;
+ case BAT_LVL:
+ if (get_transport() == TRANSPORT_BLUETOOTH && !usb_power_connected()) {
+ bat_level_animiation_start(battery_get_percentage());
+ }
+ break;
+#endif
+ default:
+#ifdef FACTORY_RESET_CHECK
+ FACTORY_RESET_CHECK(keycode, record);
+#endif
+ break;
+ }
+ return true;
+}
+
+#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE)
+static void encoder_pad_cb(void *param) {
+ encoder_inerrupt_read((uint32_t)param & 0XFF);
+}
+#endif
+
+void keyboard_post_init_kb(void) {
+ dip_switch_read(true);
+
+#ifdef KC_BLUETOOTH_ENABLE
+ /* Currently we don't use this reset pin */
+ palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+ palWriteLine(CKBT51_RESET_PIN, PAL_HIGH);
+
+ /* IMPORTANT: DO NOT enable internal pull-up resistor
+ * as there is an external pull-down resistor.
+ */
+ palSetLineMode(USB_BT_MODE_SELECT_PIN, PAL_MODE_INPUT);
+
+ ckbt51_init(false);
+ bluetooth_init();
+# ifdef ENCODER_ENABLE
+ pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A;
+ pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B;
+ for (uint32_t i = 0; i < NUM_ENCODERS; i++) {
+ palEnableLineEvent(encoders_pad_a[i], PAL_EVENT_MODE_BOTH_EDGES);
+ palEnableLineEvent(encoders_pad_b[i], PAL_EVENT_MODE_BOTH_EDGES);
+ palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i);
+ palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i);
+ }
+# endif
+#endif
+
+ keyboard_post_init_user();
+}
+
+void matrix_scan_kb(void) {
+ if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 2000) {
+ factory_timer_buffer = 0;
+ if (bt_factory_reset) {
+ bt_factory_reset = false;
+ palWriteLine(CKBT51_RESET_PIN, PAL_LOW);
+ wait_ms(5);
+ palWriteLine(CKBT51_RESET_PIN, PAL_HIGH);
+ }
+ }
+
+ if (siri_timer_buffer && sync_timer_elapsed32(siri_timer_buffer) > 500) {
+ siri_timer_buffer = 0;
+ unregister_code(KC_LGUI);
+ unregister_code(KC_SPACE);
+ }
+
+#ifdef FACTORY_RESET_TASK
+ FACTORY_RESET_TASK();
+#endif
+ matrix_scan_user();
+}
+
+#ifdef KC_BLUETOOTH_ENABLE
+static void ckbt51_param_init(void) {
+ /* Set bluetooth device name */
+ ckbt51_set_local_name(PRODUCT);
+ wait_ms(10);
+ /* Set bluetooth parameters */
+ module_param_t param = {.event_mode = 0x02,
+ .connected_idle_timeout = 7200,
+ .pairing_timeout = 180,
+ .pairing_mode = 0,
+ .reconnect_timeout = 5,
+ .report_rate = 90,
+ .vendor_id_source = 1,
+ .verndor_id = 0, // Must be 0x3434
+ .product_id = PRODUCT_ID};
+ ckbt51_set_param(¶m);
+ wait_ms(10);
+}
+
+void bluetooth_enter_disconnected_kb(uint8_t host_idx) {
+ if (bt_factory_reset) {
+ ckbt51_param_init();
+ factory_timer_buffer = timer_read32();
+ }
+ /* CKBT51 bluetooth module boot time is slower, it enters disconnected after boot,
+ so we place initialization here. */
+ if (firstDisconnect && sync_timer_read32() < 1000 && get_transport() == TRANSPORT_BLUETOOTH) {
+ ckbt51_param_init();
+ bluetooth_connect();
+ firstDisconnect = false;
+ }
+}
+
+void ckbt51_default_ack_handler(uint8_t *data, uint8_t len) {
+ if (data[1] == 0x45) {
+ module_param_t param = {.event_mode = 0x02,
+ .connected_idle_timeout = 7200,
+ .pairing_timeout = 180,
+ .pairing_mode = 0,
+ .reconnect_timeout = 5,
+ .report_rate = 90,
+ .vendor_id_source = 1,
+ .verndor_id = 0, // Must be 0x3434
+ .product_id = PRODUCT_ID};
+ ckbt51_set_param(¶m);
+ }
+}
+
+void bluetooth_pre_task(void) {
+ static uint8_t mode = 1;
+
+ if (readPin(USB_BT_MODE_SELECT_PIN) != mode) {
+ if (readPin(USB_BT_MODE_SELECT_PIN) != mode) {
+ mode = readPin(USB_BT_MODE_SELECT_PIN);
+ set_transport(mode == 0 ? TRANSPORT_BLUETOOTH : TRANSPORT_USB);
+ }
+ }
+}
+#endif
+
+void battery_calculte_voltage(uint16_t value) {
+ uint16_t voltage = ((uint32_t)value) * 2246 / 1000;
+
+#ifdef LED_MATRIX_ENABLE
+ if (led_matrix_is_enabled()) {
+ uint32_t totalBuf = 0;
+
+ for (uint8_t i = 0; i < DRIVER_COUNT; i++)
+ for (uint8_t j = 0; j < 192; j++)
+ totalBuf += g_pwm_buffer[i][j];
+ /* We assumpt it is linear relationship*/
+ voltage += (30 * totalBuf / LED_MATRIX_LED_COUNT / 255);
+ }
+#endif
+#ifdef RGB_MATRIX_ENABLE
+ if (rgb_matrix_is_enabled()) {
+ uint32_t totalBuf = 0;
+
+ for (uint8_t i = 0; i < DRIVER_COUNT; i++)
+ for (uint8_t j = 0; j < 192; j++)
+ totalBuf += g_pwm_buffer[i][j];
+ /* We assumpt it is linear relationship*/
+ uint32_t compensation = 60 * totalBuf / RGB_MATRIX_LED_COUNT / 255 / 3;
+ voltage += compensation;
+ }
+#endif
+ battery_set_voltage(voltage);
+}
+
+bool via_command_kb(uint8_t *data, uint8_t length) {
+ switch (data[0]) {
+#ifdef KC_BLUETOOTH_ENABLE
+ case 0xAA:
+ ckbt51_dfu_rx(data, length);
+ break;
+#endif
+#ifdef ENABLE_FACTORY_TEST
+ case 0xAB:
+ factory_test_rx(data, length);
+ break;
+#endif
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+#if !defined(VIA_ENABLE)
+void raw_hid_receive(uint8_t *data, uint8_t length) {
+ switch (data[0]) {
+ case RAW_HID_CMD:
+ via_command_kb(data, length);
+ break;
+ }
+}
+#endif
+
+void suspend_wakeup_init_kb(void) {
+ // code will run on keyboard wakeup
+ clear_keyboard();
+ send_keyboard_report();
+}
diff --git a/keyboards/keychron/q10_pro/q10_pro.h b/keyboards/keychron/q10_pro/q10_pro.h
new file mode 100644
index 0000000000..bc6e1effc8
--- /dev/null
+++ b/keyboards/keychron/q10_pro/q10_pro.h
@@ -0,0 +1,57 @@
+/* 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 .
+ */
+
+#pragma once
+
+#include "quantum.h"
+#ifdef VIA_ENABLE
+# include "via.h"
+#endif
+
+#define ___ KC_NO
+#define KC_MICT QK_KB_0
+#define KC_LAPA QK_KB_1
+
+#ifdef VIA_ENABLE
+# define USER_START QK_KB_2
+#else
+# define USER_START SAFE_RANGE
+#endif
+
+// clang-format off
+enum {
+ KC_LOPTN = USER_START,
+ KC_ROPTN,
+ KC_LCMMD,
+ KC_RCMMD,
+ KC_TASK,
+ KC_FILE,
+ KC_SNAP,
+ KC_CTANA,
+ KC_SIRI,
+#ifdef KC_BLUETOOTH_ENABLE
+ BT_HST1,
+ BT_HST2,
+ BT_HST3,
+ BAT_LVL,
+#else
+ BT_HST1 = KC_TRNS,
+ BT_HST2 = KC_TRNS,
+ BT_HST3 = KC_TRNS,
+ BAT_LVL = KC_TRNS,
+#endif
+ NEW_SAFE_RANGE
+};
diff --git a/keyboards/keychron/q10_pro/readme.md b/keyboards/keychron/q10_pro/readme.md
new file mode 100644
index 0000000000..6e974fa13f
--- /dev/null
+++ b/keyboards/keychron/q10_pro/readme.md
@@ -0,0 +1,23 @@
+# Keychron Q10
+
+
+
+A customizable 75% ergonomic keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q10 Pro
+* Hardware Availability: [Keychron Q10 Pro (Alice Layout) QMK/VIA Wireless Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-q10-pro-alice-layout-qmk-via-wireless-custom-mechanical-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make keychron/q10_pro/ansi_encoder:default
+ make keychron/q10_pro/iso_encoder:default
+
+Flashing example for this keyboard:
+
+ make keychron/q10_pro/ansi_encoder:default:flash
+ make keychron/q10_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".
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/keychron/q10_pro/rules.mk b/keyboards/keychron/q10_pro/rules.mk
new file mode 100644
index 0000000000..f995372f9c
--- /dev/null
+++ b/keyboards/keychron/q10_pro/rules.mk
@@ -0,0 +1,6 @@
+# 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
+
+include keyboards/keychron/bluetooth/bluetooth.mk
+include keyboards/keychron/common/common.mk
diff --git a/keyboards/keychron/q10_pro/via_json/q10_pro_ansi_encoder.json b/keyboards/keychron/q10_pro/via_json/q10_pro_ansi_encoder.json
new file mode 100644
index 0000000000..7191aaef0c
--- /dev/null
+++ b/keyboards/keychron/q10_pro/via_json/q10_pro_ansi_encoder.json
@@ -0,0 +1,395 @@
+{
+ "name": "Keychron Q10 Pro ANSI knob",
+ "vendorId": "0x3434",
+ "productId": "0x06A0",
+ "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": "Misson Control", "title": "Misson Control, availabe in macOS", "shortName": "MCtrl"},
+ {"name": "Launch pad", "title": "Launch pad, availabe in macOS", "shortName": "LPad"},
+ {"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": 6, "cols": 16},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "x": 0.5
+ },
+ "0,0\n\n\n\n\n\n\n\n\ne0",
+ {
+ "x": 0.5,
+ "c": "#777777"
+ },
+ "0,1\nESC",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,2",
+ "0,3",
+ {
+ "x": 9.35
+ },
+ "0,12",
+ "0,13",
+ {
+ "x": 0.45,
+ "c": "#aaaaaa"
+ },
+ "0,14",
+ {
+ "x": 0.45
+ },
+ "0,15"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 0.75
+ },
+ "1,0",
+ {
+ "x": 0.5
+ },
+ "1,1",
+ {
+ "c": "#cccccc"
+ },
+ "1,2",
+ "1,3",
+ {
+ "x": 8.65
+ },
+ "1,12",
+ "1,13",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "1,14",
+ {
+ "x": 0.6
+ },
+ "1,15"
+ ],
+ [
+ {
+ "x": 0.5
+ },
+ "2,0",
+ {
+ "x": 0.5,
+ "w": 1.5
+ },
+ "2,1",
+ {
+ "c": "#cccccc"
+ },
+ "2,2",
+ {
+ "x": 9.9
+ },
+ "2,12",
+ "2,13",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "2,14",
+ {
+ "x": 0.5
+ },
+ "2,15"
+ ],
+ [
+ {
+ "x": 0.25
+ },
+ "3,0",
+ {
+ "x": 0.5,
+ "w": 1.75
+ },
+ "3,1",
+ {
+ "c": "#cccccc"
+ },
+ "3,2",
+ {
+ "x": 9.5
+ },
+ "3,12",
+ "3,13",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "3,14",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa"
+ },
+ "3,15"
+ ],
+ [
+ "4,0",
+ {
+ "x": 0.5,
+ "w": 2.25
+ },
+ "4,1",
+ {
+ "c": "#cccccc"
+ },
+ "4,3",
+ {
+ "x": 9.75
+ },
+ "4,13",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "4,14"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 17.5,
+ "c": "#777777"
+ },
+ "4,15"
+ ],
+ [
+ {
+ "y": -0.25,
+ "c": "#aaaaaa"
+ },
+ "5,0",
+ {
+ "x": 0.5,
+ "w": 1.25
+ },
+ "5,1",
+ {
+ "w": 1.25
+ },
+ "5,2"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 16.5,
+ "c": "#777777"
+ },
+ "5,13",
+ "5,14",
+ "5,15"
+ ],
+ [
+ {
+ "r": 6,
+ "y": -7.05,
+ "x": 5.4,
+ "c": "#cccccc"
+ },
+ "0,4",
+ "0,5",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "0,6",
+ "0,7"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 5.55,
+ "c": "#cccccc"
+ },
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7"
+ ],
+ [
+ {
+ "x": 4.9
+ },
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6"
+ ],
+ [
+ {
+ "x": 5
+ },
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6"
+ ],
+ [
+ {
+ "x": 5.35
+ },
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7"
+ ],
+ [
+ {
+ "x": 5.35,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,3",
+ {
+ "w": 2.25
+ },
+ "5,4",
+ "5,7"
+ ],
+ [
+ {
+ "r": -6,
+ "y": -4.25,
+ "x": 10.05
+ },
+ "0,8",
+ "0,9",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,10",
+ "0,11"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 9.4
+ },
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11"
+ ],
+ [
+ {
+ "x": 8.9
+ },
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11"
+ ],
+ [
+ {
+ "x": 9.4
+ },
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11"
+ ],
+ [
+ {
+ "x": 8.85
+ },
+ "4,8",
+ "4,9",
+ "4,10",
+ "4,11",
+ "4,12"
+ ],
+ [
+ {
+ "x": 8.85,
+ "c": "#aaaaaa",
+ "w": 2.55
+ },
+ "5,8",
+ "5,9",
+ "5,10"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/keychron/q10_pro/via_json/q10_pro_iso_encoder.json b/keyboards/keychron/q10_pro/via_json/q10_pro_iso_encoder.json
new file mode 100644
index 0000000000..9ba844958b
--- /dev/null
+++ b/keyboards/keychron/q10_pro/via_json/q10_pro_iso_encoder.json
@@ -0,0 +1,399 @@
+{
+ "name": "Keychron Q10 Pro ISO knob",
+ "vendorId": "0x3434",
+ "productId": "0x06A1",
+ "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": "Misson Control", "title": "Misson Control, availabe in macOS", "shortName": "MCtrl"},
+ {"name": "Launch pad", "title": "Launch pad, availabe in macOS", "shortName": "LPad"},
+ {"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": 6, "cols": 16},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "x": 0.5
+ },
+ "0,0\n\n\n\n\n\n\n\n\ne0",
+ {
+ "x": 0.5,
+ "c": "#777777"
+ },
+ "0,1\nESC",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,2",
+ "0,3",
+ {
+ "x": 9.35
+ },
+ "0,12",
+ "0,13",
+ {
+ "x": 0.45,
+ "c": "#aaaaaa"
+ },
+ "0,14",
+ {
+ "x": 0.45
+ },
+ "0,15"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 0.75
+ },
+ "1,0",
+ {
+ "x": 0.5
+ },
+ "1,1",
+ {
+ "c": "#cccccc"
+ },
+ "1,2",
+ "1,3",
+ {
+ "x": 8.65
+ },
+ "1,12",
+ "1,13",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "1,14",
+ {
+ "x": 0.6
+ },
+ "1,15"
+ ],
+ [
+ {
+ "x": 0.5
+ },
+ "2,0",
+ {
+ "x": 0.5,
+ "w": 1.5
+ },
+ "2,1",
+ {
+ "c": "#cccccc"
+ },
+ "2,2",
+ {
+ "x": 10.25
+ },
+ "2,12",
+ "2,13",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa",
+ "w": 1.25,
+ "h": 2,
+ "w2": 1.5,
+ "h2": 1,
+ "x2": -0.25
+ },
+ "2,14",
+ {
+ "x": 0.4
+ },
+ "2,15"
+ ],
+ [
+ {
+ "x": 0.25
+ },
+ "3,0",
+ {
+ "x": 0.5,
+ "w": 1.75
+ },
+ "3,1",
+ {
+ "c": "#cccccc"
+ },
+ "3,2",
+ {
+ "x": 9.5
+ },
+ "3,12",
+ "3,13",
+ {
+ "c": "#aaaaaa"
+ },
+ "3,14",
+ {
+ "x": 1.75
+ },
+ "3,15"
+ ],
+ [
+ "4,0",
+ {
+ "x": 0.5,
+ "w": 1.25
+ },
+ "4,1",
+ "4,2",
+ {
+ "c": "#cccccc"
+ },
+ "4,3",
+ {
+ "x": 9.75
+ },
+ "4,13",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "4,14"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 17.5,
+ "c": "#777777"
+ },
+ "4,15"
+ ],
+ [
+ {
+ "y": -0.25,
+ "c": "#aaaaaa"
+ },
+ "5,0",
+ {
+ "x": 0.5,
+ "w": 1.25
+ },
+ "5,1",
+ {
+ "w": 1.25
+ },
+ "5,2"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 16.5,
+ "c": "#777777"
+ },
+ "5,13",
+ "5,14",
+ "5,15"
+ ],
+ [
+ {
+ "r": 6,
+ "y": -7.05,
+ "x": 5.4,
+ "c": "#cccccc"
+ },
+ "0,4",
+ "0,5",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "0,6",
+ "0,7"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 5.55,
+ "c": "#cccccc"
+ },
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7"
+ ],
+ [
+ {
+ "x": 4.9
+ },
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6"
+ ],
+ [
+ {
+ "x": 5
+ },
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6"
+ ],
+ [
+ {
+ "x": 5.35
+ },
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7"
+ ],
+ [
+ {
+ "x": 5.35,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,3",
+ {
+ "w": 2.25
+ },
+ "5,4",
+ "5,7"
+ ],
+ [
+ {
+ "r": -6,
+ "y": -4.25,
+ "x": 10.05
+ },
+ "0,8",
+ "0,9",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,10",
+ "0,11"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 9.4
+ },
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11"
+ ],
+ [
+ {
+ "x": 8.9
+ },
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11"
+ ],
+ [
+ {
+ "x": 9.4
+ },
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11"
+ ],
+ [
+ {
+ "x": 8.85
+ },
+ "4,8",
+ "4,9",
+ "4,10",
+ "4,11",
+ "4,12"
+ ],
+ [
+ {
+ "x": 8.85,
+ "c": "#aaaaaa",
+ "w": 2.55
+ },
+ "5,8",
+ "5,9",
+ "5,10"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q13_pro/ansi_encoder/ansi_encoder.c
new file mode 100644
index 0000000000..2c0474d5bb
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,140 @@
+/* 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 .
+ */
+
+#include "quantum.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to snled27351manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {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_14, C_14, B_14},
+ {0, A_15, C_15, B_15},
+ {0, A_16, C_16, B_16},
+ {0, L_16, J_16, K_16},
+ {0, L_15, J_15, K_15},
+ {0, L_14, J_14, K_14},
+
+ {0, G_1, I_1, H_1},
+ {0, G_2, I_2, H_2},
+ {0, G_3, I_3, H_3},
+ {0, G_4, I_4, H_4},
+ {0, G_5, I_5, H_5},
+ {0, G_6, I_6, H_6},
+ {0, G_7, I_7, H_7},
+ {0, G_8, I_8, H_8},
+ {0, G_9, I_9, H_9},
+ {0, G_10, I_10, H_10},
+ {0, G_11, I_11, H_11},
+ {0, G_12, I_12, H_12},
+ {0, G_13, I_13, H_13},
+ {0, G_14, I_14, H_14},
+ {0, G_15, I_15, H_15},
+ {0, G_16, I_16, H_16},
+ {0, L_13, J_13, K_13},
+ {0, L_12, J_12, K_12},
+ {0, L_11, J_11, K_11},
+
+ {0, D_1, F_1, E_1},
+ {0, D_2, F_2, E_2},
+ {0, D_3, F_3, E_3},
+ {0, D_4, F_4, E_4},
+ {0, D_5, F_5, E_5},
+ {0, D_6, F_6, E_6},
+ {0, D_7, F_7, E_7},
+ {0, D_8, F_8, E_8},
+ {0, D_9, F_9, E_9},
+ {0, D_10, F_10, E_10},
+ {0, D_11, F_11, E_11},
+ {0, D_12, F_12, E_12},
+ {0, D_13, F_13, E_13},
+ {0, D_14, F_14, E_14},
+ {0, D_15, F_15, E_15},
+ {0, D_16, F_16, E_16},
+ {0, L_10, J_10, K_10},
+ {0, L_9, J_9, K_9},
+ {0, L_8, J_8, K_8},
+
+ {1, A_16, C_16, B_16},
+ {1, A_15, C_15, B_15},
+ {1, A_14, C_14, B_14},
+ {1, A_13, C_13, B_13},
+ {1, A_12, C_12, B_12},
+ {1, A_11, C_11, B_11},
+ {1, A_10, C_10, B_10},
+ {1, A_8, C_8, B_8},
+ {1, A_7, C_7, B_7},
+ {1, A_6, C_6, B_6},
+ {1, A_5, C_5, B_5},
+ {1, A_4, C_4, B_4},
+ {1, A_3, C_3, B_3},
+ {1, A_2, C_2, B_2},
+ {1, A_1, C_1, B_1},
+ {1, L_1, J_1, K_1},
+ {1, L_2, J_2, K_2},
+
+ {1, G_16, I_16, H_16},
+ {1, G_15, I_15, H_15},
+ {1, G_13, I_13, H_13},
+ {1, G_12, I_12, H_12},
+ {1, G_11, I_11, H_11},
+ {1, G_10, I_10, H_10},
+ {1, G_9, I_9, H_9},
+ {1, G_8, I_8, H_8},
+ {1, G_7, I_7, H_7},
+ {1, G_6, I_6, H_6},
+ {1, G_5, I_5, H_5},
+ {1, G_4, I_4, H_4},
+ {1, G_3, I_3, H_3},
+ {1, G_2, I_2, H_2},
+ {1, G_1, I_1, H_1},
+ {1, L_3, J_3, K_3},
+ {1, L_4, J_4, K_4},
+ {1, L_5, J_5, K_5},
+ {1, L_8, J_8, K_8},
+
+ {1, D_16, F_16, E_16},
+ {1, D_15, F_15, E_15},
+ {1, D_14, F_14, E_14},
+ {1, D_13, F_13, E_13},
+ {1, D_12, F_12, E_12},
+ {1, D_9, F_9, E_9},
+ {1, D_8, F_8, E_8},
+ {1, D_7, F_7, E_7},
+ {1, D_6, F_6, E_6},
+ {1, D_3, F_3, E_3},
+ {1, D_2, F_2, E_2},
+ {1, D_1, F_1, E_1},
+ {1, L_6, J_6, K_6},
+ {1, L_7, J_7, K_7},
+};
+#endif
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/config.h b/keyboards/keychron/q13_pro/ansi_encoder/config.h
new file mode 100644
index 0000000000..fece5cd27c
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/config.h
@@ -0,0 +1,57 @@
+/* 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 .
+ */
+
+#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 DRIVER_1_LED_TOTAL 56
+# define DRIVER_2_LED_TOTAL 50
+# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Increase I2C speed to 1000 KHz */
+# define I2C1_TIMINGR_PRESC 0U
+# define I2C1_TIMINGR_SCLDEL 3U
+# define I2C1_TIMINGR_SDADEL 0U
+# define I2C1_TIMINGR_SCLH 15U
+# define I2C1_TIMINGR_SCLL 51U
+
+/* Set LED driver current */
+# define SNLED27351_CURRENT_TUNE \
+ { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
+
+/* 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 32
+
+/* Indication led */
+# define NUM_LOCK_INDEX 33
+# define CAPS_LOCK_INDEX 57
+# define LOW_BAT_IND_INDEX 96
+
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/info.json b/keyboards/keychron/q13_pro/ansi_encoder/info.json
new file mode 100644
index 0000000000..c9e8750881
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/info.json
@@ -0,0 +1,239 @@
+{
+ "usb": {
+ "pid": "0x06D0",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_107_ansi": {
+ "layout": [
+ {"matrix":[0,0], "x":0.5, "y":0},
+ {"matrix":[0,1], "x":2, "y":0},
+ {"matrix":[0,2], "x":3.25, "y":0},
+ {"matrix":[0,3], "x":4.25, "y":0},
+ {"matrix":[0,4], "x":5.4, "y":-0.55},
+ {"matrix":[0,5], "x":6.4, "y":-0.55},
+ {"matrix":[0,6], "x":7.65, "y":-0.55},
+ {"matrix":[0,7], "x":8.65, "y":-0.55},
+ {"matrix":[0,8], "x":10.05, "y":1.45},
+ {"matrix":[0,9], "x":11.05, "y":1.45},
+ {"matrix":[0,10], "x":12.3, "y":1.45},
+ {"matrix":[0,11], "x":13.3, "y":1.45},
+ {"matrix":[0,12], "x":14.6, "y":0},
+ {"matrix":[0,13], "x":15.6, "y":0},
+ {"matrix":[0,14], "x":17.05, "y":0},
+ {"matrix":[0,15], "x":18.75, "y":0},
+ {"matrix":[0,16], "x":19.75, "y":0},
+ {"matrix":[0,17], "x":20.75, "y":0},
+ {"matrix":[0,18], "x":21.75, "y":0},
+
+ {"matrix":[1,0], "x":0.75, "y":1.25},
+ {"matrix":[1,1], "x":2.25, "y":1.25},
+ {"matrix":[1,2], "x":3.25, "y":1.25},
+ {"matrix":[1,3], "x":4.25, "y":1.25},
+ {"matrix":[1,4], "x":5.55, "y":0.7},
+ {"matrix":[1,5], "x":6.55, "y":0.7},
+ {"matrix":[1,6], "x":7.55, "y":0.7},
+ {"matrix":[1,7], "x":8.55, "y":0.7},
+ {"matrix":[1,8], "x":9.4, "y":2.7},
+ {"matrix":[1,9], "x":10.4, "y":2.7},
+ {"matrix":[1,10], "x":11.4, "y":2.7},
+ {"matrix":[1,11], "x":12.4, "y":2.7},
+ {"matrix":[1,12], "x":13.9, "y":1.25},
+ {"matrix":[1,13], "x":14.9, "y":1.25},
+ {"matrix":[1,14], "x":15.9, "y":1.25, "w":2},
+ {"matrix":[1,15], "x":18.75, "y":1.25},
+ {"matrix":[1,16], "x":19.75, "y":1.25},
+ {"matrix":[1,17], "x":20.75, "y":1.25},
+ {"matrix":[1,18], "x":21.75, "y":1.25},
+
+ {"matrix":[2,0], "x":0.5, "y":2.25},
+ {"matrix":[2,1], "x":2, "y":2.25, "w":1.5},
+ {"matrix":[2,2], "x":3.5, "y":2.25},
+ {"matrix":[2,3], "x":4.9, "y":1.7},
+ {"matrix":[2,4], "x":5.9, "y":1.7},
+ {"matrix":[2,5], "x":6.9, "y":1.7},
+ {"matrix":[2,6], "x":7.9, "y":1.7},
+ {"matrix":[2,7], "x":8.9, "y":3.7},
+ {"matrix":[2,8], "x":9.9, "y":3.7},
+ {"matrix":[2,9], "x":10.9, "y":3.7},
+ {"matrix":[2,10], "x":11.9, "y":3.7},
+ {"matrix":[2,11], "x":12.9, "y":3.7},
+ {"matrix":[2,12], "x":14.4, "y":2.25},
+ {"matrix":[2,13], "x":15.4, "y":2.25},
+ {"matrix":[2,14], "x":16.4, "y":2.25, "w":1.75},
+ {"matrix":[2,15], "x":18.75, "y":2.25},
+ {"matrix":[2,16], "x":19.75, "y":2.25},
+ {"matrix":[2,17], "x":20.75, "y":2.25},
+ {"matrix":[2,18], "x":21.75, "y":2.25, "h":2},
+
+ {"matrix":[3,0], "x":0.25, "y":3.25},
+ {"matrix":[3,1], "x":1.75, "y":3.25, "w":1.75},
+ {"matrix":[3,2], "x":3.5, "y":3.25},
+ {"matrix":[3,3], "x":5, "y":2.7},
+ {"matrix":[3,4], "x":6, "y":2.7},
+ {"matrix":[3,5], "x":7, "y":2.7},
+ {"matrix":[3,6], "x":8, "y":2.7},
+ {"matrix":[3,8], "x":9.4, "y":4.7},
+ {"matrix":[3,9], "x":10.4, "y":4.7},
+ {"matrix":[3,10], "x":11.4, "y":4.7},
+ {"matrix":[3,11], "x":12.4, "y":4.7},
+ {"matrix":[3,12], "x":14, "y":3.25},
+ {"matrix":[3,13], "x":15, "y":3.25},
+ {"matrix":[3,14], "x":16, "y":3.25, "w":2.25},
+ {"matrix":[3,15], "x":18.75, "y":3.25},
+ {"matrix":[3,16], "x":19.75, "y":3.25},
+ {"matrix":[3,17], "x":20.75, "y":3.25},
+
+ {"matrix":[4,0], "x":0, "y":4.25},
+ {"matrix":[4,1], "x":1.5, "y":4.25, "w":2.25},
+ {"matrix":[4,3], "x":3.75, "y":4.25},
+ {"matrix":[4,4], "x":5.35, "y":3.7},
+ {"matrix":[4,5], "x":6.35, "y":3.7},
+ {"matrix":[4,6], "x":7.35, "y":3.7},
+ {"matrix":[4,7], "x":8.35, "y":3.7},
+ {"matrix":[4,8], "x":8.85, "y":5.7},
+ {"matrix":[4,9], "x":9.85, "y":5.7},
+ {"matrix":[4,10], "x":10.85, "y":5.7},
+ {"matrix":[4,11], "x":11.85, "y":5.7},
+ {"matrix":[4,12], "x":12.85, "y":5.7},
+ {"matrix":[4,13], "x":14.5, "y":4.25},
+ {"matrix":[4,14], "x":15.5, "y":4.25, "w":1.75},
+ {"matrix":[4,15], "x":17.5, "y":4.5},
+ {"matrix":[4,16], "x":18.75, "y":4.25},
+ {"matrix":[4,17], "x":19.75, "y":4.25},
+ {"matrix":[4,18], "x":20.75, "y":4.25},
+ {"matrix":[5,18], "x":21.75, "y":4.25, "h":2},
+
+ {"matrix":[5,0], "x":0, "y":5.25},
+ {"matrix":[5,1], "x":1.5, "y":5.25, "w":1.25},
+ {"matrix":[5,2], "x":2.75, "y":5.25, "w":1.25},
+ {"matrix":[5,3], "x":5.35, "y":4.7, "w":1.25},
+ {"matrix":[5,4], "x":6.6, "y":4.7, "w":2.25},
+ {"matrix":[5,7], "x":8.85, "y":4.7},
+ {"matrix":[5,8], "x":8.85, "y":6.7, "w":2.55},
+ {"matrix":[5,9], "x":11.4, "y":6.7},
+ {"matrix":[5,10], "x":12.4, "y":6.7},
+ {"matrix":[5,13], "x":16.5, "y":5.5},
+ {"matrix":[5,14], "x":17.5, "y":5.5},
+ {"matrix":[5,15], "x":18.5, "y":5.5},
+ {"matrix":[5,16], "x":19.75, "y":5.25},
+ {"matrix":[5,17], "x":20.75, "y":5.25}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "layout": [
+ {"matrix":[0, 1], "flags":4, "x":16, "y":0},
+ {"matrix":[0, 2], "flags":1, "x":29, "y":0},
+ {"matrix":[0, 3], "flags":1, "x":39, "y":0},
+ {"matrix":[0, 4], "flags":1, "x":51, "y":1},
+ {"matrix":[0, 5], "flags":1, "x":61, "y":3},
+ {"matrix":[0, 6], "flags":1, "x":74, "y":6},
+ {"matrix":[0, 7], "flags":1, "x":84, "y":8},
+ {"matrix":[0, 8], "flags":1, "x":103, "y":8},
+ {"matrix":[0, 9], "flags":1, "x":113, "y":6},
+ {"matrix":[0, 10], "flags":1, "x":125, "y":3},
+ {"matrix":[0, 11], "flags":1, "x":136, "y":1},
+ {"matrix":[0, 12], "flags":1, "x":148, "y":0},
+ {"matrix":[0, 13], "flags":1, "x":158, "y":0},
+ {"matrix":[0, 14], "flags":1, "x":175, "y":0},
+ {"matrix":[0, 15], "flags":4, "x":193, "y":0},
+ {"matrix":[0, 16], "flags":4, "x":203, "y":0},
+ {"matrix":[0, 17], "flags":4, "x":214, "y":0},
+ {"matrix":[0, 18], "flags":4, "x":224, "y":0},
+
+ {"matrix":[1, 0], "flags":4, "x":4, "y":14},
+ {"matrix":[1, 1], "flags":1, "x":20, "y":14},
+ {"matrix":[1, 2], "flags":8, "x":31, "y":14},
+ {"matrix":[1, 3], "flags":8, "x":41, "y":13},
+ {"matrix":[1, 4], "flags":8, "x":53, "y":15},
+ {"matrix":[1, 5], "flags":4, "x":63, "y":17},
+ {"matrix":[1, 6], "flags":4, "x":73, "y":20},
+ {"matrix":[1, 7], "flags":4, "x":84, "y":22},
+ {"matrix":[1, 8], "flags":4, "x":98, "y":22},
+ {"matrix":[1, 9], "flags":4, "x":109, "y":20},
+ {"matrix":[1, 10], "flags":4, "x":119, "y":17},
+ {"matrix":[1, 11], "flags":4, "x":129, "y":15},
+ {"matrix":[1, 12], "flags":4, "x":141, "y":13},
+ {"matrix":[1, 13], "flags":4, "x":151, "y":14},
+ {"matrix":[1, 14], "flags":1, "x":167, "y":14},
+ {"matrix":[1, 15], "flags":8, "x":193, "y":13},
+ {"matrix":[1, 16], "flags":4, "x":203, "y":13},
+ {"matrix":[1, 17], "flags":4, "x":214, "y":13},
+ {"matrix":[1, 18], "flags":4, "x":224, "y":13},
+
+ {"matrix":[2, 0], "flags":4, "x":3, "y":24},
+ {"matrix":[2, 1], "flags":1, "x":21, "y":24},
+ {"matrix":[2, 2], "flags":4, "x":34, "y":24},
+ {"matrix":[2, 3], "flags":4, "x":46, "y":24},
+ {"matrix":[2, 4], "flags":4, "x":56, "y":27},
+ {"matrix":[2, 5], "flags":4, "x":66, "y":29},
+ {"matrix":[2, 6], "flags":4, "x":76, "y":31},
+ {"matrix":[2, 7], "flags":4, "x":96, "y":33},
+ {"matrix":[2, 8], "flags":4, "x":106, "y":31},
+ {"matrix":[2, 9], "flags":4, "x":116, "y":29},
+ {"matrix":[2, 10], "flags":4, "x":127, "y":27},
+ {"matrix":[2, 11], "flags":4, "x":137, "y":24},
+ {"matrix":[2, 12], "flags":4, "x":148, "y":24},
+ {"matrix":[2, 13], "flags":4, "x":159, "y":24},
+ {"matrix":[2, 14], "flags":1, "x":172, "y":24},
+ {"matrix":[2, 15], "flags":4, "x":193, "y":24},
+ {"matrix":[2, 16], "flags":4, "x":203, "y":24},
+ {"matrix":[2, 17], "flags":4, "x":214, "y":24},
+ {"matrix":[2, 18], "flags":4, "x":224, "y":29},
+
+ {"matrix":[3, 0], "flags":4, "x":1, "y":34},
+ {"matrix":[3, 1], "flags":8, "x":20, "y":34},
+ {"matrix":[3, 2], "flags":4, "x":37, "y":34},
+ {"matrix":[3, 3], "flags":4, "x":46, "y":35},
+ {"matrix":[3, 4], "flags":4, "x":56, "y":37},
+ {"matrix":[3, 5], "flags":4, "x":66, "y":39},
+ {"matrix":[3, 6], "flags":4, "x":77, "y":42},
+ {"matrix":[3, 8], "flags":4, "x":100, "y":43},
+ {"matrix":[3, 9], "flags":4, "x":111, "y":40},
+ {"matrix":[3, 10], "flags":4, "x":121, "y":38},
+ {"matrix":[3, 11], "flags":4, "x":131, "y":36},
+ {"matrix":[3, 12], "flags":4, "x":143, "y":35},
+ {"matrix":[3, 13], "flags":4, "x":153, "y":35},
+ {"matrix":[3, 14], "flags":1, "x":170, "y":35},
+ {"matrix":[3, 15], "flags":4, "x":193, "y":35},
+ {"matrix":[3, 16], "flags":4, "x":203, "y":35},
+ {"matrix":[3, 17], "flags":4, "x":214, "y":35},
+
+ {"matrix":[4, 0], "flags":4, "x":0, "y":45},
+ {"matrix":[4, 1], "flags":1, "x":20, "y":45},
+ {"matrix":[4, 3], "flags":4, "x":37, "y":45},
+ {"matrix":[4, 4], "flags":4, "x":49, "y":46},
+ {"matrix":[4, 5], "flags":4, "x":59, "y":48},
+ {"matrix":[4, 6], "flags":4, "x":69, "y":51},
+ {"matrix":[4, 7], "flags":4, "x":80, "y":53},
+ {"matrix":[4, 8], "flags":4, "x":95, "y":54},
+ {"matrix":[4, 9], "flags":4, "x":105, "y":52},
+ {"matrix":[4, 10], "flags":4, "x":115, "y":50},
+ {"matrix":[4, 11], "flags":4, "x":126, "y":48},
+ {"matrix":[4, 12], "flags":4, "x":136, "y":46},
+ {"matrix":[4, 13], "flags":4, "x":148, "y":45},
+ {"matrix":[4, 14], "flags":1, "x":162, "y":45},
+ {"matrix":[4, 15], "flags":1, "x":179, "y":47},
+ {"matrix":[4, 16], "flags":4, "x":193, "y":45},
+ {"matrix":[4, 17], "flags":4, "x":203, "y":45},
+ {"matrix":[4, 18], "flags":4, "x":214, "y":45},
+ {"matrix":[5, 18], "flags":4, "x":224, "y":50},
+
+ {"matrix":[5, 0], "flags":4, "x":0, "y":55},
+ {"matrix":[5, 1], "flags":1, "x":15, "y":55},
+ {"matrix":[5, 2], "flags":1, "x":28, "y":55},
+ {"matrix":[5, 3], "flags":1, "x":48, "y":57},
+ {"matrix":[5, 4], "flags":4, "x":66, "y":61},
+ {"matrix":[5, 7], "flags":1, "x":83, "y":64},
+ {"matrix":[5, 8], "flags":4, "x":106, "y":63},
+ {"matrix":[5, 9], "flags":1, "x":125, "y":59},
+ {"matrix":[5, 10], "flags":1, "x":135, "y":56},
+ {"matrix":[5, 13], "flags":1, "x":169, "y":58},
+ {"matrix":[5, 14], "flags":1, "x":179, "y":58},
+ {"matrix":[5, 15], "flags":1, "x":190, "y":58},
+ {"matrix":[5, 16], "flags":4, "x":203, "y":58},
+ {"matrix":[5, 17], "flags":4, "x":214, "y":55}
+ ]
+ }
+}
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..56700e3bff
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_107_ansi(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_F13, KC_F14, KC_F15, KC_F16,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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,
+ MC_4, KC_LSFT, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [MAC_FN] = LAYOUT_107_ansi(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+
+ [WIN_BASE] = LAYOUT_107_ansi(
+ KC_MUTE, 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_DEL, _______, _______, _______, _______,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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,
+ MC_4, KC_LSFT, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [WIN_FN] = LAYOUT_107_ansi(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..186e111b62
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_107_ansi(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_F13, KC_F14, KC_F15, KC_F16,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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,
+ MC_4, KC_LSFT, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [MAC_FN] = LAYOUT_107_ansi(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+
+ [WIN_BASE] = LAYOUT_107_ansi(
+ KC_MUTE, 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_DEL, _______, _______, _______, _______,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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,
+ MC_4, KC_LSFT, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [WIN_FN] = LAYOUT_107_ansi(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q13_pro/ansi_encoder/rules.mk b/keyboards/keychron/q13_pro/ansi_encoder/rules.mk
new file mode 100644
index 0000000000..a77dc6c674
--- /dev/null
+++ b/keyboards/keychron/q13_pro/ansi_encoder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/q13_pro/config.h b/keyboards/keychron/q13_pro/config.h
new file mode 100644
index 0000000000..933e767b78
--- /dev/null
+++ b/keyboards/keychron/q13_pro/config.h
@@ -0,0 +1,85 @@
+/* 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 .
+ */
+
+#pragma once
+
+/* Disable RGB lighting when PC is in suspend */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* DIP switch for Mac/win OS switch */
+#define DIP_SWITCH_PINS \
+ { A8 }
+
+/* Encoder Configuration */
+#ifdef ENCODER_ENABLE
+# define ENCODER_DEFAULT_POS 0x3
+#endif
+
+#ifdef KC_BLUETOOTH_ENABLE
+/* Hardware configuration */
+# define USB_BT_MODE_SELECT_PIN C15
+
+# define CKBT51_RESET_PIN A9
+# define CKBT51_INT_INPUT_PIN A5
+# define BLUETOOTH_INT_INPUT_PIN A6
+
+# define USB_POWER_SENSE_PIN B1
+# define USB_POWER_CONNECTED_LEVEL 0
+
+# define HOST_DEVICES_COUNT 3
+
+# if defined(RGB_MATRIX_ENABLE)
+
+# define LED_DRIVER_SHUTDOWN_PIN C14
+
+# define HOST_LED_MATRIX_LIST \
+ { 20, 21, 22 }
+
+# define BAT_LEVEL_LED_LIST \
+ { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29 }
+
+/* Backlit disable timeout when keyboard is disconnected(unit: second) */
+# define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40
+
+/* Backlit disable timeout when keyboard is connected(unit: second) */
+# define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600
+# endif
+
+/* Keep USB connection in blueooth mode */
+# define KEEP_USB_CONNECTION_IN_BLUETOOTH_MODE
+
+/* Enable bluetooth NKRO */
+# define BLUETOOTH_NKRO_ENABLE
+
+/* Raw hid command for factory test and bluetooth DFU */
+# define RAW_HID_CMD 0xAA ... 0xAB
+#else
+/* Raw hid command for factory test */
+# define RAW_HID_CMD 0xAB
+#endif
+
+/* Emulated EEPROM configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
+/* HC595 Driver Configuration */
+#define HC595_END_INDEX 18
+
+/* Factory test keys */
+#define FN_KEY1 MO(1)
+#define FN_KEY2 MO(3)
+#define BL_TEST_KEY2 KC_DEL
diff --git a/keyboards/keychron/q13_pro/halconf.h b/keyboards/keychron/q13_pro/halconf.h
new file mode 100644
index 0000000000..8d8e138e4e
--- /dev/null
+++ b/keyboards/keychron/q13_pro/halconf.h
@@ -0,0 +1,29 @@
+/* Copyright 2023 QMK
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#define _CHIBIOS_HAL_CONF_VER_8_0_
+
+#define HAL_USE_I2C TRUE
+
+#ifdef KC_BLUETOOTH_ENABLE
+# define PAL_USE_CALLBACKS TRUE
+# define HAL_USE_SERIAL TRUE
+# define HAL_USE_RTC TRUE
+#endif
+
+#include_next
diff --git a/keyboards/keychron/q13_pro/info.json b/keyboards/keychron/q13_pro/info.json
new file mode 100644
index 0000000000..659d109bc5
--- /dev/null
+++ b/keyboards/keychron/q13_pro/info.json
@@ -0,0 +1,64 @@
+{
+ "keyboard_name": "Keychron Q13 Pro",
+ "manufacturer": "Keychron",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "processor": "STM32L432",
+ "bootloader": "stm32-dfu",
+ "usb": {
+ "vid": "0x3434"
+ },
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "dip_switch": true,
+ "encoder": true,
+ "raw": true
+ },
+ "rgb_matrix": {
+ "driver": "snled27351",
+ "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
+ }
+ },
+ "matrix_pins": {
+ "cols": [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"],
+ "custom": true,
+ "custom_lite": true
+ },
+ "diode_direction": "ROW2COL",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A0", "pin_b": "A10"}
+ ]
+ },
+ "bootmagic": {
+ "matrix": [0, 1]
+ }
+}
diff --git a/keyboards/keychron/q13_pro/iso_encoder/config.h b/keyboards/keychron/q13_pro/iso_encoder/config.h
new file mode 100644
index 0000000000..ad53e4d05a
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/config.h
@@ -0,0 +1,57 @@
+/* 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 .
+ */
+
+#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 DRIVER_1_LED_TOTAL 56
+# define DRIVER_2_LED_TOTAL 51
+# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Increase I2C speed to 1000 KHz */
+# define I2C1_TIMINGR_PRESC 0U
+# define I2C1_TIMINGR_SCLDEL 3U
+# define I2C1_TIMINGR_SDADEL 0U
+# define I2C1_TIMINGR_SCLH 15U
+# define I2C1_TIMINGR_SCLL 51U
+
+/* Set LED driver current */
+# define SNLED27351_CURRENT_TUNE \
+ { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
+
+/* 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 32
+
+/* Indication led */
+# define NUM_LOCK_INDEX 33
+# define CAPS_LOCK_INDEX 56
+# define LOW_BAT_IND_INDEX 97
+
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#endif
diff --git a/keyboards/keychron/q13_pro/iso_encoder/info.json b/keyboards/keychron/q13_pro/iso_encoder/info.json
new file mode 100644
index 0000000000..9995507a18
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/info.json
@@ -0,0 +1,241 @@
+{
+ "usb": {
+ "pid": "0x06D1",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_108_iso": {
+ "layout": [
+ {"matrix":[0,0], "x":0.5, "y":0},
+ {"matrix":[0,1], "x":2, "y":0},
+ {"matrix":[0,2], "x":3.25, "y":0},
+ {"matrix":[0,3], "x":4.25, "y":0},
+ {"matrix":[0,4], "x":5.4, "y":-0.55},
+ {"matrix":[0,5], "x":6.4, "y":-0.55},
+ {"matrix":[0,6], "x":7.65, "y":-0.55},
+ {"matrix":[0,7], "x":8.65, "y":-0.55},
+ {"matrix":[0,8], "x":10.05, "y":1.45},
+ {"matrix":[0,9], "x":11.05, "y":1.45},
+ {"matrix":[0,10], "x":12.3, "y":1.45},
+ {"matrix":[0,11], "x":13.3, "y":1.45},
+ {"matrix":[0,12], "x":14.6, "y":0},
+ {"matrix":[0,13], "x":15.6, "y":0},
+ {"matrix":[0,14], "x":17.05, "y":0},
+ {"matrix":[0,15], "x":18.75, "y":0},
+ {"matrix":[0,16], "x":19.75, "y":0},
+ {"matrix":[0,17], "x":20.75, "y":0},
+ {"matrix":[0,18], "x":21.75, "y":0},
+
+ {"matrix":[1,0], "x":0.75, "y":1.25},
+ {"matrix":[1,1], "x":2.25, "y":1.25},
+ {"matrix":[1,2], "x":3.25, "y":1.25},
+ {"matrix":[1,3], "x":4.25, "y":1.25},
+ {"matrix":[1,4], "x":5.55, "y":0.7},
+ {"matrix":[1,5], "x":6.55, "y":0.7},
+ {"matrix":[1,6], "x":7.55, "y":0.7},
+ {"matrix":[1,7], "x":8.55, "y":0.7},
+ {"matrix":[1,8], "x":9.4, "y":2.7},
+ {"matrix":[1,9], "x":10.4, "y":2.7},
+ {"matrix":[1,10], "x":11.4, "y":2.7},
+ {"matrix":[1,11], "x":12.4, "y":2.7},
+ {"matrix":[1,12], "x":13.9, "y":1.25},
+ {"matrix":[1,13], "x":14.9, "y":1.25},
+ {"matrix":[1,14], "x":15.9, "y":1.25, "w":2},
+ {"matrix":[1,15], "x":18.75, "y":1.25},
+ {"matrix":[1,16], "x":19.75, "y":1.25},
+ {"matrix":[1,17], "x":20.75, "y":1.25},
+ {"matrix":[1,18], "x":21.75, "y":1.25},
+
+ {"matrix":[2,0], "x":0.5, "y":2.25},
+ {"matrix":[2,1], "x":2, "y":2.25, "w":1.5},
+ {"matrix":[2,2], "x":3.5, "y":2.25},
+ {"matrix":[2,3], "x":4.9, "y":1.7},
+ {"matrix":[2,4], "x":5.9, "y":1.7},
+ {"matrix":[2,5], "x":6.9, "y":1.7},
+ {"matrix":[2,6], "x":7.9, "y":1.7},
+ {"matrix":[2,7], "x":8.9, "y":3.7},
+ {"matrix":[2,8], "x":9.9, "y":3.7},
+ {"matrix":[2,9], "x":10.9, "y":3.7},
+ {"matrix":[2,10], "x":11.9, "y":3.7},
+ {"matrix":[2,11], "x":12.9, "y":3.7},
+ {"matrix":[2,12], "x":14.75, "y":2.25},
+ {"matrix":[2,13], "x":15.75, "y":2.25},
+ {"matrix":[2,15], "x":18.75, "y":2.25},
+ {"matrix":[2,16], "x":19.75, "y":2.25},
+ {"matrix":[2,17], "x":20.75, "y":2.25},
+ {"matrix":[2,18], "x":21.75, "y":2.25, "h":2},
+
+ {"matrix":[3,0], "x":0.25, "y":3.25},
+ {"matrix":[3,1], "x":1.75, "y":3.25, "w":1.75},
+ {"matrix":[3,2], "x":3.5, "y":3.25},
+ {"matrix":[3,3], "x":5, "y":2.7},
+ {"matrix":[3,4], "x":6, "y":2.7},
+ {"matrix":[3,5], "x":7, "y":2.7},
+ {"matrix":[3,6], "x":8, "y":2.7},
+ {"matrix":[3,8], "x":9.4, "y":4.7},
+ {"matrix":[3,9], "x":10.4, "y":4.7},
+ {"matrix":[3,10], "x":11.4, "y":4.7},
+ {"matrix":[3,11], "x":12.4, "y":4.7},
+ {"matrix":[3,12], "x":14, "y":3.25},
+ {"matrix":[3,13], "x":15, "y":3.25},
+ {"matrix":[3,14], "x":16, "y":3.25},
+ {"matrix":[2,14], "x":17, "y":2.25, "w":1.25, "h":2},
+ {"matrix":[3,15], "x":18.75, "y":3.25},
+ {"matrix":[3,16], "x":19.75, "y":3.25},
+ {"matrix":[3,17], "x":20.75, "y":3.25},
+
+ {"matrix":[4,0], "x":0, "y":4.25},
+ {"matrix":[4,1], "x":1.5, "y":4.25, "w":1.25},
+ {"matrix":[4,2], "x":2.75, "y":4.25},
+ {"matrix":[4,3], "x":3.75, "y":4.25},
+ {"matrix":[4,4], "x":5.35, "y":3.7},
+ {"matrix":[4,5], "x":6.35, "y":3.7},
+ {"matrix":[4,6], "x":7.35, "y":3.7},
+ {"matrix":[4,7], "x":8.35, "y":3.7},
+ {"matrix":[4,8], "x":8.85, "y":5.7},
+ {"matrix":[4,9], "x":9.85, "y":5.7},
+ {"matrix":[4,10], "x":10.85, "y":5.7},
+ {"matrix":[4,11], "x":11.85, "y":5.7},
+ {"matrix":[4,12], "x":12.85, "y":5.7},
+ {"matrix":[4,13], "x":14.5, "y":4.25},
+ {"matrix":[4,14], "x":15.5, "y":4.25, "w":1.75},
+ {"matrix":[4,15], "x":17.5, "y":4.5},
+ {"matrix":[4,16], "x":18.75, "y":4.25},
+ {"matrix":[4,17], "x":19.75, "y":4.25},
+ {"matrix":[4,18], "x":20.75, "y":4.25},
+ {"matrix":[5,18], "x":21.75, "y":4.25, "h":2},
+
+ {"matrix":[5,0], "x":0, "y":5.25},
+ {"matrix":[5,1], "x":1.5, "y":5.25, "w":1.25},
+ {"matrix":[5,2], "x":2.75, "y":5.25, "w":1.25},
+ {"matrix":[5,3], "x":5.35, "y":4.7, "w":1.25},
+ {"matrix":[5,4], "x":6.6, "y":4.7, "w":2.25},
+ {"matrix":[5,7], "x":8.85, "y":4.7},
+ {"matrix":[5,8], "x":8.85, "y":6.7, "w":2.55},
+ {"matrix":[5,9], "x":11.4, "y":6.7},
+ {"matrix":[5,10], "x":12.4, "y":6.7},
+ {"matrix":[5,13], "x":16.5, "y":5.5},
+ {"matrix":[5,14], "x":17.5, "y":5.5},
+ {"matrix":[5,15], "x":18.5, "y":5.5},
+ {"matrix":[5,16], "x":19.75, "y":5.25},
+ {"matrix":[5,17], "x":20.75, "y":5.25}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "layout": [
+ {"matrix":[0, 1], "flags":4, "x":16, "y":0},
+ {"matrix":[0, 2], "flags":1, "x":29, "y":0},
+ {"matrix":[0, 3], "flags":1, "x":39, "y":0},
+ {"matrix":[0, 4], "flags":1, "x":51, "y":1},
+ {"matrix":[0, 5], "flags":1, "x":61, "y":3},
+ {"matrix":[0, 6], "flags":1, "x":74, "y":6},
+ {"matrix":[0, 7], "flags":1, "x":84, "y":8},
+ {"matrix":[0, 8], "flags":1, "x":103, "y":8},
+ {"matrix":[0, 9], "flags":1, "x":113, "y":6},
+ {"matrix":[0, 10], "flags":1, "x":125, "y":3},
+ {"matrix":[0, 11], "flags":1, "x":136, "y":1},
+ {"matrix":[0, 12], "flags":1, "x":148, "y":0},
+ {"matrix":[0, 13], "flags":1, "x":158, "y":0},
+ {"matrix":[0, 14], "flags":1, "x":175, "y":0},
+ {"matrix":[0, 15], "flags":4, "x":193, "y":0},
+ {"matrix":[0, 16], "flags":4, "x":203, "y":0},
+ {"matrix":[0, 17], "flags":4, "x":214, "y":0},
+ {"matrix":[0, 18], "flags":4, "x":224, "y":0},
+
+ {"matrix":[1, 0], "flags":4, "x":4, "y":14},
+ {"matrix":[1, 1], "flags":1, "x":20, "y":14},
+ {"matrix":[1, 2], "flags":8, "x":31, "y":14},
+ {"matrix":[1, 3], "flags":8, "x":41, "y":13},
+ {"matrix":[1, 4], "flags":8, "x":53, "y":15},
+ {"matrix":[1, 5], "flags":4, "x":63, "y":17},
+ {"matrix":[1, 6], "flags":4, "x":73, "y":20},
+ {"matrix":[1, 7], "flags":4, "x":84, "y":22},
+ {"matrix":[1, 8], "flags":4, "x":98, "y":22},
+ {"matrix":[1, 9], "flags":4, "x":109, "y":20},
+ {"matrix":[1, 10], "flags":4, "x":119, "y":17},
+ {"matrix":[1, 11], "flags":4, "x":129, "y":15},
+ {"matrix":[1, 12], "flags":4, "x":141, "y":13},
+ {"matrix":[1, 13], "flags":4, "x":151, "y":14},
+ {"matrix":[1, 14], "flags":1, "x":167, "y":14},
+ {"matrix":[1, 15], "flags":8, "x":193, "y":13},
+ {"matrix":[1, 16], "flags":4, "x":203, "y":13},
+ {"matrix":[1, 17], "flags":4, "x":214, "y":13},
+ {"matrix":[1, 18], "flags":4, "x":224, "y":13},
+
+ {"matrix":[2, 0], "flags":4, "x":3, "y":24},
+ {"matrix":[2, 1], "flags":1, "x":21, "y":24},
+ {"matrix":[2, 2], "flags":4, "x":34, "y":24},
+ {"matrix":[2, 3], "flags":4, "x":46, "y":24},
+ {"matrix":[2, 4], "flags":4, "x":56, "y":27},
+ {"matrix":[2, 5], "flags":4, "x":66, "y":29},
+ {"matrix":[2, 6], "flags":4, "x":76, "y":31},
+ {"matrix":[2, 7], "flags":4, "x":96, "y":33},
+ {"matrix":[2, 8], "flags":4, "x":106, "y":31},
+ {"matrix":[2, 9], "flags":4, "x":116, "y":29},
+ {"matrix":[2, 10], "flags":4, "x":127, "y":27},
+ {"matrix":[2, 11], "flags":4, "x":137, "y":24},
+ {"matrix":[2, 12], "flags":4, "x":151, "y":24},
+ {"matrix":[2, 13], "flags":4, "x":161, "y":24},
+ {"matrix":[2, 15], "flags":4, "x":193, "y":24},
+ {"matrix":[2, 16], "flags":4, "x":203, "y":24},
+ {"matrix":[2, 17], "flags":4, "x":214, "y":24},
+ {"matrix":[2, 18], "flags":4, "x":224, "y":29},
+
+ {"matrix":[3, 0], "flags":4, "x":1, "y":34},
+ {"matrix":[3, 1], "flags":8, "x":20, "y":34},
+ {"matrix":[3, 2], "flags":4, "x":37, "y":34},
+ {"matrix":[3, 3], "flags":4, "x":46, "y":35},
+ {"matrix":[3, 4], "flags":4, "x":56, "y":37},
+ {"matrix":[3, 5], "flags":4, "x":66, "y":39},
+ {"matrix":[3, 6], "flags":4, "x":77, "y":42},
+ {"matrix":[3, 8], "flags":4, "x":100, "y":43},
+ {"matrix":[3, 9], "flags":4, "x":111, "y":40},
+ {"matrix":[3, 10], "flags":4, "x":121, "y":38},
+ {"matrix":[3, 11], "flags":4, "x":131, "y":36},
+ {"matrix":[3, 12], "flags":4, "x":143, "y":35},
+ {"matrix":[3, 13], "flags":4, "x":153, "y":35},
+ {"matrix":[3, 14], "flags":1, "x":164, "y":35},
+ {"matrix":[2, 14], "flags":1, "x":178, "y":31},
+ {"matrix":[3, 15], "flags":4, "x":193, "y":35},
+ {"matrix":[3, 16], "flags":4, "x":203, "y":35},
+ {"matrix":[3, 17], "flags":4, "x":214, "y":35},
+
+ {"matrix":[4, 0], "flags":4, "x":0, "y":45},
+ {"matrix":[4, 1], "flags":1, "x":15, "y":45},
+ {"matrix":[4, 2], "flags":1, "x":27, "y":45},
+ {"matrix":[4, 3], "flags":4, "x":37, "y":45},
+ {"matrix":[4, 4], "flags":4, "x":49, "y":46},
+ {"matrix":[4, 5], "flags":4, "x":59, "y":48},
+ {"matrix":[4, 6], "flags":4, "x":69, "y":51},
+ {"matrix":[4, 7], "flags":4, "x":80, "y":53},
+ {"matrix":[4, 8], "flags":4, "x":95, "y":54},
+ {"matrix":[4, 9], "flags":4, "x":105, "y":52},
+ {"matrix":[4, 10], "flags":4, "x":115, "y":50},
+ {"matrix":[4, 11], "flags":4, "x":126, "y":48},
+ {"matrix":[4, 12], "flags":4, "x":136, "y":46},
+ {"matrix":[4, 13], "flags":4, "x":148, "y":45},
+ {"matrix":[4, 14], "flags":1, "x":162, "y":45},
+ {"matrix":[4, 15], "flags":1, "x":179, "y":47},
+ {"matrix":[4, 16], "flags":4, "x":193, "y":45},
+ {"matrix":[4, 17], "flags":4, "x":203, "y":45},
+ {"matrix":[4, 18], "flags":4, "x":214, "y":45},
+ {"matrix":[5, 18], "flags":4, "x":224, "y":50},
+
+ {"matrix":[5, 0], "flags":4, "x":0, "y":55},
+ {"matrix":[5, 1], "flags":1, "x":15, "y":55},
+ {"matrix":[5, 2], "flags":1, "x":28, "y":55},
+ {"matrix":[5, 3], "flags":1, "x":48, "y":57},
+ {"matrix":[5, 4], "flags":4, "x":66, "y":61},
+ {"matrix":[5, 7], "flags":1, "x":83, "y":64},
+ {"matrix":[5, 8], "flags":4, "x":106, "y":63},
+ {"matrix":[5, 9], "flags":1, "x":125, "y":59},
+ {"matrix":[5, 10], "flags":1, "x":135, "y":56},
+ {"matrix":[5, 13], "flags":1, "x":169, "y":58},
+ {"matrix":[5, 14], "flags":1, "x":179, "y":58},
+ {"matrix":[5, 15], "flags":1, "x":190, "y":58},
+ {"matrix":[5, 16], "flags":4, "x":203, "y":58},
+ {"matrix":[5, 17], "flags":4, "x":214, "y":55}
+ ]
+ }
+}
diff --git a/keyboards/keychron/q13_pro/iso_encoder/iso_encoder.c b/keyboards/keychron/q13_pro/iso_encoder/iso_encoder.c
new file mode 100644
index 0000000000..9185bd3a06
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/iso_encoder.c
@@ -0,0 +1,141 @@
+/* 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 .
+ */
+
+#include "quantum.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to snled27351manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {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_14, C_14, B_14},
+ {0, A_15, C_15, B_15},
+ {0, A_16, C_16, B_16},
+ {0, L_16, J_16, K_16},
+ {0, L_15, J_15, K_15},
+ {0, L_14, J_14, K_14},
+
+ {0, G_1, I_1, H_1},
+ {0, G_2, I_2, H_2},
+ {0, G_3, I_3, H_3},
+ {0, G_4, I_4, H_4},
+ {0, G_5, I_5, H_5},
+ {0, G_6, I_6, H_6},
+ {0, G_7, I_7, H_7},
+ {0, G_8, I_8, H_8},
+ {0, G_9, I_9, H_9},
+ {0, G_10, I_10, H_10},
+ {0, G_11, I_11, H_11},
+ {0, G_12, I_12, H_12},
+ {0, G_13, I_13, H_13},
+ {0, G_14, I_14, H_14},
+ {0, G_15, I_15, H_15},
+ {0, G_16, I_16, H_16},
+ {0, L_13, J_13, K_13},
+ {0, L_12, J_12, K_12},
+ {0, L_11, J_11, K_11},
+
+ {0, D_1, F_1, E_1},
+ {0, D_2, F_2, E_2},
+ {0, D_3, F_3, E_3},
+ {0, D_4, F_4, E_4},
+ {0, D_5, F_5, E_5},
+ {0, D_6, F_6, E_6},
+ {0, D_7, F_7, E_7},
+ {0, D_8, F_8, E_8},
+ {0, D_9, F_9, E_9},
+ {0, D_10, F_10, E_10},
+ {0, D_11, F_11, E_11},
+ {0, D_12, F_12, E_12},
+ {0, D_13, F_13, E_13},
+ {0, D_14, F_14, E_14},
+ {0, D_16, F_16, E_16},
+ {0, L_10, J_10, K_10},
+ {0, L_9, J_9, K_9},
+ {0, L_8, J_8, K_8},
+
+ {1, A_16, C_16, B_16},
+ {1, A_15, C_15, B_15},
+ {1, A_14, C_14, B_14},
+ {1, A_13, C_13, B_13},
+ {1, A_12, C_12, B_12},
+ {1, A_11, C_11, B_11},
+ {1, A_10, C_10, B_10},
+ {1, A_8, C_8, B_8},
+ {1, A_7, C_7, B_7},
+ {1, A_6, C_6, B_6},
+ {1, A_5, C_5, B_5},
+ {1, A_4, C_4, B_4},
+ {1, A_3, C_3, B_3},
+ {1, A_2, C_2, B_2},
+ {0, D_15, F_15, E_15},
+ {1, A_1, C_1, B_1},
+ {1, L_1, J_1, K_1},
+ {1, L_2, J_2, K_2},
+
+ {1, G_16, I_16, H_16},
+ {1, G_15, I_15, H_15},
+ {1, G_14, I_14, H_14},
+ {1, G_13, I_13, H_13},
+ {1, G_12, I_12, H_12},
+ {1, G_11, I_11, H_11},
+ {1, G_10, I_10, H_10},
+ {1, G_9, I_9, H_9},
+ {1, G_8, I_8, H_8},
+ {1, G_7, I_7, H_7},
+ {1, G_6, I_6, H_6},
+ {1, G_5, I_5, H_5},
+ {1, G_4, I_4, H_4},
+ {1, G_3, I_3, H_3},
+ {1, G_2, I_2, H_2},
+ {1, G_1, I_1, H_1},
+ {1, L_3, J_3, K_3},
+ {1, L_4, J_4, K_4},
+ {1, L_5, J_5, K_5},
+ {1, L_8, J_8, K_8},
+
+ {1, D_16, F_16, E_16},
+ {1, D_15, F_15, E_15},
+ {1, D_14, F_14, E_14},
+ {1, D_13, F_13, E_13},
+ {1, D_12, F_12, E_12},
+ {1, D_9, F_9, E_9},
+ {1, D_8, F_8, E_8},
+ {1, D_7, F_7, E_7},
+ {1, D_6, F_6, E_6},
+ {1, D_3, F_3, E_3},
+ {1, D_2, F_2, E_2},
+ {1, D_1, F_1, E_1},
+ {1, L_6, J_6, K_6},
+ {1, L_7, J_7, K_7},
+};
+#endif
diff --git a/keyboards/keychron/q13_pro/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q13_pro/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..5079872eb6
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_108_iso(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_F13, KC_F14, KC_F15, KC_F16,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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_P4, KC_P5, KC_P6,
+ MC_4, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [MAC_FN] = LAYOUT_108_iso(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+
+ [WIN_BASE] = LAYOUT_108_iso(
+ KC_MUTE, 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_DEL, _______, _______, _______, _______,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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_P4, KC_P5, KC_P6,
+ MC_4, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [WIN_FN] = LAYOUT_108_iso(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q13_pro/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q13_pro/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q13_pro/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q13_pro/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..c353202852
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+enum layers {
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_108_iso(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_MICT, KC_LAPA, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_F13, KC_F14, KC_F15, KC_F16,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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_P4, KC_P5, KC_P6,
+ MC_4, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [MAC_FN] = LAYOUT_108_iso(
+ RGB_TOG, _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______,
+ _______, _______, 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, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+
+ [WIN_BASE] = LAYOUT_108_iso(
+ KC_MUTE, 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_DEL, _______, _______, _______, _______,
+ MC_1, 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_NUM, KC_PSLS, KC_PAST, KC_PMNS,
+ MC_2, 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_P7, KC_P8, KC_P9, KC_PPLS,
+ MC_3, 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_P4, KC_P5, KC_P6,
+ MC_4, 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_P1, KC_P2, KC_P3, KC_PENT,
+ MC_5, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT ),
+
+ [WIN_FN] = LAYOUT_108_iso(
+ RGB_TOG, _______, 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, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ),
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [MAC_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+ [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+ [WIN_FN] = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q13_pro/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q13_pro/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q13_pro/iso_encoder/rules.mk b/keyboards/keychron/q13_pro/iso_encoder/rules.mk
new file mode 100644
index 0000000000..a77dc6c674
--- /dev/null
+++ b/keyboards/keychron/q13_pro/iso_encoder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
diff --git a/keyboards/keychron/q13_pro/mcuconf.h b/keyboards/keychron/q13_pro/mcuconf.h
new file mode 100644
index 0000000000..882d6bd568
--- /dev/null
+++ b/keyboards/keychron/q13_pro/mcuconf.h
@@ -0,0 +1,36 @@
+/* Copyright 2023 QMK
+ *
+ * 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 .
+ */
+
+#pragma once
+
+#include_next
+
+/* Set HCLK to 48 MHz as tradeoff of USB lowest clockand and
+ * lower power comsumption for bluetooth. Will use dynamic
+ * clock when STM32L4 is supported in ChibiOS */
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 2
+
+#undef STM32_PLLN_VALUE
+#define STM32_PLLN_VALUE 12
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#ifdef KC_BLUETOOTH_ENABLE
+# undef STM32_SERIAL_USE_USART2
+# define STM32_SERIAL_USE_USART2 TRUE
+#endif
diff --git a/keyboards/keychron/q13_pro/q13_pro.c b/keyboards/keychron/q13_pro/q13_pro.c
new file mode 100644
index 0000000000..98796234b9
--- /dev/null
+++ b/keyboards/keychron/q13_pro/q13_pro.c
@@ -0,0 +1,327 @@
+/* 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 .
+ */
+
+#include "q13_pro.h"
+#ifdef KC_BLUETOOTH_ENABLE
+# include "ckbt51.h"
+# include "bluetooth.h"
+# include "indicator.h"
+# include "transport.h"
+# include "battery.h"
+# include "bat_level_animation.h"
+# include "lpm.h"
+#endif
+
+#ifdef ENABLE_FACTORY_TEST
+# include "factory_test.h"
+#endif
+
+typedef struct PACKED {
+ uint8_t len;
+ uint8_t keycode[3];
+} key_combination_t;
+
+static uint32_t factory_timer_buffer = 0;
+static uint32_t siri_timer_buffer = 0;
+static uint8_t mac_keycode[4] = {KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD};
+
+key_combination_t key_comb_list[4] = {
+ {2, {KC_LWIN, KC_TAB}}, // Task (win)
+ {2, {KC_LWIN, KC_E}}, // Files (win)
+ {3, {KC_LSFT, KC_LGUI, KC_4}}, // Snapshot (mac)
+ {2, {KC_LWIN, KC_C}} // Cortana (win)
+};
+
+#ifdef KC_BLUETOOTH_ENABLE
+bool firstDisconnect = true;
+bool bt_factory_reset = false;
+static virtual_timer_t pairing_key_timer;
+extern uint8_t g_pwm_buffer[DRIVER_COUNT][192];
+
+static void pairing_key_timer_cb(void *arg) {
+ bluetooth_pairing_ex(*(uint8_t *)arg, NULL);
+}
+#endif
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+ if (index == 0) {
+#ifdef INVERT_OS_SWITCH_STATE
+ default_layer_set(1UL << (!active ? 2 : 0));
+#else
+ default_layer_set(1UL << (active ? 2 : 0));
+#endif
+ }
+ dip_switch_update_user(index, active);
+
+ return true;
+}
+
+#ifdef KC_BLUETOOTH_ENABLE
+bool process_record_kb_bt(uint16_t keycode, keyrecord_t *record) {
+#else
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+#endif
+ static uint8_t host_idx = 0;
+
+ switch (keycode) {
+ case KC_MICT:
+ if (record->event.pressed) {
+ register_code(KC_MISSION_CONTROL);
+ } else {
+ unregister_code(KC_MISSION_CONTROL);
+ }
+ return false; // Skip all further processing of this key
+ case KC_LAPA:
+ if (record->event.pressed) {
+ register_code(KC_LAUNCHPAD);
+ } else {
+ unregister_code(KC_LAUNCHPAD);
+ }
+ return false; // Skip all further processing of this key
+ case KC_LOPTN:
+ case KC_ROPTN:
+ case KC_LCMMD:
+ case KC_RCMMD:
+ if (record->event.pressed) {
+ register_code(mac_keycode[keycode - KC_LOPTN]);
+ } else {
+ unregister_code(mac_keycode[keycode - KC_LOPTN]);
+ }
+ return false; // Skip all further processing of this key)
+ case KC_TASK:
+ case KC_FILE:
+ case KC_SNAP:
+ case KC_CTANA:
+ if (record->event.pressed) {
+ for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++)
+ register_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+ } else {
+ for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++)
+ unregister_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+ }
+ return false; // Skip all further processing of this key
+ case KC_SIRI:
+ if (record->event.pressed && siri_timer_buffer == 0) {
+ register_code(KC_LGUI);
+ register_code(KC_SPACE);
+ siri_timer_buffer = sync_timer_read32() == 0 ? 1 : sync_timer_read32();
+ }
+ return false; // Skip all further processing of this key
+#ifdef KC_BLUETOOTH_ENABLE
+ case BT_HST1 ... BT_HST3:
+ if (get_transport() == TRANSPORT_BLUETOOTH) {
+ if (record->event.pressed) {
+ host_idx = keycode - BT_HST1 + 1;
+ chVTSet(&pairing_key_timer, TIME_MS2I(2000), (vtfunc_t)pairing_key_timer_cb, &host_idx);
+ bluetooth_connect_ex(host_idx, 0);
+ } else {
+ host_idx = 0;
+ chVTReset(&pairing_key_timer);
+ }
+ }
+ break;
+ case BAT_LVL:
+ if (get_transport() == TRANSPORT_BLUETOOTH && !usb_power_connected()) {
+ bat_level_animiation_start(battery_get_percentage());
+ }
+ break;
+#endif
+ default:
+#ifdef FACTORY_RESET_CHECK
+ FACTORY_RESET_CHECK(keycode, record);
+#endif
+ break;
+ }
+ return true;
+}
+
+#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE)
+static void encoder_pad_cb(void *param) {
+ encoder_inerrupt_read((uint32_t)param & 0XFF);
+}
+#endif
+
+void keyboard_post_init_kb(void) {
+ dip_switch_read(true);
+
+#ifdef KC_BLUETOOTH_ENABLE
+ /* Currently we don't use this reset pin */
+ palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL);
+ palWriteLine(CKBT51_RESET_PIN, PAL_HIGH);
+
+ /* IMPORTANT: DO NOT enable internal pull-up resistor
+ * as there is an external pull-down resistor.
+ */
+ palSetLineMode(USB_BT_MODE_SELECT_PIN, PAL_MODE_INPUT);
+
+ ckbt51_init(false);
+ bluetooth_init();
+
+# ifdef ENCODER_ENABLE
+ pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A;
+ pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B;
+ for (uint32_t i = 0; i < NUM_ENCODERS; i++) {
+ palEnableLineEvent(encoders_pad_a[i], PAL_EVENT_MODE_BOTH_EDGES);
+ palEnableLineEvent(encoders_pad_b[i], PAL_EVENT_MODE_BOTH_EDGES);
+ palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i);
+ palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i);
+ }
+# endif
+#endif
+
+ keyboard_post_init_user();
+}
+
+void matrix_scan_kb(void) {
+ if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 2000) {
+ factory_timer_buffer = 0;
+ if (bt_factory_reset) {
+ bt_factory_reset = false;
+ palWriteLine(CKBT51_RESET_PIN, PAL_LOW);
+ wait_ms(5);
+ palWriteLine(CKBT51_RESET_PIN, PAL_HIGH);
+ }
+ }
+
+ if (siri_timer_buffer && sync_timer_elapsed32(siri_timer_buffer) > 500) {
+ siri_timer_buffer = 0;
+ unregister_code(KC_LGUI);
+ unregister_code(KC_SPACE);
+ }
+
+#ifdef FACTORY_RESET_TASK
+ FACTORY_RESET_TASK();
+#endif
+ matrix_scan_user();
+}
+
+#ifdef KC_BLUETOOTH_ENABLE
+static void ckbt51_param_init(void) {
+ /* Set bluetooth device name */
+ ckbt51_set_local_name(PRODUCT);
+ wait_ms(10);
+ /* Set bluetooth parameters */
+ module_param_t param = {.event_mode = 0x02,
+ .connected_idle_timeout = 7200,
+ .pairing_timeout = 180,
+ .pairing_mode = 0,
+ .reconnect_timeout = 5,
+ .report_rate = 90,
+ .vendor_id_source = 1,
+ .verndor_id = 0, // Must be 0x3434
+ .product_id = PRODUCT_ID};
+ ckbt51_set_param(¶m);
+ wait_ms(10);
+}
+
+void bluetooth_enter_disconnected_kb(uint8_t host_idx) {
+ if (bt_factory_reset) {
+ ckbt51_param_init();
+ factory_timer_buffer = timer_read32();
+ }
+ /* CKBT51 bluetooth module boot time is slower, it enters disconnected after boot,
+ so we place initialization here. */
+ if (firstDisconnect && sync_timer_read32() < 1000 && get_transport() == TRANSPORT_BLUETOOTH) {
+ ckbt51_param_init();
+ bluetooth_connect();
+ firstDisconnect = false;
+ }
+}
+
+void ckbt51_default_ack_handler(uint8_t *data, uint8_t len) {
+ if (data[1] == 0x45) {
+ module_param_t param = {.event_mode = 0x02,
+ .connected_idle_timeout = 7200,
+ .pairing_timeout = 180,
+ .pairing_mode = 0,
+ .reconnect_timeout = 5,
+ .report_rate = 90,
+ .vendor_id_source = 1,
+ .verndor_id = 0, // Must be 0x3434
+ .product_id = PRODUCT_ID};
+ ckbt51_set_param(¶m);
+ }
+}
+
+void bluetooth_pre_task(void) {
+ static uint8_t mode = 1;
+
+ if (readPin(USB_BT_MODE_SELECT_PIN) != mode) {
+ if (readPin(USB_BT_MODE_SELECT_PIN) != mode) {
+ mode = readPin(USB_BT_MODE_SELECT_PIN);
+ set_transport(mode == 0 ? TRANSPORT_BLUETOOTH : TRANSPORT_USB);
+ }
+ }
+}
+#endif
+
+void battery_calculte_voltage(uint16_t value) {
+ uint16_t voltage = ((uint32_t)value) * 2246 / 1000;
+
+#ifdef LED_MATRIX_ENABLE
+ if (led_matrix_is_enabled()) {
+ uint32_t totalBuf = 0;
+
+ for (uint8_t i = 0; i < DRIVER_COUNT; i++)
+ for (uint8_t j = 0; j < 192; j++)
+ totalBuf += g_pwm_buffer[i][j];
+ /* We assumpt it is linear relationship*/
+ voltage += (30 * totalBuf / LED_MATRIX_LED_COUNT / 255);
+ }
+#endif
+#ifdef RGB_MATRIX_ENABLE
+ if (rgb_matrix_is_enabled()) {
+ uint32_t totalBuf = 0;
+
+ for (uint8_t i = 0; i < DRIVER_COUNT; i++)
+ for (uint8_t j = 0; j < 192; j++)
+ totalBuf += g_pwm_buffer[i][j];
+ /* We assumpt it is linear relationship*/
+ uint32_t compensation = 60 * totalBuf / RGB_MATRIX_LED_COUNT / 255 / 3;
+ voltage += compensation;
+ }
+#endif
+ battery_set_voltage(voltage);
+}
+
+bool via_command_kb(uint8_t *data, uint8_t length) {
+ switch (data[0]) {
+#ifdef KC_BLUETOOTH_ENABLE
+ case 0xAA:
+ ckbt51_dfu_rx(data, length);
+ break;
+#endif
+#ifdef ENABLE_FACTORY_TEST
+ case 0xAB:
+ factory_test_rx(data, length);
+ break;
+#endif
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+#if !defined(VIA_ENABLE)
+void raw_hid_receive(uint8_t *data, uint8_t length) {
+ switch (data[0]) {
+ case RAW_HID_CMD:
+ via_command_kb(data, length);
+ break;
+ }
+}
+#endif
diff --git a/keyboards/keychron/q13_pro/q13_pro.h b/keyboards/keychron/q13_pro/q13_pro.h
new file mode 100644
index 0000000000..bc6e1effc8
--- /dev/null
+++ b/keyboards/keychron/q13_pro/q13_pro.h
@@ -0,0 +1,57 @@
+/* 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 .
+ */
+
+#pragma once
+
+#include "quantum.h"
+#ifdef VIA_ENABLE
+# include "via.h"
+#endif
+
+#define ___ KC_NO
+#define KC_MICT QK_KB_0
+#define KC_LAPA QK_KB_1
+
+#ifdef VIA_ENABLE
+# define USER_START QK_KB_2
+#else
+# define USER_START SAFE_RANGE
+#endif
+
+// clang-format off
+enum {
+ KC_LOPTN = USER_START,
+ KC_ROPTN,
+ KC_LCMMD,
+ KC_RCMMD,
+ KC_TASK,
+ KC_FILE,
+ KC_SNAP,
+ KC_CTANA,
+ KC_SIRI,
+#ifdef KC_BLUETOOTH_ENABLE
+ BT_HST1,
+ BT_HST2,
+ BT_HST3,
+ BAT_LVL,
+#else
+ BT_HST1 = KC_TRNS,
+ BT_HST2 = KC_TRNS,
+ BT_HST3 = KC_TRNS,
+ BAT_LVL = KC_TRNS,
+#endif
+ NEW_SAFE_RANGE
+};
diff --git a/keyboards/keychron/q13_pro/readme.md b/keyboards/keychron/q13_pro/readme.md
new file mode 100644
index 0000000000..25b62a19c9
--- /dev/null
+++ b/keyboards/keychron/q13_pro/readme.md
@@ -0,0 +1,21 @@
+# Keychron Q13 Pro
+
+A customizable 96% ergonomic keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q13 Pro
+* Hardware Availability:[Keychron](https://www.keychron.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make keychron/q13_pro/ansi_encoder:default
+ make keychron/q13_pro/iso_encoder:default
+
+Flashing example for this keyboard:
+
+ make keychron/q13_pro/ansi_encoder:default:flash
+ make keychron/q13_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".
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/keychron/q13_pro/rules.mk b/keyboards/keychron/q13_pro/rules.mk
new file mode 100644
index 0000000000..f995372f9c
--- /dev/null
+++ b/keyboards/keychron/q13_pro/rules.mk
@@ -0,0 +1,6 @@
+# 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
+
+include keyboards/keychron/bluetooth/bluetooth.mk
+include keyboards/keychron/common/common.mk
diff --git a/keyboards/keychron/q13_pro/via_json/q13_pro_ansi_encoder.json b/keyboards/keychron/q13_pro/via_json/q13_pro_ansi_encoder.json
new file mode 100644
index 0000000000..c63917cec4
--- /dev/null
+++ b/keyboards/keychron/q13_pro/via_json/q13_pro_ansi_encoder.json
@@ -0,0 +1,432 @@
+{
+ "name": "Keychron Q13 Pro ANSI knob",
+ "vendorId": "0x3434",
+ "productId": "0x06D0",
+ "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": 6, "cols": 19},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "x": 0.5
+ },
+ "0,0\n\n\n\n\n\n\n\n\ne0",
+ {
+ "x": 0.5,
+ "c": "#777777"
+ },
+ "0,1\nESC",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,2",
+ "0,3",
+ {
+ "x": 9.35
+ },
+ "0,12",
+ "0,13",
+ {
+ "x": 0.45,
+ "c": "#aaaaaa"
+ },
+ "0,14",
+ {
+ "x": 0.7,
+ "c": "#cccccc"
+ },
+ "0,15",
+ "0,16",
+ "0,17",
+ "0,18"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 0.75
+ },
+ "1,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa"
+ },
+ "1,1",
+ {
+ "c": "#cccccc"
+ },
+ "1,2",
+ "1,3",
+ {
+ "x": 8.65
+ },
+ "1,12",
+ "1,13",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "1,14",
+ {
+ "x": 0.85,
+ "c": "#cccccc"
+ },
+ "1,15",
+ "1,16",
+ "1,17",
+ "1,18"
+ ],
+ [
+ {
+ "x": 0.5
+ },
+ "2,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "2,1",
+ {
+ "c": "#cccccc"
+ },
+ "2,2",
+ {
+ "x": 9.9
+ },
+ "2,12",
+ "2,13",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "2,14",
+ {
+ "x": 0.6,
+ "c": "#cccccc"
+ },
+ "2,15",
+ "2,16",
+ "2,17",
+ {
+ "h": 2
+ },
+ "2,18"
+ ],
+ [
+ {
+ "x": 0.25
+ },
+ "3,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "3,1",
+ {
+ "c": "#cccccc"
+ },
+ "3,2",
+ {
+ "x": 9.5
+ },
+ "3,12",
+ "3,13",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "3,14",
+ {
+ "x": 0.5,
+ "c": "#cccccc"
+ },
+ "3,15",
+ "3,16",
+ "3,17"
+ ],
+ [
+ "4,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 2.25
+ },
+ "4,1",
+ {
+ "c": "#cccccc"
+ },
+ "4,3",
+ {
+ "x": 9.75
+ },
+ "4,13",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "4,14",
+ {
+ "x": 1.5,
+ "c": "#cccccc"
+ },
+ "4,16",
+ "4,17",
+ "4,18",
+ {
+ "h": 2
+ },
+ "5,18"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 17.5,
+ "c": "#777777"
+ },
+ "4,15"
+ ],
+ [
+ {
+ "y": -0.25,
+ "c": "#cccccc"
+ },
+ "5,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,1",
+ {
+ "w": 1.25
+ },
+ "5,2",
+ {
+ "x": 15.75,
+ "c": "#cccccc"
+ },
+ "5,16",
+ "5,17"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 16.5,
+ "c": "#777777"
+ },
+ "5,13",
+ "5,14",
+ "5,15"
+ ],
+ [
+ {
+ "r": 6,
+ "y": -7.05,
+ "x": 5.4,
+ "c": "#cccccc"
+ },
+ "0,4",
+ "0,5",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "0,6",
+ "0,7"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 5.55,
+ "c": "#cccccc"
+ },
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7"
+ ],
+ [
+ {
+ "x": 4.9
+ },
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6"
+ ],
+ [
+ {
+ "x": 5
+ },
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6"
+ ],
+ [
+ {
+ "x": 5.35
+ },
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7"
+ ],
+ [
+ {
+ "x": 5.35,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,3",
+ {
+ "w": 2.25
+ },
+ "5,4",
+ "5,7"
+ ],
+ [
+ {
+ "r": -6,
+ "y": -4.25,
+ "x": 10.05
+ },
+ "0,8",
+ "0,9",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,10",
+ "0,11"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 9.4
+ },
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11"
+ ],
+ [
+ {
+ "x": 8.9
+ },
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11"
+ ],
+ [
+ {
+ "x": 9.4
+ },
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11"
+ ],
+ [
+ {
+ "x": 8.85
+ },
+ "4,8",
+ "4,9",
+ "4,10",
+ "4,11",
+ "4,12"
+ ],
+ [
+ {
+ "x": 8.85,
+ "c": "#aaaaaa",
+ "w": 2.55
+ },
+ "5,8",
+ "5,9",
+ "5,10"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/keychron/q13_pro/via_json/q13_pro_iso_encoder.json b/keyboards/keychron/q13_pro/via_json/q13_pro_iso_encoder.json
new file mode 100644
index 0000000000..c386ba880b
--- /dev/null
+++ b/keyboards/keychron/q13_pro/via_json/q13_pro_iso_encoder.json
@@ -0,0 +1,437 @@
+{
+ "name": "Keychron Q13 Pro ISO knob",
+ "vendorId": "0x3434",
+ "productId": "0x06D1",
+ "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": 6, "cols": 19},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "x": 0.5
+ },
+ "0,0\n\n\n\n\n\n\n\n\ne0",
+ {
+ "x": 0.5,
+ "c": "#777777"
+ },
+ "0,1\nESC",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,2",
+ "0,3",
+ {
+ "x": 9.35
+ },
+ "0,12",
+ "0,13",
+ {
+ "x": 0.45,
+ "c": "#aaaaaa"
+ },
+ "0,14",
+ {
+ "x": 0.7,
+ "c": "#cccccc"
+ },
+ "0,15",
+ "0,16",
+ "0,17",
+ "0,18"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 0.75
+ },
+ "1,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa"
+ },
+ "1,1",
+ {
+ "c": "#cccccc"
+ },
+ "1,2",
+ "1,3",
+ {
+ "x": 8.65
+ },
+ "1,12",
+ "1,13",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "1,14",
+ {
+ "x": 0.85,
+ "c": "#cccccc"
+ },
+ "1,15",
+ "1,16",
+ "1,17",
+ "1,18"
+ ],
+ [
+ {
+ "x": 0.5
+ },
+ "2,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "2,1",
+ {
+ "c": "#cccccc"
+ },
+ "2,2",
+ {
+ "x": 10.25
+ },
+ "2,12",
+ "2,13",
+ {
+ "x": 0.25,
+ "c": "#777777",
+ "w": 1.25,
+ "h": 2,
+ "w2": 1.5,
+ "h2": 1,
+ "x2": -0.25
+ },
+ "2,14",
+ {
+ "x": 0.5,
+ "c": "#cccccc"
+ },
+ "2,15",
+ "2,16",
+ "2,17",
+ {
+ "h": 2
+ },
+ "2,18"
+ ],
+ [
+ {
+ "x": 0.25
+ },
+ "3,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "3,1",
+ {
+ "c": "#cccccc"
+ },
+ "3,2",
+ {
+ "x": 9.5
+ },
+ "3,12",
+ "3,13",
+ {
+ "c": "#aaaaaa"
+ },
+ "3,14",
+ {
+ "x": 1.75,
+ "c": "#cccccc"
+ },
+ "3,15",
+ "3,16",
+ "3,17"
+ ],
+ [
+ "4,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "4,1",
+ "4,2",
+ {
+ "c": "#cccccc"
+ },
+ "4,3",
+ {
+ "x": 9.75
+ },
+ "4,13",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "4,14",
+ {
+ "x": 1.5,
+ "c": "#cccccc"
+ },
+ "4,16",
+ "4,17",
+ "4,18",
+ {
+ "h": 2
+ },
+ "5,18"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 17.5,
+ "c": "#777777"
+ },
+ "4,15"
+ ],
+ [
+ {
+ "y": -0.25,
+ "c": "#cccccc"
+ },
+ "5,0",
+ {
+ "x": 0.5,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,1",
+ {
+ "w": 1.25
+ },
+ "5,2",
+ {
+ "x": 15.75,
+ "c": "#cccccc"
+ },
+ "5,16",
+ "5,17"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 16.5,
+ "c": "#777777"
+ },
+ "5,13",
+ "5,14",
+ "5,15"
+ ],
+ [
+ {
+ "r": 6,
+ "y": -7.05,
+ "x": 5.4,
+ "c": "#cccccc"
+ },
+ "0,4",
+ "0,5",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "0,6",
+ "0,7"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 5.55,
+ "c": "#cccccc"
+ },
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7"
+ ],
+ [
+ {
+ "x": 4.9
+ },
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6"
+ ],
+ [
+ {
+ "x": 5
+ },
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6"
+ ],
+ [
+ {
+ "x": 5.35
+ },
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7"
+ ],
+ [
+ {
+ "x": 5.35,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,3",
+ {
+ "w": 2.25
+ },
+ "5,4",
+ "5,7"
+ ],
+ [
+ {
+ "r": -6,
+ "y": -4.25,
+ "x": 10.05
+ },
+ "0,8",
+ "0,9",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,10",
+ "0,11"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 9.4
+ },
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11"
+ ],
+ [
+ {
+ "x": 8.9
+ },
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11"
+ ],
+ [
+ {
+ "x": 9.4
+ },
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11"
+ ],
+ [
+ {
+ "x": 8.85
+ },
+ "4,8",
+ "4,9",
+ "4,10",
+ "4,11",
+ "4,12"
+ ],
+ [
+ {
+ "x": 8.85,
+ "c": "#aaaaaa",
+ "w": 2.55
+ },
+ "5,8",
+ "5,9",
+ "5,10"
+ ]
+ ]
+ }
+}