diff --git a/inter/tha/hardware/powder_schedule_v2.ev b/inter/tha/hardware/powder_schedule_v2.ev index 8123d9f4..a6933e61 100644 --- a/inter/tha/hardware/powder_schedule_v2.ev +++ b/inter/tha/hardware/powder_schedule_v2.ev @@ -10,27 +10,28 @@ DEBUGVAR PowderPayPushLowScheduleTurnOn10 If SystemTimeHourInt = 3 Then If SystemTimeMinuteInt = 30 Then - ; idle + ; idle ; and time match - + ; setvar PowderStatus tricker If PowderStatus = "" Then Var PowderStatus = "tricker" Var PowderTestStep = 1 - + EndIf EndIf If PowderStatus = "tricker" Then If SystemTimeMinuteInt = 60 Then - ; idle + ; idle ; and time match - - Var PowderStatus = "" + + Var PowderStatus = "" Var PowderTestStep = 0 SAVELOG "PowderScheduleGrind reset reset reset" EndIf EndIf EndIf +; setvarint PowderTestStep 1 If PowderTestStep = 1 Then If CurrentXMLFileName0 = "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml" Then Var PowderTestStep = 0 @@ -50,10 +51,10 @@ Else DEBUGVAR PowderScheduleGrind DEBUGVAR PowderDriverToLowPositionResult - If PowderScheduleGrind = "start" Then - + If PowderScheduleGrind = "start" Then + Var PowderScheduleGrind = "powder-run" - + EndIf Var StringCMD = "powder-set-time-for-low-push-stage=1," @@ -99,9 +100,9 @@ Else __CMD "CLI" "arm_id=1,arm_position=posi_ice_e" "-" "-" __CMD "CLI_QUEUE" StringCMD "-" "-" DEBUGVAR PowderScheduleGrind - + EndIf - + If PowderScheduleGrind = "wait-low-test" Then DEBUGVAR PowderDriverToLowPositionResult If PowderDriverToLowPositionResult = "" Then @@ -110,7 +111,7 @@ Else If PowderDriverToLowPositionResult = "pass" Then SAVELOG " Powder driver low test channel pass pass pass pass pass pass pass pass pass " Var PowderScheduleGrind = "" - + Else SAVELOG " Powder driver low test channel error " Var PowderScheduleGrind = "" @@ -119,6 +120,6 @@ Else EndIf EndIf - + EndIf diff --git a/inter/tha/menu/lang.tsv b/inter/tha/menu/lang.tsv index e7605bb6..fd7ae5a2 100644 --- a/inter/tha/menu/lang.tsv +++ b/inter/tha/menu/lang.tsv @@ -1274,7 +1274,7 @@ 1300008 1. Select beans 1. เลือกเมล็ดกาแฟ 1300009 2. Select direction 2. เลือกทิศทาง 1300010 Draw back หมุนกลับ -1300011 Grind beans บดถั่ว +1300011 Grind beans บดเมล็ดถั่ว 1300012 Grind sizes ขนาดบด 1300013 Standard มาตรฐาน 1300014 Result ผลลัพธ์ diff --git a/inter/tha/xml/multi/control_and_lang_swith.ev b/inter/tha/xml/multi/control_and_lang_swith.ev index 9e796b8d..880aea8d 100644 --- a/inter/tha/xml/multi/control_and_lang_swith.ev +++ b/inter/tha/xml/multi/control_and_lang_swith.ev @@ -93,8 +93,8 @@ Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fr Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml" - -Var InstanceTabOpenFile15 = "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" +TabMenuLock 15 +OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml" TabMenuVisibleInst 99 diff --git a/inter/tha/xml/multi/tab_menu.lxml b/inter/tha/xml/multi/tab_menu.lxml index 5ab85361..11fe1b26 100644 --- a/inter/tha/xml/multi/tab_menu.lxml +++ b/inter/tha/xml/multi/tab_menu.lxml @@ -75,6 +75,7 @@