1.0s间隔,灯只亮一次;2.log记录修改

This commit is contained in:
payton 2023-12-04 14:51:14 +08:00
parent 714ae53626
commit 39323aa19b

View File

@ -106,7 +106,7 @@ static UINT32 g_exif_buf_pa = 0, g_exif_buf_va = 0;
static UINT32 g_u32PrvCapCnt = 0; static UINT32 g_u32PrvCapCnt = 0;
static VOS_TICK g_tickBuf[VD_TICK_BUF_SIZE] = {0}; static VOS_TICK g_tickBuf[VD_TICK_BUF_SIZE] = {0};
static UINT32 g_vcap_trigger_frm_count = 0XFFFFFFFF; /* start from 0 */ static UINT32 g_vcap_trigger_frm_count = 0XFFFFFFFF; /* start from 0 */
static AET_STATUS_INFO ae_status = {0}; /* size of AET_STATUS_INFO is quite large, don't put it in the stack */ AET_STATUS_INFO ae_status = {0}; /* size of AET_STATUS_INFO is quite large, don't put it in the stack */
//extern //extern
extern const unsigned char gDemoKit_Font[]; extern const unsigned char gDemoKit_Font[];
@ -1567,7 +1567,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
if((duration >= period) ||((period - duration) <= (led_delay + 17)) if((duration >= period) ||((period - duration) <= (led_delay + 17))
){ ){
if((FALSE == led_flag) && (sf_is_night_mode(0) ==TRUE)){ if((SF_MULTISHOT_INTEVEL_0S != puiPara->MultiShotIntevel) && (FALSE == led_flag) && (sf_is_night_mode(0) ==TRUE)){
led_flag = TRUE; led_flag = TRUE;
sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode,0); sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode,0);
} }
@ -1724,7 +1724,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
if (start_cap == TRUE) { if (start_cap == TRUE) {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(sf_is_night_mode(0) ==TRUE){ if((SF_MULTISHOT_INTEVEL_0S != puiPara->MultiShotIntevel) && (sf_is_night_mode(0) ==TRUE)){
//DrvGPIO_IRLed_Turn_Onoff(0); //DrvGPIO_IRLed_Turn_Onoff(0);
sf_ir_led_set(0, 0, 0, 0); sf_ir_led_set(0, 0, 0, 0);
} }
@ -1755,7 +1755,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
if (start_cap == TRUE) { if (start_cap == TRUE) {
#if HUNTING_CAMERA_MCU == ENABLE #if HUNTING_CAMERA_MCU == ENABLE
if(sf_is_night_mode(0) ==TRUE){ if((SF_MULTISHOT_INTEVEL_0S != puiPara->MultiShotIntevel) && (sf_is_night_mode(0) ==TRUE)){
//DrvGPIO_IRLed_Turn_Onoff(0); //DrvGPIO_IRLed_Turn_Onoff(0);
sf_ir_led_set(0, 0, 0, 0); sf_ir_led_set(0, 0, 0, 0);
} }
@ -1806,7 +1806,11 @@ exit:
if (g_bPreViewPullFlag == FALSE) { if (g_bPreViewPullFlag == FALSE) {
// DrvGPIO_IRLed_Turn_Onoff(0); // DrvGPIO_IRLed_Turn_Onoff(0);
#if HUNTING_CAMERA_MCU == ENABLE
if((SF_MULTISHOT_INTEVEL_0S == puiPara->MultiShotIntevel) && (sf_is_night_mode(0) ==TRUE)){
sf_ir_led_set(0, 0, 0, 0);
}
#endif
g_vprc_frm_cnt = 1; g_vprc_frm_cnt = 1;
g_vcap_frm_cnt = 1; g_vcap_frm_cnt = 1;
PhotoFast_PhotoClose(); PhotoFast_PhotoClose();
@ -1959,6 +1963,15 @@ static void PhotoFast_ShutDown(void)
sf_file_thumb_cfg_sava(); sf_file_thumb_cfg_sava();
sf_para_print(); sf_para_print();
// DBG_DUMP("wait filesys close ...\n"); // DBG_DUMP("wait filesys close ...\n");
#if (LOGFILE_FUNC==ENABLE)
UIMenuStoreInfo *puiPara = sf_ui_para_get();
if(puiPara->DebugMode)
{
DBG_DUMP("LogFile_Close ...\n");
LogFile_Suspend();
LogFile_Close();
}
#endif
FileSys_Close(FST_TIME_INFINITE); FileSys_Close(FST_TIME_INFINITE);
#if SF_IQ_TEST != ENABLE #if SF_IQ_TEST != ENABLE
if(sf_get_power_off_flag()){ if(sf_get_power_off_flag()){