Merge branch 'smoothie_tbp' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into smoothie_tbp
This commit is contained in:
commit
a311b32d31
2 changed files with 110 additions and 102 deletions
|
|
@ -157,6 +157,8 @@
|
||||||
|
|
||||||
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
|
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
|
||||||
|
|
||||||
|
Var buttonRemoveCup = "Invisible"
|
||||||
|
|
||||||
SAVELOG "Thank you conti version TCT6"
|
SAVELOG "Thank you conti version TCT6"
|
||||||
|
|
||||||
;PendingFlag InternationalEnable
|
;PendingFlag InternationalEnable
|
||||||
|
|
@ -398,6 +400,9 @@
|
||||||
|
|
||||||
|
|
||||||
;include=ROOT/taobin_project/inc/remove_cup_step.inc
|
;include=ROOT/taobin_project/inc/remove_cup_step.inc
|
||||||
|
If Timeout2 < 3 Then
|
||||||
|
Var buttonRemoveCup = "Invisible"
|
||||||
|
EndIf
|
||||||
|
|
||||||
If buttonRemoveCup = "Invisible" Then
|
If buttonRemoveCup = "Invisible" Then
|
||||||
If show_eng = "true" Then
|
If show_eng = "true" Then
|
||||||
|
|
@ -451,6 +456,9 @@
|
||||||
EndIf
|
EndIf
|
||||||
EndIf
|
EndIf
|
||||||
|
|
||||||
|
If Timeout2 < 3 Then
|
||||||
|
Var MachineErrorDetailAll = "..."
|
||||||
|
EndIf
|
||||||
|
|
||||||
DEBUGVAR MenuReadyForCup
|
DEBUGVAR MenuReadyForCup
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue