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

1.增加升级标识重置参数;2.加载时检查特殊参数，以免sf app和cardv存在差异

Browse Source
This commit is contained in:
payton 2023-07-28 17:43:20 +08:00
parent 5bd85f955b
commit f3a8ad0e40
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -699,6 +699,13 @@ EXIT:
if(((UIMenuStoreInfo*)tmpInfo)->uhInfoSize == sizeof(currentInfo)){
memcpy(&currentInfo, tmpInfo, sizeof(currentInfo));
#if HUNTING_CAMERA_MCU == ENABLE
if(currentInfo.OtaFlag)
{
SysResetFlag();
currentInfo.uhInfoSize = sizeof(currentInfo);
}
#endif
}
else{
DBG_WRN("menu info size loaded from flash seems incorrect(old:%lu new:%lu), reset menu info\n",
@ -2314,6 +2321,25 @@ void sf_power_on_para_check_init(void)
{
SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize);
}
if(puiPara->ImgSize != SysGetFlag(FL_MOVIE_SIZE))
{
SysSetFlag(FL_PHOTO_SIZE, puiPara->ImgSize);
}
if(puiPara->DateStyle != SysGetFlag(FL_DateFormatIndex))
{
SysSetFlag(FL_DateFormatIndex, puiPara->DateStyle);
}
if(puiPara->Language != SysGetFlag(FL_LANGUAGE))
{
SysSetFlag(FL_LANGUAGE, puiPara->Language);
}
if(puiPara->StampSwitch != SysGetFlag(FL_DATE_STAMP))
{
SysSetFlag(FL_DATE_STAMP, puiPara->StampSwitch);
}
#if SF_HW_TEST != ENABLE
sf_set_pir_sensitivity(puiPara->PirSensitivity);
#endif

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -352,6 +352,7 @@ typedef enum {
for keep data in pstore;permanent storage
*/
typedef struct _UIMenuUIMenuStoreInfo {
UINT32 OtaFlag;
//Common
CHAR strMakerString[VER_STR_MAX];
CHAR strModelString[VER_STR_MAX];

4
code/application/source/sf_app/code/source/wifi/sf_wifi_svr.c
View File

@ -1448,6 +1448,10 @@ SINT32 sf_svr_packet_proc(SINT32 fd, UINT8 *pAppData, UINT16 dataLen)
puiPara->SendMultishotIndex3 = 1;
}
}
if(puiPara->Multishot != SysGetFlag(FL_CONTINUE_SHOT))
{
SysSetFlag(FL_CONTINUE_SHOT, puiPara->Multishot);
}
respFlag = 2;
paramSaveFlag = 1;
break;

1
rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.h
View File

@ -352,6 +352,7 @@ typedef enum {
for keep data in pstore;permanent storage
*/
typedef struct _UIMenuUIMenuStoreInfo {
UINT32 OtaFlag;
//Common
CHAR strMakerString[VER_STR_MAX];
CHAR strModelString[VER_STR_MAX];