From f6460c4123e99bc8023497941954b6c6fbc4f71d Mon Sep 17 00:00:00 2001
From: payton <payton@willfine.com>
Date: Thu, 25 Jan 2024 15:22:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=9B=86=E4=B8=AD=E5=8F=91=E9=80=81=E6=97=B6?=
 =?UTF-8?q?2=E5=92=8C5=E5=90=AF=E5=8A=A8=E4=B8=8D=E4=B8=8A=E7=94=B5?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=92=8C=E8=BF=9B=E8=A1=8C=E7=9F=AD=E4=BF=A1?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../source/sf_app/code/source/4gMng/sf_sms.c  |  4 +
 rtos/code/driver/na51089/source/mcu/sf_mcu.c  | 87 +++++++++++--------
 2 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/code/application/source/sf_app/code/source/4gMng/sf_sms.c b/code/application/source/sf_app/code/source/4gMng/sf_sms.c
index 273567ffb..129e0ac2d 100755
--- a/code/application/source/sf_app/code/source/4gMng/sf_sms.c
+++ b/code/application/source/sf_app/code/source/4gMng/sf_sms.c
@@ -2447,6 +2447,10 @@ SINT32 sf_power_off_check_sms(void)
     UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
     SLOGD(" s %d %d\n",sf_get_sim_insert(), sf_app_while_flag());
 
+    if((0 != puiPara->SendType) && ((PowerOnMode == PWR_ON_TIMELAPSE) || (PowerOnMode == PWR_ON_PIR)))
+    {
+        return 0;
+    }
     	/*instant, hybrid mode*/
 	if((!sf_get_signal_ready_flag()) && (sf_get_sim_insert()) && (sf_app_while_flag()) && (puiPara->GprsSwitch))
 	{
diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c
index 2d87fe043..0a7419f6b 100755
--- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c
+++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c
@@ -1770,51 +1770,64 @@ 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);
-        
-        mcuReg[i] = ANALOG_PIR_SENSITIVITY;
+        PowerOnMode = sf_get_power_on_mode();
+        if((0 != puiPara->SendType) && ((PowerOnMode == PWR_ON_TIMELAPSE) || (PowerOnMode == PWR_ON_PIR)))
+        {
+            mcuReg[i] = FUNCTION_SWTICH2;//dbg test
+            mcuData[i++] = 2;
 
-        temp = (puiPara->PirSensitivity);//sf_mcu_analog_pir_sen_convert(SysGetFlag(DigPirSensitivity));
-        
-        if(puiPara->GprsMode)//hybrid mode 4G module keep sleep 
-        {
-            temp |= 0x40;
-        }
-        
-        if((puiPara->GprsSwitch) && (val == 1))
-        {
-            temp |= 0x80;
+            mcuReg[i] = WDT_TIME;
+            mcuData[i++] = 5;//sf_mcu_wdg_set(5);
         }
         else
         {
-            //sf_pdp_flg_set(0);
-        }
+            mcuReg[i] = FUNCTION_SWTICH2;//dbg test
+            mcuData[i++] = 2;
 
-        mcuData[i++] = temp;
+            mcuReg[i] = WDT_TIME;
+            mcuData[i++] = 5;//sf_mcu_wdg_set(5);
 
-        if(ConfigureModeFlag)
-        {
-            mcuReg[i] = DIGITAL_PIR_SENSITIVITY;
-            mcuData[i++] = (puiPara->DigitPirSensitivity);//PirDigtSensRegValue[SysGetFlag(PirSensitivity)];
-            mcuReg[i] = DIGITAL_PIR_CFG;
-            mcuData[i++] = ((puiPara->DigitPirWindowTime) << 4) | (puiPara->DigitPirCnt);
-        }
+            mcuReg[i] = ANALOG_PIR_SENSITIVITY;
 
-        if(((puiPara->GpsSwitch) || (puiPara->FristSendDailyAndGps)) && (ConfigureModeFlag || paraSyncFlag))
-        {
-            mcuReg[i] = GPS_POWER_TIMER_CLEAR;
-            mcuData[i++] = 1;
-            mcuReg[i] = GPS_POWER_CTRL;
-            mcuData[i++] = 1;
-        }
-        else
-        {
-            mcuReg[i] = GPS_POWER_CTRL;
-            mcuData[i++] = 0;
+            temp = (puiPara->PirSensitivity);//sf_mcu_analog_pir_sen_convert(SysGetFlag(DigPirSensitivity));
+            
+            if(puiPara->GprsMode)//hybrid mode 4G module keep sleep 
+            {
+                temp |= 0x40;
+            }
+            
+            if((puiPara->GprsSwitch) && (val == 1))
+            {
+                temp |= 0x80;
+            }
+            else
+            {
+                //sf_pdp_flg_set(0);
+            }
+
+            mcuData[i++] = temp;
+
+            if(ConfigureModeFlag)
+            {
+                mcuReg[i] = DIGITAL_PIR_SENSITIVITY;
+                mcuData[i++] = (puiPara->DigitPirSensitivity);//PirDigtSensRegValue[SysGetFlag(PirSensitivity)];
+                mcuReg[i] = DIGITAL_PIR_CFG;
+                mcuData[i++] = ((puiPara->DigitPirWindowTime) << 4) | (puiPara->DigitPirCnt);
+            }
+
+            if(((puiPara->GpsSwitch) || (puiPara->FristSendDailyAndGps)) && (ConfigureModeFlag || paraSyncFlag))
+            {
+                mcuReg[i] = GPS_POWER_TIMER_CLEAR;
+                mcuData[i++] = 1;
+                mcuReg[i] = GPS_POWER_CTRL;
+                mcuData[i++] = 1;
+            }
+            else
+            {
+                mcuReg[i] = GPS_POWER_CTRL;
+                mcuData[i++] = 0;
+            }
         }
     }else if(attrId == SF_MCU_PARA){
         mcuReg[i] = ANALOG_PIR_SENSITIVITY;