From 0358e541d530016de757d718bcccc7087fcaab69 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Fri, 19 May 2023 18:39:23 +0800
Subject: Add q8_pro
---
.../keychron/q8_pro/ansi_encoder/ansi_encoder.c | 101 ++++++
keyboards/keychron/q8_pro/ansi_encoder/config.h | 50 +++
keyboards/keychron/q8_pro/ansi_encoder/info.json | 161 ++++++++++
.../q8_pro/ansi_encoder/keymaps/default/keymap.c | 73 +++++
.../q8_pro/ansi_encoder/keymaps/via/keymap.c | 73 +++++
.../q8_pro/ansi_encoder/keymaps/via/rules.mk | 3 +
keyboards/keychron/q8_pro/ansi_encoder/rules.mk | 3 +
keyboards/keychron/q8_pro/config.h | 84 +++++
keyboards/keychron/q8_pro/halconf.h | 30 ++
keyboards/keychron/q8_pro/info.json | 64 ++++
keyboards/keychron/q8_pro/matrix.c | 147 +++++++++
keyboards/keychron/q8_pro/mcuconf.h | 39 +++
keyboards/keychron/q8_pro/q8_pro.c | 300 +++++++++++++++++
keyboards/keychron/q8_pro/q8_pro.h | 55 ++++
keyboards/keychron/q8_pro/readme.md | 21 ++
keyboards/keychron/q8_pro/rules.mk | 13 +
.../q8_pro/via_json/q8_pro_ansi_encoder.json | 353 +++++++++++++++++++++
17 files changed, 1570 insertions(+)
create mode 100755 keyboards/keychron/q8_pro/ansi_encoder/ansi_encoder.c
create mode 100755 keyboards/keychron/q8_pro/ansi_encoder/config.h
create mode 100755 keyboards/keychron/q8_pro/ansi_encoder/info.json
create mode 100755 keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/keymap.c
create mode 100755 keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/keymap.c
create mode 100644 keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk
create mode 100755 keyboards/keychron/q8_pro/ansi_encoder/rules.mk
create mode 100755 keyboards/keychron/q8_pro/config.h
create mode 100755 keyboards/keychron/q8_pro/halconf.h
create mode 100755 keyboards/keychron/q8_pro/info.json
create mode 100644 keyboards/keychron/q8_pro/matrix.c
create mode 100755 keyboards/keychron/q8_pro/mcuconf.h
create mode 100755 keyboards/keychron/q8_pro/q8_pro.c
create mode 100755 keyboards/keychron/q8_pro/q8_pro.h
create mode 100755 keyboards/keychron/q8_pro/readme.md
create mode 100755 keyboards/keychron/q8_pro/rules.mk
create mode 100644 keyboards/keychron/q8_pro/via_json/q8_pro_ansi_encoder.json
(limited to 'keyboards')
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q8_pro/ansi_encoder/ansi_encoder.c
new file mode 100755
index 0000000000..47d7657b70
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/ansi_encoder.c
@@ -0,0 +1,101 @@
+/* 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 .
+ */
+
+#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_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, 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_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_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_4, A_4, B_4},
+ {1, C_3, A_3, B_3},
+ {1, C_2, A_2, B_2},
+ {1, C_1, A_1, B_1},
+
+ {1, I_15, G_15, H_15},
+ {1, I_13, G_13, H_13},
+ {1, I_12, G_12, H_12},
+ {1, I_11, G_11, H_11},
+ {1, I_10, G_10, H_10},
+ {1, I_9, G_9, H_9},
+ {1, I_8, G_8, H_8},
+ {1, I_7, G_7, H_7},
+ {1, I_6, G_6, H_6},
+ {1, I_5, G_5, H_5},
+ {1, I_4, G_4, H_4},
+ {1, I_3, G_3, H_3},
+ {1, I_2, G_2, H_2},
+ {1, I_1, G_1, H_1},
+
+ {1, F_15, D_15, E_15},
+ {1, F_14, D_14, E_14},
+ {1, F_13, D_13, E_13},
+ {1, F_12, D_12, E_12},
+ {1, F_9, D_9, E_9},
+ {1, F_8, D_8, E_8},
+ {1, F_7, D_7, E_7},
+ {1, F_6, D_6, E_6},
+ {1, F_3, D_3, E_3},
+ {1, F_2, D_2, E_2},
+ {1, F_1, D_1, E_1}
+};
+#endif
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/config.h b/keyboards/keychron/q8_pro/ansi_encoder/config.h
new file mode 100755
index 0000000000..9ca730f613
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/config.h
@@ -0,0 +1,50 @@
+/* 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 .
+ */
+
+#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_TOTAL 29
+# define DRIVER_2_LED_TOTAL 39
+# define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* Set to infinit, which is use in USB mode by default */
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+
+/* Allow to shutdown driver to save power */
+# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
+
+/* Turn off backllit if brightness value is low */
+# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
+
+# define CAPS_LOCK_INDEX 29
+# define LOW_BAT_IND_INDEX 60
+
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+# define RGB_MATRIX_KEYPRESSES
+
+/* Set LED driver current */
+# define CKLED2001_CURRENT_TUNE \
+ { 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28, 0x28 }
+
+#endif
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/info.json b/keyboards/keychron/q8_pro/ansi_encoder/info.json
new file mode 100755
index 0000000000..f1de7dd2fe
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/info.json
@@ -0,0 +1,161 @@
+{
+ "usb": {
+ "pid": "0x0680",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"matrix":[0, 0], "x":0.75, "y":0.25},
+ {"matrix":[0, 1], "x":1.75, "y":0.25},
+ {"matrix":[0, 2], "x":2.75, "y":0},
+ {"matrix":[0, 3], "x":3.75, "y":0.25},
+ {"matrix":[0, 4], "x":4.75, "y":0.25},
+ {"matrix":[0, 5], "x":5.75, "y":0.25},
+ {"matrix":[0, 6], "x":6.75, "y":0.25},
+ {"matrix":[0, 7], "x":9.5, "y":0.25},
+ {"matrix":[0, 8], "x":10.5, "y":0.25},
+ {"matrix":[0, 9], "x":11.5, "y":0.25},
+ {"matrix":[0,10], "x":12.5, "y":0.25},
+ {"matrix":[0,11], "x":13.5, "y":0},
+ {"matrix":[0,12], "x":14.5, "y":0.25},
+ {"matrix":[0,13], "x":15.5, "y":0.25, "w":2},
+ {"matrix":[0,14], "x":18, "y":0},
+
+ {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
+ {"matrix":[1, 1], "x":2, "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":9, "y":1.25},
+ {"matrix":[1, 7], "x":10, "y":1.25},
+ {"matrix":[1, 8], "x":11, "y":1.25},
+ {"matrix":[1, 9], "x":12, "y":1.25},
+ {"matrix":[1,10], "x":13.25, "y":1.25},
+ {"matrix":[1,11], "x":14.25, "y":1.25},
+ {"matrix":[1,12], "x":15.25, "y":1.25},
+ {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5},
+ {"matrix":[1,14], "x":18.25, "y":1.5},
+
+ {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
+ {"matrix":[2, 1], "x":2, "y":2.25},
+ {"matrix":[2, 2], "x":3.5, "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, 7], "x":9.25, "y":2.25},
+ {"matrix":[2, 8], "x":10.25, "y":2.25},
+ {"matrix":[2, 9], "x":11.25, "y":2.25},
+ {"matrix":[2,10], "x":12.25, "y":2.25},
+ {"matrix":[2,11], "x":13.75, "y":2.25},
+ {"matrix":[2,12], "x":14.75, "y":2.25},
+ {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25},
+ {"matrix":[2,14], "x":18.5, "y":2.5},
+
+ {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
+ {"matrix":[3, 2], "x":2.25, "y":3.25},
+ {"matrix":[3, 3], "x":3.75, "y":3.25},
+ {"matrix":[3, 4], "x":4.75, "y":3.25},
+ {"matrix":[3, 5], "x":5.75, "y":3.25},
+ {"matrix":[3, 6], "x":6.75, "y":3.25},
+ {"matrix":[3, 7], "x":8.5, "y":3.25},
+ {"matrix":[3, 8], "x":9.5, "y":3.25},
+ {"matrix":[3, 9], "x":10.5, "y":3.25},
+ {"matrix":[3,10], "x":11.5, "y":3.25},
+ {"matrix":[3,11], "x":12.5, "y":3.25},
+ {"matrix":[3,12], "x":14.25, "y":3.25},
+ {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75},
+ {"matrix":[3,14], "x":17.25, "y":3.5},
+
+ {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
+ {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
+ {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
+ {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
+ {"matrix":[4, 6], "x":7.25, "y":4.25},
+ {"matrix":[4, 7], "x":8.75, "y":4.25},
+ {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
+ {"matrix":[4, 9], "x":12.5, "y":4.25},
+ {"matrix":[4,12], "x":16.25, "y":4.5},
+ {"matrix":[4,13], "x":17.25, "y":4.5},
+ {"matrix":[4,14], "x":18.25, "y":4.5}
+ ]
+ }
+ },
+ "rgb_matrix": {
+ "layout": [
+ {"matrix":[0, 0], "flags":1, "x":7, "y":1},
+ {"matrix":[0, 1], "flags":4, "x":20, "y":1},
+ {"matrix":[0, 2], "flags":4, "x":33, "y":0},
+ {"matrix":[0, 3], "flags":4, "x":48, "y":3},
+ {"matrix":[0, 4], "flags":4, "x":61, "y":6},
+ {"matrix":[0, 5], "flags":4, "x":74, "y":8},
+ {"matrix":[0, 6], "flags":4, "x":87, "y":11},
+ {"matrix":[0, 7], "flags":4, "x":106, "y":11},
+ {"matrix":[0, 8], "flags":4, "x":119, "y":8},
+ {"matrix":[0, 9], "flags":4, "x":132, "y":6},
+ {"matrix":[0, 10], "flags":4, "x":145, "y":3},
+ {"matrix":[0, 11], "flags":4, "x":160, "y":0},
+ {"matrix":[0, 12], "flags":1, "x":173, "y":1},
+ {"matrix":[0, 13], "flags":1, "x":193, "y":1},
+
+ {"matrix":[1, 0], "flags":1, "x":7, "y":14},
+ {"matrix":[1, 1], "flags":8, "x":24, "y":14},
+ {"matrix":[1, 2], "flags":8, "x":39, "y":14},
+ {"matrix":[1, 3], "flags":8, "x":52, "y":17},
+ {"matrix":[1, 4], "flags":4, "x":65, "y":20},
+ {"matrix":[1, 5], "flags":4, "x":78, "y":22},
+ {"matrix":[1, 6], "flags":4, "x":103, "y":25},
+ {"matrix":[1, 7], "flags":4, "x":116, "y":22},
+ {"matrix":[1, 8], "flags":4, "x":129, "y":20},
+ {"matrix":[1, 9], "flags":4, "x":142, "y":17},
+ {"matrix":[1, 10], "flags":4, "x":155, "y":14},
+ {"matrix":[1, 11], "flags":4, "x":170, "y":14},
+ {"matrix":[1, 12], "flags":4, "x":183, "y":14},
+ {"matrix":[1, 13], "flags":4, "x":200, "y":14},
+ {"matrix":[1, 14], "flags":1, "x":222, "y":16},
+
+ {"matrix":[2, 0], "flags":8, "x":6, "y":27},
+ {"matrix":[2, 1], "flags":4, "x":24, "y":27},
+ {"matrix":[2, 2], "flags":4, "x":39, "y":28},
+ {"matrix":[2, 3], "flags":4, "x":52, "y":30},
+ {"matrix":[2, 4], "flags":1, "x":65, "y":33},
+ {"matrix":[2, 5], "flags":4, "x":78, "y":36},
+ {"matrix":[2, 7], "flags":4, "x":109, "y":37},
+ {"matrix":[2, 8], "flags":4, "x":122, "y":34},
+ {"matrix":[2, 9], "flags":4, "x":135, "y":32},
+ {"matrix":[2, 10], "flags":4, "x":148, "y":29},
+ {"matrix":[2, 11], "flags":4, "x":162, "y":27},
+ {"matrix":[2, 12], "flags":4, "x":176, "y":27},
+ {"matrix":[2, 13], "flags":1, "x":197, "y":27},
+ {"matrix":[2, 14], "flags":1, "x":224, "y":29},
+
+ {"matrix":[3, 0], "flags":1, "x":7, "y":40},
+ {"matrix":[3, 2], "flags":4, "x":28, "y":40},
+ {"matrix":[3, 3], "flags":4, "x":43, "y":42},
+ {"matrix":[3, 4], "flags":4, "x":56, "y":44},
+ {"matrix":[3, 5], "flags":4, "x":69, "y":47},
+ {"matrix":[3, 6], "flags":4, "x":82, "y":50},
+ {"matrix":[3, 7], "flags":4, "x":102, "y":52},
+ {"matrix":[3, 8], "flags":4, "x":115, "y":49},
+ {"matrix":[3, 9], "flags":4, "x":128, "y":46},
+ {"matrix":[3, 10], "flags":4, "x":141, "y":44},
+ {"matrix":[3, 11], "flags":4, "x":154, "y":41},
+ {"matrix":[3, 12], "flags":4, "x":169, "y":40},
+ {"matrix":[3, 13], "flags":1, "x":187, "y":40},
+ {"matrix":[3, 14], "flags":1, "x":209, "y":43},
+
+ {"matrix":[4, 0], "flags":1, "x":0, "y":53},
+ {"matrix":[4, 1], "flags":1, "x":17, "y":53},
+ {"matrix":[4, 2], "flags":1, "x":42, "y":55},
+ {"matrix":[4, 3], "flags":4, "x":65, "y":60},
+ {"matrix":[4, 6], "flags":4, "x":86, "y":64},
+ {"matrix":[4, 7], "flags":4, "x":107, "y":64},
+ {"matrix":[4, 8], "flags":4, "x":131, "y":59},
+ {"matrix":[4, 9], "flags":1, "x":156, "y":54},
+ {"matrix":[4, 12], "flags":1, "x":196, "y":56},
+ {"matrix":[4, 13], "flags":1, "x":209, "y":56},
+ {"matrix":[4, 14], "flags":1, "x":222, "y":56}
+ ]
+ }
+}
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/keymap.c
new file mode 100755
index 0000000000..429729e0ac
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+enum layers{
+ MAC_BASE,
+ WIN_BASE,
+ MAC_FN1,
+ WIN_FN1,
+ FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT(
+ KC_ESC, 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_MUTE,
+ 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_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_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN1), MO(FN2), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_BASE] = LAYOUT(
+ KC_ESC, 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_MUTE,
+ 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_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_FN1), MO(FN2), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN1] = LAYOUT(
+ KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, 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, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_FN1] = LAYOUT(
+ KC_GRV, 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, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [FN2] = LAYOUT(
+ KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [MAC_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+ [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [WIN_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+ [FN2] = {ENCODER_CCW_CW(_______, _______)},
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/keymap.c
new file mode 100755
index 0000000000..429729e0ac
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+/* 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 .
+ */
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+enum layers{
+ MAC_BASE,
+ WIN_BASE,
+ MAC_FN1,
+ WIN_FN1,
+ FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [MAC_BASE] = LAYOUT(
+ KC_ESC, 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_MUTE,
+ 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_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_LOPTN, KC_LCMMD, KC_SPC, MO(MAC_FN1), MO(FN2), KC_SPC, KC_RCMMD, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [WIN_BASE] = LAYOUT(
+ KC_ESC, 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_MUTE,
+ 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_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_FN1), MO(FN2), KC_SPC, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
+
+ [MAC_FN1] = LAYOUT(
+ KC_GRV, KC_BRID, KC_BRIU, KC_MCTL, KC_LPAD, 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, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [WIN_FN1] = LAYOUT(
+ KC_GRV, 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, _______, NK_TOGG, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+ [FN2] = LAYOUT(
+ KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, BAT_LVL, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+ [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [MAC_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+ [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+ [WIN_FN1] = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
+ [FN2] = {ENCODER_CCW_CW(_______, _______)},
+};
+#endif // ENCODER_MAP_ENABLE
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk
new file mode 100644
index 0000000000..3a4d796409
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+
+OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/rules.mk b/keyboards/keychron/q8_pro/ansi_encoder/rules.mk
new file mode 100755
index 0000000000..454f1ae428
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/rules.mk
@@ -0,0 +1,3 @@
+# Build Options
+
+include keyboards/keychron/bluetooth/bluetooth.mk
diff --git a/keyboards/keychron/q8_pro/config.h b/keyboards/keychron/q8_pro/config.h
new file mode 100755
index 0000000000..3a4174c4fa
--- /dev/null
+++ b/keyboards/keychron/q8_pro/config.h
@@ -0,0 +1,84 @@
+/* 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 .
+ */
+
+#pragma once
+
+/* turn off effects when suspended */
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define LED_DISABLE_WHEN_USB_SUSPENDED
+
+/* DIP switch */
+#define DIP_SWITCH_PINS { A8 }
+
+/* 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
+
+#ifdef KC_BLUETOOTH_ENABLE
+/* Hardware configuration */
+# define USB_BT_MODE_SELECT_PIN C15
+
+# define CKBT51_RESET_PIN A9
+# define CKBT51_INT_INPUT_PIN A5
+# define BLUETOOTH_INT_INPUT_PIN A6
+
+# define USB_POWER_SENSE_PIN B1
+# define USB_POWER_CONNECTED_LEVEL 0
+
+# define HOST_DEVICES_COUNT 3
+
+# if defined(RGB_MATRIX_ENABLE)
+
+# define LED_DRIVER_SHUTDOWN_PIN C14
+
+# define HOST_LED_MATRIX_LIST \
+ { 15, 16, 17 }
+
+# define BAT_LEVEL_LED_LIST \
+ { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 }
+
+/* Backlit disable timeout when keyboard is disconnected(unit: second) */
+# define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40
+
+/* Backlit disable timeout when keyboard is connected(unit: second) */
+# define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600
+# endif
+
+/* Keep USB connection in blueooth mode */
+# define KEEP_USB_CONNECTION_IN_BLUETOOTH_MODE
+
+/* Enable bluetooth NKRO */
+# define BLUETOOTH_NKRO_ENABLE
+
+/* Raw hid command for factory test and bluetooth DFU */
+# define RAW_HID_CMD 0xAA ... 0xAB
+#else
+/* Raw hid command for factory test */
+# define RAW_HID_CMD 0xAB
+#endif
+
+/* Emulated EEPROM configuration */
+#define FEE_DENSITY_BYTES FEE_PAGE_SIZE
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 2047
+
+/* Old default behavior of mod-taps */
+#define HOLD_ON_OTHER_KEY_PRESS
+
+/* Factory test keys */
+#define FN_KEY1 MO(4)
diff --git a/keyboards/keychron/q8_pro/halconf.h b/keyboards/keychron/q8_pro/halconf.h
new file mode 100755
index 0000000000..b0ca1150f6
--- /dev/null
+++ b/keyboards/keychron/q8_pro/halconf.h
@@ -0,0 +1,30 @@
+/* Copyright 2023 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 .
+ */
+
+#pragma once
+
+#define _CHIBIOS_HAL_CONF_VER_8_0_
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_SPI TRUE
+
+#ifdef KC_BLUETOOTH_ENABLE
+# define PAL_USE_CALLBACKS TRUE
+# define HAL_USE_SERIAL TRUE
+# define HAL_USE_RTC TRUE
+#endif
+
+#include_next
diff --git a/keyboards/keychron/q8_pro/info.json b/keyboards/keychron/q8_pro/info.json
new file mode 100755
index 0000000000..1c218bb0c6
--- /dev/null
+++ b/keyboards/keychron/q8_pro/info.json
@@ -0,0 +1,64 @@
+{
+ "manufacturer": "Keychron",
+ "keyboard_name": "Keychron Q8 Pro",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lalalademaxiya1",
+ "processor": "STM32L432",
+ "bootloader": "stm32-dfu",
+ "features": {
+ "bootmagic": true,
+ "command": false,
+ "console": false,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true,
+ "dip_switch": true,
+ "bluetooth": false,
+ "encoder": true,
+ "encoder_map": true,
+ "raw": true
+ },
+ "rgb_matrix": {
+ "driver": "CKLED2001",
+ "animations": {
+ "breathing": true,
+ "band_spiral_val": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_up_down": true,
+ "rainbow_moving_chevron": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "dual_beacon": true,
+ "rainbow_beacon": true,
+ "jellybean_raindrops": true,
+ "pixel_rain": true,
+ "typing_heatmap": true,
+ "digital_rain": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_multinexus": true,
+ "splash": true,
+ "solid_splash": true
+ }
+ },
+ "bluetooth": {
+ "driver": "custom"
+ },
+ "usb": {
+ "vid": "0x3434"
+ },
+ "matrix_pins": {
+ "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+ "rows": ["B4", "B3", "A15", "A14", "A13"]
+ },
+ "diode_direction": "ROW2COL",
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A0", "pin_b": "A10"}
+ ]
+ }
+}
diff --git a/keyboards/keychron/q8_pro/matrix.c b/keyboards/keychron/q8_pro/matrix.c
new file mode 100644
index 0000000000..663dae5ff9
--- /dev/null
+++ b/keyboards/keychron/q8_pro/matrix.c
@@ -0,0 +1,147 @@
+/* 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 .
+ */
+
+#include "quantum.h"
+
+#define HC595_STCP B0
+#define HC595_SHCP A1
+#define HC595_DS A7
+
+#define DIRECT_COL_NUM 0
+
+pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+
+static inline uint8_t readMatrixPin(pin_t pin) {
+ if (pin != NO_PIN) {
+ return readPin(pin);
+ } else {
+ return 1;
+ }
+}
+
+static inline void setPinOutput_writeLow(pin_t pin) {
+ setPinOutput(pin);
+ writePinLow(pin);
+}
+
+static inline void HC595_initPin(void) {
+ setPinOutput(HC595_DS);
+ setPinOutput(HC595_STCP);
+ setPinOutput(HC595_SHCP);
+}
+
+static inline void HC595_delay(uint16_t n) {
+ while (n-- > 0) {
+ asm volatile("nop" ::: "memory");
+ }
+}
+
+static void HC595_output(uint16_t data, bool bit) {
+ uint8_t n = 1;
+ uint8_t i;
+
+ for (i = 1; i < 16; i++) {
+ if (data & 0x1) {
+ writePinHigh(HC595_DS);
+ } else {
+ writePinLow(HC595_DS);
+ }
+ HC595_delay(n);
+ writePinHigh(HC595_SHCP);
+ HC595_delay(n);
+ writePinLow(HC595_SHCP);
+ if (bit) {
+ break;
+ } else {
+ data >>= 1;
+ }
+ }
+ writePinHigh(HC595_STCP);
+ HC595_delay(n);
+ writePinLow(HC595_STCP);
+}
+
+static void select_col(uint8_t col) {
+ if (col == DIRECT_COL_NUM) {
+ HC595_output(0x0, 1);
+ HC595_output(0x1, 1);
+ }
+}
+
+static void unselect_col(void) {
+ HC595_output(0x1, 1);
+}
+
+static void unselect_cols(void) {
+ HC595_output(0xFFFF, 0);
+}
+
+void select_all_cols(void) {
+ HC595_output(0x0, 0);
+}
+
+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
+ select_col(current_col);
+ matrix_output_select_delay();
+
+ // For each row...
+ for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+ // Check row pin state
+ if (readMatrixPin(row_pins[row_index]) == 0) {
+ // Pin LO, set col bit
+ current_matrix[row_index] |= row_shifter;
+ key_pressed = true;
+ } else {
+ // Pin HI, clear col bit
+ current_matrix[row_index] &= ~row_shifter;
+ }
+ }
+
+ // Unselect col
+ unselect_col();
+ matrix_output_unselect_delay(current_col, key_pressed); // wait for all Row signals to go HIGH
+}
+
+void matrix_init_custom(void) {
+ HC595_initPin();
+
+ for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+ if (row_pins[x] != NO_PIN) {
+ setPinInputHigh(row_pins[x]);
+ }
+ }
+
+ unselect_cols();
+}
+
+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/q8_pro/mcuconf.h b/keyboards/keychron/q8_pro/mcuconf.h
new file mode 100755
index 0000000000..87dd1ba2b9
--- /dev/null
+++ b/keyboards/keychron/q8_pro/mcuconf.h
@@ -0,0 +1,39 @@
+/* Copyright 2023 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 .
+ */
+
+#pragma once
+
+#include_next
+
+/* Set HCLK to 48 MHz as tradeoff of USB lowest clockand and
+ * lower power comsumption for bluetooth. Will use dynamic
+ * clock when STM32L4 is supported in ChibiOS */
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 2
+
+#undef STM32_PLLN_VALUE
+#define STM32_PLLN_VALUE 12
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#ifdef KC_BLUETOOTH_ENABLE
+# undef STM32_SERIAL_USE_USART2
+# define STM32_SERIAL_USE_USART2 TRUE
+#endif
diff --git a/keyboards/keychron/q8_pro/q8_pro.c b/keyboards/keychron/q8_pro/q8_pro.c
new file mode 100755
index 0000000000..9926cfb309
--- /dev/null
+++ b/keyboards/keychron/q8_pro/q8_pro.c
@@ -0,0 +1,300 @@
+/* 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 .
+ */
+
+#include "q8_pro.h"
+#ifdef KC_BLUETOOTH_ENABLE
+# include "ckbt51.h"
+# include "bluetooth.h"
+# include "indicator.h"
+# include "transport.h"
+# include "battery.h"
+# include "bat_level_animation.h"
+# include "lpm.h"
+#endif
+
+#ifdef ENABLE_FACTORY_TEST
+# include "factory_test.h"
+#endif
+
+typedef struct PACKED {
+ uint8_t len;
+ uint8_t keycode[3];
+} key_combination_t;
+
+static uint32_t siri_timer_buffer = 0;
+static uint8_t mac_keycode[4] = {KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD};
+
+key_combination_t key_comb_list[4] = {
+ {2, {KC_LWIN, KC_TAB}}, // Task (win)
+ {2, {KC_LWIN, KC_E}}, // Files (win)
+ {3, {KC_LSFT, KC_LGUI, KC_4}}, // Snapshot (mac)
+ {2, {KC_LWIN, KC_C}} // Cortana (win)
+};
+
+#ifdef KC_BLUETOOTH_ENABLE
+bool firstDisconnect = true;
+bool bt_factory_reset = false;
+static virtual_timer_t pairing_key_timer;
+extern uint8_t g_pwm_buffer[DRIVER_COUNT][192];
+
+static void pairing_key_timer_cb(void *arg) {
+ bluetooth_pairing_ex(*(uint8_t *)arg, NULL);
+}
+#endif
+
+bool dip_switch_update_kb(uint8_t index, bool active) {
+ if (index == 0) {
+#ifdef INVERT_OS_SWITCH_STATE
+ default_layer_set(1UL << (!active ? 1 : 0));
+#else
+ default_layer_set(1UL << (active ? 1 : 0));
+#endif
+ }
+ dip_switch_update_user(index, active);
+
+ return true;
+}
+
+#ifdef KC_BLUETOOTH_ENABLE
+bool process_record_kb_bt(uint16_t keycode, keyrecord_t *record) {
+#else
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+#endif
+ static uint8_t host_idx = 0;
+
+ switch (keycode) {
+ case KC_LOPTN:
+ case KC_ROPTN:
+ case KC_LCMMD:
+ case KC_RCMMD:
+ if (record->event.pressed) {
+ register_code(mac_keycode[keycode - KC_LOPTN]);
+ } else {
+ unregister_code(mac_keycode[keycode - KC_LOPTN]);
+ }
+ return false; // Skip all further processing of this key)
+ case KC_TASK:
+ case KC_FILE:
+ case KC_SNAP:
+ case KC_CTANA:
+ if (record->event.pressed) {
+ for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++)
+ register_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+ } else {
+ for (uint8_t i = 0; i < key_comb_list[keycode - KC_TASK].len; i++)
+ unregister_code(key_comb_list[keycode - KC_TASK].keycode[i]);
+ }
+ return false; // Skip all further processing of this key
+ case KC_SIRI:
+ if (record->event.pressed && siri_timer_buffer == 0) {
+ register_code(KC_LGUI);
+ register_code(KC_SPACE);
+ siri_timer_buffer = sync_timer_read32() == 0 ? 1 : sync_timer_read32();
+ }
+ return false; // Skip all further processing of this key
+#ifdef KC_BLUETOOTH_ENABLE
+ case BT_HST1 ... BT_HST3:
+ if (get_transport() == TRANSPORT_BLUETOOTH) {
+ if (record->event.pressed) {
+ host_idx = keycode - BT_HST1 + 1;
+ chVTSet(&pairing_key_timer, TIME_MS2I(2000), (vtfunc_t)pairing_key_timer_cb, &host_idx);
+ bluetooth_connect_ex(host_idx, 0);
+ } else {
+ host_idx = 0;
+ chVTReset(&pairing_key_timer);
+ }
+ }
+ break;
+ case BAT_LVL:
+ if (get_transport() == TRANSPORT_BLUETOOTH && !usb_power_connected()) {
+ bat_level_animiation_start(battery_get_percentage());
+ }
+ break;
+#endif
+ default:
+#ifdef FACTORY_RESET_CHECK
+ FACTORY_RESET_CHECK(keycode, record);
+#endif
+ break;
+ }
+ return true;
+}
+
+#if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS)
+static void encoder_pad_cb(void *param) {
+ encoder_inerrupt_read((uint32_t)param & 0XFF);
+}
+#endif
+
+void keyboard_post_init_kb(void) {
+ dip_switch_read(true);
+
+#ifdef KC_BLUETOOTH_ENABLE
+ /* Currently we don't use this reset pin */
+ palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_UNCONNECTED);
+
+ /* IMPORTANT: DO NOT enable internal pull-up resistor
+ * as there is an external pull-down resistor.
+ */
+ palSetLineMode(USB_BT_MODE_SELECT_PIN, PAL_MODE_INPUT);
+
+ ckbt51_init(false);
+ bluetooth_init();
+#endif
+
+#if defined(ENCODER_ENABLE) && defined(PAL_USE_CALLBACKS)
+ pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A;
+ pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B;
+ for (uint32_t i = 0; i < NUM_ENCODERS; i++) {
+ palEnableLineEvent(encoders_pad_a[i], PAL_EVENT_MODE_BOTH_EDGES);
+ palEnableLineEvent(encoders_pad_b[i], PAL_EVENT_MODE_BOTH_EDGES);
+ palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i);
+ palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i);
+ }
+#endif
+
+ keyboard_post_init_user();
+}
+
+void matrix_scan_kb(void) {
+ if (siri_timer_buffer && sync_timer_elapsed32(siri_timer_buffer) > 500) {
+ siri_timer_buffer = 0;
+ unregister_code(KC_LGUI);
+ unregister_code(KC_SPACE);
+ }
+
+#ifdef FACTORY_RESET_TASK
+ FACTORY_RESET_TASK();
+#endif
+ matrix_scan_user();
+}
+
+#ifdef KC_BLUETOOTH_ENABLE
+static void ckbt51_param_init(void) {
+ /* Set bluetooth device name */
+ // ckbt51_set_local_name(STR(PRODUCT));
+ ckbt51_set_local_name(PRODUCT);
+ /* Set bluetooth parameters */
+ module_param_t param = {.event_mode = 0x02,
+ .connected_idle_timeout = 7200,
+ .pairing_timeout = 180,
+ .pairing_mode = 0,
+ .reconnect_timeout = 5,
+ .report_rate = 90,
+ .vendor_id_source = 1,
+ .verndor_id = 0, // Must be 0x3434
+ .product_id = PRODUCT_ID};
+ ckbt51_set_param(¶m);
+}
+
+void bluetooth_enter_disconnected_kb(uint8_t host_idx) {
+ if (bt_factory_reset) {
+ bt_factory_reset = false;
+ ckbt51_param_init();
+ }
+ /* CKBT51 bluetooth module boot time is slower, it enters disconnected after boot,
+ so we place initialization here. */
+ if (firstDisconnect && sync_timer_read32() < 1000 && get_transport() == TRANSPORT_BLUETOOTH) {
+ ckbt51_param_init();
+ bluetooth_connect();
+ firstDisconnect = false;
+ }
+}
+
+void ckbt51_default_ack_handler(uint8_t *data, uint8_t len) {
+ if (data[1] == 0x45) {
+ module_param_t param = {.event_mode = 0x02,
+ .connected_idle_timeout = 7200,
+ .pairing_timeout = 180,
+ .pairing_mode = 0,
+ .reconnect_timeout = 5,
+ .report_rate = 90,
+ .vendor_id_source = 1,
+ .verndor_id = 0, // Must be 0x3434
+ .product_id = PRODUCT_ID};
+ ckbt51_set_param(¶m);
+ }
+}
+
+void bluetooth_pre_task(void) {
+ static uint8_t mode = 1;
+
+ if (readPin(USB_BT_MODE_SELECT_PIN) != mode) {
+ if (readPin(USB_BT_MODE_SELECT_PIN) != mode) {
+ mode = readPin(USB_BT_MODE_SELECT_PIN);
+ set_transport(mode == 0 ? TRANSPORT_BLUETOOTH : TRANSPORT_USB);
+ }
+ }
+}
+#endif
+
+void battery_calculte_voltage(uint16_t value) {
+ uint16_t voltage = ((uint32_t)value) * 2246 / 1000;
+
+#ifdef LED_MATRIX_ENABLE
+ if (led_matrix_is_enabled()) {
+ uint32_t totalBuf = 0;
+
+ for (uint8_t i = 0; i < DRIVER_COUNT; i++)
+ for (uint8_t j = 0; j < 192; j++)
+ totalBuf += g_pwm_buffer[i][j];
+ /* We assumpt it is linear relationship*/
+ voltage += (30 * totalBuf / LED_MATRIX_LED_COUNT / 255);
+ }
+#endif
+#ifdef RGB_MATRIX_ENABLE
+ if (rgb_matrix_is_enabled()) {
+ uint32_t totalBuf = 0;
+
+ for (uint8_t i = 0; i < DRIVER_COUNT; i++)
+ for (uint8_t j = 0; j < 192; j++)
+ totalBuf += g_pwm_buffer[i][j];
+ /* We assumpt it is linear relationship*/
+ uint32_t compensation = 60 * totalBuf / RGB_MATRIX_LED_COUNT / 255 / 3;
+ voltage += compensation;
+ }
+#endif
+ battery_set_voltage(voltage);
+}
+
+bool via_command_kb(uint8_t *data, uint8_t length) {
+ switch (data[0]) {
+#ifdef KC_BLUETOOTH_ENABLE
+ case 0xAA:
+ ckbt51_dfu_rx(data, length);
+ break;
+#endif
+#ifdef ENABLE_FACTORY_TEST
+ case 0xAB:
+ factory_test_rx(data, length);
+ break;
+#endif
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+#if !defined(VIA_ENABLE)
+void raw_hid_receive(uint8_t *data, uint8_t length) {
+ switch (data[0]) {
+ case RAW_HID_CMD:
+ via_command_kb(data, length);
+ break;
+ }
+}
+#endif
diff --git a/keyboards/keychron/q8_pro/q8_pro.h b/keyboards/keychron/q8_pro/q8_pro.h
new file mode 100755
index 0000000000..cd0954d579
--- /dev/null
+++ b/keyboards/keychron/q8_pro/q8_pro.h
@@ -0,0 +1,55 @@
+/* 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 .
+ */
+
+#pragma once
+
+#include "quantum.h"
+#ifdef VIA_ENABLE
+# include "via.h"
+#endif
+
+#define ___ KC_NO
+
+#ifdef VIA_ENABLE
+# define USER_START QK_KB_0
+#else
+# define USER_START SAFE_RANGE
+#endif
+
+// clang-format off
+enum {
+ KC_LOPTN = USER_START,
+ KC_ROPTN,
+ KC_LCMMD,
+ KC_RCMMD,
+ KC_TASK,
+ KC_FILE,
+ KC_SNAP,
+ KC_CTANA,
+ KC_SIRI,
+#ifdef KC_BLUETOOTH_ENABLE
+ BT_HST1,
+ BT_HST2,
+ BT_HST3,
+ BAT_LVL,
+#else
+ BT_HST1 = KC_TRNS,
+ BT_HST2 = KC_TRNS,
+ BT_HST3 = KC_TRNS,
+ BAT_LVL = KC_TRNS,
+#endif
+ NEW_SAFE_RANGE
+};
diff --git a/keyboards/keychron/q8_pro/readme.md b/keyboards/keychron/q8_pro/readme.md
new file mode 100755
index 0000000000..477d9223ff
--- /dev/null
+++ b/keyboards/keychron/q8_pro/readme.md
@@ -0,0 +1,21 @@
+# Keychron Q8 Pro
+
+![Keychron Q8 Pro]
+
+A customizable 65% Alice keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron Q8 Pro
+* Hardware Availability:
+
+Make example for this keyboard (after setting up your build environment):
+
+ make keychron/q8_pro/ansi_encoder:default
+
+Flashing example for this keyboard:
+
+ make keychron/q8_pro/ansi_encoder:default:flash
+
+**Reset Key**: Connect the USB cable, toggle mode switch to "Off", hold down the *Esc* key or reset button underneath space bar, then toggle then switch to "Cable".
+
+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).
diff --git a/keyboards/keychron/q8_pro/rules.mk b/keyboards/keychron/q8_pro/rules.mk
new file mode 100755
index 0000000000..e7444ad5bf
--- /dev/null
+++ b/keyboards/keychron/q8_pro/rules.mk
@@ -0,0 +1,13 @@
+# Build Options
+# change yes to no to disable
+#
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
+OPT_DEFS += -DKC_BLUETOOTH_ENABLE
+
+CUSTOM_MATRIX = lite
+
+SRC += matrix.c
+
+DEFAULT_FOLDER = keychron/q8_pro/ansi_encoder
diff --git a/keyboards/keychron/q8_pro/via_json/q8_pro_ansi_encoder.json b/keyboards/keychron/q8_pro/via_json/q8_pro_ansi_encoder.json
new file mode 100644
index 0000000000..68ecbe6f3d
--- /dev/null
+++ b/keyboards/keychron/q8_pro/via_json/q8_pro_ansi_encoder.json
@@ -0,0 +1,353 @@
+{
+ "name": "Keychron Q8 Pro ANSI Knob",
+ "vendorId": "0x3434",
+ "productId": "0x0680",
+ "keycodes": ["qmk_lighting"],
+ "menus": [
+ {
+ "label": "Lighting",
+ "content": [
+ {
+ "label": "Backlight",
+ "content": [
+ {
+ "label": "Brightness",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+ },
+ {
+ "label": "Effect",
+ "type": "dropdown",
+ "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+ "options": [
+ ["None", 0],
+ ["Solid Color", 1],
+ ["Breathing", 2],
+ ["Band Spiral Val", 3],
+ ["Cycle All", 4],
+ ["Cycle Left Right", 5],
+ ["Cycle Up Down", 6],
+ ["Rainbow Moving Chevron", 7],
+ ["Cycle Out In", 8],
+ ["Cycle Out In Dual", 9],
+ ["Cycle Pinwheel", 10],
+ ["Cycle Spiral", 11],
+ ["Dual Beacon", 12],
+ ["Rainbow Beacon", 13],
+ ["Jellybean Raindrops", 14],
+ ["Pixel Rain", 15],
+ ["Typing Heatmap", 16],
+ ["Digital Rain", 17],
+ ["Reactive Simple", 18],
+ ["Reactive Multiwide", 19],
+ ["Reactive Multinexus", 20],
+ ["Splash", 21],
+ ["Solid Splash", 22]
+ ]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+ "label": "Effect Speed",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+ "label": "Color",
+ "type": "color",
+ "content": ["id_qmk_rgb_matrix_color", 3, 4]
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "customKeycodes": [
+ {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
+ {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
+ {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
+ {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
+ {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
+ {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
+ {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},
+ {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"},
+ {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"},
+ {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"},
+ {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"},
+ {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"},
+ {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"}
+ ],
+ "matrix": {"rows": 5, "cols": 15},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "x": 2.75
+ },
+ "0,2",
+ {
+ "x": 8.85
+ },
+ "0,11",
+ {
+ "x": 3.5,
+ "c": "#aaaaaa"
+ },
+ "0,14\n\n\n\n\n\n\n\n\ne0"
+ ],
+ [
+ {
+ "y": -0.85,
+ "x": 0.75,
+ "c": "#777777"
+ },
+ "0,0\nESC",
+ {
+ "c": "#cccccc"
+ },
+ "0,1"
+ ],
+ [
+ {
+ "y": -0.85,
+ "x": 13.6
+ },
+ "0,12",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "0,13"
+ ],
+ [
+ {
+ "x": 0.5,
+ "w": 1.5
+ },
+ "1,0",
+ {
+ "c": "#cccccc"
+ },
+ "1,1",
+ {
+ "x": 10.3
+ },
+ "1,11",
+ "1,12",
+ {
+ "w": 1.5
+ },
+ "1,13"
+ ],
+ [
+ {
+ "y": -0.9,
+ "x": 17.3,
+ "c": "#aaaaaa"
+ },
+ "1,14"
+ ],
+ [
+ {
+ "y": -0.1,
+ "x": 0.25,
+ "w": 1.75
+ },
+ "2,0",
+ {
+ "c": "#cccccc"
+ },
+ "2,1",
+ {
+ "x": 9.75
+ },
+ "2,11",
+ "2,12",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "2,13"
+ ],
+ [
+ {
+ "y": -0.9,
+ "x": 17.5,
+ "c": "#aaaaaa"
+ },
+ "2,14"
+ ],
+ [
+ {
+ "y": -0.1,
+ "w": 2.25
+ },
+ "3,0",
+ {
+ "c": "#cccccc"
+ },
+ "3,2",
+ {
+ "x": 10.15
+ },
+ "3,12",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "3,13"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 16.4,
+ "c": "#777777"
+ },
+ "3,14"
+ ],
+ [
+ {
+ "y": -0.25,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "4,0",
+ {
+ "w": 1.25
+ },
+ "4,1"
+ ],
+ [
+ {
+ "y": -0.75,
+ "x": 15.4,
+ "c": "#777777"
+ },
+ "4,12",
+ "4,13",
+ "4,14"
+ ],
+ [
+ {
+ "r": 6,
+ "y": -5.7,
+ "x": 3.85,
+ "c": "#cccccc"
+ },
+ "0,3",
+ "0,4",
+ {
+ "c": "#aaaaaa"
+ },
+ "0,5",
+ "0,6"
+ ],
+ [
+ {
+ "x": 3.35,
+ "c": "#cccccc"
+ },
+ "1,2",
+ "1,3",
+ "1,4",
+ "1,5"
+ ],
+ [
+ {
+ "x": 3.55
+ },
+ "2,2",
+ "2,3",
+ "2,4",
+ "2,5"
+ ],
+ [
+ {
+ "x": 3.9
+ },
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6"
+ ],
+ [
+ {
+ "x": 4,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "4,2",
+ {
+ "c": "#cccccc",
+ "w": 2.25
+ },
+ "4,3",
+ {
+ "c": "#aaaaaa"
+ },
+ "4,6"
+ ],
+ [
+ {
+ "r": -6,
+ "y": -3.2,
+ "x": 8.35
+ },
+ "0,7",
+ "0,8",
+ {
+ "c": "#cccccc"
+ },
+ "0,9",
+ "0,10"
+ ],
+ [
+ {
+ "x": 7.9
+ },
+ "1,6",
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10"
+ ],
+ [
+ {
+ "x": 8.25
+ },
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10"
+ ],
+ [
+ {
+ "x": 7.8
+ },
+ "3,7",
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11"
+ ],
+ [
+ {
+ "x": 7.8,
+ "c": "#aaaaaa"
+ },
+ "4,7",
+ {
+ "c": "#cccccc",
+ "w": 2.75
+ },
+ "4,8",
+ {
+ "c": "#aaaaaa"
+ },
+ "4,9"
+ ]
+ ]
+ }
+}
--
cgit v1.2.3
From 0e2dbffc063b666349fc21a7701e6f4d3d496fee Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Mon, 22 May 2023 09:37:48 +0800
Subject: Update rules.mk
---
keyboards/keychron/q8_pro/ansi_encoder/rules.mk | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'keyboards')
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/rules.mk b/keyboards/keychron/q8_pro/ansi_encoder/rules.mk
index 454f1ae428..6e7633bfe0 100755
--- a/keyboards/keychron/q8_pro/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q8_pro/ansi_encoder/rules.mk
@@ -1,3 +1 @@
-# Build Options
-
-include keyboards/keychron/bluetooth/bluetooth.mk
+# This file intentionally left blank
--
cgit v1.2.3
From b402a99537f53013ba8d36624d9e3c086a77a453 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Mon, 22 May 2023 10:09:18 +0800
Subject: Update rules.mk
---
keyboards/keychron/q8_pro/rules.mk | 2 ++
1 file changed, 2 insertions(+)
(limited to 'keyboards')
diff --git a/keyboards/keychron/q8_pro/rules.mk b/keyboards/keychron/q8_pro/rules.mk
index e7444ad5bf..97c575dfd9 100755
--- a/keyboards/keychron/q8_pro/rules.mk
+++ b/keyboards/keychron/q8_pro/rules.mk
@@ -10,4 +10,6 @@ CUSTOM_MATRIX = lite
SRC += matrix.c
+include keyboards/keychron/bluetooth/bluetooth.mk
+
DEFAULT_FOLDER = keychron/q8_pro/ansi_encoder
--
cgit v1.2.3
From 41490853b4ee62885df0f6cac2e6cee32de64132 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Mon, 22 May 2023 12:09:56 +0800
Subject: Update q8 pro
---
keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk | 1 +
keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk | 1 +
keyboards/keychron/q8_pro/info.json | 1 -
3 files changed, 2 insertions(+), 1 deletion(-)
create mode 100644 keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk
(limited to 'keyboards')
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk
new file mode 100644
index 0000000000..98eb98e882
--- /dev/null
+++ b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP = yes
diff --git a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk
index 3a4d796409..75f881c8b8 100644
--- a/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk
+++ b/keyboards/keychron/q8_pro/ansi_encoder/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
VIA_ENABLE = yes
+ENCODER_MAP = yes
OPT_DEFS += -DDYNAMIC_KEYMAP_LAYER_COUNT=5
diff --git a/keyboards/keychron/q8_pro/info.json b/keyboards/keychron/q8_pro/info.json
index 1c218bb0c6..f562faf30d 100755
--- a/keyboards/keychron/q8_pro/info.json
+++ b/keyboards/keychron/q8_pro/info.json
@@ -16,7 +16,6 @@
"dip_switch": true,
"bluetooth": false,
"encoder": true,
- "encoder_map": true,
"raw": true
},
"rgb_matrix": {
--
cgit v1.2.3
From 8c36e3464246dfb33e6f796fcd755cc18b5d33a8 Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <66767061+lalalademaxiya1@users.noreply.github.com>
Date: Wed, 24 May 2023 11:03:51 +0800
Subject: Correct encoder map definition spelling