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-04 20:36:50 +08:00
commit cf943b1656
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/application/source/cardv/SrcCode/UIWnd/LVGL_SPORTCAM/UIFlowLVGL/UIFlowMenuCommonOption/UIFlowMenuCommonOptionEventCallback.c
View File

@ -372,13 +372,14 @@ static void LV_MenuCommonOption_UpdateContent(TM_MENU *pMenu)
lv_obj_set_pos(image_option1_scr_uiflowmenucommonoption, 288, 0); lv_obj_set_pos(image_option1_scr_uiflowmenucommonoption, 288, 0);
ui_hidden = false; ui_hidden = false;
} }
else if (i == 1) else if (i == 1 && (1 == SelOption))
{ {
lv_plugin_menu_select_item(menu_option, 0); lv_plugin_menu_select_item(menu_option, 0);
s_SelOption = 0; s_SelOption = 0;
SelOption = 0; SelOption = 0;
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED); lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
ui_hidden = true; ui_hidden = true;
SysSetFlag(pItem->SysFlag,0);
} }
} }
else else
@ -945,6 +946,7 @@ static void LV_MenuOption_OnOpen(lv_obj_t* obj, TM_MENU *data)
UINT32 cardStatus = System_GetState(SYS_STATE_CARD); UINT32 cardStatus = System_GetState(SYS_STATE_CARD);
if (cardStatus == CARD_REMOVED) if (cardStatus == CARD_REMOVED)
{ {
SelOption = 0;
lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED); lv_plugin_menu_set_item_state(menu_option, 1, LV_PLUGIN_MENU_ITEM_STATE_DISABLED);
} }
} }

4
code/lib/source/sifar/code/source/common/sf_common.c
View File

@ -258,7 +258,7 @@ void sf_mode_detect(void)
time=0; time=0;
printf("[*x] get pir statu : %d ...\n", sf_get_pir_statu_flag()); //printf("[*x] get pir statu : %d ...\n", sf_get_pir_statu_flag());
if((sf_get_pir_statu_flag()) && (!gpio_getPin(GPIO_KEY_TEST))) if((sf_get_pir_statu_flag()) && (!gpio_getPin(GPIO_KEY_TEST)))
{ {
timeBak++; timeBak++;
@ -284,7 +284,7 @@ void sf_mode_detect(void)
} }
else if((sf_get_pir_statu_flag()) && (CMD_FORMAT_SD_STA != sf_get_card_statu())) else if((sf_get_pir_statu_flag()) && (CMD_FORMAT_SD_STA != sf_get_card_statu()))
{ {
printf("[sf_mode_detect][*x] empezar going to pir................................\n"); //printf("[sf_mode_detect][*x] empezar going to pir................................\n");
pwroffcnt++; pwroffcnt++;
//printf("[%s:%d]pwroffcnt=%d\n",__FUNCTION__,__LINE__,pwroffcnt); //printf("[%s:%d]pwroffcnt=%d\n",__FUNCTION__,__LINE__,pwroffcnt);
//sf_enter_auto_mode_count_down_show(4 - pwroffcnt); //sf_enter_auto_mode_count_down_show(4 - pwroffcnt);