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

解决参数没有变更时，不写Flash

Browse Source
This commit is contained in:
greg 2024-01-12 13:59:55 +08:00
parent 4fa51839ce
commit 99d7d53553
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -336,7 +336,7 @@ static BOOL Check_OTA(VOID)
void Load_MenuInfo(void) void Load_MenuInfo(void)
{ {
#if (PST_FUNC == ENABLE) #if (PST_FUNC == ENABLE)
#if 0 #if 0
MODELEXT_HEADER *head = NULL; MODELEXT_HEADER *head = NULL;
BININFO *pBinInfo = (BININFO *)Dx_GetModelExtCfg(MODELEXT_TYPE_BIN_INFO, &head); BININFO *pBinInfo = (BININFO *)Dx_GetModelExtCfg(MODELEXT_TYPE_BIN_INFO, &head);
PPSTORE_SECTION_HANDLE pSection; PPSTORE_SECTION_HANDLE pSection;
@ -407,7 +407,7 @@ void Load_MenuInfo(void)
UINT32 result; UINT32 result;
UINT32 uiFWUpdate = 0; UINT32 uiFWUpdate = 0;
UINT32 uiTmpBoot = 0; UINT32 uiTmpBoot = 0;
#if 1 //cmdline for ota #if 1 //cmdline for ota
FILE *fp = NULL; FILE *fp = NULL;
UINT32 u32size = 0; UINT32 u32size = 0;
@ -498,8 +498,7 @@ void Load_MenuInfo(void)
#endif #endif
#else //for #if (PST_FUNC == ENABLE) #else //for #if (PST_FUNC == ENABLE)
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 HUNTING_CAMERA_MCU == ENABLE
@ -539,7 +538,7 @@ void Load_MenuInfo(void)
unsigned long long partition_ofs= 0, partition_size = 0; unsigned long long partition_ofs= 0, partition_size = 0;
int ret = -1; int ret = -1;
UINT32 sectorCnt = 0; UINT32 sectorCnt = 0;
FILE *fd_mmc = NULL; FILE *fd_mmc = NULL;
INT32 rw_len = 0; INT32 rw_len = 0;
void *pTempbuf = NULL; void *pTempbuf = NULL;
@ -581,10 +580,10 @@ void Load_MenuInfo(void)
} }
#elif defined(_EMBMEM_SPI_NAND_) #elif defined(_EMBMEM_SPI_NAND_)
unsigned long long partition_ofs= 0, partition_size = 0; unsigned long long partition_ofs= 0, partition_size = 0;
int ret = -1; int ret = -1;
FILE *nandump_fp = NULL; FILE *nandump_fp = NULL;
INT32 rw_len = 0; INT32 rw_len = 0;
UINT32 sectorCnt = 0; UINT32 sectorCnt = 0;
void *tmpInfo = NULL; void *tmpInfo = NULL;
@ -711,7 +710,8 @@ EXIT:
ret = -1; ret = -1;
goto EXIT; goto EXIT;
} }
printf("[%s:%d]((UIMenuStoreInfo*)tmpInfo)->uhInfoSize=%lu,sizeof(currentInfo)=%lu\n",
__FUNCTION__, __LINE__, ((UIMenuStoreInfo*)tmpInfo)->uhInfoSize, sizeof(currentInfo));
if(((UIMenuStoreInfo*)tmpInfo)->uhInfoSize == sizeof(currentInfo)){ if(((UIMenuStoreInfo*)tmpInfo)->uhInfoSize == sizeof(currentInfo)){
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
@ -1072,12 +1072,20 @@ EXIT:
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
sf_power_on_para_check_init(); sf_power_on_para_check_init();
#endif #endif
/* check if sys param changed */
if(memcmp(&currentInfo, &origInfo, sizeof(currentInfo)) == 0){
/* check if sys param changed */
int sflSize = sizeof(currentInfo) - ((int)&currentInfo.TimelapseTime - (int)&currentInfo);
printf("sizeof(currentInfo)=%d, (int)&currentInfo.TimelapseTime=%d, (int)&currentInfo=%d, sflSize=%d,\n",
sizeof(currentInfo), (int)&currentInfo.TimelapseTime, (int)&currentInfo, sflSize);
if(memcmp(&currentInfo.TimelapseTime, &origInfo.TimelapseTime, sflSize) == 0)
{
DBG_DUMP("menu info is not changed\n"); DBG_DUMP("menu info is not changed\n");
goto EXIT; goto EXIT;
} }
sectorCnt = (sizeof(currentInfo) / _EMBMEM_BLK_SIZE_) + ((sizeof(currentInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0); sectorCnt = (sizeof(currentInfo) / _EMBMEM_BLK_SIZE_) + ((sizeof(currentInfo) % _EMBMEM_BLK_SIZE_)? 1 : 0);
ret = UIInfo_GetStrgPartitionInfo(&partition_ofs, &partition_size, PARTITION_PATH_SYS); ret = UIInfo_GetStrgPartitionInfo(&partition_ofs, &partition_size, PARTITION_PATH_SYS);
@ -2402,4 +2410,4 @@ void sf_power_on_para_check_init(void)
sf_set_pir_sensitivity(puiPara->PirSensitivity); sf_set_pir_sensitivity(puiPara->PirSensitivity);
#endif #endif
#endif #endif
} }