Update q1 pro

13 files changed, 557 insertions, 191 deletions

diff --git a/keyboards/keychron/q1_pro/config.h b/keyboards/keychron/q1_pro/config.h
index 9a6da1ecf4..cc17c33a92 100644
--- a/keyboards/keychron/q1_pro/config.h
+++ b/keyboards/keychron/q1_pro/config.h
@@ -20,8 +20,7 @@
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
 /* DIP switch for Mac/win OS switch */
-#define DIP_SWITCH_PINS \
-    { A8 }
+#define DIP_SWITCH_PINS { A8 }
 
 #ifdef KC_BLUETOOTH_ENABLE
 /* Hardware configuration */
@@ -68,6 +67,11 @@
 #define FEE_DENSITY_BYTES FEE_PAGE_SIZE
 #define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
 
+/* Encoder Configuration */
+#ifdef ENCODER_ENABLE
+#    define ENCODER_DEFAULT_POS 0x3
+#endif
+
 /* Factory test keys */
 #define FN_KEY1 MO(1)
 #define FN_KEY2 MO(3)
diff --git a/keyboards/keychron/q1_pro/halconf.h b/keyboards/keychron/q1_pro/halconf.h
index bea63d9a29..306f917783 100644
--- a/keyboards/keychron/q1_pro/halconf.h
+++ b/keyboards/keychron/q1_pro/halconf.h
@@ -19,10 +19,9 @@
 #define _CHIBIOS_HAL_CONF_VER_8_0_
 
 #define HAL_USE_I2C TRUE
-#define HAL_USE_SPI TRUE
-#define PAL_USE_CALLBACKS TRUE
 
 #ifdef KC_BLUETOOTH_ENABLE
+#    define PAL_USE_CALLBACKS TRUE
 #    define HAL_USE_SERIAL TRUE
 #    define HAL_USE_RTC TRUE
 #endif
