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

1.模块启动时无需读光敏

Browse Source 
2.调整如果第一次为0那么再次可读光敏
3.rtos下增加低电写mcu
4.同步Linux下ui参数修改
This commit is contained in:
payton 2023-07-21 10:52:24 +08:00
parent 7ce29f235d
commit a9db3fb395
10 changed files with 285 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c
View File

@ -148,12 +148,11 @@ UINT32 DrvGPIO_GetPhotoMovieModeFromMonitor(void)
UINT8 value;
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(gpio_getIntStatus(GPIO_INT_USBPLUGIN))
if(gpio_getIntStatus(GPIO_INT_USBPLUGIN) || FALSE == (gpio_getPin(GPIO_CARD_DETECT) == 0 ? TRUE : FALSE))
{
g_uiBootMode = DX_HUNTING_MODE_OTHER;
return g_uiBootMode;
}
vos_perf_mark(&t1);
// ret = sf_mod_init();
// printf("%s:%d ret:%d\n", __FUNCTION__, __LINE__,ret);

6
rtos/code/application/source/cardv/SrcCode/FastFlow/flow_preview.c
View File

@ -935,11 +935,13 @@ int flow_preview(void)
if (strlen(pSenCfg->iq_path.path) != 0) {
IQT_DTSI_INFO iq_dtsi_info;
iq_dtsi_info.id = pSenCfg->iq_path.id;
if(sf_is_night_mode(0) ==TRUE)
//printf("[%s:%d]s\n",__FUNCTION__,__LINE__);
if(sf_is_night_mode(1) ==TRUE)
strncpy(iq_dtsi_info.node_path, "/isp/iq/os05b10_iq_0", 31);
else
strncpy(iq_dtsi_info.node_path, "/isp/iq/os05b10_iq_0_cap", 31);
//printf("[%s:%d]s\n",__FUNCTION__,__LINE__);
//vos_perf_list_mark("sie_vd", __LINE__, 1);
strncpy(iq_dtsi_info.file_path, "null", DTSI_NAME_LENGTH);
//DBG_ERR("vendor_isp_set_iq %s\r\n",iq_dtsi_info.node_path);

1
rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c
View File

@ -258,6 +258,7 @@ static void MovieFast_ShutDown(void)
#if HUNTING_CAMERA_MCU
sf_file_thumb_cfg_sava();
sf_para_print();
#if SF_IQ_TEST != ENABLE
if(sf_get_power_off_flag()){
sf_mcu_reg_set(SF_MCU_POWEROFF,0);

7
rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c
View File

@ -1890,6 +1890,7 @@ static void PhotoFast_ShutDown(void)
#endif
#if HUNTING_CAMERA_MCU == ENABLE
sf_file_thumb_cfg_sava();
sf_para_print();
#if SF_IQ_TEST != ENABLE
if(sf_get_power_off_flag()){
sf_mcu_reg_set(SF_MCU_POWEROFF,0);
@ -1930,9 +1931,11 @@ void Set_NIGHTMODE(UINT32 id, UINT8 isSnapVideo)
IQT_NIGHT_MODE night_mode = {0};
AWBT_MANUAL awb_manual = {0};
HD_RESULT hd_ret;
//static int tmpFlag = 2;
//printf("[%s:%d]s tmpFlag:%d\n",__FUNCTION__,__LINE__,tmpFlag);
//IQT_EDGE_PARAM edge = {0};
//vos_perf_list_mark("sie_vd", __LINE__, tmpFlag);
//tmpFlag++;
if(sf_is_night_mode(1) ==TRUE)
{
if ((hd_ret = vendor_isp_init()) != HD_OK) {

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

@ -63,7 +63,15 @@
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30
#else
#if (MOVIE_AI_DEMO == DISABLE)
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25
#if SF_IQ_TEST == DISABLE
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_FRONT_1280x720P30
#else
#if SF_HW_TEST == ENABLE
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_FRONT_1280x720P30
#else
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25
#endif
#endif
#else
#define DEFAULT_MOVIE_SIZE MOVIE_SIZE_DUAL_1920x1080P30_848x480P30//MOVIE_SIZE_FRONT_1920x1080P30
#endif
@ -166,32 +174,59 @@
#endif
#define DEFAULT_ETHCAM_TX_IP_ADDR 0 //0xc00a8c0
#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO_VIDEO//
#if SF_IQ_TEST == ENABLE
#if SF_HW_TEST == ENABLE
#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO
#define DEFAULT_PIR_SWITCH SF_OFF
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_0
#define DEFAULT_TIMELAPSE_SWITCH SF_ON
#else
#if SF_BATTERY_TEST == ENABLE
#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO
#else
#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO_VIDEO
#endif
#define DEFAULT_PIR_SWITCH SF_ON
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7
#define DEFAULT_TIMELAPSE_SWITCH SF_OFF
#endif
#define DEFAULT_NET_WORK_NEED_SEARCH SF_OFF
#define DEFAULT_AUTO_OFF_SWITCH SF_OFF
#else
#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO//
#define DEFAULT_NET_WORK_NEED_SEARCH SF_ON
#define DEFAULT_AUTO_OFF_SWITCH SF_ON
#define DEFAULT_PIR_SWITCH SF_ON
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7
#define DEFAULT_TIMELAPSE_SWITCH SF_OFF
#endif
#define DEFAULT_SF_CAMID SF_CAMID_OFF
#define DEFAULT_FLASH_LED SF_FLASH_LED_HIGH
#define DEFAULT_NIGHT_MODE SF_NIGHT_MODE_MIN_BLUR//SF_NIGHT_MODE_BALANCED
#define DEFAULT_NEED_TIME_SYNC SF_NEED_TIME_SYNC_OFF
#define DEFAULT_VIDEO_LENTH VIDEO_LENTH_10
#define DEFAULT_PIR_SWITCH SF_ON
#define DEFAULT_TIMELAPSE_SWITCH SF_ON
#define DEFAULT_SEND_TYPE SF_SEND_TIMELY
#define DEFAULT_PIR_DELAY_SWITCH SF_OFF
#define DEFAULT_GPRS_MODE SF_REMOTE_CONTROL_REAL_TIME
#define DEFAULT_GPRS_MODE SF_REMOTE_CONTROL_OFF
#define DEFAULT_DAILY_REPORT_SWITCH SF_ON
#define DEFAULT_GPS_SWITCH SF_OFF
#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_HIGH
#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_0//SF_PIR_SENSITIVITY_7
#endif
#define DEFAULT_NET_WORK_NEED_SEARCH SF_OFF
#define DEFAULT_GPRS_SWITCH SF_OFF
//#if defined(_MODEL_565_HUNTING_EVB_LINUX_4G_68CS_)
//#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_HIGH
//#elif defined(_MODEL_565_HUNTING_EVB_LINUX_4G_S530_)
//#define DEFAULT_PIR_SENSITIVITY SF_PIR_SENSITIVITY_7
//#endif
#define DEFAULT_GPRS_SWITCH SF_ON
#define DEFAULT_BATTERY_TYPE SF_BATT_ALKALINE
#define DEFAULT_WORKTIME_SWITCH SF_OFF
#define DEFAULT_SIM_AUTO_SWITCH SF_SIM_SWITCH_AUTO
#define DEFAULT_SEND_MAX_NUM SF_SEND_MAX_NUM_UNLIMITED
#define DEFAULT_REDAILY_REPORT_SWITCH SF_OFF
#define DEFAULT_SIN_PIN_FLAG SF_ON
#define DEFAULT_AUTO_OFF_SWITCH SF_OFF
#define DEFAULT_DATE_TIME SF_DATE_TIME_MMDDYY
#define DEFAULT_SEND_PHOTO_SWITCH SF_ON
#define DEFAULT_SEND_VIDEO_SWITCH SF_OFF
@ -203,6 +238,7 @@
#define DEFAULT_SEND_MULTISHOT_INDEX2 SF_OFF
#define DEFAULT_SEND_MULTISHOT_INDEX3 SF_OFF
#define DEFAULT_SEND_MULTISHOT_INDEX4 SF_OFF
#define DEFAULT_SEND_MULTISHOT SF_OFF
#define DEFAULT_DATE_AUTO SF_DATE_AUTO
#define DEFAULT_CAM_ARM_DIABLE SF_OFF
#define DEFAULT_DEBUG_MODE SF_OFF
@ -219,7 +255,78 @@
#define DEFAULT_TIMESEND2_SWITCH SF_OFF
#define DEFAULT_TIMESEND3_SWITCH SF_OFF
#define DEFAULT_TIMESEND4_SWITCH SF_OFF
#define DEFAULT_FTP_SWITCH SF_FTP_ON
#define DEFAULT_FTP_SWITCH SF_FTPS_ON
#define DEFAULT_MULTISHOT_INTEVEL SF_MULTISHOT_INTEVEL_1S
#define DEFAULT_PIC_UP_DAILY_REPORT SF_OFF
#define SIFAR_FTP_IP "119.23.174.139"
#define SIFAR_FTP_PORT "21"
#define SIFAR_FTP_USERNAME "cameraftp"
#define SIFAR_FTP_PASSWORD "camera123456"
#define SIFAR_FTPS_IP "49.51.247.68"
#define SIFAR_FTPS_PORT "21"
#define SIFAR_FTPS_USERNAME "sifarftpsuser"
#define SIFAR_FTPS_PASSWORD "rsHkZJPg"
#define CUSTOM_FTP_IP "ZnRwLTE1YmVuYWpmZWIuaXNoYXJlaXQubmV0"
#define CUSTOM_FTP_PORT "21"
#define CUSTOM_FTP_USERNAME "c0s2OWNxblBJcXYxRkhuNHlXbTV3WjJMaG1KVTZPUHM="
#define CUSTOM_FTP_PASSWORD "cTZwQC1WTnc3MlJxWEJXIUZnVWpIaHRZbjdWSzJHTS10Wjl6"
#define CUSTOM_TEST_FTP_IP "ZnRwLTE1YmVuYWpmZWIuaXNoYXJlaXQubmV0"
#define CUSTOM_TEST_FTP_PORT "21"
#define CUSTOM_TEST_FTP_USERNAME "dGVzdG9ubHk="
#define CUSTOM_TEST_FTP_PASSWORD "QUQwOEQ0NTktOUJDRC00OTJBLUFBQjktMUZGNjNEQzgzMjI2"
#define SIFAR_OTA_FTP_IP "MTE5LjIzLjE3NC4xMzk="
#define SIFAR_OTA_FTP_PORT "21"
#define SIFAR_OTA_FTP_USERNAME "Y2FtZXJhZnRw"
#define SIFAR_OTA_FTP_PASSWORD "Y2FtZXJhMTIzNDU2"
#define CUSTOM_OTA_FTP_IP "ZnRwLWZvMTQ0YWUxYWMuaXNoYXJlaXQubmV0"
#define CUSTOM_OTA_FTP_PORT "21"
#define CUSTOM_OTA_FTP_USERNAME "d3A4WmpjUkwyTjJU"
#define CUSTOM_OTA_FTP_PASSWORD "MWVoZipyXlFeJV5rVFleaTlpWmV0SWR6VA=="
#define CUSTOM_TEST_OTA_FTP_IP "ZnRwLWZvMTQ0YWUxYWMuaXNoYXJlaXQubmV0"
#define CUSTOM_TEST_OTA_FTP_PORT "21"
#define CUSTOM_TEST_OTA_FTP_USERNAME "dGVzdG9ubHk="
#define CUSTOM_TEST_OTA_FTP_PASSWORD "SWoqTWZmSTB2NW8qJTFHdV56RUN1WmFRcA=="
#if SF_TEST_GPRS
#define USER_FTP_IP SIFAR_FTP_IP
#define USER_FTP_PORT SIFAR_FTP_PORT
#define USER_FTP_USERNAME SIFAR_FTP_USERNAME
#define USER_FTP_PASSWORD SIFAR_FTP_PASSWORD
#elif CUSTOM_TEST_FTPS
#define USER_FTP_IP CUSTOM_TEST_FTP_IP
#define USER_FTP_PORT CUSTOM_TEST_FTP_PORT
#define USER_FTP_USERNAME CUSTOM_TEST_FTP_USERNAME
#define USER_FTP_PASSWORD CUSTOM_TEST_FTP_PASSWORD
#else
#define USER_FTP_IP CUSTOM_FTP_IP
#define USER_FTP_PORT CUSTOM_FTP_PORT
#define USER_FTP_USERNAME CUSTOM_FTP_USERNAME
#define USER_FTP_PASSWORD CUSTOM_FTP_PASSWORD
#endif
#if SF_TEST_OTA_FTP
#define OTA_FTP_IP SIFAR_OTA_FTP_IP
#define OTA_FTP_PORT SIFAR_OTA_FTP_PORT
#define OTA_FTP_USERNAME SIFAR_OTA_FTP_USERNAME
#define OTA_FTP_PASSWORD SIFAR_OTA_FTP_PASSWORD
#elif CUSTOM_TEST_OTA_FTP
#define OTA_FTP_IP CUSTOM_TEST_OTA_FTP_IP
#define OTA_FTP_PORT CUSTOM_TEST_OTA_FTP_PORT
#define OTA_FTP_USERNAME CUSTOM_TEST_OTA_FTP_USERNAME
#define OTA_FTP_PASSWORD CUSTOM_TEST_OTA_FTP_PASSWORD
#else
#define OTA_FTP_IP CUSTOM_OTA_FTP_IP
#define OTA_FTP_PORT CUSTOM_OTA_FTP_PORT
#define OTA_FTP_USERNAME CUSTOM_OTA_FTP_USERNAME
#define OTA_FTP_PASSWORD CUSTOM_OTA_FTP_PASSWORD
#endif
#endif

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

@ -365,6 +365,9 @@ void Load_MenuInfo(void)
currentInfo.uhInfoSize = sizeof(currentInfo);
SysCheckFlag();
#if HUNTING_CAMERA_MCU == ENABLE
sf_power_on_para_check_init();
#endif
origInfo = currentInfo;
#endif
@ -800,7 +803,7 @@ void SysCheckFlag(void)
//#2023/02/10#Payton - begin
#if 0
#if HUNTING_CAMERA_MCU == DISABLE
//=====================Sifar=============
SysLimitFlag(CamNameSwitch, 0, SF_CAMID_MAX, DEFAULT_SF_CAMID);
SysLimitFlag(CamMode, 0, SF_CAM_MODE_MAX, DEFAULT_BOOT_WORK_MODE);
@ -868,8 +871,7 @@ void SysCheckFlag(void)
SysLimitFlag(TimeSend4Switch, 0, SF_ON_OFF_MAX, DEFAULT_GPS_NUMBER);
#endif
#endif
printf("%s:%d sifar para e\n", __FUNCTION__, __LINE__);
//printf("%s:%d sifar para e\n", __FUNCTION__, __LINE__);
//#2023/02/10#Payton - end
@ -941,7 +943,11 @@ void SysSetFixedFlagSysInit(void)
}
void SysResetFlag(void)
{
{
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
memset(puiPara, 0, sizeof(UIMenuStoreInfo));
#endif
// Set system flag default value here
// Photo
SysSetFlag(FL_PHOTO_SIZE, DEFAULT_PHOTO_SIZE);
@ -1058,26 +1064,23 @@ void SysResetFlag(void)
SysSetFlag(FL_WIFI_AUTO_RECORDING, DEFAULT_MOVIE_WIFI_AUTO_RECORDING_OPTION);
SysSetFlag(FL_NetWorkMode, DEFAULT_WIFI_MODE); // Reset To Wi-Fi mode to AP mode.
#endif
//#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=============
#if HUNTING_CAMERA_MCU == ENABLE
UIMenuStoreInfo *puiPara = sf_ui_para_get();
//UIMenuStoreInfo *puiPara = sf_ui_para_get();
puiPara->CamNameSwitch = DEFAULT_SF_CAMID;
puiPara->CamMode = DEFAULT_BOOT_WORK_MODE;
puiPara->FlashLed = DEFAULT_FLASH_LED;
//ImgSize
puiPara->ImgSize = DEFAULT_PHOTO_SIZE;
puiPara->NightMode = DEFAULT_NIGHT_MODE;
puiPara->Multishot = DEFAULT_CONTINUE_SHOT;
puiPara->VideoSize = DEFAULT_MOVIE_SIZE;
//Multishot
//VideoSize
//VideoTimeMenu
puiPara->VideoLenth = DEFAULT_VIDEO_LENTH;
puiPara->PirSwitch = DEFAULT_PIR_SWITCH;
@ -1088,8 +1091,13 @@ void SysResetFlag(void)
if(puiPara->TimelapseSwitch)
{
puiPara->TimelapseTime.Hour = 0;
#if SF_HW_TEST == ENABLE
puiPara->TimelapseTime.Min = 0;
puiPara->TimelapseTime.Sec = 30;
#else
puiPara->TimelapseTime.Min = 0;
puiPara->TimelapseTime.Sec = 5;
#endif
}
puiPara->WorkTime1Switch = DEFAULT_WORKTIME_SWITCH;
@ -1133,6 +1141,13 @@ void SysResetFlag(void)
puiPara->SendMultishotIndex2 = DEFAULT_SEND_MULTISHOT_INDEX2;
puiPara->SendMultishotIndex3 = DEFAULT_SEND_MULTISHOT_INDEX3;
puiPara->SendMultishotIndex4 = DEFAULT_SEND_MULTISHOT_INDEX4;
puiPara->SendMulti = DEFAULT_SEND_MULTISHOT;
puiPara->SendType = DEFAULT_SEND_TYPE;
puiPara->TimeSend1.Hour = 0;
puiPara->TimeSend1.Min = 0;
puiPara->TimeSend2.Hour = 0;
puiPara->TimeSend2.Min = 0;
puiPara->DateAuto = DEFAULT_DATE_AUTO;
//NTPZoneS,
//NTPZoneH,
@ -1153,7 +1168,18 @@ void SysResetFlag(void)
puiPara->BatteryLogSwitch = DEFAULT_BATTRERY_LOG_SWITCH;
puiPara->FtpSwitch = DEFAULT_FTP_SWITCH;
puiPara->MultiShotIntevel = DEFAULT_MULTISHOT_INTEVEL;
puiPara->PicUpDailyReport = DEFAULT_PIC_UP_DAILY_REPORT;
if(puiPara->ModuleImei[0] != '\0')
{
puiPara->DailyReportTime.Hour = ((UINT16)(puiPara->ModuleImei[11]-48)*10+(puiPara->ModuleImei[12]-48))%12;
puiPara->DailyReportTime.Min = ((UINT16)(puiPara->ModuleImei[13]-48)*10+(puiPara->ModuleImei[14]-48))%60;
}
else
{
puiPara->DailyReportTime.Hour = 0;
puiPara->DailyReportTime.Min = 0;
}
memset(puiPara ->FtpIp,'\0', sizeof(puiPara ->FtpIp));
memset(puiPara ->FtpPort, '\0', sizeof(puiPara ->FtpPort));
memset(puiPara ->FtpUsr, '\0', sizeof(puiPara ->FtpUsr));
@ -1162,7 +1188,19 @@ void SysResetFlag(void)
memset(puiPara ->FtpsPort, '\0', sizeof(puiPara ->FtpsPort));
memset(puiPara ->FtpsUsr, '\0', sizeof(puiPara ->FtpsUsr));
memset(puiPara ->FtpsPwd,'\0', sizeof(puiPara ->FtpsPwd));
memset(puiPara ->WifiApPWD,'\0', sizeof(puiPara ->WifiApPWD));
#if(WIFI_FUNC==ENABLE)
memset(puiPara ->strSSID,'\0', sizeof(puiPara ->strSSID));
memset(puiPara ->strPASSPHRASE,'\0', sizeof(puiPara ->strPASSPHRASE));
memset(puiPara ->strSSID_hotspot_1,'\0', sizeof(puiPara ->strSSID_hotspot_1));
memset(puiPara ->strPASSPHRASE_hotspot_1,'\0', sizeof(puiPara ->strPASSPHRASE_hotspot_1));
snprintf((char *)puiPara->strSSID_hotspot_1, sizeof(puiPara->strSSID_hotspot_1), "S210X-TEST");
snprintf((char *)puiPara->strPASSPHRASE_hotspot_1, sizeof(puiPara->strPASSPHRASE_hotspot_1), "S210X123");
#endif
snprintf((char *)puiPara->WifiApPWD, sizeof(puiPara->WifiApPWD), "Reveal2021");
strcpy((char *)puiPara ->FtpIp, "119.23.174.139");
strcpy((char *)puiPara ->FtpPort, "21");
strcpy((char *)puiPara ->FtpUsr, "cameraftp");
@ -1174,7 +1212,6 @@ void SysResetFlag(void)
puiPara->TimeSend2Switch = DEFAULT_TIMESEND2_SWITCH;
puiPara->TimeSend3Switch = DEFAULT_TIMESEND3_SWITCH;
puiPara->TimeSend4Switch = DEFAULT_TIMESEND4_SWITCH;
sf_set_pir_sensitivity(7);
#endif
#else
@ -1249,11 +1286,8 @@ void SysResetFlag(void)
SysSetFlag(TimeSend2Switch, DEFAULT_TIMESEND2_SWITCH);
SysSetFlag(TimeSend3Switch, DEFAULT_TIMESEND3_SWITCH);
SysSetFlag(TimeSend4Switch, DEFAULT_TIMESEND4_SWITCH);
#endif
#endif
#endif
printf("%s:%d sifar para e\n", __FUNCTION__, __LINE__);
@ -1631,3 +1665,41 @@ UIMenuStoreInfo* sf_ui_para_get(void)
return (UIMenuStoreInfo*)&currentInfo;
}
/*************************************************
Function: sf_power_on_para_check_init
Description: power on reset para
Input: N/A
Output: N/A
Return: N/A
Others: N/A
*************************************************/
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;
}
memset(puiPara->SimIccid,'\0',sizeof(puiPara->SimIccid));
}
printf("PowerOnMode=%d NeedTimeSyncStartUp=%d NetWorkNeedSearch:%d\n", PowerOnMode, puiPara->NeedTimeSyncStartUp, puiPara->NetWorkNeedSearch);
if(puiPara->Multishot != SysGetFlag(FL_CONTINUE_SHOT))
{
SysSetFlag(FL_CONTINUE_SHOT, puiPara->Multishot);
}
if(puiPara->VideoSize != SysGetFlag(FL_MOVIE_SIZE))
{
SysSetFlag(FL_MOVIE_SIZE, puiPara->VideoSize);
}
#if SF_HW_TEST != ENABLE
sf_set_pir_sensitivity(puiPara->PirSensitivity);
#endif
#endif
}

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

@ -1992,13 +1992,6 @@ typedef enum {
SF_MULTISHOT_INTEVEL_MAX,
} SF_MULTISHOT_INTEVEL_e;
typedef enum {
SF_MULTISHOT_1P = 0,
SF_MULTISHOT_2P,
SF_MULTISHOT_3P,
SF_MULTISHOT_MAX,
} SF_MULTISHOT_e;
typedef enum {
SF_SEND_TIMELY = 0,
SF_SEND_TIMELY1,
@ -2054,4 +2047,5 @@ extern void UI_SaveRTCDate(void);
extern void UI_SetFileDBFileID(void);
extern UIMenuStoreInfo* sf_ui_para_get(void);
void sf_power_on_para_check_init(void);
#endif //_UIINFO_H_

3
rtos/code/driver/na51089/include/sf_mcu.h
View File

@ -522,6 +522,7 @@ void sf_mcu_flag_wait_done(MCU_FLAG_INIT boot_init);
int sf_mcu_flag_wait_done_timeout(MCU_FLAG_INIT boot_init, int timeout_ms);
void sf_mcu_flag_clear_done(MCU_FLAG_INIT boot_init);
UINT32 sf_get_send_pic_sieze(void);
void sf_para_print(void);
UINT8 sf_convert_power_on_mode(void);
#endif

6
rtos/code/driver/na51089/source/mcu/sf_battery.c
View File

@ -820,7 +820,7 @@ void sf_battery_level_polling(void)
printf("[%s:%d]power off because low battery\n", __FUNCTION__, __LINE__);
//Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_BATT_EMPTY); //shutdown start
#if SF_IQ_TEST != ENABLE
sf_set_power_off_flag(1);
sf_set_power_off_flag(APP_POWER_OFF_BATT_EMPTY);
flow_preview_set_stop_flag(TRUE);
#endif
}
@ -854,7 +854,7 @@ THREAD_RETTYPE sf_battery_check_thread(void *arg)
printf("[%s:%d]power off because low battery\n", __FUNCTION__, __LINE__);
//Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_BATT_EMPTY); //shutdown start
#if SF_IQ_TEST != ENABLE
sf_set_power_off_flag(1);
sf_set_power_off_flag(APP_POWER_OFF_BATT_EMPTY);
flow_preview_set_stop_flag(TRUE);
#endif
}
@ -1284,7 +1284,7 @@ BOOL sf_battery_check_init(void)
printf("[%s:%d]power off because low battery\n", __FUNCTION__, __LINE__);
//Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_BATT_EMPTY); //shutdown start
#if SF_IQ_TEST != ENABLE
sf_set_power_off_flag(1);
sf_set_power_off_flag(APP_POWER_OFF_BATT_EMPTY);
flow_preview_set_stop_flag(TRUE);
#endif
}

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

