From 1431f314a446685089c390d01d19c73fd7ff5cee Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Tue, 13 Dec 2022 04:10:32 +0800
Subject: [PATCH] Add Keychron Q10 (#19127)
Co-authored-by: Nick Brassel <nick@tzarc.org>
---
.../keychron/q10/ansi_encoder/ansi_encoder.c | 157 +++++++++++++
.../keychron/q10/ansi_encoder/ansi_encoder.h | 19 ++
keyboards/keychron/q10/ansi_encoder/config.h | 31 +++
keyboards/keychron/q10/ansi_encoder/info.json | 111 ++++++++++
.../q10/ansi_encoder/keymaps/default/keymap.c | 72 ++++++
.../q10/ansi_encoder/keymaps/default/rules.mk | 1 +
.../ansi_encoder/keymaps/keychron/keymap.c | 83 +++++++
.../ansi_encoder/keymaps/keychron/rules.mk | 5 +
.../q10/ansi_encoder/keymaps/via/keymap.c | 72 ++++++
.../q10/ansi_encoder/keymaps/via/rules.mk | 2 +
keyboards/keychron/q10/ansi_encoder/readme.md | 5 +
keyboards/keychron/q10/ansi_encoder/rules.mk | 32 +++
keyboards/keychron/q10/config.h | 119 ++++++++++
keyboards/keychron/q10/halconf.h | 21 ++
keyboards/keychron/q10/iso_encoder/config.h | 31 +++
keyboards/keychron/q10/iso_encoder/info.json | 112 ++++++++++
.../keychron/q10/iso_encoder/iso_encoder.c | 158 +++++++++++++
.../keychron/q10/iso_encoder/iso_encoder.h | 19 ++
.../q10/iso_encoder/keymaps/default/keymap.c | 72 ++++++
.../q10/iso_encoder/keymaps/default/rules.mk | 1 +
.../q10/iso_encoder/keymaps/keychron/keymap.c | 83 +++++++
.../q10/iso_encoder/keymaps/keychron/rules.mk | 5 +
.../q10/iso_encoder/keymaps/via/keymap.c | 72 ++++++
.../q10/iso_encoder/keymaps/via/rules.mk | 2 +
keyboards/keychron/q10/iso_encoder/readme.md | 5 +
keyboards/keychron/q10/iso_encoder/rules.mk | 32 +++
keyboards/keychron/q10/matrix.c | 208 ++++++++++++++++++
keyboards/keychron/q10/mcuconf.h | 22 ++
keyboards/keychron/q10/q10.c | 87 ++++++++
keyboards/keychron/q10/q10.h | 25 +++
keyboards/keychron/q10/readme.md | 19 ++
31 files changed, 1683 insertions(+)
create mode 100644 keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
create mode 100644 keyboards/keychron/q10/ansi_encoder/ansi_encoder.h
create mode 100644 keyboards/keychron/q10/ansi_encoder/config.h
create mode 100644 keyboards/keychron/q10/ansi_encoder/info.json
create mode 100644 keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c
create mode 100644 keyboards/keychron/q10/ansi_encoder/keymaps/default/rules.mk
create mode 100644 keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c
create mode 100644 keyboards/keychron/q10/ansi_encoder/keymaps/keychron/rules.mk
create mode 100644 keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c
create mode 100644 keyboards/keychron/q10/ansi_encoder/keymaps/via/rules.mk
create mode 100644 keyboards/keychron/q10/ansi_encoder/readme.md
create mode 100644 keyboards/keychron/q10/ansi_encoder/rules.mk
create mode 100644 keyboards/keychron/q10/config.h
create mode 100644 keyboards/keychron/q10/halconf.h
create mode 100644 keyboards/keychron/q10/iso_encoder/config.h
create mode 100644 keyboards/keychron/q10/iso_encoder/info.json
create mode 100644 keyboards/keychron/q10/iso_encoder/iso_encoder.c
create mode 100644 keyboards/keychron/q10/iso_encoder/iso_encoder.h
create mode 100644 keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c
create mode 100644 keyboards/keychron/q10/iso_encoder/keymaps/default/rules.mk
create mode 100644 keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c
create mode 100644 keyboards/keychron/q10/iso_encoder/keymaps/keychron/rules.mk
create mode 100644 keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c
create mode 100644 keyboards/keychron/q10/iso_encoder/keymaps/via/rules.mk
create mode 100644 keyboards/keychron/q10/iso_encoder/readme.md
create mode 100644 keyboards/keychron/q10/iso_encoder/rules.mk
create mode 100644 keyboards/keychron/q10/matrix.c
create mode 100644 keyboards/keychron/q10/mcuconf.h
create mode 100644 keyboards/keychron/q10/q10.c
create mode 100644 keyboards/keychron/q10/q10.h
create mode 100644 keyboards/keychron/q10/readme.md
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
new file mode 100644
index 0000000000..c5abcb4f6e
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,157 @@
+/* Copyright 2022 @ 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"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual 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_3, D_3, E_3}, // Left
+ {1, F_2, D_2, E_2}, // Down
+ {1, F_1, D_1, E_1}, // Right
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+ {
+ // Key Matrix to LED Index
+ { __, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
+ { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
+ { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46 },
+ { 47, 48, 49, 50, 51, 52, 53, __, 54, 55, 56, 57, 58, 59, 60, 61 },
+ { 62, 63, __, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76 },
+ { 77, 78, 79, 80, 81, __, __, 82, 83, 84, __, __, __, 85, 86, 87 },
+ },
+ {
+ // LED Index to Physical Position
+ {19,0}, {34,0}, {46,0}, {60,1}, {72,3}, {87,6}, {99,8}, {120,8}, {132,6}, {147,3}, {159,1}, {173,0}, {185,0}, {201,1}, {219,1},
+ {5,14}, {24,14}, {36,14}, {48,13}, {62,15}, {74,17}, {86,20}, {98,22}, {115,22}, {127,20}, {139,17}, {151,15}, {165,13}, {177,14}, {195,14}, {220,13},
+ {4,24}, {24,24}, {40,24}, {53,24}, {65,27}, {77,29}, {89,31}, {112,33}, {124,31}, {136,29}, {148,27}, {160,24}, {174,24}, {186,24}, {201,24}, {222,25},
+ {2,34}, {23,34}, {40,34}, {54,35}, {66,37}, {78,39}, {90,42}, {118,43}, {130,40}, {142,38}, {154,36}, {167,35}, {179,35}, {199,35}, {224,36},
+ {0,45}, {24,45}, {44,45}, {57,46}, {69,48}, {81,51}, {93,53}, {111,54}, {123,52}, {135,50}, {147,48}, {159,46}, {173,45}, {190,45}, {210,47},
+ {0,55}, {18,55}, {33,55}, {56,57}, {77,61}, {97,64}, {124,63}, {147,59}, {198,58}, {210,58}, {222,58},
+ },
+ {
+ // RGB LED Index to Flag
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 1, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1,
+ }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h
new file mode 100644
index 0000000000..db52563dc4
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/ansi_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q10/ansi_encoder/config.h b/keyboards/keychron/q10/ansi_encoder/config.h
new file mode 100644
index 0000000000..d02436c01d
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2022 @ 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
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 47
+#define DRIVER_2_LED_TOTAL 41
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { A8 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 48
diff --git a/keyboards/keychron/q10/ansi_encoder/info.json b/keyboards/keychron/q10/ansi_encoder/info.json
new file mode 100644
index 0000000000..caf0d8d6bf
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/info.json
@@ -0,0 +1,111 @@
+{
+ "keyboard_name": "Keychron Q10",
+ "manufacturer": "Keychron",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "usb": {
+ "vid": "0x3434",
+ "pid": "0x01A1",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_ansi_89": {
+ "layout": [
+ {"matrix":[0, 0], "x":0.25, "y":0},
+ {"matrix":[0, 1], "x":1.75, "y":0},
+ {"matrix":[0, 2], "x":3, "y":0},
+ {"matrix":[0, 3], "x":4, "y":0},
+ {"matrix":[0, 4], "x":5, "y":0},
+ {"matrix":[0, 5], "x":6, "y":0},
+ {"matrix":[0, 6], "x":7.25, "y":0},
+ {"matrix":[0, 7], "x":8.25, "y":0},
+ {"matrix":[0, 8], "x":11, "y":0},
+ {"matrix":[0, 9], "x":12, "y":0},
+ {"matrix":[0,10], "x":13.25, "y":0},
+ {"matrix":[0,11], "x":14.25, "y":0},
+ {"matrix":[0,12], "x":15.25, "y":0},
+ {"matrix":[0,13], "x":16.25, "y":0},
+ {"matrix":[0,14], "x":17.5, "y":0},
+ {"matrix":[0,15], "x":18.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.25, "y":1.25},
+ {"matrix":[1, 5], "x":6.25, "y":1.25},
+ {"matrix":[1, 6], "x":7.25, "y":1.25},
+ {"matrix":[1, 7], "x":8.25, "y":1.25},
+ {"matrix":[1, 8], "x":10.5, "y":1.25},
+ {"matrix":[1, 9], "x":11.5, "y":1.25},
+ {"matrix":[1,10], "x":12.5, "y":1.25},
+ {"matrix":[1,11], "x":13.5, "y":1.25},
+ {"matrix":[1,12], "x":14.5, "y":1.25},
+ {"matrix":[1,13], "x":15.5, "y":1.25},
+ {"matrix":[1,14], "x":16.5, "y":1.25, "w":2},
+ {"matrix":[1,15], "x":19, "y":1.25},
+
+ {"matrix":[2, 0], "x":0.5, "y":2.25},
+ {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5},
+ {"matrix":[2, 2], "x":3.25, "y":2.25},
+ {"matrix":[2, 3], "x":4.5, "y":2.25},
+ {"matrix":[2, 4], "x":5.5, "y":2.25},
+ {"matrix":[2, 5], "x":6.5, "y":2.25},
+ {"matrix":[2, 6], "x":7.5, "y":2.25},
+ {"matrix":[2, 7], "x":10, "y":2.25},
+ {"matrix":[2, 8], "x":11, "y":2.25},
+ {"matrix":[2, 9], "x":12, "y":2.25},
+ {"matrix":[2,10], "x":13, "y":2.25},
+ {"matrix":[2,11], "x":14, "y":2.25},
+ {"matrix":[2,12], "x":15.25, "y":2.25},
+ {"matrix":[2,13], "x":16.25, "y":2.25},
+ {"matrix":[2,14], "x":17.25, "y":2.25, "w":1.5},
+ {"matrix":[2,15], "x":19.25, "y":2.25},
+
+ {"matrix":[3, 0], "x":0.25, "y":3.25},
+ {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75},
+ {"matrix":[3, 2], "x":3.25, "y":3.25},
+ {"matrix":[3, 3], "x":4.5, "y":3.25},
+ {"matrix":[3, 4], "x":5.5, "y":3.25},
+ {"matrix":[3, 5], "x":6.5, "y":3.25},
+ {"matrix":[3, 6], "x":7.5, "y":3.25},
+ {"matrix":[3, 8], "x":10.25, "y":3.25},
+ {"matrix":[3, 9], "x":11.25, "y":3.25},
+ {"matrix":[3,10], "x":12.25, "y":3.25},
+ {"matrix":[3,11], "x":13.25, "y":3.25},
+ {"matrix":[3,12], "x":14.75, "y":3.25},
+ {"matrix":[3,13], "x":15.75, "y":3.25},
+ {"matrix":[3,14], "x":16.75, "y":3.25, "w":2.25},
+ {"matrix":[3,15], "x":19.5, "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.5, "y":4.25},
+ {"matrix":[4, 4], "x":4.75, "y":4.25},
+ {"matrix":[4, 5], "x":5.75, "y":4.25},
+ {"matrix":[4, 6], "x":6.75, "y":4.25},
+ {"matrix":[4, 7], "x":7.75, "y":4.25},
+ {"matrix":[4, 8], "x":9.5, "y":4.25},
+ {"matrix":[4, 9], "x":10.5, "y":4.25},
+ {"matrix":[4,10], "x":11.5, "y":4.25},
+ {"matrix":[4,11], "x":12.5, "y":4.25},
+ {"matrix":[4,12], "x":13.5, "y":4.25},
+ {"matrix":[4,13], "x":15.25, "y":4.25},
+ {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75},
+ {"matrix":[4,15], "x":18.25, "y":4.5},
+
+ {"matrix":[5, 0], "x":0, "y":5.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, 3], "x":4.75, "y":5.25, "w":1.25},
+ {"matrix":[5, 4], "x":6, "y":5.25, "w":2.25},
+ {"matrix":[5, 7], "x":8.25, "y":5.25},
+ {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75},
+ {"matrix":[5, 9], "x":12.25, "y":5.25},
+ {"matrix":[5,13], "x":17.25, "y":5.5},
+ {"matrix":[5,14], "x":18.25, "y":5.5},
+ {"matrix":[5,15], "x":19.25, "y":5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..59a4773771
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_ansi_89(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ _______, 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,
+ _______, 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,
+ _______, 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,
+ _______, 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_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_ansi_89(
+ 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, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_ansi_89(
+ 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,
+ _______, 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,
+ _______, 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,
+ _______, 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,
+ _______, 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_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_ansi_89(
+ RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_ENABLE) && 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/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q10/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..0693820029
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2022 @ 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
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_ansi_89(
+ 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,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_ansi_89(
+ 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, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_ansi_89(
+ 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,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_ansi_89(
+ RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_ENABLE) && 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
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+ housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..da55586f86
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_ansi_89(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_ansi_89(
+ 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, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_ansi_89(
+ 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,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_ansi_89(
+ RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_ENABLE) && 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/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q10/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10/ansi_encoder/readme.md b/keyboards/keychron/q10/ansi_encoder/readme.md
new file mode 100644
index 0000000000..6f7f579659
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ANSI variant of the Keychron Q10
+
+- Enable EC11 rotary encoder.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top left key pushbutton to mute.
diff --git a/keyboards/keychron/q10/ansi_encoder/rules.mk b/keyboards/keychron/q10/ansi_encoder/rules.mk
new file mode 100644
index 0000000000..359346625e
--- /dev/null
+++ b/keyboards/keychron/q10/ansi_encoder/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = yes # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+ENCODER_ENABLE = yes # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q10/config.h b/keyboards/keychron/q10/config.h
new file mode 100644
index 0000000000..d5f30a12c0
--- /dev/null
+++ b/keyboards/keychron/q10/config.h
@@ -0,0 +1,119 @@
+/* Copyright 2022 @ 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
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS \
+ { B5, B4, B3, A15, A14, A13 }
+#define MATRIX_COL_PINS \
+ { C14, C15, A0, A1, A2, A3, A4, A5, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* RGB Matrix Driver Configuration */
+#define DRIVER_COUNT 2
+#define DRIVER_ADDR_1 0b1110111
+#define DRIVER_ADDR_2 0b1110100
+
+/* 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
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
+#define PHASE_CHANNEL MSKPHASE_9CHANNEL
+#define CKLED2001_CURRENT_TUNE \
+ { 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A }
+
+/* DIP switch */
+#define DIP_SWITCH_MATRIX_GRID { {5,5} }
+
+/* Disable DIP switch in matrix data */
+#define MATRIX_MASKED
+
+/* Disable RGB lighting when PC is in suspend */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* EEPROM Driver Configuration */
+#define WEAR_LEVELING_LOGICAL_SIZE 2048
+#define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2)
+
+/* Specify (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 1
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+// #define ENABLE_RGB_MATRIX_ALPHAS_MODS
+// #define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_BREATHING
+// #define ENABLE_RGB_MATRIX_BAND_SAT
+// #define ENABLE_RGB_MATRIX_BAND_VAL
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+// #define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+// #define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define ENABLE_RGB_MATRIX_CYCLE_ALL
+#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define ENABLE_RGB_MATRIX_DUAL_BEACON
+#define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+// #define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+// #define ENABLE_RGB_MATRIX_RAINDROPS
+#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #define ENABLE_RGB_MATRIX_HUE_BREATHING
+// #define ENABLE_RGB_MATRIX_HUE_PENDULUM
+// #define ENABLE_RGB_MATRIX_HUE_WAVE
+#define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// #define ENABLE_RGB_MATRIX_PIXEL_FLOW
+// #define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+// #define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define ENABLE_RGB_MATRIX_SPLASH
+// #define ENABLE_RGB_MATRIX_MULTISPLASH
+#define ENABLE_RGB_MATRIX_SOLID_SPLASH
+// #define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/keychron/q10/halconf.h b/keyboards/keychron/q10/halconf.h
new file mode 100644
index 0000000000..41bddcb279
--- /dev/null
+++ b/keyboards/keychron/q10/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next <halconf.h>
diff --git a/keyboards/keychron/q10/iso_encoder/config.h b/keyboards/keychron/q10/iso_encoder/config.h
new file mode 100644
index 0000000000..7f4a575432
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/config.h
@@ -0,0 +1,31 @@
+/* Copyright 2022 @ 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
+
+/* 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)
+
+/* Encoder Configuration */
+#define ENCODERS_PAD_A { A10 }
+#define ENCODERS_PAD_B { A8 }
+#define ENCODER_RESOLUTION 4
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 47
diff --git a/keyboards/keychron/q10/iso_encoder/info.json b/keyboards/keychron/q10/iso_encoder/info.json
new file mode 100644
index 0000000000..9978af0b4b
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/info.json
@@ -0,0 +1,112 @@
+{
+ "keyboard_name": "Keychron Q10",
+ "manufacturer": "Keychron",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "usb": {
+ "vid": "0x3434",
+ "pid": "0x01A3",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_iso_90": {
+ "layout": [
+ {"matrix":[0, 0], "x":0.25, "y":0},
+ {"matrix":[0, 1], "x":1.75, "y":0},
+ {"matrix":[0, 2], "x":3, "y":0},
+ {"matrix":[0, 3], "x":4, "y":0},
+ {"matrix":[0, 4], "x":5, "y":0},
+ {"matrix":[0, 5], "x":6, "y":0},
+ {"matrix":[0, 6], "x":7.25, "y":0},
+ {"matrix":[0, 7], "x":8.25, "y":0},
+ {"matrix":[0, 8], "x":11, "y":0},
+ {"matrix":[0, 9], "x":12, "y":0},
+ {"matrix":[0,10], "x":13.25, "y":0},
+ {"matrix":[0,11], "x":14.25, "y":0},
+ {"matrix":[0,12], "x":15.25, "y":0},
+ {"matrix":[0,13], "x":16.25, "y":0},
+ {"matrix":[0,14], "x":17.5, "y":0},
+ {"matrix":[0,15], "x":18.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.25, "y":1.25},
+ {"matrix":[1, 5], "x":6.25, "y":1.25},
+ {"matrix":[1, 6], "x":7.25, "y":1.25},
+ {"matrix":[1, 7], "x":8.25, "y":1.25},
+ {"matrix":[1, 8], "x":10.5, "y":1.25},
+ {"matrix":[1, 9], "x":11.5, "y":1.25},
+ {"matrix":[1,10], "x":12.5, "y":1.25},
+ {"matrix":[1,11], "x":13.5, "y":1.25},
+ {"matrix":[1,12], "x":14.5, "y":1.25},
+ {"matrix":[1,13], "x":15.5, "y":1.25},
+ {"matrix":[1,14], "x":16.5, "y":1.25, "w":2},
+ {"matrix":[1,15], "x":19, "y":1.25},
+
+ {"matrix":[2, 0], "x":0.5, "y":2.25},
+ {"matrix":[2, 1], "x":1.75, "y":2.25, "w":1.5},
+ {"matrix":[2, 2], "x":3.25, "y":2.25},
+ {"matrix":[2, 3], "x":4.5, "y":2.25},
+ {"matrix":[2, 4], "x":5.5, "y":2.25},
+ {"matrix":[2, 5], "x":6.5, "y":2.25},
+ {"matrix":[2, 6], "x":7.5, "y":2.25},
+ {"matrix":[2, 7], "x":10, "y":2.25},
+ {"matrix":[2, 8], "x":11, "y":2.25},
+ {"matrix":[2, 9], "x":12, "y":2.25},
+ {"matrix":[2,10], "x":13, "y":2.25},
+ {"matrix":[2,11], "x":14, "y":2.25},
+ {"matrix":[2,12], "x":15.25, "y":2.25},
+ {"matrix":[2,13], "x":16.25, "y":2.25},
+ {"matrix":[2,15], "x":19.25, "y":2.25},
+
+ {"matrix":[3, 0], "x":0.25, "y":3.25},
+ {"matrix":[3, 1], "x":1.5, "y":3.25, "w":1.75},
+ {"matrix":[3, 2], "x":3.25, "y":3.25},
+ {"matrix":[3, 3], "x":4.5, "y":3.25},
+ {"matrix":[3, 4], "x":5.5, "y":3.25},
+ {"matrix":[3, 5], "x":6.5, "y":3.25},
+ {"matrix":[3, 6], "x":7.5, "y":3.25},
+ {"matrix":[3, 8], "x":10.25, "y":3.25},
+ {"matrix":[3, 9], "x":11.25, "y":3.25},
+ {"matrix":[3,10], "x":12.25, "y":3.25},
+ {"matrix":[3,11], "x":13.25, "y":3.25},
+ {"matrix":[3,12], "x":14.75, "y":3.25},
+ {"matrix":[3,13], "x":15.75, "y":3.25},
+ {"matrix":[3,14], "x":16.75, "y":3.25},
+ {"matrix":[2,14], "x":17.75, "y":3.25, "w":1.25, "h":2},
+ {"matrix":[3,15], "x":19.5, "y":3.25},
+
+ {"matrix":[4, 0], "x":0, "y":4.25},
+ {"matrix":[4, 1], "x":1.5, "y":4.25},
+ {"matrix":[4, 2], "x":2.5, "y":4.25},
+ {"matrix":[4, 3], "x":3.5, "y":4.25},
+ {"matrix":[4, 4], "x":4.75, "y":4.25},
+ {"matrix":[4, 5], "x":5.75, "y":4.25},
+ {"matrix":[4, 6], "x":6.75, "y":4.25},
+ {"matrix":[4, 7], "x":7.75, "y":4.25},
+ {"matrix":[4, 8], "x":9.5, "y":4.25},
+ {"matrix":[4, 9], "x":10.5, "y":4.25},
+ {"matrix":[4,10], "x":11.5, "y":4.25},
+ {"matrix":[4,11], "x":12.5, "y":4.25},
+ {"matrix":[4,12], "x":13.5, "y":4.25},
+ {"matrix":[4,13], "x":15.25, "y":4.25},
+ {"matrix":[4,14], "x":16.25, "y":4.25, "w":1.75},
+ {"matrix":[4,15], "x":18.25, "y":4.5},
+
+ {"matrix":[5, 0], "x":0, "y":5.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, 3], "x":4.75, "y":5.25, "w":1.25},
+ {"matrix":[5, 4], "x":6, "y":5.25, "w":2.25},
+ {"matrix":[5, 7], "x":8.25, "y":5.25},
+ {"matrix":[5, 8], "x":9.5, "y":5.25, "w":2.75},
+ {"matrix":[5, 9], "x":12.25, "y":5.25},
+ {"matrix":[5,13], "x":17.25, "y":5.5},
+ {"matrix":[5,14], "x":18.25, "y":5.5},
+ {"matrix":[5,15], "x":19.25, "y":5.5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.c b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
new file mode 100644
index 0000000000..1e8f80ddd8
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/iso_encoder.c
@@ -0,0 +1,158 @@
+/* Copyright 2022 @ 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"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+
+const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual 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}, // '
+ {0, F_15, D_15, E_15}, // |
+ {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_14, G_14, H_14},
+ {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_3, D_3, E_3}, // Left
+ {1, F_2, D_2, E_2}, // Down
+ {1, F_1, D_1, E_1}, // Right
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+ {
+ // Key Matrix to LED Index
+ { __, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14 },
+ { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 },
+ { 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 59, 45 },
+ { 46, 47, 48, 49, 50, 51, 52, __, 53, 54, 55, 56, 57, 58, 60, 61 },
+ { 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77 },
+ { 78, 79, 80, 81, 82, __, __, 83, 84, 85, __, __, __, 86, 87, 88 },
+ },
+ {
+ // LED Index to Physical Position
+ {0,0}, {19,0}, {34,0}, {60,1}, {72,3}, {87,6}, {99,8}, {120,8}, {132,6}, {147,3}, {159,1}, {173,0}, {185,0}, {201,1}, {219,1},
+ {5,14}, {24,14}, {36,14}, {48,13}, {62,15}, {74,17}, {86,20}, {98,22}, {115,22}, {127,20}, {139,17}, {151,15}, {165,13}, {177,14}, {195,14}, {220,15},
+ {4,24}, {24,24}, {40,24}, {53,24}, {65,27}, {77,29}, {89,31}, {112,33}, {124,31}, {136,29}, {148,27}, {160,24}, {176,24}, {189,24}, {222,25},
+ {2,34}, {23,34}, {40,34}, {54,35}, {66,37}, {78,39}, {90,42}, {118,43}, {130,40}, {142,38}, {154,36}, {167,35}, {179,35}, {192,35}, {208,31}, {224,36},
+ {0,45}, {18,45}, {31,45}, {44,45}, {57,46}, {69,48}, {81,51}, {93,53}, {111,54}, {123,52}, {135,50}, {147,48}, {159,46}, {173,45}, {190,45}, {210,47},
+ {0,55}, {18,55}, {33,55}, {56,57}, {77,61}, {97,64}, {124,63}, {147,59}, {198,58}, {210,58}, {222,58},
+ },
+ {
+ // RGB LED Index to Flag
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+ 1, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+ 1, 1, 1, 1, 4, 1, 4, 1, 1, 1, 1,
+ }
+};
+
+#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q10/iso_encoder/iso_encoder.h b/keyboards/keychron/q10/iso_encoder/iso_encoder.h
new file mode 100644
index 0000000000..db52563dc4
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/iso_encoder.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..68bc5e0954
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_iso_90(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ _______, 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,
+ _______, 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,
+ _______, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
+ _______, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ _______, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_iso_90(
+ 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, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_iso_90(
+ 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,
+ _______, 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,
+ _______, 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,
+ _______, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, KC_HOME,
+ _______, KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+ _______, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_iso_90(
+ RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_ENABLE) && 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/iso_encoder/keymaps/default/rules.mk b/keyboards/keychron/q10/iso_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..9d19e8b09f
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2022 @ 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
+#include "keychron_common.h"
+
+// clang-format off
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_iso_90(
+ 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,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_iso_90(
+ 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, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_iso_90(
+ 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,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_iso_90(
+ RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_ENABLE) && 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
+
+// clang-format on
+
+void housekeeping_task_user(void) {
+ housekeeping_task_keychron();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/keychron/rules.mk
@@ -0,0 +1,5 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
+
+VPATH += keyboards/keychron/common
+SRC += keychron_common.c
diff --git a/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..7d61df46b9
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/via/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2022 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+enum layers{
+ MAC_BASE,
+ MAC_FN,
+ WIN_BASE,
+ WIN_FN
+};
+
+#define KC_TASK LGUI(KC_TAB)
+#define KC_FLXP LGUI(KC_E)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT_iso_90(
+ KC_MUTE, KC_ESC, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_INS, KC_DEL,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, MO(MAC_FN), KC_SPC, KC_RCMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN] = LAYOUT_iso_90(
+ 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, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_BASE] = LAYOUT_iso_90(
+ 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,
+ MACRO01, 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,
+ MACRO02, 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,
+ MACRO03, 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,
+ MACRO04, 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,
+ MACRO05, KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, MO(WIN_FN), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_FN] = LAYOUT_iso_90(
+ RGB_TOG, _______, KC_BRID, KC_BRIU, KC_TASK, KC_FLXP, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+};
+
+#if defined(ENCODER_ENABLE) && 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/iso_encoder/keymaps/via/rules.mk b/keyboards/keychron/q10/iso_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q10/iso_encoder/readme.md b/keyboards/keychron/q10/iso_encoder/readme.md
new file mode 100644
index 0000000000..e66322443a
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/readme.md
@@ -0,0 +1,5 @@
+# The ISO variant of the Keychron Q10
+
+- Enable EC11 rotary encoder.
+- Turn clockwise to increase volume and turn anti-clockwise to decrease volume.
+- Press top left key pushbutton to mute.
diff --git a/keyboards/keychron/q10/iso_encoder/rules.mk b/keyboards/keychron/q10/iso_encoder/rules.mk
new file mode 100644
index 0000000000..359346625e
--- /dev/null
+++ b/keyboards/keychron/q10/iso_encoder/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = STM32L432
+
+# Bootloader selection
+BOOTLOADER = stm32-dfu
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = yes # Enable USB N-key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+ENCODER_ENABLE = yes # Enable Encoder
+DIP_SWITCH_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = CKLED2001
+EEPROM_DRIVER = wear_leveling
+WEAR_LEVELING_DRIVER = embedded_flash
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# custom matrix setup
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
diff --git a/keyboards/keychron/q10/matrix.c b/keyboards/keychron/q10/matrix.c
new file mode 100644
index 0000000000..5c035b0e42
--- /dev/null
+++ b/keyboards/keychron/q10/matrix.c
@@ -0,0 +1,208 @@
+/* Copyright 2021 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "matrix.h"
+#include "quantum.h"
+
+// Pin connected to DS of 74HC595
+#define DATA_PIN A7
+// Pin connected to SH_CP of 74HC595
+#define CLOCK_PIN B1
+// Pin connected to ST_CP of 74HC595
+#define LATCH_PIN B0
+
+#ifdef MATRIX_ROW_PINS
+static pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+#endif // MATRIX_ROW_PINS
+#ifdef MATRIX_COL_PINS
+static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif // MATRIX_COL_PINS
+
+#define ROWS_PER_HAND (MATRIX_ROWS)
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+ ATOMIC_BLOCK_FORCEON {
+ setPinOutput(pin);
+ writePinLow(pin);
+ }
+}
+
+static inline void setPinOutput_writeHigh(pin_t pin) {
+ ATOMIC_BLOCK_FORCEON {
+ setPinOutput(pin);
+ writePinHigh(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 void shiftOutMultiple(uint16_t dataOut) {
+ for (uint8_t i = 0; i < 8; i++) {
+ if (dataOut & 0x1) {
+ setPinOutput_writeHigh(DATA_PIN);
+ } else {
+ setPinOutput_writeLow(DATA_PIN);
+ }
+ dataOut = dataOut >> 1;
+ setPinOutput_writeHigh(CLOCK_PIN);
+ setPinOutput_writeLow(CLOCK_PIN);
+ }
+ setPinOutput_writeHigh(LATCH_PIN);
+ setPinOutput_writeLow(LATCH_PIN);
+}
+
+static void shiftOut_single(uint8_t dataOut) {
+ if (dataOut & 0x1) {
+ setPinOutput_writeHigh(DATA_PIN);
+ } else {
+ setPinOutput_writeLow(DATA_PIN);
+ }
+ setPinOutput_writeHigh(CLOCK_PIN);
+ setPinOutput_writeLow(CLOCK_PIN);
+ setPinOutput_writeHigh(LATCH_PIN);
+ setPinOutput_writeLow(LATCH_PIN);
+}
+
+static bool select_col(uint8_t col) {
+ pin_t pin = col_pins[col];
+
+ if (pin != NO_PIN) {
+ setPinOutput_writeLow(pin);
+ return true;
+ } else {
+ if (col == (MATRIX_COLS - 8)) {
+ shiftOut_single(0x00);
+ } else {
+ shiftOut_single(0x01);
+ }
+ return true;
+ }
+ return false;
+}
+
+static void unselect_col(uint8_t col) {
+ pin_t pin = col_pins[col];
+
+ if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+ setPinOutput_writeHigh(pin);
+#else
+ setPinInputHigh_atomic(pin);
+#endif
+ } else {
+ if (col == (MATRIX_COLS - 1)) {
+ setPinOutput_writeHigh(CLOCK_PIN);
+ setPinOutput_writeLow(CLOCK_PIN);
+ setPinOutput_writeHigh(LATCH_PIN);
+ setPinOutput_writeLow(LATCH_PIN);
+ }
+ }
+}
+
+static void unselect_cols(void) {
+ // unselect column pins
+ for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+ pin_t pin = col_pins[x];
+ if (pin != NO_PIN) {
+#ifdef MATRIX_UNSELECT_DRIVE_HIGH
+ setPinOutput_writeHigh(pin);
+#else
+ setPinInputHigh_atomic(pin);
+#endif
+ } else {
+ if (x == (MATRIX_COLS - 1)) {
+ // unselect Shift Register
+ shiftOutMultiple(0xFF);
+ }
+ }
+ }
+}
+
+static void matrix_init_pins(void) {
+ unselect_cols();
+ for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+ if (row_pins[x] != NO_PIN) {
+ setPinInputHigh_atomic(row_pins[x]);
+ }
+ }
+}
+
+static void matrix_read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col, matrix_row_t row_shifter) {
+ bool key_pressed = false;
+
+ // Select col
+ if (!select_col(current_col)) { // select col
+ return; // skip NO_PIN col
+ }
+
+ if (current_col < (MATRIX_COLS - 8)) {
+ matrix_output_select_delay();
+ } else {
+ matrix_output_select_delay();
+ matrix_output_select_delay();
+ matrix_output_select_delay();
+ matrix_output_select_delay();
+ }
+
+ // For each row...
+ for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {
+ // Check row pin state
+ if (readMatrixPin(row_pins[row_index]) == 0) {
+ // Pin LO, set col bit
+ current_matrix[row_index] |= row_shifter;
+ key_pressed = true;
+ } else {
+ // Pin HI, clear col bit
+ current_matrix[row_index] &= ~row_shifter;
+ }
+ }
+
+ // Unselect col
+ unselect_col(current_col);
+ matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+ // initialize key pins
+ matrix_init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+ matrix_row_t curr_matrix[MATRIX_ROWS] = {0};
+
+ // Set col, read rows
+ matrix_row_t row_shifter = MATRIX_ROW_SHIFTER;
+ for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++, row_shifter <<= 1) {
+ matrix_read_rows_on_col(curr_matrix, current_col, row_shifter);
+ }
+
+ bool changed = memcmp(current_matrix, curr_matrix, sizeof(curr_matrix)) != 0;
+ if (changed) memcpy(current_matrix, curr_matrix, sizeof(curr_matrix));
+
+ return changed;
+}
diff --git a/keyboards/keychron/q10/mcuconf.h b/keyboards/keychron/q10/mcuconf.h
new file mode 100644
index 0000000000..0ca8c64850
--- /dev/null
+++ b/keyboards/keychron/q10/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c
new file mode 100644
index 0000000000..c823e6939f
--- /dev/null
+++ b/keyboards/keychron/q10/q10.c
@@ -0,0 +1,87 @@
+/* Copyright 2022 @ 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 "q10.h"
+
+const matrix_row_t matrix_mask[] = {
+ 0b1111111111111111,
+ 0b1111111111111111,
+ 0b1111111111111111,
+ 0b1111111111111111,
+ 0b1111111111111111,
+ 0b1111111111011111,
+};
+
+#ifdef DIP_SWITCH_ENABLE
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+ if (!dip_switch_update_user(index, active)) {
+ return false;
+ }
+ if (index == 0) {
+ default_layer_set(1UL << (active ? 2 : 0));
+ }
+ return true;
+}
+
+#endif // DIP_SWITCH_ENABLE
+
+#if defined(RGB_MATRIX_ENABLE) && defined(CAPS_LOCK_LED_INDEX)
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_user(keycode, record)) {
+ return false;
+ }
+ switch (keycode) {
+# ifdef RGB_MATRIX_ENABLE
+ case RGB_TOG:
+ if (record->event.pressed) {
+ switch (rgb_matrix_get_flags()) {
+ case LED_FLAG_ALL: {
+ rgb_matrix_set_flags(LED_FLAG_NONE);
+ rgb_matrix_set_color_all(0, 0, 0);
+ } break;
+ default: {
+ rgb_matrix_set_flags(LED_FLAG_ALL);
+ } break;
+ }
+ }
+ if (!rgb_matrix_is_enabled()) {
+ rgb_matrix_set_flags(LED_FLAG_ALL);
+ rgb_matrix_enable();
+ }
+ return false;
+# endif
+ }
+ return true;
+}
+
+bool rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {
+ if (!rgb_matrix_indicators_advanced_user(led_min, led_max)) {
+ return false;
+ }
+
+ if (host_keyboard_led_state().caps_lock) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 255, 255, 255);
+ } else {
+ if (!rgb_matrix_get_flags()) {
+ RGB_MATRIX_INDICATOR_SET_COLOR(CAPS_LOCK_LED_INDEX, 0, 0, 0);
+ }
+ }
+ return true;
+}
+
+#endif // CAPS_LOCK_LED_INDEX
diff --git a/keyboards/keychron/q10/q10.h b/keyboards/keychron/q10/q10.h
new file mode 100644
index 0000000000..80e747aca3
--- /dev/null
+++ b/keyboards/keychron/q10/q10.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 @ 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
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_keychron_q10_ansi_encoder)
+# include "ansi_encoder.h"
+#elif defined(KEYBOARD_keychron_q10_iso_encoder)
+# include "iso_encoder.h"
+#endif
diff --git a/keyboards/keychron/q10/readme.md b/keyboards/keychron/q10/readme.md
new file mode 100644
index 0000000000..ad3c5ebf41
--- /dev/null
+++ b/keyboards/keychron/q10/readme.md
@@ -0,0 +1,19 @@
+# Keychron Q10
+
+A customizable 75% ergonomic keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q10
+* Hardware Availability: [Keychron](https://www.keychron.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make keychron/q10/ansi_encoder:default
+
+Flashing example for this keyboard:
+
+ make keychron/q10/ansi_encoder:default:flash
+
+**Reset Key**: Hold down the key located at *K01*, which programmed as *Esc* while plugging in the keyboard.
+
+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).