diff --git a/keyboards/keychron/q1_pro/jis_encoder/config.h b/keyboards/keychron/q1_pro/jis_encoder/config.h
new file mode 100644
index 0000000000..ff5ef5a6e2
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_encoder/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+/* Encoder Configuration */
+#ifdef ENCODER_ENABLE
+#    define ENCODER_DEFAULT_POS 0x3
+#endif
+
+#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_COUNT 46
+#    define DRIVER_2_LED_COUNT 40
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
+
+/* 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 index */
+#    define CAPS_LOCK_INDEX 45
+#    define LOW_BAT_IND_INDEX 78
+
+/* RGB Matrix Animation modes. Explicitly enabled
+ * For full list of effects, see:
+ * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+ */
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+/* Set LED driver current */
+#    define CKLED2001_CURRENT_TUNE \
+        { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
+#endif
diff --git a/keyboards/keychron/q1_pro/jis_encoder/info.json b/keyboards/keychron/q1_pro/jis_encoder/info.json
new file mode 100644
index 0000000000..d149ca039a
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_encoder/info.json
@@ -0,0 +1,198 @@
+{
+    "usb": {
+    	"pid": "0x0612",
+    	"device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT_86_jis": {
+            "layout": [
+                {"matrix":[0,0], "x":0, "y":0},
+                {"matrix":[0,1], "x":1.25, "y":0},
+                {"matrix":[0,2], "x":2.25, "y":0},
+                {"matrix":[0,3], "x":3.25, "y":0},
+                {"matrix":[0,4], "x":4.25, "y":0},
+                {"matrix":[0,5], "x":5.5, "y":0},
+                {"matrix":[0,6], "x":6.5, "y":0},
+                {"matrix":[0,7], "x":7.5, "y":0},
+                {"matrix":[0,8], "x":8.5, "y":0},
+                {"matrix":[0,9], "x":9.75, "y":0},
+                {"matrix":[0,10], "x":10.75, "y":0},
+                {"matrix":[0,11], "x":11.75, "y":0},
+                {"matrix":[0,12], "x":12.75, "y":0},
+                {"matrix":[0,13], "x":14, "y":0},
+                {"matrix":[0,15], "x":15.25, "y":0},
+
+                {"matrix":[1,0], "x":0, "y":1.25},
+                {"matrix":[1,1], "x":1, "y":1.25},
+                {"matrix":[1,2], "x":2, "y":1.25},
+                {"matrix":[1,3], "x":3, "y":1.25},
+                {"matrix":[1,4], "x":4, "y":1.25},
+                {"matrix":[1,5], "x":5, "y":1.25},
+                {"matrix":[1,6], "x":6, "y":1.25},
+                {"matrix":[1,7], "x":7, "y":1.25},
+                {"matrix":[1,8], "x":8, "y":1.25},
+                {"matrix":[1,9], "x":9, "y":1.25},
+                {"matrix":[1,10], "x":10, "y":1.25},
+                {"matrix":[1,11], "x":11, "y":1.25},
+                {"matrix":[1,12], "x":12, "y":1.25},
+                {"matrix":[1,13], "x":13, "y":1.25},
+                {"matrix":[1,14], "x":14, "y":1.25},
+                {"matrix":[1,15], "x":15.25, "y":1.25},
+
+                {"matrix":[2,0], "x":0, "y":2.25, "w":1.5},
+                {"matrix":[2,1], "x":1.5, "y":2.25},
+                {"matrix":[2,2], "x":2.5, "y":2.25},
+                {"matrix":[2,3], "x":3.5, "y":2.25},
+                {"matrix":[2,4], "x":4.5, "y":2.25},
+                {"matrix":[2,5], "x":5.5, "y":2.25},
+                {"matrix":[2,6], "x":6.5, "y":2.25},
+                {"matrix":[2,7], "x":7.5, "y":2.25},
+                {"matrix":[2,8], "x":8.5, "y":2.25},
+                {"matrix":[2,9], "x":9.5, "y":2.25},
+                {"matrix":[2,10], "x":10.5, "y":2.25},
+                {"matrix":[2,11], "x":11.5, "y":2.25},
+                {"matrix":[2,12], "x":12.5, "y":2.25},
+                {"matrix":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"matrix":[2,15], "x":15.25, "y":2.25},
+
+                {"matrix":[3,0], "x":0, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":1.75, "y":3.25},
+                {"matrix":[3,2], "x":2.75, "y":3.25},
+                {"matrix":[3,3], "x":3.75, "y":3.25},
+                {"matrix":[3,4], "x":4.75, "y":3.25},
+                {"matrix":[3,5], "x":5.75, "y":3.25},
+                {"matrix":[3,6], "x":6.75, "y":3.25},
+                {"matrix":[3,7], "x":7.75, "y":3.25},
+                {"matrix":[3,8], "x":8.75, "y":3.25},
+                {"matrix":[3,9], "x":9.75, "y":3.25},
+                {"matrix":[3,10], "x":10.75, "y":3.25},
+                {"matrix":[3,11], "x":11.75, "y":3.25},
+                {"matrix":[3,13], "x":12.75, "y":3.25},
+                {"matrix":[3,15], "x":15.25, "y":3.25},
+
+                {"matrix":[4,0], "x":0, "y":4.25, "w":2.25},
+                {"matrix":[4,2], "x":2.25, "y":4.25},
+                {"matrix":[4,3], "x":3.25, "y":4.25},
+                {"matrix":[4,4], "x":4.25, "y":4.25},
+                {"matrix":[4,5], "x":5.25, "y":4.25},
+                {"matrix":[4,6], "x":6.25, "y":4.25},
+                {"matrix":[4,7], "x":7.25, "y":4.25},
+                {"matrix":[4,8], "x":8.25, "y":4.25},
+                {"matrix":[4,9], "x":9.25, "y":4.25},
+                {"matrix":[4,10], "x":10.25, "y":4.25},
+                {"matrix":[4,11], "x":11.25, "y":4.25},
+                {"matrix":[4,12], "x":12.25, "y":4.25},
+                {"matrix":[4,13], "x":13.25, "y":4.25},
+                {"matrix":[4,14], "x":14.25, "y":4.25},
+
+                {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
+                {"matrix":[5,1], "x":1.25, "y":5.25},
+                {"matrix":[5,2], "x":2.25, "y":5.25, "w":1.25},
+                {"matrix":[5,3], "x":3.5, "y":5.25},
+                {"matrix":[5,6], "x":4.5, "y":5.25, "w":4.5},
+                {"matrix":[5,9], "x":9, "y":5.25, "w":1.25},
+                {"matrix":[5,10], "x":10.25, "y":5.25},
+                {"matrix":[5,11], "x":11.25, "y":5.25},
+                {"matrix":[5,12], "x":12.25, "y":5.25},
+                {"matrix":[5,13], "x":13.25, "y":5.25},
+                {"matrix":[5,14], "x":14.25, "y":5.25},
+                {"matrix":[5,15], "x":15.25, "y":5.25}
+            ]
+        }
+    },
+    "rgb_matrix": {
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":18,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":33,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":48,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":62,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":81,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":95,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":125, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":143, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":158, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":172, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":187, "y":0},
+            {"matrix":[0, 13], "flags":1, "x":205, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1],  "flags":8, "x":15,  "y":15},
+            {"matrix":[1, 2],  "flags":8, "x":29,  "y":15},
+            {"matrix":[1, 3],  "flags":8, "x":44,  "y":15},
+            {"matrix":[1, 4],  "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1, 6],  "flags":4, "x":88,  "y":15},
+            {"matrix":[1, 7],  "flags":4, "x":103, "y":15},
+            {"matrix":[1, 8],  "flags":4, "x":117, "y":15},
+            {"matrix":[1, 9],  "flags":4, "x":132, "y":15},
+            {"matrix":[1, 10], "flags":4, "x":146, "y":15},
+            {"matrix":[1, 11], "flags":4, "x":161, "y":15},
+            {"matrix":[1, 12], "flags":4, "x":176, "y":15},
+            {"matrix":[1, 13], "flags":1, "x":190, "y":15},
+            {"matrix":[1, 14], "flags":1, "x":205, "y":15},
+            {"matrix":[1, 15], "flags":1, "x":224, "y":15},
+
+            {"matrix":[2, 0],  "flags":1, "x":4,   "y":28},
+            {"matrix":[2, 1],  "flags":4, "x":22,  "y":28},
+            {"matrix":[2, 2],  "flags":4, "x":37,  "y":28},
+            {"matrix":[2, 3],  "flags":4, "x":51,  "y":28},
+            {"matrix":[2, 4],  "flags":4, "x":66,  "y":28},
+            {"matrix":[2, 5],  "flags":4, "x":81,  "y":28},
+            {"matrix":[2, 6],  "flags":4, "x":95,  "y":28},
+            {"matrix":[2, 7],  "flags":4, "x":110, "y":28},
+            {"matrix":[2, 8],  "flags":4, "x":125, "y":28},
+            {"matrix":[2, 9],  "flags":4, "x":139, "y":28},
+            {"matrix":[2, 10], "flags":4, "x":154, "y":28},
+            {"matrix":[2, 11], "flags":4, "x":168, "y":28},
+            {"matrix":[2, 12], "flags":4, "x":183, "y":28},
+            {"matrix":[2, 15], "flags":1, "x":224, "y":28},
+
+            {"matrix":[3, 0],  "flags":8, "x":5,   "y":40},
+            {"matrix":[3, 1],  "flags":4, "x":26,  "y":40},
+            {"matrix":[3, 2],  "flags":4, "x":40,  "y":40},
+            {"matrix":[3, 3],  "flags":4, "x":55,  "y":40},
+            {"matrix":[3, 4],  "flags":4, "x":70,  "y":40},
+            {"matrix":[3, 5],  "flags":4, "x":84,  "y":40},
+            {"matrix":[3, 6],  "flags":4, "x":99,  "y":40},
+            {"matrix":[3, 7],  "flags":4, "x":114, "y":40},
+            {"matrix":[3, 8],  "flags":4, "x":128, "y":40},
+            {"matrix":[3, 9],  "flags":4, "x":143, "y":40},
+            {"matrix":[3, 10], "flags":4, "x":158, "y":40},
+            {"matrix":[3, 11], "flags":4, "x":172, "y":40},
+            {"matrix":[3, 13], "flags":1, "x":187, "y":40},
+            {"matrix":[2, 13], "flags":1, "x":207, "y":36},
+            {"matrix":[3, 15], "flags":1, "x":224, "y":40},
+
+            {"matrix":[4, 0],  "flags":1, "x":9,   "y":52},
+            {"matrix":[4, 2],  "flags":4, "x":33,  "y":52},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":52},
+            {"matrix":[4, 4],  "flags":4, "x":62,  "y":52},
+            {"matrix":[4, 5],  "flags":4, "x":77,  "y":52},
+            {"matrix":[4, 6],  "flags":4, "x":92,  "y":52},
+            {"matrix":[4, 7],  "flags":4, "x":106, "y":52},
+            {"matrix":[4, 8],  "flags":4, "x":121, "y":52},
+            {"matrix":[4, 9],  "flags":4, "x":136, "y":52},
+            {"matrix":[4, 10], "flags":4, "x":150, "y":52},
+            {"matrix":[4, 11], "flags":4, "x":165, "y":52},
+            {"matrix":[4, 12], "flags":1, "x":179, "y":52},
+            {"matrix":[4, 13], "flags":1, "x":194, "y":52},
+            {"matrix":[4, 14], "flags":1, "x":209, "y":52},
+
+            {"matrix":[5, 0],  "flags":1, "x":2,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":18,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":35,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":51,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":92,  "y":64},
+            {"matrix":[5, 9],  "flags":1, "x":134, "y":64},
+            {"matrix":[5, 10], "flags":1, "x":140, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":179, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":194, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":209, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/q1_pro/jis_encoder/jis_encoder.c b/keyboards/keychron/q1_pro/jis_encoder/jis_encoder.c
new file mode 100644
index 0000000000..d7d0a0ca69
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_encoder/jis_encoder.c
@@ -0,0 +1,120 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+   {0, I_1,    G_1,     H_1},
+   {0, I_2,    G_2,     H_2},
+   {0, I_3,    G_3,     H_3},
+   {0, I_4,    G_4,     H_4},
+   {0, I_5,    G_5,     H_5},
+   {0, I_6,    G_6,     H_6},
+   {0, I_7,    G_7,     H_7},
+   {0, I_8,    G_8,     H_8},
+   {0, I_9,    G_9,     H_9},
+   {0, I_10,   G_10,    H_10},
+   {0, I_11,   G_11,    H_11},
+   {0, I_12,   G_12,    H_12},
+   {0, I_13,   G_13,    H_13},
+   {0, I_14,   G_14,    H_14},
+   {0, I_16,   G_16,    H_16},
+
+   {0, C_1,    A_1,     B_1},
+   {0, C_2,    A_2,     B_2},
+   {0, C_3,    A_3,     B_3},
+   {0, C_4,    A_4,     B_4},
+   {0, C_5,    A_5,     B_5},
+   {0, C_6,    A_6,     B_6},
+   {0, C_7,    A_7,     B_7},
+   {0, C_8,    A_8,     B_8},
+   {0, C_9,    A_9,     B_9},
+   {0, C_10,   A_10,    B_10},
+   {0, C_11,   A_11,    B_11},
+   {0, C_12,   A_12,    B_12},
+   {0, C_13,   A_13,    B_13},
+   {0, C_14,   A_14,    B_14},
+   {0, C_15,   A_15,    B_15},
+   {0, C_16,   A_16,    B_16},
+
+   {0, F_1,    D_1,     E_1},
+   {0, F_2,    D_2,     E_2},
+   {0, F_3,    D_3,     E_3},
+   {0, F_4,    D_4,     E_4},
+   {0, F_5,    D_5,     E_5},
+   {0, F_6,    D_6,     E_6},
+   {0, F_7,    D_7,     E_7},
+   {0, F_8,    D_8,     E_8},
+   {0, F_9,    D_9,     E_9},
+   {0, F_10,   D_10,    E_10},
+   {0, F_11,   D_11,    E_11},
+   {0, F_12,   D_12,    E_12},
+   {0, F_13,   D_13,    E_13},
+   {0, F_16,   D_16,    E_16},
+
+   {1, C_16,   A_16,    B_16},
+   {1, C_15,   A_15,    B_15},
+   {1, C_14,   A_14,    B_14},
+   {1, C_13,   A_13,    B_13},
+   {1, C_12,   A_12,    B_12},
+   {1, C_11,   A_11,    B_11},
+   {1, C_10,   A_10,    B_10},
+   {1, C_9,    A_9,     B_9},
+   {1, C_8,    A_8,     B_8},
+   {1, C_7,    A_7,     B_7},
+   {1, C_6,    A_6,     B_6},
+   {1, C_5,    A_5,     B_5},
+   {1, C_3,    A_3,     B_3},
+   {0, F_14,   D_14,    E_14},
+   {1, C_1,    A_1,     B_1},
+
+   {1, I_16,   G_16,    H_16},
+   {1, I_14,   G_14,    H_14},
+   {1, I_13,   G_13,    H_13},
+   {1, I_12,   G_12,    H_12},
+   {1, I_11,   G_11,    H_11},
+   {1, I_10,   G_10,    H_10},
+   {1, I_9,    G_9,     H_9},
+   {1, I_8,    G_8,     H_8},
+   {1, I_7,    G_7,     H_7},
+   {1, I_6,    G_6,     H_6},
+   {1, I_5,    G_5,     H_5},
+   {1, I_4,    G_4,     H_4},
+   {1, I_3,    G_3,     H_3},
+   {1, I_2,    G_2,     H_2},
+
+   {1, F_16,   D_16,    E_16},
+   {1, F_15,   D_15,    E_15},
+   {1, F_14,   D_14,    E_14},
+   {1, F_13,   D_13,    E_13},
+   {1, F_10,   D_10,    E_10},
+   {1, F_7,    D_7,     E_7},
+   {1, F_6,    D_6,     E_6},
+   {1, F_5,    D_5,     E_5},
+   {1, F_4,    D_4,     E_4},
+   {1, F_3,    D_3,     E_3},
+   {1, F_2,    D_2,     E_2},
+   {1, F_1,    D_1,     E_1}
+};
+#endif
diff --git a/keyboards/keychron/q1_pro/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1_pro/jis_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..95fcd80dbb
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_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 <http://www.gnu.org/licenses/>.
+ */
+
+#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_86_jis(
+        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_MUTE,
+        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_INT3,  KC_BSPC,  KC_PGUP,
+        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_ENT,             KC_PGDN,
+        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_BSLS,            KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD,MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_86_jis(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,            RGB_TOG,
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            KC_END,
+        _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_86_jis(
+        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,             KC_MUTE,
+        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_INT3,  KC_BSPC,  KC_PGUP,
+        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_ENT,             KC_PGDN,
+        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_BSLS,            KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_86_jis(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,            RGB_TOG,
+        _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            KC_END,
+        _______,            _______,  _______,  _______,  _______,  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/q1_pro/jis_encoder/keymaps/default/rules.mk b/keyboards/keychron/q1_pro/jis_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1_pro/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1_pro/jis_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..95fcd80dbb
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_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 <http://www.gnu.org/licenses/>.
+ */
+
+#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_86_jis(
+        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_MUTE,
+        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_INT3,  KC_BSPC,  KC_PGUP,
+        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_ENT,             KC_PGDN,
+        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_BSLS,            KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LOPTN, KC_LCMMD, KC_LNG2,                      KC_SPC,                       KC_LNG1,  KC_RCMMD,MO(MAC_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_86_jis(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   _______,            RGB_TOG,
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            KC_END,
+        _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,  _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_86_jis(
+        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,             KC_MUTE,
+        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_INT3,  KC_BSPC,  KC_PGUP,
+        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_ENT,             KC_PGDN,
+        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_BSLS,            KC_HOME,
+        KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,  KC_UP,
+        KC_LCTL,  KC_LGUI,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT, MO(WIN_FN),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_86_jis(
+        _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  _______,            RGB_TOG,
+        _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+        _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,            _______,            KC_END,
+        _______,            _______,  _______,  _______,  _______,  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/q1_pro/jis_encoder/keymaps/via/rules.mk b/keyboards/keychron/q1_pro/jis_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q1_pro/jis_encoder/rules.mk b/keyboards/keychron/q1_pro/jis_encoder/rules.mk
new file mode 100644
index 0000000000..f886ea2e8e
--- /dev/null
+++ b/keyboards/keychron/q1_pro/jis_encoder/rules.mk
@@ -0,0 +1 @@
+# This file intentionally blank
\ No newline at end of file
diff --git a/keyboards/keychron/q1_pro/matrix.c b/keyboards/keychron/q1_pro/matrix.c
deleted file mode 100644
index ec623eb297..0000000000
--- a/keyboards/keychron/q1_pro/matrix.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/* Copyright 2023 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "stdint.h"
-#include "hal.h"
-#include "gpio.h"
-#include "quantum.h"
-
-#ifndef DRIVE_SHRIFT_REGISTER_WITH_SPI
-#    define DRIVE_SHRIFT_REGISTER_WITH_SPI 0
-#endif
-
-#define HC595_STCP B0
-#define HC595_SHCP A1
-#define HC595_DS A7
-
-pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
-pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
-
-static inline void HC595_delay(uint16_t n) {
-    while (n-- > 0) {
-        asm volatile("nop" ::: "memory");
-    };
-}
-
-#if (DRIVE_SHRIFT_REGISTER_WITH_SPI)
-// clang-format off
-const SPIConfig hs_spicfg = {
-    false,
-    NULL,
-    PAL_PORT(HC595_STCP),
-    PAL_PAD(HC595_STCP),
-    SPI_CR1_BR_1,
-    SPI_CR2_DS_3 | SPI_CR2_DS_2 | SPI_CR2_DS_1 | SPI_CR2_DS_0 | SPI_CR2_SSOE | SPI_CR2_NSSP
-    };
-// clang-format on
-#endif
-
-static void HC595_output(uint16_t data) {
-#if (DRIVE_SHRIFT_REGISTER_WITH_SPI)
-    spiStart(&SPID1, &hs_spicfg);
-    spiSend(&SPID1, 1, &data);
-#else
-    uint8_t i;
-    uint8_t n = 1;
-    for (i = 16; i > 0; i--) {
-        writePinLow(HC595_SHCP);
-
-        if (data & 0x8000)
-            writePinHigh(HC595_DS);
-        else
-            writePinLow(HC595_DS);
-
-        data <<= 1;
-
-        HC595_delay(n);
-
-        writePinHigh(HC595_SHCP);
-        HC595_delay(n);
-    }
-
-    HC595_delay(n);
-    writePinLow(HC595_STCP);
-    HC595_delay(n);
-    writePinHigh(HC595_STCP);
-#endif
-}
-
-static inline void setPinOutput_writeLow(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON {
-        setPinOutput(pin);
-        writePinLow(pin);
-    }
-}
-
-static inline void setPinInputHigh_atomic(pin_t pin) {
-    ATOMIC_BLOCK_FORCEON {
-        setPinInputHigh(pin);
-    }
-}
-
-static inline uint8_t readMatrixPin(pin_t pin) {
-    if (pin != NO_PIN) {
-        return readPin(pin);
-    } else {
-        return 1;
-    }
-}
-
-static bool select_col(uint8_t col) {
-    HC595_output(~(0x01 << col));
-    return true;
-}
-
-static void unselect_col(uint8_t col) {
-    HC595_output(0xFFFF);
-}
-
-static void unselect_cols(void) {
-    HC595_output(0xFFFF);
-}
-
-void select_all_cols(void) {
-    HC595_output(0x0000);
-}
-
-void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
-    // Select col
-    if (!select_col(current_col)) { // select col
-        return;                     // skip NO_PIN col
-    }
-
-    HC595_delay(100);
-
-    // For each row...
-    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
-        // Check row pin state
-        if (readMatrixPin(row_pins[row_index]) == 0) {
-            // Pin LO, set col bit
-            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
-        } else {
-            // Pin HI, clear col bit
-            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
-        }
-    }
-
-    unselect_col(current_col);
-    HC595_delay(100);
-}
-
-void matrix_init_custom(void) {
-    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        if (row_pins[x] != NO_PIN) {
-            setPinInputHigh_atomic(row_pins[x]);
-        }
-    }
-#if (DRIVE_SHRIFT_REGISTER_WITH_SPI)
-    palSetPadMode(PAL_PORT(HC595_SHCP), PAL_PAD(HC595_SHCP), PAL_MODE_ALTERNATE(5) | PAL_STM32_OSPEED_HIGHEST); /* SCK */
-    palSetPadMode(PAL_PORT(HC595_DS), PAL_PAD(HC595_DS), PAL_MODE_ALTERNATE(5) | PAL_STM32_OSPEED_HIGHEST);     /* MOSI*/
-    palSetPadMode(PAL_PORT(HC595_STCP), PAL_PAD(HC595_STCP), PAL_MODE_ALTERNATE(5) | PAL_STM32_OSPEED_HIGHEST); /* CS*/
-#else
-    setPinOutput(HC595_DS);
-    setPinOutput(HC595_STCP);
-    setPinOutput(HC595_SHCP);
-#endif
-    unselect_cols();
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool matrix_has_changed = false;
-
-    matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
-
-    // Set col, read rows
-    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
-        matrix_read_rows_on_col(curr_matrix, current_col);
-    }
-
-    matrix_has_changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
-    if (matrix_has_changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
-
-    return matrix_has_changed;
-}
diff --git a/keyboards/keychron/q1_pro/mcuconf.h b/keyboards/keychron/q1_pro/mcuconf.h
index 2e17094d3b..4dae767a44 100644
--- a/keyboards/keychron/q1_pro/mcuconf.h
+++ b/