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

Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into branch_s550_fast_emmc

Browse Source
This commit is contained in:
xiaojiazhu 2024-02-01 13:45:43 +08:00
commit 33cf5f36e1
6 changed files with 57 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuSend.c
View File

@ -113,14 +113,44 @@ int Send_MenuCallback(UINT32 uiMessage, UINT32 uiParam)
case FOUR_TIME_DAY: case FOUR_TIME_DAY:
puiPara->TimeSend4Switch = 1; puiPara->TimeSend4Switch = 1;
puiPara->TimeSend3Switch = 1; puiPara->TimeSend3Switch = 1;
// break;
case TWICE_DAY:
puiPara->TimeSend2Switch = 1; puiPara->TimeSend2Switch = 1;
// break;
case ONCE_DAY:
puiPara->TimeSend1Switch = 1; puiPara->TimeSend1Switch = 1;
// break; break;
case TWICE_DAY:
puiPara->TimeSend4Switch = 0;
puiPara->TimeSend3Switch = 0;
puiPara->TimeSend2Switch = 1;
puiPara->TimeSend1Switch = 1;
puiPara->TimeSend3.Hour = 0;
puiPara->TimeSend3.Min = 0;
puiPara->TimeSend4.Hour = 0;
puiPara->TimeSend4.Min = 0;
break;
case ONCE_DAY:
puiPara->TimeSend4Switch = 0;
puiPara->TimeSend3Switch = 0;
puiPara->TimeSend2Switch = 0;
puiPara->TimeSend1Switch = 1;
puiPara->TimeSend2.Hour = 0;
puiPara->TimeSend2.Min = 0;
puiPara->TimeSend3.Hour = 0;
puiPara->TimeSend3.Min = 0;
puiPara->TimeSend4.Hour = 0;
puiPara->TimeSend4.Min = 0;
break;
default: default:
puiPara->TimeSend4Switch = 0;
puiPara->TimeSend3Switch = 0;
puiPara->TimeSend2Switch = 0;
puiPara->TimeSend1Switch = 0;
puiPara->TimeSend1.Hour = 0;
puiPara->TimeSend1.Min = 0;
puiPara->TimeSend2.Hour = 0;
puiPara->TimeSend2.Min = 0;
puiPara->TimeSend3.Hour = 0;
puiPara->TimeSend3.Min = 0;
puiPara->TimeSend4.Hour = 0;
puiPara->TimeSend4.Min = 0;
break; break;
} }
printf("\033[33m[Send_MenuCallback]SendType:%d\033[0m\n", puiPara->SendType); printf("\033[33m[Send_MenuCallback]SendType:%d\033[0m\n", puiPara->SendType);

12
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMovie/UIFlowMovieEventCallback.c
View File

