From 39323aa19be5499b0e174691579726f1bf9cd7d2 Mon Sep 17 00:00:00 2001 From: payton Date: Mon, 4 Dec 2023 14:51:14 +0800 Subject: [PATCH] =?UTF-8?q?1.0s=E9=97=B4=E9=9A=94=EF=BC=8C=E7=81=AF?= =?UTF-8?q?=E5=8F=AA=E4=BA=AE=E4=B8=80=E6=AC=A1=EF=BC=9B2.log=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c index 081d9b2dd..0f2ff02ff 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c @@ -106,7 +106,7 @@ static UINT32 g_exif_buf_pa = 0, g_exif_buf_va = 0; static UINT32 g_u32PrvCapCnt = 0; static VOS_TICK g_tickBuf[VD_TICK_BUF_SIZE] = {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 const unsigned char gDemoKit_Font[]; @@ -1567,7 +1567,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) 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; 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 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); sf_ir_led_set(0, 0, 0, 0); } @@ -1755,7 +1755,7 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg) if (start_cap == TRUE) { #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); sf_ir_led_set(0, 0, 0, 0); } @@ -1806,7 +1806,11 @@ exit: if (g_bPreViewPullFlag == FALSE) { // 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_vcap_frm_cnt = 1; PhotoFast_PhotoClose(); @@ -1959,6 +1963,15 @@ static void PhotoFast_ShutDown(void) sf_file_thumb_cfg_sava(); sf_para_print(); // 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); #if SF_IQ_TEST != ENABLE if(sf_get_power_off_flag()){