fix HEAD
This commit is contained in:
parent
410f802f51
commit
5f6b94ccf6
15 changed files with 14 additions and 275 deletions
|
|
@ -59,11 +59,11 @@
|
|||
;DEBUGVAR LidState
|
||||
DEBUGVAR BottomText
|
||||
|
||||
;If StarwState = "Press" Then
|
||||
;I f StarwState = "Press" Then
|
||||
; Machine StrawWithDelay
|
||||
; LED LedDoorLid Blink 255 255 255 255
|
||||
;EndIf
|
||||
;If LidState = "Press" Then
|
||||
;I f LidState = "Press" Then
|
||||
; Machine LidWithDelay
|
||||
; LED LedDoorLid Blink 255 255 255 255
|
||||
;EndIf
|
||||
|
|
@ -293,25 +293,20 @@
|
|||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
<<<<<<< HEAD
|
||||
Else
|
||||
=======
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
EndIf
|
||||
Else
|
||||
>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
|
||||
If CupChecking = "true" Then
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = " Please take a cup."
|
||||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
|
||||
EndIf
|
||||
Else
|
||||
If show_eng = "true" Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue