diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 9da211d10..bd03725cd 100755 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -2321,7 +2321,7 @@ void sf_power_on_para_check_init(void) } else if(PowerOnMode == PWR_ON_DAILY_REPORT) { - puiPara->NeedTimeSyncStartUp = 1; + //puiPara->NeedTimeSyncStartUp = 1; if (puiPara->DailyReportSwitch) { puiPara->GpsSendFlag = 1; // indicate need send dp file in b power on. } diff --git a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c index 55f919e35..d0de1ab7e 100755 --- a/code/application/source/sf_app/code/source/paramMng/sf_param_common.c +++ b/code/application/source/sf_app/code/source/paramMng/sf_param_common.c @@ -287,16 +287,28 @@ void sf_app_power_on_para_check_init(void) #if HUNTING_CAMERA_MCU == ENABLE UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UINT8 PowerOnMode = sf_poweron_type_get(); - if(((PowerOnMode == SF_MCU_STARTUP_NORMAL) || (PowerOnMode == SF_MCU_STARTUP_OFF) || (PowerOnMode == SF_MCU_STARTUP_ONKEY))) - { - if(1 == puiPara->NeedTimeSyncStartUp){ - puiPara->NeedTimeSyncStartUp = 0; - } - if(0 == puiPara->NetWorkNeedSearch){ - puiPara->NetWorkNeedSearch = 1; - } + if(((PowerOnMode == SF_MCU_STARTUP_NORMAL) || (PowerOnMode == SF_MCU_STARTUP_OFF) || (PowerOnMode == SF_MCU_STARTUP_ONKEY))) + { + if(1 == puiPara->NeedTimeSyncStartUp){ + puiPara->NeedTimeSyncStartUp = 0; + } + if(0 == puiPara->NetWorkNeedSearch){ + puiPara->NetWorkNeedSearch = 1; + } memset(puiPara->SimIccid,'\0',sizeof(puiPara->SimIccid)); - } + } + else if(PowerOnMode == SF_MCU_STARTUP_SYN_PARAM) + { + puiPara->NetWorkNeedSearch = 0; + puiPara->NeedTimeSyncStartUp = 0; + } + else if(PowerOnMode == SF_MCU_STARTUP_DP) + { + //puiPara->NeedTimeSyncStartUp = 1; + if (puiPara->DailyReportSwitch) { + puiPara->GpsSendFlag = 1; // indicate need send dp file in b power on. + } + } printf("PowerOnMode=%d NeedTimeSyncStartUp=%d NetWorkNeedSearch:%d\n", PowerOnMode, puiPara->NeedTimeSyncStartUp, puiPara->NetWorkNeedSearch); if(puiPara->Multishot != sf_sys_get_flag(FL_CONTINUE_SHOT)) { diff --git a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c index 79aeb8c38..4245ca5dc 100755 --- a/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/rtos/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -579,7 +579,7 @@ void Init_SysInfo(void) void Init_MenuInfo(void) { DBG_IND("[Init_MenuInfo][PStore update state]\r\n"); - DBG_IND("Version %s %d\r\n", currentInfo.pVersion, currentInfo.uhInfoSize); + DBG_IND("uhInfoSize:%d\r\n", currentInfo.uhInfoSize); SysCheckFlag(); // check flag (limit value) //SysSetFixedFlag(); // set fixed flag @@ -652,7 +652,7 @@ void KeyScan_EnableMisc(BOOL bEn) GxPower_SetControl(GXPWR_CTRL_AUTOPOWEROFF_EN, 0xff); //reset GxPower_SetControl(GXPWR_CTRL_AUTOSLEEP_EN, 0xff); //reset SxTimer_SetFuncActive(SX_TIMER_DET_AUTOPOWEROFF_ID, FALSE); -#if (USB_MODE == ENABLE) +#if (USB_MODE==ENABLE) SxTimer_SetFuncActive(SX_TIMER_DET_USB_ID, FALSE); #endif //UISound_EnableKey(FALSE); // 660 is full-duplex for audio @@ -663,7 +663,7 @@ void KeyScan_EnableMisc(BOOL bEn) //#NT#Fix Mantis Issue 0113246 SxTimer_SetFuncActive(SX_TIMER_DET_AUTOPOWEROFF_ID, TRUE); //#NT#2016/11/21#Adam Su -end -#if (USB_MODE == ENABLE) +#if (USB_MODE==ENABLE) SxTimer_SetFuncActive(SX_TIMER_DET_USB_ID, TRUE); #endif //UISound_EnableKey(TRUE); // 660 is full-duplex for audio @@ -1099,8 +1099,8 @@ void SysResetFlag(void) { puiPara->TimelapseTime.Hour = 0; #if SF_HW_TEST == ENABLE - puiPara->TimelapseTime.Min = 0; - puiPara->TimelapseTime.Sec = 30; + puiPara->TimelapseTime.Min = 3; + puiPara->TimelapseTime.Sec = 0; #else puiPara->TimelapseTime.Min = 0; puiPara->TimelapseTime.Sec = 5; @@ -1206,7 +1206,9 @@ void SysResetFlag(void) snprintf((char *)puiPara->strPASSPHRASE_hotspot_1, sizeof(puiPara->strPASSPHRASE_hotspot_1), "S210X123"); #endif - + + snprintf((char *)puiPara->WifiApPWD, sizeof(puiPara->WifiApPWD), "Reveal2021"); + UINT8 tmpStr[60] = {0}; #if SF_TEST_GPRS snprintf((char *)puiPara->FtpIp, sizeof(puiPara->FtpIp), USER_FTP_IP); @@ -1230,6 +1232,7 @@ void SysResetFlag(void) snprintf((char *)puiPara->FtpPwd, sizeof(puiPara->FtpPwd), (char *)tmpStr); #endif + memset(tmpStr, '\0', sizeof(tmpStr)); sf_base64_decode(OTA_FTP_IP, (char *)tmpStr); snprintf((char *)puiPara->OtaFtpIp, sizeof(puiPara->OtaFtpIp), (char *)tmpStr); @@ -1242,14 +1245,14 @@ void SysResetFlag(void) memset(tmpStr, '\0', sizeof(tmpStr)); sf_base64_decode(OTA_FTP_PASSWORD, (char *)tmpStr); snprintf((char *)puiPara->OtaFtpPassWord, sizeof(puiPara->OtaFtpPassWord), (char *)tmpStr); - + #if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_) puiPara->GpsNumber = DEFAULT_GPS_NUMBER; puiPara->TimeSend1Switch = DEFAULT_TIMESEND1_SWITCH; puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH; puiPara->TimeSend3Switch = DEFAULT_TIMESEND3_SWITCH; puiPara->TimeSend4Switch = DEFAULT_TIMESEND4_SWITCH; - #endif + #endif puiPara->x1 = 0; puiPara->x2 = 0; @@ -1257,18 +1260,10 @@ void SysResetFlag(void) puiPara->x4 = 0; puiPara->x5 = 0; puiPara->x6 = 0; - + #else - SysSetFlag(FL_ETHCAM_TX_IP_ADDR, DEFAULT_ETHCAM_TX_IP_ADDR); - //#NT#2023/01/11#Eric - begin //#NT#Support - //=====================Sifar=============///Eric - //Ux_SendEvent(&UISetupObjCtrl, NVTEVT_EXE_BOOTWORKMODE, 1, SysGetFlag(CamMode)); - //#NT#2023/01/11#Eric - end - //#2023/02/10#Payton - begin - //=====================Sifar============= - SysSetFlag(CamNameSwitch, DEFAULT_SF_CAMID); SysSetFlag(CamMode, DEFAULT_BOOT_WORK_MODE); SysSetFlag(FlashLed, DEFAULT_FLASH_LED); //ImgSize @@ -1413,13 +1408,7 @@ void SysExeMenuSettingFuncs(void) #endif //#NT#2023/01/11#Eric - begin //#NT#Support //=====================Sifar=============///Eric - #if HUNTING_CAMERA_MCU == ENABLE - UIMenuStoreInfo *puiPara = sf_ui_para_get(); - Ux_SendEvent(&UISetupObjCtrl, NVTEVT_EXE_BOOTWORKMODE, 1, puiPara->CamMode); - #else - Ux_SendEvent(&UISetupObjCtrl, NVTEVT_EXE_BOOTWORKMODE, 1, SysGetFlag(CamMode)); - #endif - +// Ux_SendEvent(&UISetupObjCtrl, NVTEVT_EXE_BOOTWORKMODE, 1, SysGetFlag(CamMode)); //#NT#2023/01/11#Eric - end } @@ -1723,16 +1712,29 @@ void sf_power_on_para_check_init(void) #if HUNTING_CAMERA_MCU == ENABLE UIMenuStoreInfo *puiPara = sf_ui_para_get(); UINT8 PowerOnMode = sf_convert_power_on_mode(); - if(((PowerOnMode == PWR_ON_AUTO) || (PowerOnMode == PWR_OFF) || (PowerOnMode == PWR_ON_SETUP))) - { - if(1 == puiPara->NeedTimeSyncStartUp){ - puiPara->NeedTimeSyncStartUp = 0; - } - if(0 == puiPara->NetWorkNeedSearch){ - puiPara->NetWorkNeedSearch = 1; - } + if(((PowerOnMode == PWR_ON_AUTO) || (PowerOnMode == PWR_OFF) || (PowerOnMode == PWR_ON_SETUP))) + { + if(1 == puiPara->NeedTimeSyncStartUp){ + puiPara->NeedTimeSyncStartUp = 0; + } + if(0 == puiPara->NetWorkNeedSearch){ + puiPara->NetWorkNeedSearch = 1; + } memset(puiPara->SimIccid,'\0',sizeof(puiPara->SimIccid)); - } + } + else if(PowerOnMode == PWR_ON_TIME_SYNC) + { + puiPara->NetWorkNeedSearch = 0; + puiPara->NeedTimeSyncStartUp = 0; + } + else if(PowerOnMode == PWR_ON_DAILY_REPORT) + { + //puiPara->NeedTimeSyncStartUp = 1; + if (puiPara->DailyReportSwitch) { + puiPara->GpsSendFlag = 1; // indicate need send dp file in b power on. + } + } + printf("PowerOnMode=%d NeedTimeSyncStartUp=%d NetWorkNeedSearch:%d\n", PowerOnMode, puiPara->NeedTimeSyncStartUp, puiPara->NetWorkNeedSearch); if(puiPara->Multishot != SysGetFlag(FL_CONTINUE_SHOT)) {