Merge remote-tracking branch 'origin/master' into develop

26 files changed, 1647 insertions, 0 deletions

diff --git a/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
new file mode 100644
index 0000000000..2cfaeae8fc
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,170 @@
+/* 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"
+
+#ifdef RGB_MATRIX_ENABLE
+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, I_1,    G_1,    H_1}
+    {0, I_2,    G_2,    H_2},  // F13
+    {0, I_3,    G_3,    H_3},  // F14
+    {0, I_4,    G_4,    H_4},  // F15
+    {0, I_5,    G_5,    H_5},  // Esc
+    {0, I_6,    G_6,    H_6},  // F1
+    {0, I_7,    G_7,    H_7},  // F2
+    {0, I_8,    G_8,    H_8},  // F3
+    {0, I_9,    G_9,    H_9},  // F4
+    {0, I_10,   G_10,   H_10}, // F5
+    {0, I_11,   G_11,   H_11}, // F6
+    {0, I_12,   G_12,   H_12}, // F7
+    {0, I_13,   G_13,   H_13}, // F8
+    {0, I_14,   G_14,   H_14}, // F9
+    {0, I_15,   G_15,   H_15}, // F10
+    {0, I_16,   G_16,   H_16}, // F11
+    {0, L_16,   J_16,   K_16}, // F12
+    {0, L_15,   J_15,   K_15}, // DEL
+    {0, L_14,   J_14,   K_14}, // Light
+
+
+    {0, C_1,    A_1,    B_1},  // num_lock
+    {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},  // 1!
+    {0, C_7,    A_7,    B_7},  // 2@
+    {0, C_8,    A_8,    B_8},  // 3#
+    {0, C_9,    A_9,    B_9},  // 4$
+    {0, C_10,   A_10,   B_10}, // 5%
+    {0, C_11,   A_11,   B_11}, // 6^
+    {0, C_12,   A_12,   B_12}, // 7&
+    {0, C_13,   A_13,   B_13}, // 8*
+    {0, C_14,   A_14,   B_14}, // 9(
+    {0, C_15,   A_15,   B_15}, // 0)
+    {0, C_16,   A_16,   B_16}, // -_
+    {0, L_13,   J_13,   K_13}, // =+
+    {0, L_12,   J_12,   K_12}, // BackSpace
+    {0, L_11,   J_11,   K_11}, // PgUp
+
+    {0, F_1,    D_1,    E_1},  // 7
+    {0, F_2,    D_2,    E_2},  // 8
+    {0, F_3,    D_3,    E_3},  // 9
+    {0, F_4,    D_4,    E_4},  // +
+    {0, F_5,    D_5,    E_5},  // TAB
+    {0, F_6,    D_6,    E_6},  // Q
+    {0, F_7,    D_7,    E_7},  // W
+    {0, F_8,    D_8,    E_8},  // E
+    {0, F_9,    D_9,    E_9},  // R
+    {0, F_10,   D_10,   E_10}, // T
+    {0, F_11,   D_11,   E_11}, // Y
+    {0, F_12,   D_12,   E_12}, // U
+    {0, F_13,   D_13,   E_13}, // I
+    {0, F_14,   D_14,   E_14}, // O
+    {0, F_15,   D_15,   E_15}, // P
+    {0, F_16,   D_16,   E_16}, // [
+    {0, L_10,   J_10,   K_10}, // ]
+    {0, L_9,    J_9,    K_9},  // \|
+    {0, L_8,    J_8,    K_8},  // PgDn
+
+    {1, C_16,   A_16,   B_16}, // 4
+    {1, C_15,   A_15,   B_15}, // 5
+    {1, C_14,   A_14,   B_14}, // 6
+    // {0, F_4,    D_4,    E_4},  // +
+    {1, C_12,   A_12,   B_12}, // CapsLock
+    {1, C_11,   A_11,   B_11}, // A
+    {1, C_10,   A_10,   B_10}, // S
+    {1, C_9,    A_9,    B_9},  // D
+    {1, C_8,    A_8,    B_8},  // F
+    {1, C_7,    A_7,    B_7},  // G
+    {1, C_6,    A_6,    B_6},  // H
+    {1, C_5,    A_5,    B_5},  // J
+    {1, C_4,    A_4,    B_4},  // k
+    {1, C_3,    A_3,    B_3},  // l
+    {1, C_2,    A_2,    B_2},  // ；
+    {1, C_1,    A_1,    B_1},  // '
+    {1, L_1,    J_1,    K_1},  // Enter
+    {1, L_2,    J_2,    K_2},  // Home
+
+    {1, I_16,   G_16,   H_16}, // 1
+    {1, I_15,   G_15,   H_15}, // 2
+    {1, I_14,   G_14,   H_14}, // 3
+    {1, I_13,   G_13,   H_13}, // Enter
+    {1, I_12,   G_12,   H_12}, //Shift_L
+    {1, I_10,   G_10,   H_10}, // Z
+    {1, I_9,    G_9,    H_9},  // X
+    {1, I_8,    G_8,    H_8},  // C
+    {1, I_7,    G_7,    H_7},  // V
+    {1, I_6,    G_6,    H_6},  // B
+    {1, I_5,    G_5,    H_5},  // N
+    {1, I_4,    G_4,    H_4},  // M
+    {1, I_3,    G_3,    H_3},  // ,
+    {1, I_2,    G_2,    H_2},  // .
+    {1, I_1,    G_1,    H_1},  // ?
+    {1, L_3,    J_3,    K_3},  // Shift_R
+    {1, L_4,    J_4,    K_4},  // Up
+
+    {1, F_16,   D_16,   E_16}, // 0
+    {1, F_14,   D_14,   E_14}, // .
+    {1, F_12,   D_12,   E_12}, // Ctrl_L
+    {1, F_11,   D_11,   E_11}, // Win_L
+    {1, F_10,   D_10,   E_10}, // Alt_L
+    {1, F_6,    D_6,    E_6},  // Space
+    {1, F_3,    D_3,    E_3},  // Alt_R
+    {1, F_2,    D_2,    E_2},  // Fn
+    {1, F_1,    D_1,    E_1},  // Ctrl_R
+    {1, L_5,    J_5,    K_5},  // Left
+    {1, L_6,    J_6,    K_6},  // Down
+    {1, L_7,    J_7,    K_7},  // Right
+};
+
+#define __ NO_LED
+
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15,  16,  17, __,  0,  1 },
+        { 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34,  35,  36, 18, 19, 20 },
+        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53,  54,  55, 37, 38, 39 },
+        { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 76,  71,  72, 56, 57, 58 },
+        { 77, __, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, __,  88,  89, 73, 74, 75 },
+        { 92, 93, 94, __, __, 21, 95, 40, __, 96, 97, 98, 99, 100, 101, 90,  2, 91 },
+    },
+    {
+        // LED Index to Physical Position
+                {11,0},  {23,0},  {34,0},  {49,0},  {63,0},  {75,0},  {86,0},  {98,0},   {112,0},  {123,0},  {135,0},  {146,0},  {161,0},  {172,0},  {184,0},  {195,0},  {209,0},            {224,0},
+        {0,15}, {11,15}, {23,15}, {34,15}, {49,15}, {60,15}, {72,15}, {83,15}, {95,15},  {106,15}, {118,15}, {129,15}, {141,15}, {152,15}, {164,15}, {175,15}, {186,15}, {204,15},           {224,15},
+        {0,26}, {11,26}, {23,26}, {34,32}, {52,26}, {66,26}, {78,26}, {89,26}, {101,26}, {112,26}, {123,26}, {135,26}, {146,26}, {158,26}, {169,26}, {181,26}, {192,26}, {207,26},           {224,26},
+        {0,38}, {11,38}, {23,38},          {53,38}, {69,38}, {81,38}, {92,38}, {103,38}, {115,38}, {126,38}, {138,38}, {149,38}, {161,38}, {172,38}, {184,38},           {202,38},           {224,38},
+        {0,49}, {11,49}, {23,49}, {34,55}, {56,49},          {75,49}, {86,49}, {98,49},  {109,49}, {121,49}, {132,49}, {144,49}, {155,49}, {166,49}, {178,49},           {194,49}, {213,52},
+        {6,61},          {23,61},          {50,61}, {65,61}, {79,61},                              {122,61},                               {163,61}, {175,61}, {186,61}, {201,64}, {213,64}, {224,64},
+    },
+    {
+        // RGB LED Index to Flag
+           1, 1, 1,  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,    1,
+        8, 4, 4, 4,  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,    1,
+        4, 4, 4, 4,  1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
+        4, 4, 4,     8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
+        4, 4, 4, 4,  1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1,
+        4,    4,     1, 1, 1,          4,          1, 4, 1, 1, 1, 1,
+    }
+};
+#endif
diff --git a/keyboards/keychron/q12/ansi_encoder/config.h b/keyboards/keychron/q12/ansi_encoder/config.h
new file mode 100644
index 0000000000..56a1f7505f
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/config.h
@@ -0,0 +1,30 @@
+/* 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
+
+/* RGB Matrix Configuration */
+#define DRIVER_1_LED_TOTAL 56
+#define DRIVER_2_LED_TOTAL 46
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define ENCODER_DEFAULT_POS 0x3
+
+/* Enable caps-lock LED */
+#define CAPS_LOCK_LED_INDEX 59
+
+/* Enable num-lock LED */
+#define NUM_LOCK_LED_INDEX 18
diff --git a/keyboards/keychron/q12/ansi_encoder/info.json b/keyboards/keychron/q12/ansi_encoder/info.json
new file mode 100644
index 0000000000..0e3179708a
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/info.json
@@ -0,0 +1,132 @@
+{
+    "keyboard_name": "Keychron Q12",
+    "manufacturer": "Keychron",
+    "url": "https://github.com/Keychron",
+    "maintainer": "lalalademaxiya1",
+    "usb": {
+        "vid": "0x3434",
+        "pid": "0x01D1",
+        "device_version": "1.0.0"
+    },
+    "encoder": {
+        "rotary": [
+            {"pin_a": "A2", "pin_b": "C14"}
+        ]
+    },
+    "processor": "STM32L432",
+    "bootloader": "stm32-dfu",
+    "layouts": {
+        "LAYOUT_ansi_103": {
+            "layout": [
+                {"matrix":[0,15], "x":0, "y":0},
+                {"matrix":[0,16], "x":1, "y":0},
+                {"matrix":[0,17], "x":2, "y":0},
+                {"matrix":[5,16], "x":3, "y":0},
+                {"matrix":[0,0], "x":4.25, "y":0},
+                {"matrix":[0,1], "x":5.5, "y":0},
+                {"matrix":[0,2], "x":6.5, "y":0},
+                {"matrix":[0,3], "x":7.5, "y":0},
+                {"matrix":[0,4], "x":8.5, "y":0},
+                {"matrix":[0,5], "x":9.75, "y":0},
+                {"matrix":[0,6], "x":10.75, "y":0},
+                {"matrix":[0,7], "x":11.75, "y":0},
+                {"matrix":[0,8], "x":12.75, "y":0},
+                {"matrix":[0,9], "x":14, "y":0},
+                {"matrix":[0,10], "x":15, "y":0},
+                {"matrix":[0,11], "x":16, "y":0},
+                {"matrix":[0,12], "x":17, "y":0},
+                {"matrix":[0,13], "x":18.25, "y":0},
+                {"matrix":[0,14], "x":19.5, "y":0},
+
+                {"matrix":[1,15], "x":0, "y":1.25},
+                {"matrix":[1,16], "x":1, "y":1.25},
+                {"matrix":[1,17], "x":2, "y":1.25},
+                {"matrix":[5,5], "x":3, "y":1.25},
+                {"matrix":[1,0], "x":4.25, "y":1.25},
+                {"matrix":[1,1], "x":5.25, "y":1.25},
+                {"matrix":[1,2], "x":6.25, "y":1.25},
+                {"matrix":[1,3], "x":7.25, "y":1.25},
+                {"matrix":[1,4], "x":8.25, "y":1.25},
+                {"matrix":[1,5], "x":9.25, "y":1.25},
+                {"matrix":[1,6], "x":10.25, "y":1.25},
+                {"matrix":[1,7], "x":11.25, "y":1.25},
+                {"matrix":[1,8], "x":12.25, "y":1.25},
+                {"matrix":[1,9], "x":13.25, "y":1.25},
+                {"matrix":[1,10], "x":14.25, "y":1.25},
+                {"matrix":[1,11], "x":15.25, "y":1.25},
+                {"matrix":[1,12], "x":16.25, "y":1.25},
+                {"matrix":[1,13], "x":17.25, "y":1.25, "w":2},
+                {"matrix":[1,14], "x":19.5, "y":1.25},
+
+                {"matrix":[2,15], "x":0, "y":2.25},
+                {"matrix":[2,16], "x":1, "y":2.25},
+                {"matrix":[2,17], "x":2, "y":2.25},
+                {"matrix":[5,7], "x":3, "y":2.25, "h":2},
+                {"matrix":[2,0], "x":4.25, "y":2.25, "w":1.5},
+                {"matrix":[2,1], "x":5.75, "y":2.25},
+                {"matrix":[2,2], "x":6.75, "y":2.25},
+                {"matrix":[2,3], "x":7.75, "y":2.25},
+                {"matrix":[2,4], "x":8.75, "y":2.25},
+                {"matrix":[2,5], "x":9.75, "y":2.25},
+                {"matrix":[2,6], "x":10.75, "y":2.25},
+                {"matrix":[2,7], "x":11.75, "y":2.25},
+                {"matrix":[2,8], "x":12.75, "y":2.25},
+                {"matrix":[2,9], "x":13.75, "y":2.25},
+                {"matrix":[2,10], "x":14.75, "y":2.25},
+                {"matrix":[2,11], "x":15.75, "y":2.25},
+                {"matrix":[2,12], "x":16.75, "y":2.25},
+                {"matrix":[2,13], "x":17.75, "y":2.25, "w":1.5},
+                {"matrix":[2,14], "x":19.5, "y":2.25},
+
+                {"matrix":[3,15], "x":0, "y":3.25},
+                {"matrix":[3,16], "x":1, "y":3.25},
+                {"matrix":[3,17], "x":2, "y":3.25},
+                {"matrix":[3,0], "x":4.25, "y":3.25, "w":1.75},
+                {"matrix":[3,1], "x":6, "y":3.25},
+                {"matrix":[3,2], "x":7, "y":3.25},
+                {"matrix":[3,3], "x":8, "y":3.25},
+                {"matrix":[3,4], "x":9, "y":3.25},
+                {"matrix":[3,5], "x":10, "y":3.25},
+                {"matrix":[3,6], "x":11, "y":3.25},
+                {"matrix":[3,7], "x":12, "y":3.25},
+                {"matrix":[3,8], "x":13, "y":3.25},
+                {"matrix":[3,9], "x":14, "y":3.25},
+                {"matrix":[3,10], "x":15, "y":3.25},
+                {"matrix":[3,11], "x":16, "y":3.25},
+                {"matrix":[3,13], "x":17, "y":3.25, "w":2.25},
+                {"matrix":[3,14], "x":19.5, "y":3.25},
+
+                {"matrix":[4,15], "x":0, "y":4.25},
+                {"matrix":[4,16], "x":1, "y":4.25},
+                {"matrix":[4,17], "x":2, "y":4.25},
+                {"matrix":[3,12], "x":3, "y":4.25, "h":2},
+                {"matrix":[4,0], "x":4.25, "y":4.25, "w":2.25},
+                {"matrix":[4,2], "x":6.5, "y":4.25},
+                {"matrix":[4,3], "x":7.5, "y":4.25},
+                {"matrix":[4,4], "x":8.5, "y":4.25},
+                {"matrix":[4,5], "x":9.5, "y":4.25},
+                {"matrix":[4,6], "x":10.5, "y":4.25},
+                {"matrix":[4,7], "x":11.5, "y":4.25},
+                {"matrix":[4,8], "x":12.5, "y":4.25},
+                {"matrix":[4,9], "x":13.5, "y":4.25},
+                {"matrix":[4,10], "x":14.5, "y":4.25},
+                {"matrix":[4,11], "x":15.5, "y":4.25},
+                {"matrix":[4,13], "x":16.5, "y":4.25, "w":1.75},
+                {"matrix":[4,14], "x":18.5, "y":4.5},
+
+                {"matrix":[5,15], "x":0, "y":5.25, "w":2},
+                {"matrix":[5,17], "x":2, "y":5.25},
+                {"matrix":[5,0], "x":4.25, "y":5.25, "w":1.25},
+                {"matrix":[5,1], "x":5.5, "y":5.25, "w":1.25},
+                {"matrix":[5,2], "x":6.75, "y":5.25, "w":1.25},
+                {"matrix":[5,6], "x":8, "y":5.25, "w":6.25},
+                {"matrix":[5,9], "x":14.25, "y":5.25},
+                {"matrix":[5,10], "x":15.25, "y":5.25},
+                {"matrix":[5,11], "x":16.25, "y":5.25},
+                {"matrix":[5,12], "x":17.5, "y":5.5},
+                {"matrix":[5,13], "x":18.5, "y":5.5},
+                {"matrix":[5,14], "x":19.5, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c
new file mode 100644
index 0000000000..9c9ee41ef6
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <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_103(
+        KC_MUTE,  KC_F13,   KC_F14,   KC_F15,    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_DEL,            RGB_MOD,
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   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_P7,    KC_P8,    KC_P9,    KC_PPLS,   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_P4,    KC_P5,    KC_P6,               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_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,            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_P0,              KC_PDOT,             KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
+    [MAC_FN] = LAYOUT_ansi_103(
+        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_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_103(
+        KC_MUTE,  _______,  _______,  _______,   KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,     KC_F12,   KC_DEL,            RGB_MOD,
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   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_P7,    KC_P8,    KC_P9,    KC_PPLS,   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_P4,    KC_P5,    KC_P6,               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_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,            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_P0,              KC_PDOT,             KC_LCTL,  KC_LWIN,  KC_LALT,                                 KC_SPC,                                KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
+    [WIN_FN] = LAYOUT_ansi_103(
+        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_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_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
diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q12/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c
new file mode 100644
index 0000000000..abd259d1d1
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/keymap.c
@@ -0,0 +1,80 @@
+/* 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
+#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_103(
+        KC_MUTE,  KC_F13,   KC_F14,   KC_F15,    KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_DEL,             RGB_MOD,
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   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_P7,    KC_P8,    KC_P9,    KC_PPLS,   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_P4,    KC_P5,    KC_P6,               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_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,            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_P0,              KC_PDOT,             KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [MAC_FN] = LAYOUT_ansi_103(
+        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_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_103(
+        KC_MUTE,  _______,  _______,  _______,   KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,     KC_F9,   KC_F10,   KC_F11,     KC_F12,   KC_DEL,             RGB_MOD,
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   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_P7,    KC_P8,    KC_P9,    KC_PPLS,   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_P4,    KC_P5,    KC_P6,               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_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,            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_P0,              KC_PDOT,             KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [WIN_FN] = LAYOUT_ansi_103(
+        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_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,   _______, _______,  _______,    _______,  _______,            _______,
+        _______,  _______,  _______,             _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,   _______, _______,  _______,              _______,            _______,
+        _______,  _______,  _______,  _______,   _______,            _______,  _______,  _______,  _______,  _______,  NK_TOGG,  _______,   _______, _______,  _______,              _______,  _______,
+        _______,            _______,             _______,  _______,  _______,                                _______,                                _______,  _______,    _______,  _______,  _______,  _______),
+};
+
+// clang-format on
+
+#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
+
+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/q12/ansi_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q12/ansi_encoder/keymaps/keychron/rules.mk
new file mode 100644
index 0000000000..9cf1a9b56c
--- /dev/null
+++ b/keyboards/keychron/q12/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/q12/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c
new file mode 100644
index 0000000000..9c9ee41ef6
--- /dev/null
+++ b/keyboards/keychron/q12/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2023 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <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_103(
+        KC_MUTE,  KC_F13,   KC_F14,   KC_F15,    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_DEL,            RGB_MOD,
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   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_P7,    KC_P8,    KC_P9,    KC_PPLS,   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_P4,    KC_P5,    KC_P6,               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_P1,    KC_P2,    KC_P3,    KC_PENT,   KC_LSFT,            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_P0,              KC_PDOT,             KC_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN, KC_RGHT),
+    [MAC_FN] = LAYOUT_ansi_103(
+        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_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_103(
+        KC_MUTE,  _______,  _______,  _______,   KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,   KC_F10,   KC_F11,     KC_F12,   KC_DEL,            RGB_MOD,
+        KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,   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_P7,    KC_P8,    KC_P9,    KC_PPLS,   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