@ -719,6 +719,7 @@ UINT8 sf_get_power_on_mode(void)
BOOL sf_is_night_mode(BOOL isRefresh)
{
static BOOL nightMode = FALSE;
static BOOL nightModeFlag = FALSE;
if(sf_get_mode_flag()) //setup always use new status
{
@ -726,7 +727,12 @@ BOOL sf_is_night_mode(BOOL isRefresh)
}
else if(isRefresh)
{
sf_mcu_get_irshtter();
if((TRUE != nightModeFlag) && (0 == IRSHTTER))
{
sf_mcu_get_irshtter();
nightModeFlag = TRUE;
}
if(IRSHTTER < SF_MCU_NIGHT_MODE_LUMINANCE)
{
nightMode = TRUE;
@ -1378,13 +1384,17 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
isCard = sf_in_card_exist();
isCardFull = sf_is_card_full();
PowerOnMode = sf_get_power_on_mode();
if(APP_POWER_OFF_BATT_EMPTY == sf_get_power_off_flag())
{
val = APP_POWER_OFF_BATT_EMPTY;
}
}
sf_set_sim_insert(1);//Remove hardware detection SIM card
printf("Firmware compile time:%s %s VER:%s\n", __DATE__, __TIME__,SF_BASE_VERSION);
printf("%s:%d DailyReportSwitch=%d %02d:%02d\n",__FUNCTION__,__LINE__, puiPara->DailyReportSwitch, puiPara->DailyReportTime2.Hour, puiPara->DailyReportTime2.Min);
printf("%s:%d isUsb = %d isCard = %d isCardFull = %d val = %d simCardInsert = %ld start mode = %d\n",__FUNCTION__,__LINE__, isUsb, isCard, isCardFull, val, simCardInsert, PowerOnMode);
sf_mcu_get_irshtter();
if (attrId > SF_MCU_PARAM_MAX)
{
printf("attrId ERROR!\n");
@ -1394,6 +1404,8 @@ UINT8 sf_mcu_reg_set(MCUParam_t attrId, UINT8 val)
if(attrId == SF_MCU_POWEROFF)
{
if(0 == IRSHTTER)
sf_mcu_get_irshtter();
//printf("SynMcuSet = %x\n", statisPara->SynMcuSet);
printf("NeedTimeSyncStartUp = %d\n", puiPara->NeedTimeSyncStartUp);
if(puiPara->NeedTimeSyncStartUp == 1)
@ -1999,7 +2011,7 @@ int sf_while_flag(void)
*************************************************/
UINT16 sf_mcu_get_irshtter(void)
{
static BOOL isRefresh = 1;
//static BOOL isRefresh = 1;
UINT8 dataTemp1 = 0, dataTemp2 = 0;
UINT8 mcuReg[REG_SIZE] = { 0 };
@ -2009,8 +2021,8 @@ UINT16 sf_mcu_get_irshtter(void)
{
return IRSHTTER;
}
if(isRefresh){
isRefresh = 0;
//if(isRefresh){
//isRefresh = 0;
mcuReg[i++] = LUMINANCE_L;
mcuReg[i++] = LUMINANCE_H;
sf_mcu_read_multi(mcuReg, mcuData, i);
@ -2020,7 +2032,7 @@ UINT16 sf_mcu_get_irshtter(void)
dataTemp2 = mcuData[i++];
IRSHTTER = (dataTemp2 << 8) | dataTemp1;
}
//}
printf("%s:%d IRSHTTER = %d\n", __FUNCTION__, __LINE__, IRSHTTER);
@ -2042,19 +2054,18 @@ UINT32 sf_set_pir_sensitivity(UINT8 pirs)
puiPara->DigitPirSensitivity = digPirLevel[pirs];
puiPara->DigitPirCnt = digPirCount[pirs];
puiPara->DigitPirWindowTime = 0;
/*if(puiPara->PirSensitivity))
//#if SF_IS_RELEASE == ENABLE
if(puiPara->PirSensitivity)
{
puiPara->TimelapseSwitch, SF_OFF);
puiPara->TimelapseSwitch = SF_OFF;
puiPara->TimelapseTime.Hour = 0;
puiPara->TimelapseTime.Min = 0;
puiPara->TimelapseTime.Sec = 0;
//Save_MenuInfo();
}*/
}
//#endif
return SUCCESS;
}
void sf_set_module_sleep_flag(UINT8 flag)
{
gModuleSleep = flag;
@ -2105,7 +2116,7 @@ void sf_file_thumb_cfg_clear(void)
void sf_file_thumb_cfg_sava(void)
{
printf("%s:%d s\n", __FUNCTION__, __LINE__);
//printf("%s:%d s\n", __FUNCTION__, __LINE__);
#if 0
@ -2145,7 +2156,7 @@ void sf_file_thumb_cfg_sava(void)
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 e Size:%ld\n", __FUNCTION__, __LINE__,pThumbFileCfg->stfileattr[fileIndex].thumbfileSize);
//printf("%s:%d e Size:%ld\n", __FUNCTION__, __LINE__,pThumbFileCfg->stfileattr[fileIndex].thumbfileSize);
free(pThumbFileCfg);
}
}
@ -2182,12 +2193,16 @@ void sf_add_file_name_to_send_list(char *sendfname)
return;
}
printf("Add %s to send.List\n", sendfname);
//printf("Add %s to send.List\n", sendfname);
if(0 == puiPara->SendType){
snprintf(sendListName, sizeof(sendListName), "%s", SF_THUMB_SEND_AUTO);
if (FileSys_DeleteFile(sendListName) != FST_STA_OK) {
DBG_IND("Ignore deleting file.\r\n");
if(access(sendListName, F_OK) == 0)
{
if (FileSys_DeleteFile(sendListName) != FST_STA_OK) {
DBG_IND("Ignore deleting file.\r\n");
}
}
}else {
snprintf(sendListName, sizeof(sendListName), "%s", SF_THUMB_SEND_LIST);
}
@ -2207,7 +2222,7 @@ void sf_add_file_name_to_send_list(char *sendfname)
write(fd, buff, SF_SEND_LIST_ITEM_LENGTH);
close(fd);
printf("Add Success st_size:%ld\n", st.st_size);
//printf("Add Success st_size:%ld\n", st.st_size);
}
#if SF_BATTERY_TEST == ENABLE
char str1[5] = { 0 };
@ -2216,6 +2231,31 @@ void sf_add_file_name_to_send_list(char *sendfname)
#endif
}
/*************************************************
Function: sf_para_print
Description: printf para
Input: N/A
Output: N/A
Return: N/A
Others: N/A
*************************************************/
void sf_para_print(void)
{
struct tm ctv = {0};
UINT8 PowerOnMode = 0;
signed int isUsb = 0;
signed int isCard = 0;
signed int isCardFull = 0;
isUsb = sf_is_usb_flag();
isCard = sf_in_card_exist();
isCardFull = sf_is_card_full();
PowerOnMode = sf_get_power_on_mode();
ctv = hwclock_get_time(TIME_ID_CURRENT);
printf("Firmware compile time:%s %s VER:%s\n", __DATE__, __TIME__,SF_BASE_VERSION);
printf("%s:%d tm: %d : %d : %d : %d : %d : %d\n", __FUNCTION__, __LINE__,ctv.tm_year, ctv.tm_mon,ctv.tm_mday,ctv.tm_hour,ctv.tm_min,ctv.tm_sec);
printf("%s:%d isUsb = %d isCard = %d isCardFull = %d simCardInsert = %ld start mode = %d IRSHTTER = %d\n",__FUNCTION__,__LINE__, isUsb, isCard, isCardFull, simCardInsert, PowerOnMode, IRSHTTER);
}
#if defined __FREERTOS
int sf_mod_init(void)