From 34cdd88e1b7d75acd675ff9992e08f365e0c9d95 Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Fri, 21 Jul 2023 22:03:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=8F=92usb=E4=BD=8E?=
 =?UTF-8?q?=E7=94=B5=E9=97=AE=E9=A2=98=202.=E6=B8=A9=E5=BA=A6=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=203.=E5=85=88=E8=BF=98=E5=8E=9F=E5=8E=9F=E5=A7=8B?=
 =?UTF-8?q?=E7=9A=84=E7=94=B5=E5=8E=8B=E8=AF=BB=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rtos/code/driver/na51089/include/sf_battery.h |  1 +
 .../driver/na51089/source/mcu/sf_battery.c    | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/rtos/code/driver/na51089/include/sf_battery.h b/rtos/code/driver/na51089/include/sf_battery.h
index fd8741eb0..41b87a990 100644
--- a/rtos/code/driver/na51089/include/sf_battery.h
+++ b/rtos/code/driver/na51089/include/sf_battery.h
@@ -39,4 +39,5 @@ void sf_stamp_temperature_get(INT16 *fTem,INT16 *cTem); /*0:F  1:C*/
 void sf_temper_update(void);
 INT16 sf_celsius_change_to_fahrenheit(INT16 cTemper);
 void sf_BatteryInfoSave(char *name);
+UINT32 sf_get_temper_adc(void);
 #endif
diff --git a/rtos/code/driver/na51089/source/mcu/sf_battery.c b/rtos/code/driver/na51089/source/mcu/sf_battery.c
index f9a3ca586..ce1cd20fa 100644
--- a/rtos/code/driver/na51089/source/mcu/sf_battery.c
+++ b/rtos/code/driver/na51089/source/mcu/sf_battery.c
@@ -309,7 +309,7 @@ UINT32 sf_battery_adc_value_get_once(void)
 	if(sf_adc_value_get(SF_ADC_DC, &batAdc) == SUCCESS)
 	{
         dcVoltageVal = sf_battery_voltage_convert(10, 100, batAdc);
-        dcVoltageVal += 4;
+        //dcVoltageVal += 4;
         if(puiPara->BatteryLogSwitch)
 		    printf("DC ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,dcVoltageVal,dcVoltageVal/10,dcVoltageVal%10);
     }
@@ -317,7 +317,7 @@ UINT32 sf_battery_adc_value_get_once(void)
     if(sf_adc_value_get(SF_ADC_LI, &batAdc) == SUCCESS)
     {
         liPolymerVoltageVal = sf_battery_voltage_convert(15, 100, batAdc);
-        liPolymerVoltageVal += 4;
+        //liPolymerVoltageVal += 4;
         if(puiPara->BatteryLogSwitch)
 		    printf("Li ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,liPolymerVoltageVal,liPolymerVoltageVal/10,liPolymerVoltageVal%10);
     }
@@ -325,7 +325,7 @@ UINT32 sf_battery_adc_value_get_once(void)
     if(sf_adc_value_get(SF_ADC_BATT, &batAdc) == SUCCESS)
     {
         batVoltageVal = sf_battery_voltage_convert(15, 100, batAdc);
-        batVoltageVal += 4;
+        //batVoltageVal += 4;
         if(puiPara->BatteryLogSwitch)
 		    printf("Bat ADC Value:%lu After Convert:%lu(%lu.%luV)\n",batAdc,batVoltageVal,batVoltageVal/10,batVoltageVal%10);
  
@@ -853,7 +853,7 @@ THREAD_RETTYPE sf_battery_check_thread(void *arg)
     {
         printf("[%s:%d]power off because low battery\n", __FUNCTION__, __LINE__);
         //Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_BATT_EMPTY); //shutdown start
-        #if SF_IQ_TEST != ENABLE
+        #if (SF_IQ_TEST != ENABLE) && (SF_BATTERY_TEST != ENABLE)
         sf_set_power_off_flag(APP_POWER_OFF_BATT_EMPTY);
         flow_preview_set_stop_flag(TRUE);
         #endif
@@ -1278,6 +1278,11 @@ BOOL sf_is_battery_low(UINT8 refresh, UINT8 nightMode)
 *************************************************/
 BOOL sf_battery_check_init(void)
 {
+    if(sf_is_usb_flag()){
+        printf("[%s:%d]usb power\n", __FUNCTION__, __LINE__);
+        return TRUE;
+    }
+
     sf_adc_init();
     if(sf_is_battery_low(1, 0) == TRUE)
     {
@@ -1457,7 +1462,7 @@ void sf_BatteryInfoSave(char *name)
 	batAdc = sf_battery_convert_to_adc(15, 100, BatVoltageValTest);
 
 
-	sprintf(tmpBuf, "%s BatAdc=%lu  BatVal=%lu  LiBatAdc=%lu  LiBatVal=%lu\r\n", name, batAdc, BatVoltageValTest, LibatAdc, LiPolymerVoltageValTest);
+	sprintf(tmpBuf, "%s BatAdc=%lu  BatVal=%lu  LiBatAdc=%lu  LiBatVal=%lu TemperAdc=%lu\r\n", name, batAdc, BatVoltageValTest, LibatAdc, LiPolymerVoltageValTest, TemperAdc);
 	printf("%s\r", tmpBuf);
 
     if(fd)
@@ -1472,5 +1477,17 @@ void sf_BatteryInfoSave(char *name)
 }
 
 #endif
+/******************************************************
+   Function: sf_get_temper_adc
+   Description: 
+   Input:  N/A
+   Output: N/A
+   Return: TemperAdc
+   Others: N/A
+ *******************************************************/
+UINT32 sf_get_temper_adc(void)
+{
+    return TemperAdc;
+}
 
 #endif