fix compiling errors of some keyboard model

8 files changed, 15 insertions, 32 deletions

diff --git a/keyboards/keychron/k8_pro/jis/white/keymaps/default/keymap.c b/keyboards/keychron/k8_pro/jis/white/keymaps/default/keymap.c
index 0a4e1bc28b..1eff064b7a 100755..100644
--- a/keyboards/keychron/k8_pro/jis/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/k8_pro/jis/white/keymaps/default/keymap.c
@@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [WIN_BASE] = LAYOUT_91_jis(
         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, BL_STEP,
         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_INT3, 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_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,  KC_RBRC,                     KC_DEL,   KC_END,   KC_PGDN,
         KC_CAPS,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_NUHS,  KC_ENT,
         KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_INT1,  KC_RSFT,                     KC_UP,
         KC_LCTL,  KC_LGUI,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT4,  KC_RALT,  KC_RGUI, MO(WIN_FN),KC_RCTL,           KC_LEFT,  KC_DOWN,  KC_RGHT),
diff --git a/keyboards/keychron/q14_pro/q14_pro.c b/keyboards/keychron/q14_pro/q14_pro.c
index 93837c1fa2..de6a3f22e5 100755
--- a/keyboards/keychron/q14_pro/q14_pro.c
+++ b/keyboards/keychron/q14_pro/q14_pro.c
@@ -311,9 +311,3 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
     }
 }
 #endif
-
-void suspend_wakeup_init_kb(void) {
-    // code will run on keyboard wakeup
-    clear_keyboard();
-    send_keyboard_report();
-}
diff --git a/keyboards/keychron/q1_pro/config.h b/keyboards/keychron/q1_pro/config.h
index cc17c33a92..0b1aa45d86 100644
--- a/keyboards/keychron/q1_pro/config.h
+++ b/keyboards/keychron/q1_pro/config.h
@@ -25,6 +25,8 @@
 #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
 
diff --git a/keyboards/keychron/q1_pro/q1_pro.c b/keyboards/keychron/q1_pro/q1_pro.c
index 7508b200e1..a83953fdbd 100644
--- a/keyboards/keychron/q1_pro/q1_pro.c
+++ b/keyboards/keychron/q1_pro/q1_pro.c
@@ -35,8 +35,8 @@ typedef struct PACKED {
 } key_combination_t;
 
 static uint32_t factory_timer_buffer = 0;
-static uint32_t siri_timer_buffer = 0;
-static uint8_t  mac_keycode[4]    = {KC_LOPT, KC_ROPT, KC_LCMD, KC_RCMD};
+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)
@@ -130,8 +130,8 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
     return true;
 }
 
-#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE)
-static void encoder_pad_cb(void *param) {
+#if defined(ENCODER_ENABLE)
+static void encoder0_pad_cb(void *param) {
     encoder_inerrupt_read((uint32_t)param & 0XFF);
 }
 #endif
@@ -176,7 +176,7 @@ void keyboard_post_init_kb(void) {
     palEnableLineEvent(encoders_pad_b[0], PAL_EVENT_MODE_BOTH_EDGES);
     palSetLineCallback(encoders_pad_a[0], encoder0_pad_cb, NULL);
     palSetLineCallback(encoders_pad_b[0], encoder0_pad_cb, NULL);
-#endif
+#    endif
 #endif
 
     keyboard_post_init_user();
diff --git a/keyboards/keychron/q1_pro/rules.mk b/keyboards/keychron/q1_pro/rules.mk
index 8e536fc345..f995372f9c 100644
--- a/keyboards/keychron/q1_pro/rules.mk
+++ b/keyboards/keychron/q1_pro/rules.mk
@@ -2,8 +2,5 @@
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 OPT_DEFS += -DNO_USB_STARTUP_CHECK -DENABLE_FACTORY_TEST
 
-SRC += matrix.c
-
 include keyboards/keychron/bluetooth/bluetooth.mk
-
-
+include keyboards/keychron/common/common.mk
diff --git a/keyboards/keychron/q2_pro/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q2_pro/iso_encoder/keymaps/default/keymap.c
index d920ae8199..7424db7271 100755..100644
--- a/keyboards/keychron/q2_pro/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q2_pro/iso_encoder/keymaps/default/keymap.c
@@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[NUM_ENCODERS][][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
     [MAC_FN1]  = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI) },
diff --git a/keyboards/keychron/q3_pro/jis_encoder_se/config.h b/keyboards/keychron/q3_pro/jis_encoder_se/config.h
index 43a3782ea3..8e09306c32 100755
--- a/keyboards/keychron/q3_pro/jis_encoder_se/config.h
+++ b/keyboards/keychron/q3_pro/jis_encoder_se/config.h
@@ -53,18 +53,14 @@
 #    define RGB_MATRIX_KEYPRESSES
 
 #    ifdef KC_BLUETOOTH_ENABLE
-#            define HOST_DEVICES_COUNT 3
-#            define HOST_LED_MATRIX_LIST \
-                { 17, 18, 19 }
-#            define BAT_LEVEL_LED_LIST \
-                { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
+#        define HOST_DEVICES_COUNT 3
+#        define HOST_LED_MATRIX_LIST \
+            { 17, 18, 19 }
+#        define BAT_LEVEL_LED_LIST \
+            { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
 #    endif
 #endif // RGB_MATRIX_ENABLE
 
 /* Specifed (0,1) which programmed as "ESC" key on this keyboard as bootmagic key */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 1
-
-#ifdef KC_BLUETOOTH_ENABLE
-#    define BAT_LOW_LED_PIN_STATE
-#endif
diff --git a/keyboards/keychron/q8_pro/q8_pro.c b/keyboards/keychron/q8_pro/q8_pro.c
index aa0426149a..c2afbc04c2 100755
--- a/keyboards/keychron/q8_pro/q8_pro.c
+++ b/keyboards/keychron/q8_pro/q8_pro.c
@@ -312,9 +312,3 @@ void raw_hid_receive(uint8_t *data, uint8_t length) {
     }
 }
 #endif
-
-void suspend_wakeup_init_kb(void) {
-    // code will run on keyboard wakeup
-    clear_keyboard();
-    send_keyboard_report();
-}