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

1.修改参数同步问题

Browse Source
This commit is contained in:
payton 2023-09-08 16:12:56 +08:00
parent 049a600c44
commit 19307baf27
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c
View File

@ -501,6 +501,16 @@ void Load_MenuInfo(void)
if(Check_OTA() == TRUE){ if(Check_OTA() == TRUE){
DBG_DUMP("OTA success, reset system param\n"); DBG_DUMP("OTA success, reset system param\n");
#if HUNTING_CAMERA_MCU == ENABLE
if(sf_get_ui_para_flag())
{
memcpy(&origInfo, &currentInfo, sizeof(currentInfo));
memcpy(&origInfo_check, &currentInfo, sizeof(currentInfo));
return;
}
#endif
SysResetFlag(); SysResetFlag();
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
@ -515,7 +525,7 @@ void Load_MenuInfo(void)
//origInfo_check = currentInfo; //origInfo_check = currentInfo;
memcpy(&origInfo, &currentInfo, sizeof(currentInfo)); memcpy(&origInfo, &currentInfo, sizeof(currentInfo));
memcpy(&origInfo_check, &currentInfo, sizeof(currentInfo)); memcpy(&origInfo_check, &currentInfo, sizeof(currentInfo));
sf_share_mem_customer_down(0); //sf_share_mem_customer_down(0);
#endif #endif
return; return;
} }
@ -698,14 +708,19 @@ EXIT:
} }
if(((UIMenuStoreInfo*)tmpInfo)->uhInfoSize == sizeof(currentInfo)){ if(((UIMenuStoreInfo*)tmpInfo)->uhInfoSize == sizeof(currentInfo)){
memcpy(&currentInfo, tmpInfo, sizeof(currentInfo));
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(!sf_get_ui_para_flag())
{
memcpy(&currentInfo, tmpInfo, sizeof(currentInfo));
}
if(currentInfo.OtaFlag) if(currentInfo.OtaFlag)
{ {
SysResetFlag(); SysResetFlag();
currentInfo.uhInfoSize = sizeof(currentInfo); currentInfo.uhInfoSize = sizeof(currentInfo);
} }
#endif #endif
} }
else{ else{
DBG_WRN("menu info size loaded from flash seems incorrect(old:%lu new:%lu), reset menu info\n", DBG_WRN("menu info size loaded from flash seems incorrect(old:%lu new:%lu), reset menu info\n",

3
code/lib/source/sifar/code/include/sf_common.h
View File

@ -123,5 +123,6 @@ UINT32 sf_cardv_hd_cap_start(void);
void sf_cardv_set_wait_shared_condition(int in); void sf_cardv_set_wait_shared_condition(int in);
int sf_cardv_para_signaling_start(void); int sf_cardv_para_signaling_start(void);
UINT32 sf_cardv_wifi_send(void); UINT32 sf_cardv_wifi_send(void);
void sf_set_ui_para_flag(UINT8 flag);
UINT8 sf_get_ui_para_flag(void);
#endif #endif

12
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -89,6 +89,7 @@ static pthread_cond_t condition;
static pthread_mutex_t Param_mutexLock; static pthread_mutex_t Param_mutexLock;
static int shared_condition = 1; static int shared_condition = 1;
static SINT32 WifiSocket = 0; static SINT32 WifiSocket = 0;
static UINT8 UiparaFlag = 0;
static SF_THREAD_S UpgradeTskParam = static SF_THREAD_S UpgradeTskParam =
{ {
.IsRun = 0, .IsRun = 0,
@ -1617,6 +1618,7 @@ static SINT32 sf_cardv_proccess_cmd_para_update(SF_MESSAGE_BUF_S *pMessageBuf)
{ {
case SF_PARA_CMD_UPDATE: case SF_PARA_CMD_UPDATE:
//MLOGI("NeedTimeSyncStartUp = %d\n",puiPara->NeedTimeSyncStartUp); //MLOGI("NeedTimeSyncStartUp = %d\n",puiPara->NeedTimeSyncStartUp);
sf_set_ui_para_flag(1);
sf_share_mem_customer_update(); sf_share_mem_customer_update();
//MLOGI("NeedTimeSyncStartUp = %d\n",puiPara->NeedTimeSyncStartUp); //MLOGI("NeedTimeSyncStartUp = %d\n",puiPara->NeedTimeSyncStartUp);
break; break;
@ -2643,3 +2645,13 @@ UINT32 sf_cardv_wifi_send(void)
} }
return 0; return 0;
} }
UINT8 sf_get_ui_para_flag(void)
{
return UiparaFlag;
}
void sf_set_ui_para_flag(UINT8 flag)
{
UiparaFlag = flag;
}