Add file select 5

This commit is contained in:
kong 2022-02-28 22:33:45 +07:00
parent 6b2caad97a
commit 3713f62d05
18 changed files with 2057 additions and 45 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Before After
Before After

View file

@ -28,6 +28,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -13,6 +13,8 @@
DEBUGVAR SoundVolume DEBUGVAR SoundVolume
Var NextOrder = "false" Var NextOrder = "false"
@ -554,6 +556,23 @@
Else Else
Var buttonRemoveCup = "Invisible" Var buttonRemoveCup = "Invisible"
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
Refresh Refresh
TimerReset TimerReset

View file

@ -100,6 +100,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -167,6 +167,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -155,6 +155,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -143,6 +143,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -142,6 +142,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -140,6 +140,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -133,6 +133,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -139,6 +139,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -155,6 +155,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -135,6 +135,19 @@
Open CurrentXMLFileName2 Open CurrentXMLFileName2
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Var Timeout = Timeout + 1 Var Timeout = Timeout + 1
TimerReset TimerReset
</EventTimeout> </EventTimeout>

View file

@ -32,6 +32,8 @@
Var QRCODE8 = "" Var QRCODE8 = ""
Var CountStepPackPayment = 0 Var CountStepPackPayment = 0
Var CountStepForCupFlagDelay = 1
Var Seeker.TaobinErrorNetwork = 0 Var Seeker.TaobinErrorNetwork = 0
@ -126,29 +128,34 @@
</EventOpen> </EventOpen>
<Timeout> 900 </Timeout> <Timeout> 900 </Timeout>
<EventTimeout> <EventTimeout>
DEBUGVAR Seeker
DEBUGVAR HaveCup
DEBUGVAR CupChecking
DEBUGVAR CountStepPackPayment
If Seeker = "curr" Then If Seeker = "curr" Then
If web_ready = "false" Then
If MachineStage = "remove-cup" Then
SAVELOG "MachineStage = remove-cup"
If HaveCup = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
If MachineStage = "remove-cup" Then
SAVELOG "MachineStage = remove-cup"
If HaveCup = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf EndIf
EndIf If CupChecking = "true" Then
If HaveCup = "true" Then
If CupChecking = "true" Then Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
If HaveCup = "true" Then EndIf
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf EndIf
EndIf EndIf
EndIf EndIf
If CupChecking = "true" Then
Var CountStepForCupFlagDelay = 3
EndIf
If HaveCup = "true" Then
Var CountStepForCupFlagDelay = 3
EndIf
If ReadyForBrew = "false" Then If ReadyForBrew = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml" Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -162,12 +169,18 @@
EndIf EndIf
If CupChecking = "false" Then If CupChecking = "false" Then
If HaveCup = "false" Then
Var CountStepPackPayment = CountStepPackPayment + 1 Var CountStepPackPayment = CountStepPackPayment + 1
EndIf
EndIf EndIf
If CountStepPackPayment = 1 Then DEBUGVAR Seeker
DEBUGVAR HaveCup
DEBUGVAR CupChecking
DEBUGVAR CountStepPackPayment
DEBUGVAR CountStepForCupFlagDelay
If CountStepPackPayment = CountStepForCupFlagDelay Then
SAVELOG ExtendData SAVELOG ExtendData

View file

@ -16,6 +16,15 @@
Var show_error_normal = "Invisible" Var show_error_normal = "Invisible"
Var show_error_sp1 = "Enable" Var show_error_sp1 = "Enable"
If EmergencyStop = "true" Then
Var stop_now = "true"
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
Else
Var DirImage = "ROOT/taobin_project/image/vending_error"
EndIf
EndIf
If MachineStage = "mcu-upgrade" Then If MachineStage = "mcu-upgrade" Then
If show_eng = "true" Then If show_eng = "true" Then
@ -97,46 +106,61 @@
Var RandomImage = RandomImage + ".png" Var RandomImage = RandomImage + ".png"
EndIf EndIf
DEBUGVAR Seeker
DEBUGVAR DoorCupPosition
DEBUGVAR DoorLidPosition
DEBUGVAR EmergencyStop
</EventOpen> </EventOpen>
<Timeout> 5000 </Timeout> <Timeout> 5000 </Timeout>
<EventTimeout> <EventTimeout>
;SAVELOG MachineErrorDetail SAVELOG EmergencyStop
Var MachineErrorDetailAll = MachineErrorDetail + " / " If EmergencyStop = "true" Then
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var MachineErrorDetailAll = "Emergency stop!"
DEBUGVAR MachineStage EndIf
If MachineStage = "show-menu" Then Else
Var MachineErrorDetailAll = MachineErrorDetail + " / "
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
DEBUGVAR MachineStage
If MachineStage = "show-menu" Then
Var LEDSet = "false"
Open "ROOT/taobin_project/xml/page_board.xml"
EndIf
If MachineStage = "remove-cup" Then
Var LEDSet = "false" Var LEDSet = "false"
Open "ROOT/taobin_project/xml/page_board.xml" Open "ROOT/taobin_project/xml/page_remove_cup.xml"
EndIf EndIf
If MachineStage = "remove-cup" Then
Var LEDSet = "false"
Open "ROOT/taobin_project/xml/page_remove_cup.xml"
EndIf If MachineStage = "drink-failed" Then
Var FirstOpen = 1
If MachineStage = "drink-failed" Then
Var FirstOpen = 1
Var LEDSet = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
If FirstOpen = 1 Then
Var FirstOpen = 0
If MachineStage = "close-maintenance" Then
Var LEDSet = "true" Var LEDSet = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml" Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf EndIf
If FirstOpen = 1 Then
Var FirstOpen = 0
If MachineStage = "close-maintenance" Then
Var LEDSet = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml"
EndIf
EndIf
EndIf EndIf
Refresh Refresh
TimerReset TimerReset

View file

@ -190,6 +190,18 @@
EndIf EndIf
EndIf EndIf
If Seeker = "curr" Then
If DoorCupPosition = "bottom" Then
; It normal
Var EmergencyStop = "false"
Else
Var EmergencyStop = "true"
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
EndIf
EndIf
Refresh Refresh
TimerReset TimerReset
</EventTimeout> </EventTimeout>

1801
xml/page_topping_select5.xml Normal file

File diff suppressed because it is too large Load diff

View file

@ -95,8 +95,8 @@
Var RandomPromotionMyworld = 0 Var RandomPromotionMyworld = 0
Var RandomSalePackage = 0 Var RandomSalePackage = 0
Var XMLPageVersion = "6.07" Var XMLPageVersion = "6.09"
Var XMLPageVersionInt = 607 Var XMLPageVersionInt = 609
</EventOpen> </EventOpen>
<Text> <Text>