Added q3 pre v2 and q3 v1 iso version

8 files changed, 0 insertions, 467 deletions

diff --git a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c
deleted file mode 100644
index 79a02ccfc5..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/ansi_encoder.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* Copyright 2023 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "quantum.h"
-
-// clang-format off
-#ifdef RGB_MATRIX_ENABLE
-const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED2001 manual for these locations
- *   driver
- *   |  R location
- *   |  |       G location
- *   |  |       |       B location
- *   |  |       |       | */
-//    {0, I_1,    G_1,     H_1},
-    {0, I_2,    G_2,    H_2},
-    {0, I_3,    G_3,    H_3},
-    {0, I_4,    G_4,    H_4},
-    {0, I_5,    G_5,    H_5},
-    {0, I_6,    G_6,    H_6},
-    {0, I_7,    G_7,    H_7},
-    {0, I_8,    G_8,    H_8},
-    {0, I_9,    G_9,    H_9},
-    {0, I_10,   G_10,   H_10},
-    {0, I_11,   G_11,   H_11},
-    {0, I_12,   G_12,   H_12},
-    {0, I_13,   G_13,   H_13},
-    {0, I_14,   G_14,   H_14},
-    {0, I_15,   G_15,   H_15},
-    {0, I_16,   G_16,   H_16},
-    {1, C_4,    A_4,    B_4},  // 16
-
-    {0, C_1,    A_1,    B_1},
-    {0, C_2,    A_2,    B_2},
-    {0, C_3,    A_3,    B_3},
-    {0, C_4,    A_4,    B_4},
-    {0, C_5,    A_5,    B_5},
-    {0, C_6,    A_6,    B_6},
-    {0, C_7,    A_7,    B_7},
-    {0, C_8,    A_8,    B_8},
-    {0, C_9,    A_9,    B_9},
-    {0, C_10,   A_10,   B_10},
-    {0, C_11,   A_11,   B_11},
-    {0, C_12,   A_12,   B_12},
-    {0, C_13,   A_13,   B_13},
-    {0, C_14,   A_14,   B_14},
-    {0, C_15,   A_15,   B_15},
-    {0, C_16,   A_16,   B_16},
-    {1, C_2,    A_2,    B_2},  // 17
-
-    {1, F_13,   D_13,   E_13},
-    {0, F_1,    D_1,    E_1},
-    {0, F_2,    D_2,    E_2},
-    {0, F_3,    D_3,    E_3},
-    {0, F_4,    D_4,    E_4},
-    {0, F_5,    D_5,    E_5},
-    {0, F_6,    D_6,    E_6},
-    {0, F_7,    D_7,    E_7},
-    {0, F_8,    D_8,    E_8},
-    {0, F_9,    D_9,    E_9},
-    {0, F_10,   D_10,   E_10},
-    {0, F_11,   D_11,   E_11},
-    {0, F_12,   D_12,   E_12},
-    {0, F_13,   D_13,   E_13},
-    {0, F_14,   D_14,   E_14},
-    {0, F_15,   D_15,   E_15},
-    {0, F_16,   D_16,   E_16},
-    {1, C_1,    A_1,    B_1},  // 17
-
-    {1, F_12,   D_12,   E_12},
-    {1, C_16,   A_16,   B_16},
-    {1, C_15,   A_15,   B_15},
-    {1, C_14,   A_14,   B_14},
-    {1, C_13,   A_13,   B_13},
-    {1, C_12,   A_12,   B_12},
-    {1, C_11,   A_11,   B_11},
-    {1, C_10,   A_10,   B_10},
-    {1, C_9,    A_9,    B_9},
-    {1, C_8,    A_8,    B_8},
-    {1, C_7,    A_7,    B_7},
-    {1, C_6,    A_6,    B_6},
-    {1, C_5,    A_5,    B_5},
-    {1, C_3,    A_3,    B_3},  // 13
-
-    {1, F_8,    D_8,    E_8},
-    {1, I_16,   G_16,   H_16},
-    {1, I_14,   G_14,   H_14},
-    {1, I_13,   G_13,   H_13},
-    {1, I_12,   G_12,   H_12},
-    {1, I_11,   G_11,   H_11},
-    {1, I_10,   G_10,   H_10},
-    {1, I_9,    G_9,    H_9},
-    {1, I_8,    G_8,    H_8},
-    {1, I_7,    G_7,    H_7},
-    {1, I_6,    G_6,    H_6},
-    {1, I_5,    G_5,    H_5},
-    {1, I_3,    G_3,    H_3},
-    {1, I_1,    G_1,    H_1},  // 13
-
-    {1, F_7,    D_7,    E_7},
-    {1, F_16,   D_16,   E_16},
-    {1, F_15,   D_15,   E_15},
-    {1, F_14,   D_14,   E_14},
-    {1, F_10,   D_10,   E_10},
-    {1, F_6,    D_6,    E_6},
-    {1, F_5,    D_5,    E_5},
-    {1, F_4,    D_4,    E_4},
-    {1, F_3,    D_3,    E_3},
-    {1, F_2,    D_2,    E_2},
-    {1, F_1,    D_1,    E_1},
-    {1, I_2,    G_2,    H_2},
-};
-
-#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, __ },
-        { 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, __, 64, __, __, __, 51 },
-        { 66, __, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, __, 77, __, 78, __, 65 },
-        { 80, 81, 82, __, __, __, 83, __, __, __, 84, 85, 86, 87, 88, 89, 90, 79 },
-    },
-    {
-        // LED Index to Physical Position
-                {21,0},           {44,0},  {56,0},  {68,0},  {79,0},  {96,0},  {108,0},  {120,0},  {131,0},  {149,0},  {160,0},  {172,0},  {183,0},  {201,0},  {212,0},  {224,0},
-                {21,17}, {32,17}, {44,17}, {55,17}, {67,17}, {79,17}, {90,17}, {102,17}, {114,17}, {125,17}, {137,17}, {149,17}, {160,17}, {178,17}, {201,17}, {212,17}, {224,17},
-        {0,23}, {23,29}, {38,29}, {50,29}, {61,29}, {73,29}, {85,29}, {96,29}, {108,29}, {119,29}, {131,29}, {143,29}, {154,29}, {166,29}, {180,29}, {201,29}, {212,29}, {224,29},
-        {0,37}, {25,40}, {41,40}, {53,40}, {64,40}, {76,40}, {87,40}, {99,40}, {111,40}, {122,40}, {134,40}, {146,40}, {157,40},           {176,40},
-        {0,50}, {28,52},          {47,52}, {58,52}, {70,52}, {82,52}, {93,52}, {105,52}, {116,52}, {128,52}, {140,52}, {151,52},           {173,52},           {212,52},
-        {0,64}, {22,63}, {37,63}, {51,63},                            {95,63},                               {138,63}, {153,63}, {167,63}, {182,63}, {201,63}, {212,63}, {224,63},
-    },
-    {
-        // RGB LED Index to Flag
-           1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-           4, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1,
-        4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
-        4, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
-        4, 1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
-        4, 1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1,
-    }
-};
-#endif
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/config.h b/keyboards/keychron/q3_pro/ansi_encoder/config.h
deleted file mode 100644
index c111b5c6c0..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2023 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#ifdef RGB_MATRIX_ENABLE
-/* RGB Matrix driver configuration */
-#    define DRIVER_COUNT 2
-
-#    define DRIVER_ADDR_1 0b1110111
-#    define DRIVER_ADDR_2 0b1110100
-#    define DRIVER_1_LED_COUNT 47
-#    define DRIVER_2_LED_COUNT 44
-#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_COUNT + DRIVER_2_LED_COUNT)
-
-/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in CKLED2001.h) */
-#    define PHASE_CHANNEL MSKPHASE_9CHANNEL
-
-/* Set LED driver current */
-#    define CKLED2001_CURRENT_TUNE \
-        { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20 }
-
-/* Set to infinit, which is use in USB mode by default */
-#    define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
-
-/* Allow shutdown of led driver to save power */
-#    define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
-/* Turn off backlight on low brightness to save power */
-#    define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
-
-#    define LOW_BAT_IND_INDEX 83
-
-/* RGB Matrix Animation modes. Explicitly enabled
- * For full list of effects, see:
- * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
- */
-
-#    define RGB_MATRIX_KEYPRESSES
-#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#endif // RGB_MATRIX_ENABLE
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/info.json b/keyboards/keychron/q3_pro/ansi_encoder/info.json
deleted file mode 100644
index 50b57d199e..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/info.json
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-    "usb": {
-    	"pid": "0x0630",
-    	"device_version": "1.0.0"
-    },
-    "layouts": {
-        "LAYOUT_ansi_92": {
-            "layout": [
-                {"matrix":[0,0], "x":0, "y":0.25},
-
-                {"matrix":[0,1], "x":1.25, "y":0},
-                {"matrix":[0,2], "x":3.25, "y":0},
-                {"matrix":[0,3], "x":4.25, "y":0},
-                {"matrix":[0,4], "x":5.25, "y":0},
-                {"matrix":[0,5], "x":6.25, "y":0},
-                {"matrix":[0,6], "x":7.75, "y":0},
-                {"matrix":[0,7], "x":8.75, "y":0},
-                {"matrix":[0,8], "x":9.75, "y":0},
-                {"matrix":[0,9], "x":10.75, "y":0},
-                {"matrix":[0,10], "x":12.25, "y":0},
-                {"matrix":[0,11], "x":13.25, "y":0},
-                {"matrix":[0,12], "x":14.25, "y":0},
-                {"matrix":[0,13], "x":15.25, "y":0},
-                {"matrix":[0,14], "x":16.5, "y":0},
-                {"matrix":[0,15], "x":17.5, "y":0},
-                {"matrix":[0,16], "x":18.5, "y":0},
-
-                {"matrix":[1,0], "x":1.25, "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":9.25, "y":1.25},
-                {"matrix":[1,9], "x":10.25, "y":1.25},
-                {"matrix":[1,10], "x":11.25, "y":1.25},
-                {"matrix":[1,11], "x":12.25, "y":1.25},
-                {"matrix":[1,12], "x":13.25, "y":1.25},
-                {"matrix":[1,13], "x":14.25, "y":1.25, "w":2},
-                {"matrix":[1,14], "x":16.5, "y":1.25},
-                {"matrix":[1,15], "x":17.5, "y":1.25},
-                {"matrix":[1,16], "x":18.5, "y":1.25},
-
-                {"matrix":[1,17], "x":0, "y":1.5},
-
-                {"matrix":[2,0], "x":1.25, "y":2.25, "w":1.5},
-                {"matrix":[2,1], "x":2.75, "y":2.25},
-                {"matrix":[2,2], "x":3.75, "y":2.25},
-                {"matrix":[2,3], "x":4.75, "y":2.25},
-                {"matrix":[2,4], "x":5.75, "y":2.25},
-                {"matrix":[2,5], "x":6.75, "y":2.25},
-                {"matrix":[2,6], "x":7.75, "y":2.25},
-                {"matrix":[2,7], "x":8.75, "y":2.25},
-                {"matrix":[2,8], "x":9.75, "y":2.25},
-                {"matrix":[2,9], "x":10.75, "y":2.25},
-                {"matrix":[2,10], "x":11.75, "y":2.25},
-                {"matrix":[2,11], "x":12.75, "y":2.25},
-                {"matrix":[2,12], "x":13.75, "y":2.25},
-                {"matrix":[2,13], "x":14.75, "y":2.25, "w":1.5},
-                {"matrix":[2,14], "x":16.5, "y":2.25},
-                {"matrix":[2,15], "x":17.5, "y":2.25},
-                {"matrix":[2,16], "x":18.5, "y":2.25},
-
-                {"matrix":[3,17], "x":0, "y":2.75},
-
-                {"matrix":[3,0], "x":1.25, "y":3.25, "w":1.75},
-                {"matrix":[3,1], "x":3, "y":3.25},
-                {"matrix":[3,2], "x":4, "y":3.25},
-                {"matrix":[3,3], "x":5, "y":3.25},
-                {"matrix":[3,4], "x":6, "y":3.25},
-                {"matrix":[3,5], "x":7, "y":3.25},
-                {"matrix":[3,6], "x":8, "y":3.25},
-                {"matrix":[3,7], "x":9, "y":3.25},
-                {"matrix":[3,8], "x":10, "y":3.25},
-                {"matrix":[3,9], "x":11, "y":3.25},
-                {"matrix":[3,10], "x":12, "y":3.25},
-                {"matrix":[3,11], "x":13, "y":3.25},
-                {"matrix":[3,13], "x":14, "y":3.25, "w":2.25},
-
-                {"matrix":[4,17], "x":0, "y":4},
-
-                {"matrix":[4,0], "x":1.25, "y":4.25, "w":2.25},
-                {"matrix":[4,2], "x":3.5, "y":4.25},
-                {"matrix":[4,3], "x":4.5, "y":4.25},
-                {"matrix":[4,4], "x":5.5, "y":4.25},
-                {"matrix":[4,5], "x":6.5, "y":4.25},
-                {"matrix":[4,6], "x":7.5, "y":4.25},
-                {"matrix":[4,7], "x":8.5, "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,13], "x":13.5, "y":4.25, "w":2.75},
-                {"matrix":[4,15], "x":17.5, "y":4.25},
-
-                {"matrix":[5,17], "x":0, "y":5.25},
-
-                {"matrix":[5,0], "x":1.25, "y":5.25, "w":1.25},
-                {"matrix":[5,1], "x":2.5, "y":5.25, "w":1.25},
-                {"matrix":[5,2], "x":3.75, "y":5.25, "w":1.25},
-                {"matrix":[5,6], "x":5, "y":5.25, "w":6.25},
-                {"matrix":[5,10], "x":11.25, "y":5.25, "w":1.25},
-                {"matrix":[5,11], "x":12.5, "y":5.25, "w":1.25},
-                {"matrix":[5,12], "x":13.75, "y":5.25, "w":1.25},
-                {"matrix":[5,13], "x":15, "y":5.25, "w":1.25},
-                {"matrix":[5,14], "x":16.5, "y":5.25},
-                {"matrix":[5,15], "x":17.5, "y":5.25},
-                {"matrix":[5,16], "x":18.5, "y":5.25}
-            ]
-        }
-    }
-}
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c
deleted file mode 100644
index 2a8a218ef7..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2023 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "q3_pro.h"
-#include QMK_KEYBOARD_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_92(
-        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_SNAP,  KC_SIRI,  RGB_MOD,
-                  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-        _______,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
-        _______,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
-        _______,  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_LCTL,  KC_LOPT,  KC_LCMD,                                KC_SPC,                                 KC_RCMD,  KC_ROPT,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-    [MAC_FN] = LAYOUT_ansi_92(
-        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,
-                  _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
-        _______,  _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
-        _______,  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
-
-    [WIN_BASE] = LAYOUT_ansi_92(
-        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_PSCR,  KC_CTANA, RGB_MOD,
-                  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-        _______,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,    KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
-        _______,  KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,              KC_ENT,
-        _______,  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_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-    [WIN_FN] = LAYOUT_ansi_92(
-        RGB_TOG,  _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    _______,  _______,  RGB_TOG,
-                  _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
-        _______,  _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
-        _______,  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
-    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
-};
-#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/rules.mk
deleted file mode 100644
index ee32568148..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/keymap.c
deleted file mode 100644
index 3193dfa5fa..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 2023 @ Keychron (https://www.keychron.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "q3_pro.h"
-#include QMK_KEYBOARD_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_92(
-        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_SNAP,  KC_SIRI,  RGB_MOD,
-                  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-        MC_1,     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_DEL,   KC_END,   KC_PGDN,
-        MC_2,     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,
-        MC_3,     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,
-        MC_4,     KC_LCTL,  KC_LOPTN, KC_LCMMD,                               KC_SPC,                                 KC_RCMMD, KC_ROPTN, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-    [MAC_FN] = LAYOUT_ansi_92(
-        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,
-                  _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
-        _______,  _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
-        _______,  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
-
-    [WIN_BASE] = LAYOUT_ansi_92(
-        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_PSCR,  KC_CTANA, RGB_MOD,
-                  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,     KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-        MC_1,     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_DEL,   KC_END,   KC_PGDN,
-        MC_2,     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,
-        MC_3,     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,
-        MC_4,     KC_LCTL,  KC_LWIN,  KC_LALT,                                KC_SPC,                                 KC_RALT,  KC_RWIN,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
-
-    [WIN_FN] = LAYOUT_ansi_92(
-        RGB_TOG,  _______,            KC_BRID,  KC_BRIU,  KC_TASK,  KC_FILE,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,    _______,  _______,  RGB_TOG,
-                  _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,  _______,  _______,
-        _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_HUD,  RGB_SAD,  RGB_SPD,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
-        _______,  _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,            _______,
-        _______,  _______,  _______,  _______,                                _______,                                _______,  _______,  _______,    _______,  _______,  _______,  _______),
-};
-
-#if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [MAC_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [MAC_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
-    [WIN_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
-    [WIN_FN]   = { ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
-};
-#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/rules.mk
deleted file mode 100644
index f1adcab005..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/keymaps/via/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-VIA_ENABLE = yes
-ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk b/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
deleted file mode 100644
index f886ea2e8e..0000000000
--- a/keyboards/keychron/q3_pro/ansi_encoder/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-# This file intentionally blank
\ No newline at end of file