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-26 09:56:31 +08:00
commit 4e877e2c2e
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 "7MR5RCwE10A" #define SF_BASE_VERSION "7MR5RCwE10B"
#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 */

15
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonItem/MenuQR.c
View File

@ -310,6 +310,7 @@ static int ProfileFocused = 0;
static unsigned char ProfileNameList[PROFILE_MAX][PROFILE_NAME_SIZE] = {0}; static unsigned char ProfileNameList[PROFILE_MAX][PROFILE_NAME_SIZE] = {0};
int ReadFile = 0; int ReadFile = 0;
int isFirst = 0; int isFirst = 0;
int isComplete = 0;
static int Countdown = 0; static int Countdown = 0;
@ -531,6 +532,7 @@ static void network_scan_task_cb(lv_task_t* task)
static void network_select_task_end(void) static void network_select_task_end(void)
{ {
isComplete = 0;
if(network_select_task) if(network_select_task)
{ {
lv_task_del(network_select_task); lv_task_del(network_select_task);
@ -542,7 +544,7 @@ static void network_select_task_cb(lv_task_t* task)
{ {
lv_obj_t* obj = (lv_obj_t*)task->user_data; lv_obj_t* obj = (lv_obj_t*)task->user_data;
if(Countdown) if(Countdown && isComplete)
{ {
printf("[%s]Countdown:%d\n", __FUNCTION__, Countdown); printf("[%s]Countdown:%d\n", __FUNCTION__, Countdown);
Countdown--; Countdown--;
@ -573,24 +575,19 @@ static void network_select_task_cb(lv_task_t* task)
stMessageBuf.cmdId = CMD_DEV; stMessageBuf.cmdId = CMD_DEV;
sf_com_message_send_to_app(&stMessageBuf); sf_com_message_send_to_app(&stMessageBuf);
Countdown = 3; Countdown = 3;
isComplete = 1;
break; break;
case 0x34:/*NETWORK_NOT_NEED_SET*/ case 0x34:/*NETWORK_NOT_NEED_SET*/
lv_label_set_text(plabel, "\n\nProfile is enabled"); lv_label_set_text(plabel, "\n\nProfile is enabled");
Countdown = 3; Countdown = 3;
while (Countdown > 0) isComplete = 1;
{
Countdown--;
usleep(1000*1000);
}
network_select_task_end();
lv_plugin_scr_close(obj, gen_nvtmsg_data(NVTRET_ENTER_MENU, 0));
hidde_Network_Selection_page();
break; break;
case 0xff: case 0xff:
break; break;
default: default:
lv_label_set_text(plabel, "\n\nCurrently network is busy, Please try it later"); lv_label_set_text(plabel, "\n\nCurrently network is busy, Please try it later");
Countdown = 3; Countdown = 3;
isComplete = 1;
break; break;
} }
} }

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 "7MR5RCwE10A" #define SF_BASE_VERSION "7MR5RCwE10B"
#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 */