payton/nt9856x
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.集中发送时2和5启动不上电模块和进行短信检测

Browse Source
This commit is contained in:
payton 2024-01-25 15:22:25 +08:00
parent 9741a821e5
commit f6460c4123
2 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/sf_app/code/source/4gMng/sf_sms.c
View File

@ -2447,6 +2447,10 @@ SINT32 sf_power_off_check_sms(void)
UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
SLOGD(" s %d %d\n",sf_get_sim_insert(), sf_app_while_flag()); 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*/ /*instant, hybrid mode*/
if((!sf_get_signal_ready_flag()) && (sf_get_sim_insert()) && (sf_app_while_flag()) && (puiPara->GprsSwitch)) if((!sf_get_signal_ready_flag()) && (sf_get_sim_insert()) && (sf_app_while_flag()) && (puiPara->GprsSwitch))
{ {

87
rtos/code/driver/na51089/source/mcu/sf_mcu.c
View File

@ -1770,51 +1770,64 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
mcuData[i++] = puiPara->TimeSend4.Min; mcuData[i++] = puiPara->TimeSend4.Min;
}else if(attrId == SF_MCU_CTRL_MODULE_PIR){ }else if(attrId == SF_MCU_CTRL_MODULE_PIR){
mcuReg[i] = FUNCTION_SWTICH2;//dbg test
mcuData[i++] = 2;
mcuReg[i] = WDT_TIME; PowerOnMode = sf_get_power_on_mode();
mcuData[i++] = 5;//sf_mcu_wdg_set(5); if((0 != puiPara->SendType) && ((PowerOnMode == PWR_ON_TIMELAPSE) || (PowerOnMode == PWR_ON_PIR)))
{
mcuReg[i] = ANALOG_PIR_SENSITIVITY; mcuReg[i] = FUNCTION_SWTICH2;//dbg test
mcuData[i++] = 2;
temp = (puiPara->PirSensitivity);//sf_mcu_analog_pir_sen_convert(SysGetFlag(DigPirSensitivity)); mcuReg[i] = WDT_TIME;
mcuData[i++] = 5;//sf_mcu_wdg_set(5);
if(puiPara->GprsMode)//hybrid mode 4G module keep sleep
{
temp |= 0x40;
}
if((puiPara->GprsSwitch) && (val == 1))
{
temp |= 0x80;
} }
else 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] = ANALOG_PIR_SENSITIVITY;
{
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)) temp = (puiPara->PirSensitivity);//sf_mcu_analog_pir_sen_convert(SysGetFlag(DigPirSensitivity));
{
mcuReg[i] = GPS_POWER_TIMER_CLEAR; if(puiPara->GprsMode)//hybrid mode 4G module keep sleep
mcuData[i++] = 1; {
mcuReg[i] = GPS_POWER_CTRL; temp |= 0x40;
mcuData[i++] = 1; }
}
else if((puiPara->GprsSwitch) && (val == 1))
{ {
mcuReg[i] = GPS_POWER_CTRL; temp |= 0x80;
mcuData[i++] = 0; }
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){ }else if(attrId == SF_MCU_PARA){
mcuReg[i] = ANALOG_PIR_SENSITIVITY; mcuReg[i] = ANALOG_PIR_SENSITIVITY;