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:
payton 2024-01-09 16:34:00 +08:00
commit b076336ce7
6 changed files with 22 additions and 8 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 #!/bin/bash
#用于gitlab-ci.yml编译使用 #用于gitlab-ci.yml编译使用
#make app_clean make app_clean
echo "Start compile." echo "Start compile."
export ROOT_PATH=$PWD export ROOT_PATH=$PWD
@ -9,7 +9,7 @@ export ROOT_PATH=$PWD
cd rtos cd rtos
source build/envsetup.sh source build/envsetup.sh
lunch rtos cfg_565_HUNTING_EVB_LINUX_4G_S550 gcc-6.5-newlib-2.4-2019.11-arm-ca9-eabihf 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 make all > /dev/null
cp output/application.bin ../ cp output/application.bin ../
cp output/rtos-main.bin ../ cp output/rtos-main.bin ../
@ -18,7 +18,7 @@ cp output/rtos-main.bin ../
cd $ROOT_PATH cd $ROOT_PATH
source build/envsetup.sh source build/envsetup.sh
lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01 lunch Linux cfg_565_HUNTING_EVB_LINUX_4G_S550 arm-ca9-linux-uclibcgnueabihf-8.4.01
#make clean make clean
make all > /dev/null make all > /dev/null
cd $ROOT_PATH cd $ROOT_PATH

2
code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -924,7 +924,7 @@
#define HUNTING_MCU_UART ENABLE #define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE #define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256 #define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwE101" #define SF_BASE_VERSION "7MR5RCwE102"
#define HW_S530 DISABLE #define HW_S530 DISABLE
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */

1
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonConfirm/UIFlowMenuCommonConfirmEventCallback.c
View File

@ -543,6 +543,7 @@ static void UIFlowMenuCommonConfirm_MessageBox_ValueChanged(lv_obj_t* obj, uint3
} else if (gBKGEvt == NVTEVT_BKW_ENTER_WORK_MODE) } else if (gBKGEvt == NVTEVT_BKW_ENTER_WORK_MODE)
{ {
OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF); OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
sf_set_pir_statu_flag(1);
// BKG_PostEvent(gBKGEvt); // BKG_PostEvent(gBKGEvt);
// UIFlowMenuCommonConfirm_CloseScr(); // UIFlowMenuCommonConfirm_CloseScr();
} else if (gBKGEvt) { } else if (gBKGEvt) {

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

@ -1739,6 +1739,7 @@ static void task_update_icons_timer_cb(lv_task_t* task)
else else
{ {
OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF); OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
sf_set_pir_statu_flag(1);
} }
} }
return; return;
@ -2129,6 +2130,7 @@ void UIFlowPhtot_KeyLongPress(lv_obj_t* obj, uint32_t key)
{ {
// Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO); // Ux_PostEvent(NVTEVT_SYSTEM_SHUTDOWN, 1, APP_POWER_OFF_APO);
OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF); OpenClosingScreen(DISPLAY_FINAL_DO_NOT_SHOW_POWER_OFF);
sf_set_pir_statu_flag(1);
KeyLeftPressingTimeMs = 0; KeyLeftPressingTimeMs = 0;
} }
break; break;

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

@ -7,6 +7,7 @@
#include "sf_sd_common.h" #include "sf_sd_common.h"
#include "sf_commu_mcu_reg.h" #include "sf_commu_mcu_reg.h"
#include "sf_common.h" #include "sf_common.h"
extern BOOL sf_is_usb_flag(void);
/************************************************************** /**************************************************************
* static variables * static variables
@ -42,7 +43,10 @@ static void task_msgbox_timer_cb(lv_task_t* task)
UINT16 autoOffTime = sf_get_auto_off_time(); UINT16 autoOffTime = sf_get_auto_off_time();
const lv_plugin_string_t* string = lv_plugin_get_string(msgID); const lv_plugin_string_t* string = lv_plugin_get_string(msgID);
if(sf_is_usb_flag())
{
return;
}
if (0 == autoClose || autoOffTime <= 10) if (0 == autoClose || autoOffTime <= 10)
{ {
printf("[task_msgbox_timer_cb][*x]auto close\n"); printf("[task_msgbox_timer_cb][*x]auto close\n");
@ -51,8 +55,15 @@ static void task_msgbox_timer_cb(lv_task_t* task)
msgbox_timer = NULL; msgbox_timer = NULL;
if (msgbox) if (msgbox)
{ {
printf("msg box close delay 1000.\n"); if (0 != autoClose)
lv_msgbox_start_auto_close(msgbox, 1000); {
printf("msg box close delay 1000.\n");
lv_msgbox_start_auto_close(msgbox, 1000);
}
else
{
lv_msgbox_start_auto_close(msgbox, 5000);
}
} }
if (0 == autoClose) if (0 == autoClose)
{ {

2
rtos/code/application/source/cardv/SrcCode/PrjCfg_HUNTING_S550.h
View File

@ -945,7 +945,7 @@
#define HUNTING_MCU_UART ENABLE #define HUNTING_MCU_UART ENABLE
#define HUNTING_IR_LED_940 ENABLE #define HUNTING_IR_LED_940 ENABLE
#define SF_EXIF_MN_BUF_SIZE 256 #define SF_EXIF_MN_BUF_SIZE 256
#define SF_BASE_VERSION "7MR5RCwE101" #define SF_BASE_VERSION "7MR5RCwE102"
#define DCF_DIR_NAME "MEDIA" /* 100MEDIA */ #define DCF_DIR_NAME "MEDIA" /* 100MEDIA */
#define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */ #define DCF_FILE_NAME "SYGW" /* SYFW0001.JPG */
#define SF_EMMC_DCF_FILE_NAME "SYBX" /* SYBX0001.JPG */ #define SF_EMMC_DCF_FILE_NAME "SYBX" /* SYBX0001.JPG */