From: SnickerSun <snickersun@163.com>
Date: Fri, 26 Apr 2024 09:38:53 +0000 (+0800)
Subject: 修复 插着充电线重启 充电检测无效问题
X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~67^2~2
X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=1fc80cf03c731448f30d2ee337c5137c432baa56;p=mirrors%2FFD230.git

修复 插着充电线重启 充电检测无效问题
---

diff --git a/code/sdk/application/battery/service/battery_service.cpp b/code/sdk/application/battery/service/battery_service.cpp
index b34d46d4e..06128c4bc 100644
--- a/code/sdk/application/battery/service/battery_service.cpp
+++ b/code/sdk/application/battery/service/battery_service.cpp
@@ -68,7 +68,7 @@ errcode_t uapi_battery_init(void);
  * 临时性去除充电禁止能力，待海思更新 充电线静态检测能力再回复。
  * 否则会产生插着充电线重启后，无法继续充电的问题。
 */
-#define DISABLE_VBUS_CHECK
+// #define DISABLE_VBUS_CHECK
 
 osTimerId_t g_battery_timer = NULL;
 
diff --git a/code/sdk/drivers/chips/brandy/porting/button/button_porting.c b/code/sdk/drivers/chips/brandy/porting/button/button_porting.c
index e0c60ed3f..2487a60b1 100755
--- a/code/sdk/drivers/chips/brandy/porting/button/button_porting.c
+++ b/code/sdk/drivers/chips/brandy/porting/button/button_porting.c
@@ -228,7 +228,10 @@ errcode_t uapi_register_charger_event_callback(charger_plug_event_callback_func_
 
 bool  uapi_get_charger_plug_status(void)
 {
-    return charger_plugged;
+
+    uint32_t charge_stat =  reg32_getbit(0x5702C034, 2);
+    // printf("uapi_get_charger_plug_status reg %d charger_plugged %d\r\n",charge_stat,charger_plugged);
+    return charge_stat | charger_plugged;
 }
 
 static void deal_with_vbus_event(void)