Merge branch 'masterpiece' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
ce02726c99
13 changed files with 76 additions and 43 deletions
|
|
@ -2133,14 +2133,7 @@ PRICE "Reset" "-"
|
|||
|
||||
Var OpenFromPageBoard = 1
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
Else
|
||||
__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
DEBUGVAR InternationalEnable
|
||||
|
|
@ -2149,6 +2142,17 @@ PRICE "Reset" "-"
|
|||
If CurrHelpCenter = 1 Then
|
||||
OpenInst 0 "ROOT/taobin_project/xml/page_board.xml"
|
||||
Else
|
||||
|
||||
|
||||
If DoorCupPosition = "bottom" Then
|
||||
If CupOnArm = "true" Then
|
||||
|
||||
Else
|
||||
__CMD "CLI" "arm_id=3,arm_position=posi_espresso_ii" "-" "-"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
Var BaseOnPageBoard = 0
|
||||
TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue