diff --git a/image/page2/bn_vending_machine2.png b/image/page2/bn_vending_machine2.png
new file mode 100644
index 00000000..f9fd96c5
Binary files /dev/null and b/image/page2/bn_vending_machine2.png differ
diff --git a/image/page2/bp_vending_machine2.png b/image/page2/bp_vending_machine2.png
new file mode 100644
index 00000000..7f225d4e
Binary files /dev/null and b/image/page2/bp_vending_machine2.png differ
diff --git a/image/page2_en/page2/bn_vending_machine2.png b/image/page2_en/page2/bn_vending_machine2.png
new file mode 100644
index 00000000..bb9605a8
Binary files /dev/null and b/image/page2_en/page2/bn_vending_machine2.png differ
diff --git a/image/page2_en/page2/bp_vending_machine2.png b/image/page2_en/page2/bp_vending_machine2.png
new file mode 100644
index 00000000..88d7e07e
Binary files /dev/null and b/image/page2_en/page2/bp_vending_machine2.png differ
diff --git a/image/vending_error/textspiral.png b/image/vending_error/textspiral.png
new file mode 100644
index 00000000..33f54c88
Binary files /dev/null and b/image/vending_error/textspiral.png differ
diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml
index c2d23af7..57e48af0 100644
--- a/spiral/xml/page_catalog_vending_machine.xml
+++ b/spiral/xml/page_catalog_vending_machine.xml
@@ -11,7 +11,7 @@
Var MachineSpiralStage = ""
Var SpiralOption = 0
- Var SpiralSoftwareVersion = "1.11"
+ Var SpiralSoftwareVersion = "1.12"
Var ColorBrown = 0x746253
Var ColorBrown2 = 0x513C2F
@@ -127,6 +127,21 @@
Var MenuSpiral1 = "PressForever"
Var Timeout = 0
+
+
+ If SetSpiralOnline = 1 Then
+ Var Menu1Selected = "Invisible"
+ Var Menu2Selected = "Invisible"
+ Var Menu3Selected = "Invisible"
+ Var Menu4Selected = "Invisible"
+ Var Menu5Selected = "Invisible"
+ Var Menu6Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Invisible"
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu22Selected = "Invisible"
+ EndIf
@@ -207,9 +222,14 @@
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- If SpiralOnline = "true" Then
+
+ If SpiralOnline = "true" Then
If Seeker = "curr" Then
- Open "ROOT/taobin_project/xml/page_catalog_with_vending.xml"
+ If SetSpiralOnline = 1 Then
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ Else
+ Open "ROOT/taobin_project/spiral/xml/page_catalog_vending_machine.xml"
+ EndIf
Else
Open "ROOT/taobin_project/xml/page_catalog.xml"
EndIf
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 94ed7c48..ff80ffda 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -5,7 +5,9 @@
; "0xeae6e1"
SoundVolume
-
+ If SetSpiralOnline = 1 Then
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ EndIf
If InternationalEnable = 1 Then
Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.lxml"
EndIf
diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml
index 1c051715..0a74e863 100644
--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@@ -31,6 +31,14 @@
; EndIf
;EndIf
+ If SpiralOnline = "true"
+ If show_eng = "true" Then
+ Var DirImageSpiral = "ROOT/taobin_project/image/page2_en/page2"
+ Else
+ Var DirImageSpiral = "ROOT/taobin_project/image/page2"
+ EndIf
+ EndIf
+
If MachineStage = "mcu-upgrade" Then
If show_eng = "true" Then
Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
@@ -149,6 +157,10 @@
DEBUGVAR MachineStage
DEBUGVAR NETCORE_EVENT_CNT_TMP
+ If SpiralOnline = "true" Then
+ Open "ROOT/taobin_project/xml/page_show_error_spiral.xml"
+ EndIf
+
Var EmergencyStop = "-"
If DoorCupPosition = "bottom" Then
diff --git a/xml/page_show_error_spiral.xml b/xml/page_show_error_spiral.xml
new file mode 100644
index 00000000..b0573d91
--- /dev/null
+++ b/xml/page_show_error_spiral.xml
@@ -0,0 +1,442 @@
+
+ 0
+ 608
+ "Enable"
+ 1080
+ 1312
+ "0xEAE6E1"
+ SoundVolume
+
+ Var countClick = 0
+ Var countClick2 = 0
+ Var SetSpiralOnline = 0
+
+ DEBUGVAR MachineStage
+ DEBUGVAR stop_now
+
+
+ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+
+ Var DirImage = "ROOT/taobin_project/image/vending_error"
+
+ Var show_error_normal = "Invisible"
+ 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 SpiralOnline = "true"
+ If show_eng = "true" Then
+ Var DirImageSpiral = "ROOT/taobin_project/image/page2_en/page2"
+ Else
+ Var DirImageSpiral = "ROOT/taobin_project/image/page2"
+ EndIf
+ EndIf
+
+ If MachineStage = "mcu-upgrade" Then
+ 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 NeedUpgrade = "true" Then
+ 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
+
+ DEBUGVAR stop_now
+ DEBUGVAR MachineStage
+
+ If MachineStage = "close-maintenance" Then
+ If stop_now = "true" Then
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
+ Else
+ Var DirImage = "ROOT/taobin_project/image/vending_error"
+ EndIf
+ Else
+
+ Var show_error_normal = "Enable"
+ Var show_error_sp1 = "Invisible"
+
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/close_en/"
+ Else
+ Var DirImage = "ROOT/taobin_project/image/close_th"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ DEBUGVAR DirImage
+
+ If MachineStage = "drink-failed" Then
+ If stop_now = "true" Then
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/vending_error"
+ EndIf
+ Else
+ Var show_error_normal = "Enable"
+ Var show_error_sp1 = "Invisible"
+ If show_eng = "true" Then
+ Var DirImage = "ROOT/taobin_project/image/close_en/"
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/close_th"
+ EndIf
+ EndIf
+ EndIf
+
+ If NETCORE_LOST_CNT > 0 Then
+ 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 NETCORE_EVENT_CNT_X >= 30 Then
+ Var NETCORE_EVENT_CNT_X = 0
+ 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
+
+
+ StopLongPlay
+
+ If LEDSet = "true" Then
+
+ Else
+ LED LedDoorCup On 255 0 0 255
+ LED LedDoorLid Off 255 255 255 255
+ EndIf
+
+ Var MaintenanceCard = 20
+ Random MaintenanceCard
+ Var index = 1 + MaintenanceCard
+ If show_eng = "true" Then
+ Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
+ Var RandomImage = RandomImage + ".png"
+ Else
+ Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
+ Var RandomImage = RandomImage + ".png"
+ EndIf
+
+ DEBUGVAR Seeker
+ DEBUGVAR DoorCupPosition
+ DEBUGVAR DoorLidPosition
+ DEBUGVAR EmergencyStop
+
+ Var TimeOut = 0
+ Var textStep = 0
+
+ 1000
+
+ DEBUGVAR NETCORE_LOST_CNT
+ DEBUGVAR MachineStage
+ DEBUGVAR NETCORE_EVENT_CNT_TMP
+
+ If SpiralOnline = "true" Then
+ Open "ROOT/taobin_project/xml/page_show_error_spiral.xml"
+ EndIf
+
+ Var EmergencyStop = "-"
+
+ If DoorCupPosition = "bottom" Then
+
+ If stop_now_from_door_cup = 1 Then
+ Var stop_now = "false"
+ Var EmergencyStop = "false"
+ SAVELOG "stop_now_from_door_cup is set"
+ Var stop_now_from_door_cup = 0
+ Var MachineErrorDetailAll = " --- "
+
+ EndIf
+ Else
+ Var EmergencyStop = "true"
+ EndIf
+
+ If EmergencyStop = "true" Then
+ If DoorCupPosition = "bottom" Then
+ ; It normal
+ Var EmergencyStop = "false"
+ Else
+ Var MachineErrorDetailAll = "Emergency stop!"
+
+ EndIf
+ Else
+
+ Var MachineErrorDetailAll = MachineErrorDetail + " / "
+ Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+
+ If textStep > 3 Then
+ Var textStep = 0
+ Var MachineErrorDetailAll = MachineErrorDetailAll + " [ \ ]"
+ EndIf
+ If textStep = 3 Then
+ Var MachineErrorDetailAll = MachineErrorDetailAll + " [ - ]"
+ EndIf
+ If textStep = 2 Then
+ Var MachineErrorDetailAll = MachineErrorDetailAll + " [ / ]"
+ EndIf
+ If textStep = 1 Then
+ Var MachineErrorDetailAll = MachineErrorDetailAll + " [ | ]"
+ EndIf
+
+ Var textStep = textStep + 1
+
+ ;DEBUGVAR MachineErrorDetailAll
+ ;DEBUGVAR textStep
+
+ If NETCORE_LOST_CNT > 0 Then
+
+ Else
+
+ DEBUGVAR NCIC07_EVENT_CNT
+ DEBUGVAR NETCORE_EVENT_CNT_TMP
+
+ If NCIC07_EVENT_CNT = NETCORE_EVENT_CNT_TMP Then
+
+ Var NETCORE_LOST_COUNT_UP = NETCORE_LOST_COUNT_UP + 1
+ DEBUGVAR NETCORE_LOST_COUNT_UP
+
+ If NETCORE_LOST_COUNT_UP > 300 Then
+ SAVELOG " NETCORE_LOST_COUNT_UP out !"
+ Reboot
+ EndIf
+
+ Var NETCORE_LOST_COUNT_UP_STR = " Net " + NETCORE_LOST_COUNT_UP
+
+ If textStep = 4 Then
+ Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " ###"
+ EndIf
+ If textStep = 3 Then
+ Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " ###"
+ EndIf
+ If textStep = 2 Then
+ Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " ##"
+ EndIf
+ If textStep = 1 Then
+ Var MachineErrorDetailAll = NETCORE_LOST_COUNT_UP_STR + " #"
+ EndIf
+ Else
+ ; zone all ok
+
+ If stop_now_from_netcore_event = 1 Then
+ Var stop_now = "false"
+ SAVELOG "stop_now_from_netcore_event is set"
+ Var stop_now_from_netcore_event = 0
+ EndIf
+
+
+
+ If MachineStage = "" Then
+
+ Var LEDSet = "false"
+ Open "ROOT/taobin_project/xml/page_board.xml"
+
+ EndIf
+ 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"
+ Open "ROOT/taobin_project/xml/page_remove_cup.xml"
+
+ EndIf
+
+ If MachineStage = "drink-failed" Then
+ Var FirstOpen = 1
+ Var LEDSet = "true"
+ ;Open "ROOT/taobin_project/xml/page_show_error.xml"
+ Refresh
+ 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"
+ Refresh
+
+ EndIf
+ EndIf
+ EndIf
+ EndIf
+
+
+
+
+ EndIf
+
+ Var TimeOut = TimeOut + 1
+ If TimeOut > 60 Then
+ Var TimeOut = 0
+ Open "ROOT/taobin_project/xml/page_show_error.xml"
+
+ EndIf
+
+ Refresh
+ TimerReset
+
+ Var LEDSet = "true"
+ ;Open "ROOT/taobin_project/xml/page_show_error.xml"
+
+
+
+ show_error_normal
+ 127
+ 688
+ Var(DirImage + "/img1.png")
+
+
+
+ show_error_normal
+ 0
+ 924
+ RandomImage
+
+
+;
+; show_error_sp1
+; 0
+; 897
+; Var(DirImage + "/img1.png")
+;
+
+
+ show_error_sp1
+ 0
+ 694
+ Var(DirImage + "/textspiral.png")
+
+
+
+ show_error_sp1
+ 0
+ 1685
+ Var(DirImage + "/text2.png")
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 5
+ 1868
+ 24
+ Center
+ 1080
+ RobotoRegular
+ 0xDE794E
+ MachineErrorDetailAll
+
+
+
+ PushFile "/sdcard/" "RootManPicture" "scn_240703193755.png"
+
+
+
\ No newline at end of file