From d0a6fa1b1bced78bb11655fdaff9d30437f8fe6a Mon Sep 17 00:00:00 2001 From: lalalademaxiya1 <2831039915@qq.com> Date: Sat, 8 Jul 2023 11:21:09 +0800 Subject: Added q3 pre v2 and q3 v1 iso version --- keyboards/keychron/q3_pro/q3_pro.c | 50 ++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 16 deletions(-) (limited to 'keyboards/keychron/q3_pro/q3_pro.c') diff --git a/keyboards/keychron/q3_pro/q3_pro.c b/keyboards/keychron/q3_pro/q3_pro.c index 750f539790..6c47334e72 100644 --- a/keyboards/keychron/q3_pro/q3_pro.c +++ b/keyboards/keychron/q3_pro/q3_pro.c @@ -30,13 +30,19 @@ # include "factory_test.h" #endif +#ifdef BAT_LOW_LED_PIN +static uint32_t power_on_indicator_timer_buffer; +# define POWER_ON_LED_DURATION 3000 +#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}; +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}; key_combination_t key_comb_list[4] = { {2, {KC_LWIN, KC_TAB}}, // Task (win) @@ -132,10 +138,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) { return true; } -#ifdef KC_BLUETOOTH_ENABLE -static void encoder0_pad_cb(void *param) { - (void)param; - encoder_inerrupt_read(0); +#if defined(KC_BLUETOOTH_ENABLE) && defined(ENCODER_ENABLE) +static void encoder_pad_cb(void *param) { + encoder_inerrupt_read((uint32_t)param & 0XFF); } #endif @@ -144,7 +149,8 @@ void keyboard_post_init_kb(void) { #ifdef KC_BLUETOOTH_ENABLE /* Currently we don't use this reset pin */ - palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_UNCONNECTED); + palSetLineMode(CKBT51_RESET_PIN, PAL_MODE_OUTPUT_PUSHPULL); + palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); /* IMPORTANT: DO NOT enable internal pull-up resistor * as there is an external pull-down resistor. @@ -154,20 +160,37 @@ void keyboard_post_init_kb(void) { ckbt51_init(false); bluetooth_init(); +# ifdef ENCODER_ENABLE pin_t encoders_pad_a[NUM_ENCODERS] = ENCODERS_PAD_A; pin_t encoders_pad_b[NUM_ENCODERS] = ENCODERS_PAD_B; - for (uint8_t i = 0; i < NUM_ENCODERS; i++) { + 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], encoder0_pad_cb, NULL); - palSetLineCallback(encoders_pad_b[i], encoder0_pad_cb, NULL); + palSetLineCallback(encoders_pad_a[i], encoder_pad_cb, (void *)i); + palSetLineCallback(encoders_pad_b[i], encoder_pad_cb, (void *)i); } +# endif +#endif + +#ifdef BAT_LOW_LED_PIN + power_on_indicator_timer_buffer = sync_timer_read32() | 1; + writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE); #endif keyboard_post_init_user(); } void matrix_scan_kb(void) { + if (factory_timer_buffer && timer_elapsed32(factory_timer_buffer) > 2000) { + factory_timer_buffer = 0; + if (bt_factory_reset) { + bt_factory_reset = false; + palWriteLine(CKBT51_RESET_PIN, PAL_LOW); + wait_ms(5); + palWriteLine(CKBT51_RESET_PIN, PAL_HIGH); + } + } + if (siri_timer_buffer && sync_timer_elapsed32(siri_timer_buffer) > 500) { siri_timer_buffer = 0; unregister_code(KC_LGUI); @@ -184,7 +207,6 @@ void matrix_scan_kb(void) { #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, @@ -201,8 +223,8 @@ static void ckbt51_param_init(void) { void bluetooth_enter_disconnected_kb(uint8_t host_idx) { if (bt_factory_reset) { - bt_factory_reset = false; ckbt51_param_init(); + factory_timer_buffer = timer_read32(); } /* CKBT51 bluetooth module boot time is slower, it enters disconnected after boot, so we place initialization here. */ @@ -298,7 +320,3 @@ void raw_hid_receive(uint8_t *data, uint8_t length) { } } #endif - -void restart_usb_driver(USBDriver *usbp) { - (void)usbp; -} -- cgit v1.2.3