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

Merge branch 'Branch_S550_Fast_Emmc' into Branch_S550_Fast_Emmc_Optimize

Browse Source
This commit is contained in:
sober.song 2023-12-28 13:41:56 +08:00
commit c091cc7b03
4 changed files with 21 additions and 15 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
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
make all > /dev/null
cd $ROOT_PATH

13
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/UIFlowMenuCommonItemEventCallback.c
View File

@ -79,15 +79,13 @@ static int is_camera_fw_upgrade(void)
FST_FILE hFile = NULL;
// return UPGRADABLE;
hFile = FileSys_OpenFile(FW_UPDATE_NAME, FST_OPEN_READ);
if (gBattery < 40 || hFile == NULL)
//if (gBattery < 40 || hFile == NULL)
if (hFile == NULL)
{
if (hFile != NULL)
{
FileSys_CloseFile(hFile);
}
return NOT_UPGRADABLE;
}
if (hFile != NULL)
else
{
FileSys_CloseFile(hFile);
}
@ -97,7 +95,8 @@ static int is_module_fw_upgrade(void)
{
// return UPGRADABLE;
UINT8 updateFileName[60] = {0};
if (gBattery < 40 || sf_is_4g_module_usb_update_file_exist(updateFileName) == FALSE)
//if (gBattery < 40 || sf_is_4g_module_usb_update_file_exist(updateFileName) == FALSE)
if (sf_is_4g_module_usb_update_file_exist(updateFileName) == FALSE)
{
return NOT_UPGRADABLE;
}

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

@ -778,7 +778,7 @@ static void update_camera_message(void)
else
{
set_warning_label_text(label_6_scr_uiflowphoto);
lv_label_set_text(label_6_scr_uiflowphoto, "SD Card Error");
lv_label_set_text(label_6_scr_uiflowphoto, "No SD Card");
}
#endif

11
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowWrnMsg/UIFlowWrnMsgEventCallback.c
View File

@ -327,7 +327,11 @@ void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key)
{
case LV_USER_KEY_MENU:
// message_box_wrnmsg_OnKeyMenu(msgbox);
break;
if(evt != NVTEVT_NULL){
UIFlowWrnMsg_CloseScr(evt);
}else{
UIFlowWrnMsg_CloseScr(NVTEVT_NULL);
}
//#NT#2023/11/14#Eric - begin
//#NT#Support IVOT_N12144_CO-148_A
case LV_KEY_ENTER:
@ -335,6 +339,7 @@ void message_box_wrnmsg_OnKey(lv_obj_t* msgbox, uint32_t key)
break;
//#NT#2023/11/14#Eric - end
default:
UIFlowWrnMsg_CloseScr(evt);
break;
}
@ -371,7 +376,9 @@ void message_box_wrnmsg_event_callback(lv_obj_t* obj, lv_event_t event)
msgbox = NULL;
if(msgID == LV_PLUGIN_STRING_ID_STRING_NO_SD ||
msgID == LV_PLUGIN_STRING_ID_STRING_FORMATING)
msgID == LV_PLUGIN_STRING_ID_STRING_FORMATING ||
msgID == LV_PLUGIN_STRING_ID_STRING_UPGRADE_LOWBAT ||
msgID == LV_PLUGIN_STRING_ID_STRING_UPGRADE_ERR)
{
evt = NVTRET_ENTER_MENU;
}