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

1.启动方式寄存器取位改为f

Browse Source
This commit is contained in:
payton 2023-07-12 09:47:14 +08:00
parent eac54608ab
commit 15045b439a
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/application/source/sf_app/code/source/systemMng/sf_commu_mcu.c
View File

@ -942,7 +942,7 @@ unsigned char sf_commu_parse_mcu_data(unsigned char * src, unsigned int len)
stMessageBuf.cmdId = CMD_KEY; stMessageBuf.cmdId = CMD_KEY;
stMessageBuf.arg1 = SF_EVENT_KEY_SHORT_CLICK; stMessageBuf.arg1 = SF_EVENT_KEY_SHORT_CLICK;
stMessageBuf.arg2 = SF_KEY_PIN_DATAREADY; stMessageBuf.arg2 = SF_KEY_PIN_DATAREADY;
stMessageBuf.arg3 = (val[0] & 0x1F); stMessageBuf.arg3 = (val[0] & 0xF);
ret = 0x05; ret = 0x05;
if(3 == stMessageBuf.arg3) //ON if(3 == stMessageBuf.arg3) //ON
@ -950,21 +950,20 @@ unsigned char sf_commu_parse_mcu_data(unsigned char * src, unsigned int len)
sf_set_pir_statu_flag(1); sf_set_pir_statu_flag(1);
if(sf_get_mode_flag()){ if(sf_get_mode_flag()){
sf_com_message_send_to_cardv(&stMessageBuf); sf_com_message_send_to_cardv(&stMessageBuf);
sf_set_power_off_flag(1);
} }
printf("%s:%d-------PIR Key Pressed.------\n", __FUNCTION__, __LINE__); printf("%s:%d-------PIR Key Pressed.------\n", __FUNCTION__, __LINE__);
} }
else if(1 == stMessageBuf.arg3) //ON->OFF else if(1 == stMessageBuf.arg3) //ON->SETUP
{//PIR MODE: ON->OFF/ 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_set_module_sleep_flag(0);
sf_com_message_send_to_cardv(&stMessageBuf); sf_com_message_send_to_cardv(&stMessageBuf);
sf_sys_status_led_set(SF_LED_SYS_STATE_POWER_OFF); 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);
} }
} }

4
code/application/source/sf_app/code/source/systemMng/sf_commu_mcu_reg.c
View File

@ -137,7 +137,7 @@ unsigned char sf_mcu_power_on_para_get (MCUParam_t attrId)
if(attrId == SF_MCU_STARTMODE) if(attrId == SF_MCU_STARTMODE)
{ {
sf_mcu_read(START_MODE, &dataTemp1); sf_mcu_read(START_MODE, &dataTemp1);
startMode = dataTemp1 & 0x1F; startMode = dataTemp1 & 0xF;
} }
else else
{ {
@ -156,7 +156,7 @@ unsigned char sf_mcu_power_on_para_get (MCUParam_t attrId)
McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion; McuVersion = (UINT16)mcuData[i++] << 8 | McuVersion;
McuProductInfo = mcuData[i++]; McuProductInfo = mcuData[i++];
dataTemp1 = mcuData[i++]; dataTemp1 = mcuData[i++];
startMode = dataTemp1 & 0x1F; startMode = dataTemp1 & 0xF;
DailyReportStartMode = (dataTemp1 & 0xc0) >> 6; DailyReportStartMode = (dataTemp1 & 0xc0) >> 6;
dataTemp1= mcuData[i++]; dataTemp1= mcuData[i++];
dataTemp2 = mcuData[i++]; dataTemp2 = mcuData[i++];

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

@ -381,7 +381,7 @@ UINT8 sf_mcu_power_on_para_get(MCUParam_t attrId)
sf_mcu_read_multi(mcuReg, mcuData, i); sf_mcu_read_multi(mcuReg, mcuData, i);
i = 0; i = 0;
dataTemp1 = mcuData[i++]; dataTemp1 = mcuData[i++];
startMode = dataTemp1 & 0x1F; startMode = dataTemp1 & 0xF;
DailyReportStartMode = (dataTemp1 & 0xc0) >> 6; DailyReportStartMode = (dataTemp1 & 0xc0) >> 6;
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
if(startMode == PWR_ON_TIME_SYNC) if(startMode == PWR_ON_TIME_SYNC)
@ -2124,9 +2124,12 @@ void sf_file_thumb_cfg_sava(void)
free(pThumbFileCfg); free(pThumbFileCfg);
#endif #endif
UINT8 fileIndex = 0; UINT8 fileIndex = 0;
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if (pThumbFileCfg != NULL) { if (pThumbFileCfg != NULL) {
for(fileIndex = 0; fileIndex < pThumbFileCfg->filecnt; fileIndex++) for(fileIndex = 0; fileIndex < pThumbFileCfg->filecnt; fileIndex++)
{ {
if((fileIndex == 0) || (puiPara->SendMulti == 1))
sf_add_file_name_to_send_list(pThumbFileCfg->stfileattr[fileIndex].thumbfileName); 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 thumbfileSize:%ld thumbfileName:%s thumbfilePath:%s\n", __FUNCTION__, __LINE__,pThumbFileCfg->stfileattr[fileIndex].thumbfileSize,pThumbFileCfg->stfileattr[fileIndex].thumbfileName,pThumbFileCfg->stfileattr[fileIndex].thumbfilePath);
} }