From: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Date: Fri, 26 Apr 2024 09:43:52 +0000 (+0000)
Subject: Merge #93 into xts_origin from refs/changes/93/head
X-Git-Tag: release_V1.2.70_20241020_135402~1025^2~67^2^2
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=7ee8a8bfd23010e0cd152f47bfbfc43f4229f7cd;p=mirrors%2FFD230.git

Merge #93 into xts_origin from refs/changes/93/head

Code review from snickersun@163.com

* refs/changes/93/head: (2 commits squashed)

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

  - 临时默认开机开启Cat1 然后根据配置关闭或保持开启

Signed-off-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Reviewed-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>
Merged-by: snickersun@163.com <accounts_62b90f7fcf51ade33b6f628e@mail.teambition.com>

CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/93
---

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/boards/brandy_evb/board_config/board_evb.h b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
index 1216792cd..f0951098f 100755
--- a/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
+++ b/code/sdk/drivers/boards/brandy_evb/board_config/board_evb.h
@@ -242,8 +242,9 @@ const hal_pio_config_t g_pio_function_config[PIN_MAX_NUMBER] = {
  */
 
 
-//默认开启Cat1 然后再根据配置决定是否关闭.
-#define DEFAULT_POWERON_CAT1 0
+//默认开启Cat1 然后再根据配置决定是否关闭. 
+//默认不开启 ppg checkid失败，原因未知，暂时开机开启cat1
+#define DEFAULT_POWERON_CAT1 1
 
 //需要配置默认输出的，以及需要配置默认输入中断函数的。
 const hal_gpio_config_t g_gpio_function_config[PIN_MAX_NUMBER] = {
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)