summaryrefslogtreecommitdiffstats
path: root/keyboards/keychron/q3_pro
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/keychron/q3_pro')
-rwxr-xr-xkeyboards/keychron/q3_pro/ansi_encoder/rules.mk2
-rw-r--r--keyboards/keychron/q3_pro/ansi_encoder_se/rules.mk2
-rw-r--r--keyboards/keychron/q3_pro/config.h10
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/config.h68
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/info.json214
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/iso_encoder.c122
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/keymaps/default/keymap.c68
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/keymaps/default/rules.mk1
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/keymaps/via/keymap.c68
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/keymaps/via/rules.mk2
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder/rules.mk1
-rwxr-xr-xkeyboards/keychron/q3_pro/iso_encoder_se/rules.mk2
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/config.h70
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/info.json237
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/jis_encoder_se.c129
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/keymaps/default/keymap.c68
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/keymaps/default/rules.mk1
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/keymaps/via/keymap.c68
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/keymaps/via/rules.mk2
-rwxr-xr-xkeyboards/keychron/q3_pro/jis_encoder_se/rules.mk1
-rw-r--r--keyboards/keychron/q3_pro/matrix.c (renamed from keyboards/keychron/q3_pro/matrix_v1.c)0
-rwxr-xr-xkeyboards/keychron/q3_pro/matrix_v2.c190
22 files changed, 1127 insertions, 199 deletions
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
index fb73a108fa..23c407488a 100755
--- a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
@@ -1 +1 @@
-SRC += matrix_v2.c
+include keyboards/keychron/common/common.mk
diff --git a/keyboards/keychron/q3_pro/ansi_encoder_se/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder_se/rules.mk
index d609c1b199..36ee49ccb0 100644
--- a/keyboards/keychron/q3_pro/ansi_encoder_se/rules.mk
+++ b/keyboards/keychron/q3_pro/ansi_encoder_se/rules.mk
@@ -1 +1 @@
-SRC += matrix_v1.c
+SRC += matrix.c
diff --git a/keyboards/keychron/q3_pro/config.h b/keyboards/keychron/q3_pro/config.h
index b74ec45f41..7f0abcec6e 100644
--- a/keyboards/keychron/q3_pro/config.h
+++ b/keyboards/keychron/q3_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 }
/* Increase I2C speed to 1000 KHz */
#define I2C1_TIMINGR_PRESC 0U
@@ -76,15 +75,14 @@
#endif // KC_BLUETOOTH_ENABLE
/* Encoder Configuration */
-#define ENCODER_DEFAULT_POS 0x3
+#ifdef ENCODER_ENABLE
+# define ENCODER_DEFAULT_POS 0x3
+#endif
/* Emulated EEPROM configuration */
#define FEE_DENSITY_BYTES FEE_PAGE_SIZE
#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
-/* Old default behavior of mod-taps */
-#define HOLD_ON_OTHER_KEY_PRESS
-
/* Factory test keys */
#define FN_KEY1 MO(1)
#define FN_KEY2 MO(3)
diff --git a/keyboards/keychron/q3_pro/iso_encoder/config.h b/keyboards/keychron/q3_pro/iso_encoder/config.h
new file mode 100755
index 0000000000..d874d291ee
--- /dev/null
+++ b/keyboards/keychron/q3_pro/iso_encoder/config.h
@@ -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/>.
+ */
+
+#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_COUNT 47
+# define DRIVER_2_LED_COUNT 41
+# 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 */
+# define CAPS_LOCK_INDEX 49
+# define LOW_BAT_IND_INDEX 80
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+# define RGB_MATRIX_KEYPRESSES
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
+# define PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* Set LED driver current */
+# define CKLED2001_CURRENT_TUNE \
+ { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
+
+# ifdef KC_BLUETOOTH_ENABLE
+# define HOST_DEVICES_COUNT 3
+# define HOST_LED_MATRIX_LIST \
+ { 17, 18, 19 }
+# define BAT_LEVEL_LED_LIST \
+ { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
+# endif
+#endif
+
+#ifdef KC_BLUETOOTH_ENABLE
+# define BAT_LOW_LED_PIN A10
+# define BAT_LOW_LED_PIN_ON_STATE 1
+#endif
diff --git a/keyboards/keychron/q3_pro/iso_encoder/info.json b/keyboards/keychron/q3_pro/iso_encoder/info.json
new file mode 100755
index 0000000000..d1bd4c13e4
--- /dev/null
+++ b/keyboards/keychron/q3_pro/iso_encoder/info.json
@@ -0,0 +1,214 @@
+{
+ "usb": {
+ "pid": "0x0634",
+ "device_version": "1.0.0"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A4", "pin_b": "A0"}
+ ]
+ },
+ "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
+ },
+ "layouts": {
+ "LAYOUT_tkl_f13_iso": {
+ "layout": [
+ {"matrix":[0,0], "x":0, "y":0},
+ {"matrix":[0,1], "x":1.25, "y":0},
+ {"matrix":[0,2], "x":2.25, "y":0},
+ {"matrix":[0,3], "x":3.25, "y":0},
+ {"matrix":[0,4], "x":4.25, "y":0},
+ {"matrix":[0,5], "x":5.5, "y":0},
+ {"matrix":[0,6], "x":6.5, "y":0},
+ {"matrix":[0,7], "x":7.5, "y":0},
+ {"matrix":[0,8], "x":8.5, "y":0},
+ {"matrix":[0,9], "x":9.75, "y":0},
+ {"matrix":[0,10], "x":10.75, "y":0},
+ {"matrix":[0,11], "x":11.75, "y":0},
+ {"matrix":[0,12], "x":12.75, "y":0},
+ {"matrix":[0,13], "x":14, "y":0},
+ {"matrix":[0,14], "x":15.25, "y":0},
+ {"matrix":[0,15], "x":16.25, "y":0},
+ {"matrix":[3,12], "x":17.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, "w":2},
+ {"matrix":[1,14], "x":15.25, "y":1.25},
+ {"matrix":[1,15], "x":16.25, "y":1.25},
+ {"matrix":[3,14], "x":17.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,14], "x":15.25, "y":2.25},
+ {"matrix":[2,15], "x":16.25, "y":2.25},
+ {"matrix":[3,15], "x":17.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":[2,13], "x":13.75, "y":2.25, "w":1.25, "h":2},
+
+ {"matrix":[4,0], "x":0, "y":4.25, "w":1.25},
+ {"matrix":[4,1], "x":1.25, "y":4.25},
+ {"matrix":[4,2], "x":2.25, "y":4.25},
+ {"matrix":[4,3], "x":3.25, "y":4.25},
+ {"matrix":[4,4], "x":4.25, "y":4.25},
+ {"matrix":[4,5], "x":5.25, "y":4.25},
+ {"matrix":[4,6], "x":6.25, "y":4.25},
+ {"matrix":[4,7], "x":7.25, "y":4.25},
+ {"matrix":[4,8], "x":8.25, "y":4.25},
+ {"matrix":[4,9], "x":9.25, "y":4.25},
+ {"matrix":[4,10], "x":10.25, "y":4.25},
+ {"matrix":[4,11], "x":11.25, "y":4.25},
+ {"matrix":[4,13], "x":12.25, "y":4.25, "w":2.75},
+ {"matrix":[4,15], "x":16.25, "y":4.25},
+
+ {"matrix":[5,0], "x":0, "y":5.25, "w":1.25},
+ {"matrix":[5,1], "x":1.25, "y":5.25, "w":1.25},
+ {"matrix":[5,2], "x":2.5, "y":5.25, "w":1.25},
+ {"matrix":[5,6], "x":3.75, "y":5.25, "w":6.25},
+ {"matrix":[5,10], "x":10, "y":5.25, "w":1.25},
+ {"matrix":[5,11], "x":11.25, "y":5.25, "w":1.25},
+ {"matrix":[5,12], "x":12.5, "y":5.25, "w":1.25},
+ {"matrix":[5,13], "x":13.75, "y":5.25, "w":1.25},
+ {"matrix":[5,14], "x":15.25, "y":5.25},
+ {"matrix":[5,15], "x":16.25, "y":5.25},
+ {"matrix":[4,14], "x":17.25, "y":5.25}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "layout": [
+ {"matrix":[0, 0], "flags":1, "x":0, "y":0},
+ {"matrix":[0, 1], "flags":1, "x":16, "y":0},
+ {"matrix":[0, 2], "flags":1, "x":29, "y":0},
+ {"matrix":[0, 3], "flags":1, "x":42, "y":0},
+ {"matrix":[0, 4], "flags":1, "x":55, "y":0},
+ {"matrix":[0, 5], "flags":1, "x":71, "y":0},
+ {"matrix":[0, 6], "flags":1, "x":84, "y":0},
+ {"matrix":[0, 7], "flags":1, "x":97, "y":0},
+ {"matrix":[0, 8], "flags":1, "x":110, "y":0},
+ {"matrix":[0, 9], "flags":1, "x":126, "y":0},
+ {"matrix":[0, 10], "flags":1, "x":139, "y":0},
+ {"matrix":[0, 11], "flags":1, "x":152, "y":0},
+ {"matrix":[0, 12], "flags":1, "x":165, "y":0},
+ {"matrix":[0, 14], "flags":1, "x":198, "y":0},
+ {"matrix":[0, 15], "flags":1, "x":211, "y":0},
+ {"matrix":[3, 12], "flags":1, "x":224, "y":0},
+
+ {"matrix":[1, 0], "flags":1, "x":0, "y":15},
+ {"matrix":[1, 1], "flags":8, "x":13, "y":15},
+ {"matrix":[1, 2], "flags":8, "x":26, "y":15},
+ {"matrix":[1, 3], "flags":8, "x":39, "y":15},
+ {"matrix":[1, 4], "flags":4, "x":52, "y":15},
+ {"matrix":[1, 5], "flags":4, "x":65, "y":15},
+ {"matrix":[1, 6], "flags":4, "x":78, "y":15},
+ {"matrix":[1, 7], "flags":4, "x":91, "y":15},
+ {"matrix":[1, 8], "flags":4, "x":104, "y":15},
+ {"matrix":[1, 9], "flags":4, "x":117, "y":15},
+ {"matrix":[1, 10], "flags":4, "x":130, "y":15},
+ {"matrix":[1, 11], "flags":4, "x":143, "y":15},
+ {"matrix":[1, 12], "flags":4, "x":156, "y":15},
+ {"matrix":[1, 13], "flags":1, "x":176, "y":15},
+ {"matrix":[1, 14], "flags":1, "x":198, "y":15},
+ {"matrix":[1, 15], "flags":1, "x":211, "y":15},
+ {"matrix":[3, 14], "flags":1, "x":224, "y":15},
+
+ {"matrix":[2, 0], "flags":1, "x":3, "y":28},
+ {"matrix":[2, 1], "flags":4, "x":19, "y":28},
+ {"matrix":[2, 2], "flags":4, "x":32, "y":28},
+ {"matrix":[2, 3], "flags":4, "x":45, "y":28},
+ {"matrix":[2, 4], "flags":4, "x":59, "y":28},
+ {"matrix":[2, 5], "flags":4, "x":72, "y":28},
+ {"matrix":[2, 6], "flags":4, "x":85, "y":28},
+ {"matrix":[2, 7], "flags":4, "x":98, "y":28},
+ {"matrix":[2, 8], "flags":4, "x":111, "y":28},
+ {"matrix":[2, 9], "flags":4, "x":124, "y":28},
+ {"matrix":[2, 10], "flags":4, "x":137, "y":28},
+ {"matrix":[2, 11], "flags":4, "x":150, "y":28},
+ {"matrix":[2, 12], "flags":4, "x":163, "y":28},
+ {"matrix":[2, 14], "flags":1, "x":198, "y":28},
+ {"matrix":[2, 15], "flags":1, "x":211, "y":28},
+ {"matrix":[3, 15], "flags":1, "x":224, "y":28},
+
+ {"matrix":[3, 0], "flags":8, "x":5, "y":40},
+ {"matrix":[3, 1], "flags":4, "x":23, "y":40},
+ {"matrix":[3, 2], "flags":4, "x":36, "y":40},
+ {"matrix":[3, 3], "flags":4, "x":49, "y":40},
+ {"matrix":[3, 4], "flags":4, "x":62, "y":40},
+ {"matrix":[3, 5], "flags":4, "x":75, "y":40},
+ {"matrix":[3, 6], "flags":4, "x":88, "y":40},
+ {"matrix":[3, 7], "flags":4, "x":101, "y":40},
+ {"matrix":[3, 8], "flags":4, "x":114, "y":40},
+ {"matrix":[3, 9], "flags":4, "x":127, "y":40},
+ {"matrix":[3, 10], "flags":4, "x":140, "y":40},
+ {"matrix":[3, 11], "flags":4, "x":153, "y":40},
+ {"matrix":[3, 13], "flags":1, "x":166, "y":40},
+ {"matrix":[2, 13], "flags":1, "x":183, "y":36},
+
+ {"matrix":[4, 0], "flags":1, "x":2, "y":52},
+ {"matrix":[4, 1], "flags":1, "x":16, "y":52},
+ {"matrix":[4, 2], "flags":4, "x":29, "y":52},
+ {"matrix":[4, 3], "flags":4, "x":42, "y":52},
+ {"matrix":[4, 4], "flags":4, "x":55, "y":52},
+ {"matrix":[4, 5], "flags":4, "x":68, "y":52},
+ {"matrix":[4, 6], "flags":4, "x":81, "y":52},
+ {"matrix":[4, 7], "flags":4, "x":94, "y":52},
+ {"matrix":[4, 8], "flags":4, "x":107, "y":52},
+ {"matrix":[4, 9], "flags":4, "x":120, "y":52},
+ {"matrix":[4, 10], "flags":4, "x":133, "y":52},
+ {"matrix":[4, 11], "flags":4, "x":146, "y":52},
+ {"matrix":[4, 13], "flags":1, "x":171, "y":52},
+ {"matrix":[4, 15], "flags":1, "x":211, "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":34, "y":64},
+ {"matrix":[5, 6], "flags":4, "x":83, "y":64},
+ {"matrix":[5, 10], "flags":1, "x":131, "y":64},
+ {"matrix":[5, 11], "flags":1, "x":148, "y":64},
+ {"matrix":[5, 12], "flags":1, "x":164, "y":64},
+ {"matrix":[5, 13], "flags":1, "x":180, "y":64},
+ {"matrix":[5, 14], "flags":1, "x":198, "y":64},
+ {"matrix":[5, 15], "flags":1, "x":211, "y":64},
+ {"matrix":[4, 14], "flags":1, "x":224, "y":64}
+ ]
+ }
+}
diff --git a/keyboards/keychron/q3_pro/iso_encoder/iso_encoder.c b/keyboards/keychron/q3_pro/iso_encoder/iso_encoder.c
new file mode 100755
index 0000000000..18d1338926
--- /dev/null
+++ b/keyboards/keychron/q3_pro/iso_encoder/iso_encoder.c
@@ -0,0 +1,122 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, I_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_15, G_15, H_15},
+ {0, I_16, G_16, H_16},
+ {1, C_4, A_4, B_4}, // 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},
+ {1, C_2, A_2, B_2}, // 17
+
+ {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_15, D_15, E_15},
+ {0, F_16, D_16, E_16},
+ {1, C_1, A_1, B_1}, // 17
+
+ {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}, // 13
+ {0, F_14, D_14, E_14}, // Enter
+
+ {1, I_16, G_16, H_16},
+ {1, I_15, G_15, H_15},
+ {1, I_14, G_14, H_14},
+ {1, I_13, G_13, H_13},
+ {1, I_12, G_12, H_12},
+ {1, I_11, G_11, H_11},
+ {1, I_10, G_10, H_10},
+ {1, I_9, G_9, H_9},
+ {1, I_8, G_8, H_8},
+ {1, I_7, G_7, H_7},
+ {1, I_6, G_6, H_6},
+ {1, I_5, G_5, H_5},
+ {1, I_3, G_3, H_3},
+ {1, I_1, G_1, H_1}, // 13
+
+ {1, F_16, D_16, E_16},
+ {1, F_15, D_15, E_15},
+ {1, F_14, D_14, E_14},
+ {1, F_10, D_10, E_10},
+ {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},
+ {1, I_2, G_2, H_2},
+};
+#endif
diff --git a/keyboards/keychron/q3_pro/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3_pro/iso_encoder/keymaps/default/keymap.c
new file mode 100755
index 0000000000..2e6b8acc79
--- /dev/null
+++ b/keyboards/keychron/q3_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 <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_tkl_f13_iso(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_SNAP, KC_SIRI, RGB_MOD,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, 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_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_tkl_f13_iso(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_tkl_f13_iso(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_CTANA, RGB_MOD,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, 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_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_tkl_f13_iso(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, 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/q3_pro/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q3_pro/iso_encoder/keymaps/default/rules.mk
new file mode 100755
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q3_pro/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3_pro/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3_pro/iso_encoder/keymaps/via/keymap.c
new file mode 100755
index 0000000000..2e6b8acc79
--- /dev/null
+++ b/keyboards/keychron/q3_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 <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_tkl_f13_iso(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_SNAP, KC_SIRI, RGB_MOD,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, 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_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_tkl_f13_iso(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, RGB_TOG, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_tkl_f13_iso(
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_MUTE, KC_PSCR, KC_CTANA, RGB_MOD,
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_INS, KC_HOME, KC_PGUP,
+ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_DEL, KC_END, 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_NUHS, KC_ENT,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LCMD, KC_LALT, KC_SPC, KC_RALT, KC_RWIN, MO(WIN_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_tkl_f13_iso(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_TOG, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, 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/q3_pro/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q3_pro/iso_encoder/keymaps/via/rules.mk
new file mode 100755
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q3_pro/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3_pro/iso_encoder/rules.mk b/keyboards/keychron/q3_pro/iso_encoder/rules.mk
new file mode 100755
index 0000000000..23c407488a
--- /dev/null
+++ b/keyboards/keychron/q3_pro/iso_encoder/rules.mk
@@ -0,0 +1 @@
+include keyboards/keychron/common/common.mk
diff --git a/keyboards/keychron/q3_pro/iso_encoder_se/rules.mk b/keyboards/keychron/q3_pro/iso_encoder_se/rules.mk
index d609c1b199..36ee49ccb0 100755
--- a/keyboards/keychron/q3_pro/iso_encoder_se/rules.mk
+++ b/keyboards/keychron/q3_pro/iso_encoder_se/rules.mk
@@ -1 +1 @@
-SRC += matrix_v1.c
+SRC += matrix.c
diff --git a/keyboards/keychron/q3_pro/jis_encoder_se/config.h b/keyboards/keychron/q3_pro/jis_encoder_se/config.h
new file mode 100755
index 0000000000..43a3782ea3
--- /dev/null
+++ b/keyboards/keychron/q3_pro/jis_encoder_se/config.h
@@ -0,0 +1,70 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+/* RGB Matrix Driver Configuration */
+# define DRIVER_COUNT 2
+# define DRIVER_ADDR_1 0b1110111
+# define DRIVER_ADDR_2 0b1110100
+<