diff --git a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h index eb9ac7884..2fcf8ddfc 100644 --- a/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h +++ b/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h @@ -959,7 +959,9 @@ #define SF_TEST_OTA_FTP 0 #define CUSTOM_TEST_OTA_FTP 0 - +#define SF_BATTERY_TEST ENABLE +#define SF_BATTERY_TEST_FILE "A:\\BATTERY.TXT" +#define SF_HW_TEST DISABLE //////////////////////sf end/////////////////////////////// /******************************************************************************************* diff --git a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h index 4775857f3..9f0a092da 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UICfgDefault.h @@ -66,7 +66,11 @@ #if SF_IQ_TEST == DISABLE #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_FRONT_1280x720P30 #else - #define DEFAULT_MOVIE_SIZE MOVIE_SIZE_CLONE_1920x1080P30_1920x1080P25 + #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 @@ -172,13 +176,28 @@ #define DEFAULT_ETHCAM_TX_IP_ADDR 0 //0xc00a8c0 #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 + #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 + #endif #define DEFAULT_NET_WORK_NEED_SEARCH SF_OFF -#define DEFAULT_BOOT_WORK_MODE SF_CAM_MODE_PHOTO_VIDEO// #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 #endif #define DEFAULT_SF_CAMID SF_CAMID_OFF @@ -186,17 +205,17 @@ #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_PIR_DELAY_SWITCH SF_OFF #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_7 -#endif +//#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 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 7e3ab7d96..21852eb17 100644 --- a/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c +++ b/code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIInfo/UIInfo.c @@ -1671,8 +1671,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; diff --git a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c index 23cdaeb52..96fc91b75 100644 --- a/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c +++ b/rtos/code/application/source/cardv/SrcCode/Dx/565_HUNTING_EVB_LINUX_4G_S530/DxHunting.c @@ -420,6 +420,9 @@ void sf_ir_led_set(UINT8 mode, UINT8 flashLed, UINT8 stillExp, UINT8 isSnapVideo { printf("[%s:%d]s mode:%d,flashLed:%d,isSnapVideo:%d\n",__FUNCTION__,__LINE__,mode,flashLed, isSnapVideo); +#if SF_HW_TEST == ENABLE + return ; +#endif PWM_CFG pwm_cfg = { .ui_prd = 100, .ui_rise = 0, diff --git a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h index 0abf20e18..e3162136e 100644 --- a/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h +++ b/rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S530.h @@ -980,6 +980,10 @@ #define FASTBOOT_WAIT_FILESYS_TIMEOUT_MS 5000 #define FASTBOOT_WAIT_FILENAMING_TIMEOUT_MS 5000 + +#define SF_BATTERY_TEST ENABLE +#define SF_BATTERY_TEST_FILE "A:\\BATTERY.TXT" +#define SF_HW_TEST DISABLE ////////////////////sf end//////////////////////////////// diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c b/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c index 90db8cea4..bbdf1141f 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/Photo/UIDateImprint.c @@ -209,7 +209,7 @@ typedef struct { GXIMG_CP_ENG copyEngine; UINT32 lockptn; BOOL isStrDirty; - CHAR StrBuf[64]; + CHAR StrBuf[128]; UINT32 pic_cnt; } DATE_IMPRINT_INFO; diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c index 39b5978a6..9dddd3ab1 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFastCapDateImprint.c @@ -142,7 +142,7 @@ typedef struct { lv_user_font_conv_calc_buffer_size_result buff_size; } PhotoFastCapDateImprint_Info; -char photo_aesteam[64]={0}; +char photo_aesteam[128]={0}; extern UINT16 IRSHTTER; //extern UINT32 Cap_cnt; extern UINT32 ae_preset_exp; @@ -353,7 +353,7 @@ void PhotoFastCapDateImprint_InitBuff(void) #if PHOTO_STAMP_ISP_STATUS == ENABLE memset(photo_aesteam, '\0', sizeof(photo_aesteam)); - PhotoStamp_get_isp_status_jpg(0,&photo_aesteam[0],64); + PhotoStamp_get_isp_status_jpg(0,&photo_aesteam[0],128); #endif lv_user_font_conv_draw_cfg_init(&stamp_text.draw_cfg); @@ -611,8 +611,12 @@ INT32 PhotoFastCapDateImprint_GenYuvData(HD_VIDEO_FRAME *pDstImg) #else stamp_text.draw_cfg.string.font = (lv_font_t *) lv_plugin_get_font(FONT)->font; #endif - + #if PHOTO_STAMP_ISP_STATUS == ENABLE + stamp_text.draw_cfg.string.text = &photo_aesteam[0];// STRING; + #else stamp_text.draw_cfg.string.text = PhotoFast_InitStrBuf(); + #endif + lv_user_font_conv_calc_buffer_size(&stamp_text.draw_cfg, &stamp_text.buff_size); lv_user_font_conv(&stamp_text.draw_cfg, &stamp_text.mem_cfg); @@ -691,8 +695,11 @@ INT32 PhotoFastCapDateImprint_GenYuvData2(HD_VIDEO_FRAME *pDstImg) stamp_text.draw_cfg.string.font = (lv_font_t *) lv_plugin_get_font(FONT)->font; #endif + #if PHOTO_STAMP_ISP_STATUS == ENABLE + stamp_text.draw_cfg.string.text = &photo_aesteam[0];// STRING; + #else stamp_text.draw_cfg.string.text = PhotoFast_InitStrBuf(); - + #endif lv_user_font_conv_calc_buffer_size(&stamp_text.draw_cfg, &stamp_text.buff_size); lv_user_font_conv(&stamp_text.draw_cfg, &stamp_text.mem_cfg);