Merge branch 'Branch_S550_Fast_Emmc' of gitlab.sifar.tech:linux-em-group/s530-ntk into Branch_S550_Fast_Emmc
This commit is contained in:
payton
commit
842d1f1552
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/bash
|
||||
#用于gitlab-ci.yml编译使用
|
||||
|
||||
make app_clean
|
||||
#make app_clean
|
||||
|
||||
echo "Start compile."
|
||||
export ROOT_PATH=$PWD
|
||||
|
|
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
|
|||
cd rtos
|
||||
source build/envsetup.sh
|
||||
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf
|
||||
make clean
|
||||
#make clean
|
||||
bear make all > /dev/null
|
||||
cp output/application.bin ../
|
||||
cp output/rtos-main.bin ../
|
||||
|
|
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
|
|||
cd $ROOT_PATH
|
||||
source build/envsetup.sh
|
||||
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
|
||||
make clean
|
||||
#make clean
|
||||
bear make all > /dev/null
|
||||
|
||||
cd $ROOT_PATH
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2);
|
|||
|
||||
void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
|
||||
{
|
||||
printf("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
|
||||
UINT32 status;
|
||||
|
||||
#if HUNTING_CAMERA_MCU == ENABLE
|
||||
|
|
@ -74,6 +75,7 @@ void Strg_CB(UINT32 event, UINT32 param1, UINT32 param2)
|
|||
}
|
||||
#endif
|
||||
//#NT#2016/03/02#Niven Cho -end
|
||||
|
||||
Ux_PostEvent(NVTEVT_STRG_INSERT, 1, param1);
|
||||
break;
|
||||
case STRG_CB_REMOVED: //call after card removed
|
||||
|
|
|
|||
|
|
@ -693,6 +693,7 @@ int search_str_in_file(char *path, char *str)
|
|||
int System_check_mmcblk0p1(void)
|
||||
{
|
||||
SysMain_system("ls /dev/mmcblk0p1 > /tmp/lsdev.txt");
|
||||
printf("\n=====================================================");
|
||||
vos_util_delay_ms(100);
|
||||
if (search_str_in_file("/tmp/lsdev.txt", "/dev/mmcblk0p1")) {
|
||||
return 1;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@ static BOOL g_BgInitFileSys = FALSE;
|
|||
uint16_t warn_msgbox_auto_close_ms = 1000 * 3;
|
||||
uint32_t warn_msgbox_auto_infinite_ms = 0xffffffff;
|
||||
|
||||
UINT32 dcf_handle = -1;
|
||||
static void UIFlowMovie_REC_FINISH(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg);
|
||||
extern DCF_HANDLE System_Get_DCF_Handle(void);
|
||||
|
||||
//MOVIE_SIZE_TAG
|
||||
static CHAR *resolution_Buf[MOVIE_SIZE_ID_MAX] = {
|
||||
|
||||
|
|
@ -705,6 +709,7 @@ static void set_indev_keypad_group(lv_obj_t* obj)
|
|||
|
||||
static void UIFlowMovie_ScrOpen(lv_obj_t* obj)
|
||||
{
|
||||
dcf_handle = (UINT32)System_Get_DCF_Handle();/* 0 emmc 1 sd*/
|
||||
DBG_DUMP("%s\r\n", __func__);
|
||||
|
||||
// #if HUNTING_CAMERA_MCU == ENABLE
|
||||
|
|
@ -904,13 +909,10 @@ static void UIFlowMovie_ScrClose(lv_obj_t* obj)
|
|||
static void UIFlowMovie_OnExeRecord(lv_obj_t* obj)
|
||||
{
|
||||
if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_SAFE) {
|
||||
|
||||
// if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) {
|
||||
|
||||
// UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
|
||||
// return;
|
||||
// }
|
||||
|
||||
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);
|
||||
printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
} else if (System_GetState(SYS_STATE_POWERON) == SYSTEM_POWERON_NORMAL) {
|
||||
|
||||
if (GxStrg_GetDeviceCtrl(0, CARD_READONLY)) { // card lock
|
||||
|
|
@ -920,11 +922,10 @@ static void UIFlowMovie_OnExeRecord(lv_obj_t* obj)
|
|||
|
||||
}
|
||||
|
||||
// if (System_GetState(SYS_STATE_CARD) == CARD_REMOVED) {
|
||||
|
||||
// UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_PLEASE_INSERT_SD, warn_msgbox_auto_close_ms);
|
||||
// return;
|
||||
// }
|
||||
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);
|
||||
printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1178,10 +1179,17 @@ static void UIFlowMovie_WR_ERROR(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA*
|
|||
set_rec_status(false);
|
||||
update_max_rec_time();
|
||||
lv_obj_set_hidden(image_rec_ellipse_scr_uiflowmovie, true);
|
||||
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);
|
||||
printf("[%s:%d] card removed\n", __FUNCTION__, __LINE__);
|
||||
lv_group_send_data(gp, LV_KEY_ENTER);
|
||||
return;
|
||||
}
|
||||
if (System_GetState(SYS_STATE_CARD) == CARD_LOCKED) {
|
||||
gMovData.State = MOV_ST_WARNING_MENU;
|
||||
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_IMG_ID_ICON_SD_LOCK, warn_msgbox_auto_close_ms);
|
||||
} else {
|
||||
|
||||
gMovData.State = MOV_ST_WARNING_MENU;
|
||||
UIFlowWrnMsgAPI_Open_StringID(LV_PLUGIN_STRING_ID_STRID_MEMORYERROR, warn_msgbox_auto_close_ms);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -76,6 +76,7 @@ static BOOL g_SysStrg_Chg = true;
|
|||
static int cnt = 0;
|
||||
static int first_check_storage = 1;
|
||||
|
||||
|
||||
#define FREE_SIZE_MB 30
|
||||
|
||||
static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key);
|
||||
|
|
@ -755,7 +756,7 @@ static void update_sd_emmc_status(void)
|
|||
diskFreeEmmc = FileSys_GetDiskInfoEx('B', FST_INFO_FREE_SPACE);
|
||||
}
|
||||
lv_obj_set_hidden(label_7_scr_uiflowphoto, showError);
|
||||
//lv_obj_set_pos(label_7_scr_uiflowphoto, 65, 171);
|
||||
//lv_obj_set_x(label_7_scr_uiflowphoto, 65);
|
||||
lv_label_set_text(label_7_scr_uiflowphoto, "");
|
||||
set_warning_label_text(label_7_scr_uiflowphoto);
|
||||
|
||||
|
|
@ -791,6 +792,7 @@ static void update_sd_emmc_status(void)
|
|||
idRight = LV_PLUGIN_IMG_ID_SF_SD_EMMC_DIS;
|
||||
textLabel = "No SD Card";
|
||||
textLabelError = "EMMC Error, Please format it";
|
||||
lv_obj_set_x(label_7_scr_uiflowphoto, 65);
|
||||
setWarning = true;
|
||||
showError = false;
|
||||
}
|
||||
|
|
@ -835,6 +837,7 @@ static void update_sd_emmc_status(void)
|
|||
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
|
||||
textLabel = Get_FreePicNumString(g_uiFreePicNum);
|
||||
textLabelError = "SD Card Error, Please format it";
|
||||
lv_obj_set_x(label_7_scr_uiflowphoto, 56);
|
||||
setWarning = false;
|
||||
showError = false;
|
||||
}
|
||||
|
|
@ -855,6 +858,7 @@ static void update_sd_emmc_status(void)
|
|||
UIStorageCheck(STORAGE_CHECK_FULL, &g_uiFreePicNum);
|
||||
textLabel = Get_FreePicNumString(g_uiFreePicNum);
|
||||
textLabelError = "EMMC Error, Please format it";
|
||||
lv_obj_set_x(label_7_scr_uiflowphoto, 62);
|
||||
setWarning = false;
|
||||
showError = false;
|
||||
}
|
||||
|
|
@ -865,6 +869,7 @@ static void update_sd_emmc_status(void)
|
|||
textLabel = "SD CARD Error";
|
||||
lv_obj_set_pos(label_7_scr_uiflowphoto, 10, 171);
|
||||
textLabelError = "EMMC and SD Card Error, Please format it";
|
||||
lv_obj_set_x(label_7_scr_uiflowphoto, 10);
|
||||
setWarning = true;
|
||||
showError = false;
|
||||
}
|
||||
|
|
@ -874,6 +879,7 @@ static void update_sd_emmc_status(void)
|
|||
idRight = LV_PLUGIN_IMG_ID_SF_SD_EMMC_DIS;
|
||||
textLabel = "SD CARD Full";
|
||||
textLabelError = "EMMC Error, Please format it";
|
||||
lv_obj_set_x(label_7_scr_uiflowphoto, 62);
|
||||
setWarning = true;
|
||||
showError = false;
|
||||
}
|
||||
|
|
@ -894,6 +900,7 @@ static void update_sd_emmc_status(void)
|
|||
idRight = LV_PLUGIN_IMG_ID_SF_EMMC_FULL;
|
||||
textLabel = "SD CARD Error";
|
||||
textLabelError = "SD Card Error, Please format it";
|
||||
lv_obj_set_x(label_7_scr_uiflowphoto, 62);
|
||||
setWarning = true;
|
||||
showError = false;
|
||||
}
|
||||
|
|
@ -2011,6 +2018,7 @@ void UIFlowPhoto_UpdateInfo(lv_obj_t* obj, const LV_USER_EVENT_NVTMSG_DATA* msg)
|
|||
|
||||
return ;
|
||||
}
|
||||
|
||||
static void sf_show_send_text(lv_obj_t* obj, const unsigned short status)
|
||||
{
|
||||
#define SENDING_KEEP_SHOW_TIME_S 3
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user