Merge remote-tracking branch 'origin/masterpiece' into th_inter
This commit is contained in:
commit
7c084cd7c6
92 changed files with 70785 additions and 21165 deletions
|
|
@ -78,15 +78,15 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/complete/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/complete_mmr/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MSC" Then
|
||||
If LanguageShow = "MSC" Then
|
||||
Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MTC" Then
|
||||
If LanguageShow = "MTC" Then
|
||||
Var DirImage = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
|
||||
EndIf
|
||||
|
||||
|
|
@ -289,10 +289,10 @@
|
|||
Var TextDoorJamStage = "Invisible"
|
||||
Var CountUpDoorJamAlert = 0
|
||||
Var BlinkUpDoorJamAlert = 0
|
||||
|
||||
|
||||
|
||||
Var EnableDoorJamAlert = 0
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 500 </Timeout>
|
||||
<EventTimeout>
|
||||
|
|
@ -454,8 +454,8 @@
|
|||
If CountryName = "Thailand" Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3"
|
||||
|
||||
If FromJemilaPro = 1 Then
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/jemila/drinkfinish.m4a"
|
||||
If SongkranSoundCampaign = 1 Then
|
||||
Var PlaySoundLag = DrinkFinishSound[SoundCampaignIndex]
|
||||
EndIf
|
||||
Else
|
||||
Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3"
|
||||
|
|
@ -495,9 +495,9 @@
|
|||
EndIf
|
||||
|
||||
If EnableDoorJamAlert = 1 Then
|
||||
|
||||
|
||||
Var BlinkUpDoorJamAlert = BlinkUpDoorJamAlert + 1
|
||||
|
||||
|
||||
|
||||
If DOOR_CUP_OPEN_ERROR = "true" Then
|
||||
Var CountUpDoorJamAlert = CountUpDoorJamAlert + 1
|
||||
|
|
@ -510,13 +510,13 @@
|
|||
EndIf
|
||||
|
||||
If CountUpDoorJamAlert > 8 Then
|
||||
DEBUGVAR DOOR_CUP_OPEN_ERROR
|
||||
DEBUGVAR DOOR_CUP_CLOSE_ERROR
|
||||
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
|
||||
|
|
@ -531,7 +531,7 @@
|
|||
Var TextBottomShow = "Enable"
|
||||
Var TextDoorJamStage = "Invisible"
|
||||
EndIf
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var TextDoorJamString = " Door Error. "
|
||||
Else
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue