Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
6ea6c9dc10
9221 changed files with 673077 additions and 21007 deletions
|
|
@ -247,7 +247,7 @@
|
|||
AddData 50 dummyPhone param1 param2 param3
|
||||
EndIf
|
||||
|
||||
SAVELOG "drinkok.xml version 3"
|
||||
SAVELOG "drinkok.xml version 4"
|
||||
|
||||
Var DrinkNameOnArm[DrinkArmCupID] = Seeker.showname
|
||||
Var DrinkImageOnArm[DrinkArmCupID] = Seeker.PictureDrink
|
||||
|
|
@ -257,6 +257,13 @@
|
|||
DEBUGVAR DrinkImageOnArm[DrinkArmCupID]
|
||||
DEBUGVAR DrinkNameOnArm[DrinkArmCupID]
|
||||
|
||||
Var TextDoorJamStage = "Invisible"
|
||||
Var CountUpDoorJamAlert = 0
|
||||
Var BlinkUpDoorJamAlert = 0
|
||||
|
||||
|
||||
Var EnableDoorJamAlert = 0
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 500 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -280,7 +287,8 @@
|
|||
Var Timeout = Timeout + 1
|
||||
|
||||
If Timeout = 2 Then
|
||||
Var SlientRefreshEnable = 1
|
||||
;Var SlientRefreshEnable = 1
|
||||
;Var SlientRefreshIndex = 2
|
||||
EndIf
|
||||
|
||||
If BrewTimeoutExtend = 1 Then
|
||||
|
|
@ -423,10 +431,56 @@
|
|||
If txtDrinkOKState = "Enable" Then
|
||||
Var TextBottomShow = "Invisible"
|
||||
Else
|
||||
Var TextBottomShow = "Enable"
|
||||
;Var TextBottomShow = "Enable"
|
||||
EndIf
|
||||
|
||||
If EnableDoorJamAlert = 1 Then
|
||||
|
||||
Var BlinkUpDoorJamAlert = BlinkUpDoorJamAlert + 1
|
||||
|
||||
|
||||
If DOOR_CUP_OPEN_ERROR = "true" Then
|
||||
Var CountUpDoorJamAlert = CountUpDoorJamAlert + 1
|
||||
EndIf
|
||||
If DOOR_CUP_CLOSE_ERROR = "true" Then
|
||||
Var CountUpDoorJamAlert = CountUpDoorJamAlert + 1
|
||||
EndIf
|
||||
If CountUpDoorJamAlert > 0 Then
|
||||
DEBUGVAR CountUpDoorJamAlert
|
||||
EndIf
|
||||
|
||||
If CountUpDoorJamAlert > 8 Then
|
||||
DEBUGVAR DOOR_CUP_OPEN_ERROR
|
||||
DEBUGVAR DOOR_CUP_CLOSE_ERROR
|
||||
Var TextBottomShow = "Invisible"
|
||||
;Var TextDoorJamStage = "Enable"
|
||||
|
||||
|
||||
|
||||
If BlinkUpDoorJamAlert > 1 Then
|
||||
Var TextDoorJamStage = "Enable"
|
||||
Var BlinkUpDoorJamAlert = 0
|
||||
Else
|
||||
Var TextDoorJamStage = "Invisible"
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
If CountUpDoorJamAlert > 50 Then
|
||||
Var CountUpDoorJamAlert = 1
|
||||
Var TextBottomShow = "Enable"
|
||||
Var TextDoorJamStage = "Invisible"
|
||||
EndIf
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var TextDoorJamString = " Door Error. "
|
||||
Else
|
||||
Var TextDoorJamString = " ประตูมีปัญหา "
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
|
@ -501,6 +555,18 @@
|
|||
<Filename> text_bottom </Filename>
|
||||
</Image>
|
||||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 1418 </Y>
|
||||
<Size> 87 </Size>
|
||||
<Align> Center </Align>
|
||||
<Color> 0xEF4D2C </Color>
|
||||
<Font> KanitLightTTF </Font>
|
||||
<State> TextDoorJamStage </State>
|
||||
<Value> TextDoorJamString </Value>
|
||||
</Text>
|
||||
|
||||
|
||||
|
||||
<Text>
|
||||
<X> 757 </X>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue