merge
This commit is contained in:
commit
5c238cd286
16 changed files with 1231 additions and 118 deletions
|
|
@ -87,6 +87,21 @@
|
|||
Var SmoothieProcessState = "idle"
|
||||
Var CountDownCertainConfuse = 5
|
||||
|
||||
Var ArmIDForMakeOrder = 0
|
||||
|
||||
|
||||
If CH9992_Status = "READY" Then
|
||||
Var ArmIDForMakeOrder = 2
|
||||
EndIf
|
||||
|
||||
If CH9994_Status = "READY" Then
|
||||
;Var ArmIDForMakeOrder = 4
|
||||
EndIf
|
||||
|
||||
DEBUGVAR ArmIDForMakeOrder
|
||||
__CMD "ui-load-playlist" 0 SelectDrink "-"
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -169,8 +184,19 @@
|
|||
DEBUGVAR SmoothieProcessState
|
||||
DEBUGVAR AnyArmConfuse
|
||||
DEBUGVAR SensorDoorCupStatus
|
||||
DEBUGVAR ArmIDForMakeOrder
|
||||
|
||||
If ArmIDForMakeOrder = 2 Then
|
||||
Var ChannelArmForProccessStatus = CH9992_Status
|
||||
EndIf
|
||||
If ArmIDForMakeOrder = 4 Then
|
||||
Var ChannelArmForProccessStatus = CH9994_Status
|
||||
EndIf
|
||||
|
||||
|
||||
DEBUGVAR ChannelArmForProccessStatus
|
||||
|
||||
|
||||
Var ChannelArmForProccessStatus = CH9992_Status
|
||||
|
||||
If ChannelArmForProccessStatus = "READY" Then
|
||||
|
||||
|
|
@ -187,6 +213,9 @@
|
|||
EndIf
|
||||
Else
|
||||
If DoorCupPosition = "top" Then
|
||||
|
||||
|
||||
|
||||
Var TextDoorButtonID = 001204
|
||||
If SmoothieProcessState = "press" Then
|
||||
Var SmoothieProcessState = "insert"
|
||||
|
|
@ -228,19 +257,21 @@
|
|||
Var SelectDrink = Seeker.selected_a_drink
|
||||
Var SelectSugarID = ""
|
||||
|
||||
Machine StrawOrder
|
||||
|
||||
|
||||
Topping "Select" SelectDrink
|
||||
|
||||
Var SmoothieProcessState = "blending"
|
||||
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
If SmoothieProcessState = "blending" Then
|
||||
|
||||
|
||||
Menu "set-name" "Smoothie "
|
||||
Menu "set-image" Seeker.PictureDrink
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_payment_pack_and_send.xml"
|
||||
|
||||
EndIf
|
||||
|
|
@ -254,6 +285,8 @@
|
|||
|
||||
;DEBUGVAR Var [ChannelArmForProccessStatus] = RUNNING
|
||||
|
||||
;include="ROOT/taobin_project/inc/video.inc"
|
||||
|
||||
<Image>
|
||||
<X> 0 </X>
|
||||
<Y> 380 </Y>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue