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

1.卡异常退出时开启log；2.夜视灯关闭代码优化；3.超时关机调整

Browse Source
This commit is contained in:
payton 2024-01-24 17:44:19 +08:00
parent d0f817561e
commit 24a64a859d
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,6 +194,7 @@ THREAD_RETTYPE MovieFast_PowerOffTsk(void *arg)
{
fastboot_msg_en(ENABLE);
DBG_ERR("failed timeout ID:%d\n", MOVIEFAST_FLG_ID);
goto exit;
break;
}
vos_util_delay_ms(delay_ms);
@ -203,6 +204,7 @@ THREAD_RETTYPE MovieFast_PowerOffTsk(void *arg)
vos_flag_set(MOVIEFAST_FLG_ID, FLGMOVIEFAST_SHUTDOWN);
}
else{
exit:
MovieFast_ShutDown();
}
@ -1232,6 +1234,7 @@ static void MovieFast_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT3
break;
case MOVIE_USER_CB_ERROR_CARD_SLOW:
{
fastboot_msg_en(ENABLE);
DBG_ERR("Slow card!, id %d\r\n", value);
MovieFast_Set_Shutdown_flag();
}
@ -1239,6 +1242,7 @@ static void MovieFast_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT3
case MOVIE_USER_CB_ERROR_CARD_WR_ERR:
{
fastboot_msg_en(ENABLE);
DBG_ERR("EVENT %d: card write error!\r\n", event_id);
MovieFast_Set_Shutdown_flag();
}
@ -1247,6 +1251,7 @@ static void MovieFast_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT3
case MOVIE_USER_CB_EVENT_CARD_FULL:
{
fastboot_msg_en(ENABLE);
DBG_ERR("EVENT %d: card full!\r\n", event_id);
MovieFast_Set_Shutdown_flag();
}
@ -1264,7 +1269,10 @@ static void MovieFast_UserEventCb(UINT32 id, MOVIE_USER_CB_EVENT event_id, UINT3
#endif
case MOVIE_USER_CB_EVENT_CLOSE_FILE_COMPLETED: {
sf_ir_led_set(0, 0, 0, 0);
if(sf_is_night_mode(0) ==TRUE)
{
sf_ir_led_set(0, 0, 0, 0);
}
//MOVIEMULTI_CLOSE_FILE_INFO *info = (MOVIEMULTI_CLOSE_FILE_INFO *)value;
//DCF_AddDBfile(info->path);
//DBG_DUMP("%s added to DCF\r\n", info->path);
@ -2035,7 +2043,10 @@ DBG_WRN(">>>>>>>>>>>>>>> movie thread <<<<<<<<<<\r\n");
if( vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT ||
(ae_preset_flag == TRUE && vprc_frm_cnt >= (vprc_frm_cnt_ae_preset + 5))){
#if SF_TRIGGER_TIME_TEST == ENABLE && HUNTING_CAMERA_MCU == ENABLE
sf_trigger_time_led_cb(1);
#endif
DBG_DUMP("*** trigger frame count = %llu frame timestamp = %llums , \n", frame.count, frame.timestamp); /* UINT64, use %llu */
if(vcap_frm_cnt >= PHOTOFAST_START_CAP_FRAME_CNT){
DBG_DUMP("triggered by PHOTOFAST_START_CAP_FRAME_CNT\n");
}
@ -2053,7 +2064,8 @@ DBG_WRN(">>>>>>>>>>>>>>> movie thread <<<<<<<<<<\r\n");
}
} while(1);
nvt_cmdsys_runcmd("ae dbg 0 0");
nvt_cmdsys_runcmd("awb dbg 0 0");
vos_perf_mark(&g_alg_end_time);
}
vos_util_delay_ms(33);

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

@ -2036,7 +2036,8 @@ THREAD_RETTYPE PhotoFast_FlowPreviewThread(void *arg)
VOS_TICK tick;
PhotoFast_GetTick(video_cap_frame.count, &tick);
nvt_cmdsys_runcmd("ae dbg 0 0");
nvt_cmdsys_runcmd("awb dbg 0 0");
DBG_DUMP("*** trigger frame count = %llu (start from 1) frame timestamp = %llu, tick=%lu ms , \n", video_cap_frame.count, video_cap_frame.timestamp, tick); /* UINT64, use %llu */
//Set_AEMODE(1);
}

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

@ -2356,6 +2356,12 @@ INT32 PhotoFast_SliceEncode_CB3(void* user_data)
continue;
}
if(DrvGPIO_GetPhotoMovieModeFromMonitor() == DX_HUNTING_MODE_MOVIE2)
{
fastboot_msg_en(ENABLE);
DBG_WRN("fastboot_msg_en test\n");
}
if(queue_ele_in->comm.terminate){
DBG_ERR("abort CB3\n");
free(queue_ele_in);
@ -2387,6 +2393,7 @@ INT32 PhotoFast_SliceEncode_CB3(void* user_data)
}
if(waitFalg)
{
fastboot_msg_en(ENABLE);
DBG_WRN("filesys not ready, store data into mem\n");
SYS_USRMEM usrmem = {0};