renovate remove cup and cup on arm
This commit is contained in:
parent
34ceea967c
commit
f6a7ec1501
57 changed files with 591 additions and 475 deletions
|
|
@ -167,10 +167,11 @@
|
|||
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
Var thankyouContiVersion = "TC12 "
|
||||
Var thankyouContiVersion = "TC13 "
|
||||
SAVELOG "Thank you conti version " + thankyouContiVersion
|
||||
SAVELOG "Support NextSmoothie and fix bug next"
|
||||
SAVELOG "DirImage detele. use DirImage2"
|
||||
SAVELOG "MenuErrorCode"
|
||||
|
||||
|
||||
DEBUGVAR NextSmoothie
|
||||
DEBUGVAR Seeker.SmoothieToPayment
|
||||
|
|
@ -210,8 +211,9 @@
|
|||
If CountDownFailErrorHappendClear = 29 Then
|
||||
__CMD "CLI" "clear-ice-for-next-drink" "-" "-"
|
||||
EndIf
|
||||
|
||||
If CountDownFailErrorHappendClear = 25 Then
|
||||
__CMD "error-code-clear-all" "-" "-" "-"
|
||||
;__CMD "error-code-clear-all" "-" "-" "-"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -313,6 +315,7 @@
|
|||
Var PictureFile = PictureFile + "1"
|
||||
Var PictureFile = PictureFile + PictureEnd
|
||||
|
||||
SAVELOG "============ Older condition ================="
|
||||
DEBUGVAR Seeker.selected_a_drink
|
||||
If NextOrderStatus = "Disable" Then
|
||||
Var LastMakeDrinkResult = "fail"
|
||||
|
|
@ -327,54 +330,6 @@
|
|||
|
||||
DEBUGVAR CountDownThankyou
|
||||
|
||||
; obsolete
|
||||
If CountDownThankyou = 99 Then
|
||||
|
||||
; reset all var
|
||||
DEBUGVAR MachineStage
|
||||
SAVELOG "CountDownThankyou = 0"
|
||||
|
||||
Var CountDownBrewing = BrewTime
|
||||
Var CountUpBrewing = 0
|
||||
SAVELOG BrewTime
|
||||
|
||||
Var ShowCountDownBrewing = CountDownBrewing
|
||||
Var MachineState_Result = 0
|
||||
|
||||
If MachineStage = "show-menu" Then
|
||||
If HaveCup = "false" Then
|
||||
|
||||
Var LastMakeDrinkResult = "-"
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
|
||||
|
||||
If CountryName = "Thailand" Then
|
||||
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
|
||||
Open Brew3Inter
|
||||
Else
|
||||
;obsolete
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
; run test;
|
||||
If CountDownThankyou = 0 Then
|
||||
|
|
@ -421,8 +376,6 @@
|
|||
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
|
|
@ -458,6 +411,7 @@
|
|||
|
||||
|
||||
;include=ROOT/taobin_project/inc/remove_cup_step.inc
|
||||
|
||||
If Timeout2 < 3 Then
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
EndIf
|
||||
|
|
@ -477,6 +431,7 @@
|
|||
EndIf
|
||||
|
||||
DEBUGVAR MenuReadyForCup
|
||||
DEBUGVAR MenuErrorCode
|
||||
|
||||
If MenuReadyForCup = "YES" Then
|
||||
|
||||
|
|
@ -515,6 +470,32 @@
|
|||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
Else
|
||||
If MenuErrorCode > 0 Then
|
||||
|
||||
If Timeout2 > 40 Then
|
||||
SAVELOG "Timeout2 40 MenuErrorCode not zero"
|
||||
|
||||
|
||||
Var error_code_stop_now = MenuErrorCode
|
||||
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
|
||||
Else
|
||||
Var error_code_stop_now = 1296
|
||||
__CMD "error-code-1296" 0 "-" "-"
|
||||
EndIf
|
||||
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
|
||||
Var LastMakeDrinkResult = "fail"
|
||||
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue