From: SnickerSun Date: Fri, 29 Mar 2024 09:51:20 +0000 (+0800) Subject: 修复充电开机后检测不到充电状态bug X-Git-Tag: release_V1.2.70_20241020_135402~1241^2~13^2~1 X-Git-Url: http://git.snicker.com.cn/img/static/gitweb.css?a=commitdiff_plain;h=df839be649149db069b2decb9887a3c76aeea80c;p=mirrors%2FFD230.git 修复充电开机后检测不到充电状态bug --- diff --git a/code/sdk/application/brandy/brandy_standard/board_init.c b/code/sdk/application/brandy/brandy_standard/board_init.c index ec062ca5b..2003168f0 100755 --- a/code/sdk/application/brandy/brandy_standard/board_init.c +++ b/code/sdk/application/brandy/brandy_standard/board_init.c @@ -99,23 +99,7 @@ static void gpio_func_init(void) } static button_press_state_t g_pwrkey_press_state = RELEASED; -startup_reason_t startup_reason = STARTUP_OTHER; - -static startup_reason_t get_startup_reason(void) -{ - startup_reason_t startup_type = STARTUP_OTHER; - uint16_t g_ulp_wkup_flag = readw(ULP_WKUP_INT_STS); - if (((g_ulp_wkup_flag >> WKUP_SYSTICK_MASK) & 1) == 1) { - startup_type = STARTUP_SYSTICK; - } - if (((g_ulp_wkup_flag >> WKUP_PWRON_MASK) & 1) == 1) { - startup_type = STARTUP_PWRON; - } - if (((g_ulp_wkup_flag >> WKUP_VBUS_EN_MASK) & 1) == 1) { - startup_type = STARTUP_VBUS_EN; - } - return startup_type; -} +static startup_reason_t startup_reason = STARTUP_OTHER; static button_press_state_t porting_button_get_state(void) { if ((readl(ANA_STS) & 0x3) == 0) { @@ -130,7 +114,8 @@ void check_pwrkey_3s(void) bool button_pressed = false; int pressed_count = 0; // button_api->button_register_callback(PIN_NONE, (osal_irq_handler)button_irq_callback); - startup_reason = get_startup_reason(); + uapi_ulp_wkup_type_record(); + startup_reason = uapi_get_startup_reason(); PRINT("bootup reasion %d (0-systick 1-pwrkey 2-vbus 3-other)"NEWLINE,startup_reason); if(startup_reason == 1) g_pwrkey_press_state = PRESSED; else g_pwrkey_press_state = RELEASED;