@ -710,6 +710,7 @@ static void set_indev_keypad_group(lv_obj_t* obj)
static void UIFlowMovie_ScrOpen(lv_obj_t* obj) static void UIFlowMovie_ScrOpen(lv_obj_t* obj)
{ {
dcf_handle = (UINT32)System_Get_DCF_Handle();/* 0 emmc 1 sd*/ dcf_handle = (UINT32)System_Get_DCF_Handle();/* 0 emmc 1 sd*/
printf("start video dcf handle : %d \n", dcf_handle);
DBG_DUMP("%s\r\n", __func__); DBG_DUMP("%s\r\n", __func__);
// #if HUNTING_CAMERA_MCU == ENABLE // #if HUNTING_CAMERA_MCU == ENABLE
@ -1182,16 +1183,17 @@ static void UIFlowMovie_WR_ERROR(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA*
if (1 == dcf_handle && System_GetState(SYS_STATE_CARD) == CARD_REMOVED) { if (1 == dcf_handle && System_GetState(SYS_STATE_CARD) == CARD_REMOVED) {
//UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms); //UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__); printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__);
lv_group_send_data(gp, LV_KEY_ENTER); UI_SetData(FL_MOVIE_MOTION_DET, MOVIE_MOTIONDET_OFF);
//lv_group_send_data(gp, LV_KEY_ENTER);
return; return;
} }
if (System_GetState(SYS_STATE_CARD) == CARD_LOCKED) { if (System_GetState(SYS_STATE_CARD) == CARD_LOCKED) {
gMovData.State = MOV_ST_WARNING_MENU; //gMovData.State = MOV_ST_WARNING_MENU;
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_IMG_ID_ICON_SD_LOCK, warn_msgbox_auto_close_ms); //UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_IMG_ID_ICON_SD_LOCK, warn_msgbox_auto_close_ms);
} else { } else {
gMovData.State = MOV_ST_WARNING_MENU; //gMovData.State = MOV_ST_WARNING_MENU;
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_MEMORYERROR, warn_msgbox_auto_close_ms); //UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_MEMORYERROR, warn_msgbox_auto_close_ms);
} }
update_icons(); update_icons();
} else { } else {

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPlay/UIFlowPlayEventCallback.c
View File

@ -315,6 +315,7 @@ void Option_play_Selection_Key(lv_obj_t* obj, uint32_t key)
if (OPTION_PAGE_SELECT_FUNCTION == gOptionPage) if (OPTION_PAGE_SELECT_FUNCTION == gOptionPage)
{ {
ProfileFocused = 0;
hidde_Selection_page(); hidde_Selection_page();
} }
else else

5
code/application/source/sf_app/code/source/app/sf_service.c
View File

@ -264,6 +264,11 @@ SINT32 sf_USB_net_init(void)
static U16 flag = 0; static U16 flag = 0;
UIMenuStoreInfo *puiPara = sf_app_ui_para_get(); UIMenuStoreInfo *puiPara = sf_app_ui_para_get();
if (!sf_app_while_flag())
{
printf("[%s:%d]is update ... \n", __FUNCTION__, __LINE__);
return;
}
if (flag == 0) if (flag == 0)
{ {
flag = 1; flag = 1;

1
code/application/source/sf_app/code/source/app/sf_system.c
View File

@ -1264,6 +1264,7 @@ UINT32 sf_4g_update(UINT8 *upFname)
printf("[%s:%d] cmd:%s\n", __FUNCTION__, __LINE__,cmdStr); printf("[%s:%d] cmd:%s\n", __FUNCTION__, __LINE__,cmdStr);
if (ret == SF_SUCCESS) { if (ret == SF_SUCCESS) {
system("killall quectel-CM-EG91");
ret = system(cmdStr); ret = system(cmdStr);
if (sf_poweron_type_get() == SF_MCU_STARTUP_RING) { if (sf_poweron_type_get() == SF_MCU_STARTUP_RING) {
sleep(2); sleep(2);

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

@ -2028,7 +2028,7 @@ DBG_WRN(">>>>>>>>>>>>>>> movie thread <<<<<<<<<<\r\n");
nvt_cmdsys_runcmd("ae dbg 0 256 1 "); nvt_cmdsys_runcmd("ae dbg 0 256 1 ");
nvt_cmdsys_runcmd("awb dbg 0 16 1 "); //nvt_cmdsys_runcmd("awb dbg 0 16 1 ");
HD_VIDEO_FRAME frame_capture = {0}; HD_VIDEO_FRAME frame_capture = {0};
VOS_TICK t1, t2; VOS_TICK t1, t2;
@ -2059,7 +2059,7 @@ DBG_WRN(">>>>>>>>>>>>>>> movie thread <<<<<<<<<<\r\n");
ae_preset_flag = TRUE; ae_preset_flag = TRUE;
vprc_frm_cnt_ae_preset = vprc_frm_cnt; vprc_frm_cnt_ae_preset = vprc_frm_cnt;
DBG_DUMP("ae preset vprc frame cnt = %lu\n", vprc_frm_cnt_ae_preset); DBG_DUMP("ae preset vprc frame cnt = %lu\n", vprc_frm_cnt_ae_preset);
Set_AEMODE(0); Set_AEMODE(1);
//Set_NIGHTMODE(0, 0); //Set_NIGHTMODE(0, 0);
setet_preset_param(); //sun chen@20240111 setet_preset_param(); //sun chen@20240111
} }
@ -2122,11 +2122,11 @@ DBG_WRN(">>>>>>>>>>>>>>> movie thread <<<<<<<<<<\r\n");
} }
} while(1); } while(1);
nvt_cmdsys_runcmd("ae dbg 0 0"); //nvt_cmdsys_runcmd("ae dbg 0 0");
nvt_cmdsys_runcmd("awb dbg 0 0"); //nvt_cmdsys_runcmd("awb dbg 0 0");
vos_perf_mark(&g_alg_end_time); vos_perf_mark(&g_alg_end_time);
} }
vos_util_delay_ms(33); vos_util_delay_ms(100);
// if ((g_moviefast_power_off_tsk_id = vos_task_create(MovieFast_PowerOffTsk, 0, "MovieFastPwrTsk", PRI_MOVIEFAST_CMDTSK, STKSIZE_MOVIEFAST_CMDTSK)) == 0) { // if ((g_moviefast_power_off_tsk_id = vos_task_create(MovieFast_PowerOffTsk, 0, "MovieFastPwrTsk", PRI_MOVIEFAST_CMDTSK, STKSIZE_MOVIEFAST_CMDTSK)) == 0) {
// DBG_ERR("MovieFast_PowerOffTsk create failed.\r\n"); // DBG_ERR("MovieFast_PowerOffTsk create failed.\r\n");
@ -2275,10 +2275,12 @@ DBG_WRN(">>>>>>>>>>>>>>> movie thread <<<<<<<<<<\r\n");
sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode, 1); sf_ir_led_set(((2 == puiPara->NightMode) ? 2 : 1),puiPara->FlashLed, puiPara->NightMode, 1);
} }
#endif #endif
Set_AEMODE(0); //sun chen@20240130 P+V start video record
vos_util_delay_ms(200);
vos_flag_set(MOVIEFAST_FLG_ID, FLGMOVIEFAST_RECSTART); vos_flag_set(MOVIEFAST_FLG_ID, FLGMOVIEFAST_RECSTART);
Set_AEMODE(0); //sun chen@20240111
#if FIX_RECORD_NOISE == ENABLE #if FIX_RECORD_NOISE == ENABLE
// UINT32 elapse_time_ms = ((t2 - t1) / 1000); // UINT32 elapse_time_ms = ((t2 - t1) / 1000);