diff --git a/xml/page_NewBrewing3.xml b/xml/page_NewBrewing3.xml index 15b9f48a..aca7dec0 100644 --- a/xml/page_NewBrewing3.xml +++ b/xml/page_NewBrewing3.xml @@ -852,8 +852,8 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" - LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf If BREW_CNT = 0 Then diff --git a/xml/page_NewBrewing3Conti.xml b/xml/page_NewBrewing3Conti.xml index a69d4cac..51c3af99 100644 --- a/xml/page_NewBrewing3Conti.xml +++ b/xml/page_NewBrewing3Conti.xml @@ -309,8 +309,8 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" - LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf If CountDownBrewing = 0 Then diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index 64f96289..c871e9c0 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -932,7 +932,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf DEBUGVAR EnableDoubleCupNoError diff --git a/xml/page_brewing3Conti.xml b/xml/page_brewing3Conti.xml index ab4be42f..5d5d46c1 100644 --- a/xml/page_brewing3Conti.xml +++ b/xml/page_brewing3Conti.xml @@ -397,8 +397,8 @@ If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" - LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf diff --git a/xml/page_collect_point_1-2.xml b/xml/page_collect_point_1-2.xml index c7616d23..d6e33790 100644 --- a/xml/page_collect_point_1-2.xml +++ b/xml/page_collect_point_1-2.xml @@ -50,7 +50,7 @@ DEBUGVAR Timeout If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf Var Timeout = Timeout + 1 diff --git a/xml/page_collect_point_1-3.xml b/xml/page_collect_point_1-3.xml index 79dc5c64..fc052675 100644 --- a/xml/page_collect_point_1-3.xml +++ b/xml/page_collect_point_1-3.xml @@ -154,7 +154,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf StrLen TelephoneNumber TelNumLen diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index 248bf51c..dce3e3f6 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -243,7 +243,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf diff --git a/xml/page_collect_point_2.xml b/xml/page_collect_point_2.xml index 11443566..eb9b0a42 100644 --- a/xml/page_collect_point_2.xml +++ b/xml/page_collect_point_2.xml @@ -77,7 +77,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf diff --git a/xml/page_collect_point_3.xml b/xml/page_collect_point_3.xml index 383a1ff1..2afdbd0b 100644 --- a/xml/page_collect_point_3.xml +++ b/xml/page_collect_point_3.xml @@ -975,7 +975,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf diff --git a/xml/page_collect_point_3_28.xml b/xml/page_collect_point_3_28.xml index ab68fb01..584be904 100644 --- a/xml/page_collect_point_3_28.xml +++ b/xml/page_collect_point_3_28.xml @@ -959,7 +959,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf diff --git a/xml/page_collect_point_3_28_lucky_draw_campaign.xml b/xml/page_collect_point_3_28_lucky_draw_campaign.xml index 0bab64ba..eb652e6c 100644 --- a/xml/page_collect_point_3_28_lucky_draw_campaign.xml +++ b/xml/page_collect_point_3_28_lucky_draw_campaign.xml @@ -1058,7 +1058,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml index 1fcad825..1aae239b 100644 --- a/xml/page_display_get_free.xml +++ b/xml/page_display_get_free.xml @@ -95,7 +95,7 @@ Var ShowCountDownBrewing = CountDownBrewing If FrontDoorVersionInt > 19999 Then - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" EndIf Var Timeout = Timeout + 1 diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index e04c7087..88cd1c61 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -317,7 +317,7 @@ Else Var ShowNameMysteryName = Seeker.shownameMystery EndIf - + If CatalogLayoutV3 = 1 Then SCROLL_TO_TOP "5" SCROLL_TO_TOP "6" @@ -331,7 +331,7 @@ EndIf If FrontDoorVersionInt > 19999 Then - LEDv4Playlist "reset" "-" "-" + ;LEDv4Playlist "reset" "-" "-" TRY "ROOT/taobin_project/xml/process/temp_ledv4_page_drinkok.ev" EndIf diff --git a/xml/page_test_color.xml b/xml/page_test_color.xml index b0be7a7b..387e183e 100644 --- a/xml/page_test_color.xml +++ b/xml/page_test_color.xml @@ -220,7 +220,7 @@ EndIf If LEDv4PlaylistStatus = "Running" Then - LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES EndIf EndIf diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml index 5863b587..4b7694d8 100644 --- a/xml/page_thankyou.xml +++ b/xml/page_thankyou.xml @@ -221,7 +221,7 @@ Var CountDownBrewing = BREW_CNT - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" Var TimeoutThankyou = TimeoutThankyou + 1 If TimeoutThankyou = TimeoutToNext Then diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 1826a5fd..5758b5a4 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -17,7 +17,7 @@ SAVELOG BrewTime Var ShowCountDownBrewing = CountDownBrewing - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" Var Timeout = 0 Var ChangeFlag = 0 @@ -174,7 +174,7 @@ SAVELOG "Thank you conti version " + thankyouContiVersion SAVELOG "Support NextSmoothie and fix bug next" SAVELOG "MenuErrorCode" - + DEBUGVAR NextSmoothie DEBUGVAR Seeker.SmoothieToPayment @@ -189,7 +189,7 @@ Var CountDownFailErrorHappendClear = 30 Var ThankyouContiString = "" - + DEBUGVAR FailErrorHappend ; setvarint FailErrorHappend 1 @@ -214,10 +214,10 @@ If CountDownFailErrorHappendClear = 29 Then __CMD "CLI" "clear-ice-for-next-drink" "-" "-" EndIf - + If CountDownFailErrorHappendClear = 25 Then ;__CMD "error-code-clear-all" "-" "-" "-" - + EndIf Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1 @@ -348,17 +348,17 @@ Var ShowCountDownBrewing = CountDownBrewing - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" Var MachineState_Result = 0 - + If FailErrorHappend = 1 Then EndIf If MenuReadyForCup = "YES" Then - + Var LastMakeDrinkResult = "-" If New_Payment = 1 Then @@ -371,7 +371,7 @@ Var NextSmoothie = 0 If Seeker.SmoothieToPayment = 1 Then Var TimeOutSmoothiesProcess = 120 - + OpenInst 3 "ROOT/taobin_project/xml/topview2.xml" Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml" EndIf @@ -416,11 +416,11 @@ Var ShowCountDownBrewing = CountDownBrewing - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" ;include=ROOT/taobin_project/inc/remove_cup_step.inc - + If Timeout2 < 3 Then Var buttonRemoveCup = "Invisible" EndIf @@ -482,7 +482,7 @@ Else If MenuErrorCode > 0 Then - + If Timeout2 > 40 Then SAVELOG "Timeout2 40 MenuErrorCode not zero" diff --git a/xml/page_thankyouMore.xml b/xml/page_thankyouMore.xml index d03b7b4b..d685306c 100644 --- a/xml/page_thankyouMore.xml +++ b/xml/page_thankyouMore.xml @@ -26,30 +26,30 @@ Var MachineState_Result = 0 Var ChangeOK = 0 - - If show_eng = "true" Then - Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" + + If show_eng = "true" Then + Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png" Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" Var BottomText = PicturePath + "text_bottom_eng.png" - + Else - Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" + Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var BottomText = PicturePath + "text_bottom_thai2.png" EndIf ;inter-image - If LanguageShow = "MYANMAR" Then + If LanguageShow = "MYANMAR" Then Var BottomText = PicturePath + "text_bottom_eng.png" Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr" EndIf - If LanguageShow = "MSC" Then + If LanguageShow = "MSC" Then Var BottomText = PicturePath + "text_bottom_eng.png" @@ -60,7 +60,7 @@ DEBUGVAR LidState DEBUGVAR BottomText - + If StarwState = "Press" Then Machine StrawWithDelay LED LedDoorLid Blink 255 255 255 255 @@ -72,7 +72,7 @@ - + If CART_INDEX = 2 Then Var showname = CART2_NAME_THAI @@ -87,22 +87,22 @@ EndIf - - + + 1000 - + Var CountDownBrewing = CountDownBrewing - 1 Var CountDownThankyou = CountDownThankyou - 1 - Var Timeout = Timeout + 1 + Var Timeout = Timeout + 1 If Timeout = 3 Then - If CART_INDEX = 0 Then + If CART_INDEX = 0 Then Else ;Cart "MakeID" CART_INDEX - + Var VideoPath = "/mnt/sdcard/coffeevending/taobin_project/animation01/" Var VideoFileBegin = "TaoBin2_draft02_art" Var VideoFileEnd = ".mp4" @@ -123,22 +123,22 @@ EndIf - + EndIf ; run test; - If CountDownThankyou = 0 Then - + If CountDownThankyou = 0 Then + Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 SAVELOG BrewTime Var ShowCountDownBrewing = CountDownBrewing - TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + ;TRY "ROOT/taobin_project/xml/process/ledv4_process.ev" + + Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" - Open "ROOT/taobin_project/xml/page_brewing3Multi.xml" - EndIf Var ShowCountDownBrewing = CountDownBrewing @@ -147,7 +147,7 @@ Refresh TimerReset - + ; ; 0 @@ -185,8 +185,8 @@ - If ChangeStatus = "payout-end" Then - + If ChangeStatus = "payout-end" Then + EndIf diff --git a/xml/process/ledv4_process.ev b/xml/process/ledv4_process.ev index 558e2079..61a13e97 100644 --- a/xml/process/ledv4_process.ev +++ b/xml/process/ledv4_process.ev @@ -2,7 +2,7 @@ DEBUGVAR FrontDoorVersionInt If FrontDoorVersionInt > 19999 Then DEBUGVAR StartLEDBrewingAnimation If StartLEDBrewingAnimation = 0 Then - LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing + ;LEDv4Playlist "new" Seeker.selected_a_drink CountDownBrewing Var StartLEDBrewingAnimation = 1 EndIf @@ -17,7 +17,7 @@ If FrontDoorVersionInt > 19999 Then Else ; If LEDv4PlaylistStatus = "Running" Then - LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES + ;LEDv2 GEN4_POS On 100 20 0 LED_TIMES LED_DIM_TIMES Else LEDv4Playlist "pause" "processEv" "_notReady" EndIf