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

修改emmc和sd卡错误提示位置

Browse Source
This commit is contained in:
xiehongyan 2024-01-25 17:13:29 +08:00
parent 80ba515a4c
commit 503ec4c2d6
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_all.sh
View File

@ -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

2
code/application/source/cardv/SrcCode/System/SysStrg_CB.c
View File

@ -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

1
code/application/source/cardv/SrcCode/System/SysStrg_Exe.c
View File

@ -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;

11
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowPhoto/UIFlowPhotoEventCallback.c
View File

@ -76,6 +76,8 @@ static BOOL g_SysStrg_Chg = true;
static int cnt = 0;
static int first_check_storage = 1;
//UINT32 dcf_handle = -1;
#define FREE_SIZE_MB 30
static void UIFlowPhoto_Key(lv_obj_t* obj, uint32_t key);
@ -755,7 +757,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 +793,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 +838,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 +859,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 +870,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 +880,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 +901,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;
}
@ -2009,6 +2017,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