From 431576b40d8ec9149dc01dea838353d59caf9b2c Mon Sep 17 00:00:00 2001 From: payton Date: Fri, 7 Jul 2023 10:25:06 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E6=95=B4=E7=94=B5=E5=8E=8B=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E4=BD=8D=E7=BD=AE=202.=E8=B0=83=E6=95=B4=E5=86=99?= =?UTF-8?q?=E5=85=A5=E5=8F=91=E9=80=81=E5=88=97=E8=A1=A8=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96p+v=E5=90=8E=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=86=99=E5=85=A5=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../application/source/cardv/SrcCode/System/rtos-main.c | 5 +++-- .../source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c | 3 ++- .../source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c index db19987a3..aa277862e 100644 --- a/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c +++ b/rtos/code/application/source/cardv/SrcCode/System/rtos-main.c @@ -385,12 +385,13 @@ static void * get_fdt_by_sensor_type(char *name) static void mcu_task(void) { #if HUNTING_CAMERA_MCU == ENABLE - sf_battery_thread_init(); + //sf_battery_thread_init(); + vos_util_delay_ms(5); sf_mcu_power_on_para_get(SF_MCU_POWERON); sf_mcu_wdg_set(5); sf_mcu_reg_set(SF_MCU_CTRL_MODULE_PIR, 1); - + sf_battery_check_init(); //sf_led_init(); //sf_sys_status_led_set(SF_LED_SYS_STATE_PIR_NOT_DETECT); diff --git a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c index 3a04387e3..5d3bb1a55 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/MovieFast/MovieFast.c @@ -257,6 +257,7 @@ static void MovieFast_ShutDown(void) #endif #if HUNTING_CAMERA_MCU + sf_file_thumb_cfg_sava(); #if SF_IQ_TEST != ENABLE if(sf_get_power_off_flag()){ sf_mcu_reg_set(SF_MCU_POWEROFF,0); @@ -742,7 +743,7 @@ static void MovieFast_OnRecStart(void) mask <<= 1; } - nvt_cmdsys_runcmd("venc info"); + //nvt_cmdsys_runcmd("venc info"); } static void MovieFast_OnRecStop(void) 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 8f5953cf7..96b6b03f8 100644 --- a/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c +++ b/rtos/code/application/source/cardv/SrcCode/UIApp/PhotoFast/PhotoFast.c @@ -1757,9 +1757,9 @@ exit: { vos_flag_set(PHOTOFAST_FLG_ID, FLGPHOTOFAST_SHUTDOWN); } - else { - sf_file_thumb_cfg_sava(); - } + //else { + // sf_file_thumb_cfg_sava(); + //} /*UINT32 uiSelect = UI_GetData(FL_PHOTO_SIZE)+1; if(UI_GetData(FL_PHOTO_SIZE) >= PHOTO_SIZE_8M) @@ -1889,7 +1889,7 @@ static void PhotoFast_ShutDown(void) PhotoFast_TriggerFrm_Dump(); #endif #if HUNTING_CAMERA_MCU == ENABLE - + sf_file_thumb_cfg_sava(); #if SF_IQ_TEST != ENABLE if(sf_get_power_off_flag()){ sf_mcu_reg_set(SF_MCU_POWEROFF,0);