From e1a4a033628eb1cb47fa4c2a83d1837deb375a09 Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Fri, 19 Jan 2024 21:23:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E7=94=B5=E5=8E=8B=E5=88=86?=
 =?UTF-8?q?=E4=BD=8D=EF=BC=9B2=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AFmcu=20db?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sf_app/code/source/battery/sf_battery.c   | 20 +++++++++----------
 code/lib/source/sifar/code/include/sf_mcu.h   |  1 +
 .../sifar/code/source/common/sf_common.c      |  2 +-
 .../driver/na51089/source/mcu/sf_battery.c    | 20 +++++++++----------
 rtos/code/driver/na51089/source/mcu/sf_mcu.c  |  3 +++
 5 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/code/application/source/sf_app/code/source/battery/sf_battery.c b/code/application/source/sf_app/code/source/battery/sf_battery.c
index 387428f55..2a9321864 100755
--- a/code/application/source/sf_app/code/source/battery/sf_battery.c
+++ b/code/application/source/sf_app/code/source/battery/sf_battery.c
@@ -1177,9 +1177,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 		{
 			batteryVal = LiPolymerVoltageVal;
 			
-			if(batteryVal < 65)
+			if(batteryVal < 66)
 			{
-				if(nightMode && (batteryVal >= 43))
+				if(nightMode && (batteryVal >= 45))
 					value = 1;
 				else
 					value = 0;
@@ -1235,9 +1235,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 			
 			if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK
 			{
-				if(batteryVal < 62)
+				if(batteryVal < 63)
 				{
-					if(nightMode && (batteryVal >= 43))
+					if(nightMode && (batteryVal >= 45))
 						value = 1;
 					else
 						value = 0;
@@ -1289,18 +1289,18 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 			}
 			else if(puiPara->BatteryType == SF_BATT_NI_MH) //NIH
 			{
-				if(batteryVal < 60)
+				if(batteryVal < 61)
 				{
-					if(nightMode && (batteryVal >= 43))
+					if(nightMode && (batteryVal >= 45))
 						value = 1;
 					else
 						value = 0;
 				}
-				else if(batteryVal < 61)
+				else if(batteryVal < 62)
 				{
 					value = 1;
 				}
-				else if(batteryVal < 62)
+				else if(batteryVal < 63)
 				{
 					value = 10;
 				}
@@ -1343,9 +1343,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 			}
 			else
 			{
-				if(batteryVal < 62)
+				if(batteryVal < 63)
 				{
-					if(nightMode && (batteryVal >= 43))
+					if(nightMode && (batteryVal >= 45))
 						value = 1;
 					else
 						value = 0;
diff --git a/code/lib/source/sifar/code/include/sf_mcu.h b/code/lib/source/sifar/code/include/sf_mcu.h
index 93b14f808..ee55375ae 100644
--- a/code/lib/source/sifar/code/include/sf_mcu.h
+++ b/code/lib/source/sifar/code/include/sf_mcu.h
@@ -412,5 +412,6 @@ SINT32 sf_sys_rtc_time_set(SF_PARA_TIME_S* pstDateTime);
 void sf_set_ae_night_mode(UINT8 isNightMode);
 UINT32 sf_get_send_pic_sieze(void);
 void sf_mcu_version_get(UINT8 *mcuVer);
+BOOL sf_is_night_mode(BOOL isRefresh);
 #endif
 
diff --git a/code/lib/source/sifar/code/source/common/sf_common.c b/code/lib/source/sifar/code/source/common/sf_common.c
index ce9f94567..6fbba0dbe 100755
--- a/code/lib/source/sifar/code/source/common/sf_common.c
+++ b/code/lib/source/sifar/code/source/common/sf_common.c
@@ -2595,7 +2595,7 @@ BOOL sf_is_flash_voltage_abnormal(void)
 
 	printf("powerVal=%d batteryType=%d \n", powerVal, batteryType);
 
-	if((/*SF_POWER_TYPE_DC*/1 != batteryType) && (powerVal < 55) )
+	if((/*SF_POWER_TYPE_DC*/1 != batteryType) && (powerVal < 56) )
 	{
 		printf("low battery no write flash\n");
 		return TRUE;
diff --git a/rtos/code/driver/na51089/source/mcu/sf_battery.c b/rtos/code/driver/na51089/source/mcu/sf_battery.c
index 4be6f2fa4..20ec89584 100755
--- a/rtos/code/driver/na51089/source/mcu/sf_battery.c
+++ b/rtos/code/driver/na51089/source/mcu/sf_battery.c
@@ -1049,9 +1049,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 		{
 			batteryVal = LiPolymerVoltageVal;
 			
-			if(batteryVal < 65)
+			if(batteryVal < 66)
 			{
-				if(nightMode && (batteryVal >= 43))
+				if(nightMode && (batteryVal >= 45))
 					value = 1;
 				else
 					value = 0;
@@ -1107,9 +1107,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 			
 			if(puiPara->BatteryType == SF_BATT_ALKALINE) //ALK
 			{
-				if(batteryVal < 62)
+				if(batteryVal < 63)
 				{
-					if(nightMode && (batteryVal >= 43))
+					if(nightMode && (batteryVal >= 45))
 						value = 1;
 					else
 						value = 0;
@@ -1161,18 +1161,18 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 			}
 			else if(puiPara->BatteryType == SF_BATT_NI_MH) //NIH
 			{
-				if(batteryVal < 60)
+				if(batteryVal < 61)
 				{
-					if(nightMode && (batteryVal >= 43))
+					if(nightMode && (batteryVal >= 45))
 						value = 1;
 					else
 						value = 0;
 				}
-				else if(batteryVal < 61)
+				else if(batteryVal < 62)
 				{
 					value = 1;
 				}
-				else if(batteryVal < 62)
+				else if(batteryVal < 63)
 				{
 					value = 10;
 				}
@@ -1215,9 +1215,9 @@ UINT8 sf_battery_value_get(UINT8 nightMode)
 			}
 			else
 			{
-				if(batteryVal < 62)
+				if(batteryVal < 63)
 				{
-					if(nightMode && (batteryVal >= 43))
+					if(nightMode && (batteryVal >= 45))
 						value = 1;
 					else
 						value = 0;
diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c
index 299dc350b..1c93a4fa9 100755
--- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c
+++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c
@@ -1770,6 +1770,9 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
         mcuData[i++] = puiPara->TimeSend4.Min;
     }else if(attrId == SF_MCU_CTRL_MODULE_PIR){
 
+        mcuReg[i] = FUNCTION_SWTICH2;//dbg test
+        mcuData[i++] = 2;
+
         mcuReg[i] = WDT_TIME;
         mcuData[i++] = 5;//sf_mcu_wdg_set(5);