From 15045b439a8b5682de4146d013c4ac2f3820fca0 Mon Sep 17 00:00:00 2001 From: payton Date: Wed, 12 Jul 2023 09:47:14 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=90=AF=E5=8A=A8=E6=96=B9=E5=BC=8F=E5=AF=84?= =?UTF-8?q?=E5=AD=98=E5=99=A8=E5=8F=96=E4=BD=8D=E6=94=B9=E4=B8=BAf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../code/source/systemMng/sf_commu_mcu.c | 21 +++++++++---------- .../code/source/systemMng/sf_commu_mcu_reg.c | 4 ++-- rtos/code/driver/na51089/source/mcu/sf_mcu.c | 7 +++++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c index fd459fe77..dcc34116f 100644 --- a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c +++ b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c @@ -942,7 +942,7 @@ unsigned char sf_commu_parse_mcu_data(unsigned char * src, unsigned int len) stMessageBuf.cmdId = CMD_KEY; stMessageBuf.arg1 = SF_EVENT_KEY_SHORT_CLICK; stMessageBuf.arg2 = SF_KEY_PIN_DATAREADY; - stMessageBuf.arg3 = (val[0] & 0x1F); + stMessageBuf.arg3 = (val[0] & 0xF); ret = 0x05; if(3 == stMessageBuf.arg3) //ON @@ -950,22 +950,21 @@ unsigned char sf_commu_parse_mcu_data(unsigned char * src, unsigned int len) sf_set_pir_statu_flag(1); if(sf_get_mode_flag()){ sf_com_message_send_to_cardv(&stMessageBuf); + sf_set_power_off_flag(1); } printf("%s:%d-------PIR Key Pressed.------\n", __FUNCTION__, __LINE__); } - else if(1 == stMessageBuf.arg3) //ON->OFF - {//PIR MODE: ON->OFF/ ON->SETUP + else if(1 == stMessageBuf.arg3) //ON->SETUP + { + sf_set_module_sleep_flag(0); + sf_com_message_send_to_cardv(&stMessageBuf); + } + else if(0 == stMessageBuf.arg3) //ON->OFF + { sf_set_module_sleep_flag(0); sf_com_message_send_to_cardv(&stMessageBuf); sf_sys_status_led_set(SF_LED_SYS_STATE_POWER_OFF); - } - else if(0 == stMessageBuf.arg3) //ON->SETUP - {//PIR MODE: ON->OFF/ ON->SETUP - sf_set_module_sleep_flag(0); - sf_com_message_send_to_cardv(&stMessageBuf); - } - if(sf_get_mode_flag()){ - sf_set_power_off_flag(1); + sf_set_power_off_flag(1); } } else diff --git a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c index 2a16f1fc3..3f28ec6b6 100644 --- a/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c +++ b/code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c @@ -137,7 +137,7 @@ unsigned char sf_mcu_power_on_para_get (MCUParam_t attrId) if(attrId == SF_MCU_STARTMODE) { sf_mcu_read(START_MODE, &dataTemp1); - startMode = dataTemp1 & 0x1F; + startMode = dataTemp1 & 0xF; } else { @@ -156,7 +156,7 @@ unsigned char sf_mcu_power_on_para_get (MCUParam_t attrId) McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion; McuProductInfo = mcuData[i++]; dataTemp1 = mcuData[i++]; - startMode = dataTemp1 & 0x1F; + startMode = dataTemp1 & 0xF; DailyReportStartMode = (dataTemp1 & 0xc0) >> 6; dataTemp1= mcuData[i++]; dataTemp2 = mcuData[i++]; diff --git a/rtos/code/driver/na51089/source/mcu/sf_mcu.c b/rtos/code/driver/na51089/source/mcu/sf_mcu.c index 5538e8a8e..2262b5046 100644 --- a/rtos/code/driver/na51089/source/mcu/sf_mcu.c +++ b/rtos/code/driver/na51089/source/mcu/sf_mcu.c @@ -381,7 +381,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId) sf_mcu_read_multi(mcuReg, mcuData, i); i = 0; dataTemp1 = mcuData[i++]; - startMode = dataTemp1 & 0x1F; + startMode = dataTemp1 & 0xF; DailyReportStartMode = (dataTemp1 & 0xc0) >> 6; #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) if(startMode == PWR_ON_TIME_SYNC) @@ -2124,10 +2124,13 @@ void sf_file_thumb_cfg_sava(void) free(pThumbFileCfg); #endif UINT8 fileIndex = 0; + UIMenuStoreInfo *puiPara = sf_ui_para_get(); + if (pThumbFileCfg != NULL) { for(fileIndex = 0; fileIndex < pThumbFileCfg->filecnt; fileIndex++) { - sf_add_file_name_to_send_list(pThumbFileCfg->stfileattr[fileIndex].thumbfileName); + if((fileIndex == 0) || (puiPara->SendMulti == 1)) + sf_add_file_name_to_send_list(pThumbFileCfg->stfileattr[fileIndex].thumbfileName); printf("%s:%d thumbfileSize:%ld thumbfileName:%s thumbfilePath:%s\n", __FUNCTION__, __LINE__,pThumbFileCfg->stfileattr[fileIndex].thumbfileSize,pThumbFileCfg->stfileattr[fileIndex].thumbfileName,pThumbFileCfg->stfileattr[fileIndex].thumbfilePath); } printf("%s:%d e Size:%ld\n", __FUNCTION__, __LINE__,pThumbFileCfg->stfileattr[fileIndex].thumbfileSize);