pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge origin/masterpiece into smoothie_tbp

Browse source
This commit is contained in:
Ittipat Lusuk 2025-05-13 09:59:33 +07:00
commit 678a79ae83
80 changed files with 10192 additions and 14079 deletions
Download patch file Download diff file Expand all files Collapse all files

60
inter/tha/xml/page_smoothie_suggest_and_process.xml
View file

@ -6,7 +6,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
SAVELOG "======================================= page_smoothie_suggest_and_process.xml ================================"
SAVELOG "======================================= page_smoothie_suggest_and_process.xml == Version 1.02 =============================="
; On open
TopView "show"
@ -86,7 +86,7 @@
Var TextDoorButtonID = 001202
Var SmoothieProcessState = "idle"
Var CountDownCertainConfuse = 5
Var CountDownCertainConfuse = 2
Var ArmIDForMakeOrder = 0
@ -102,6 +102,7 @@
DEBUGVAR ArmIDForMakeOrder
__CMD "ui-load-playlist" 0 SelectDrink "-"
Var CountDownCupStageRunningTimeout = 15
</EventOpen>
<Timeout> 1000 </Timeout>
@ -165,7 +166,9 @@
Var TimeOutSmoothiesProcess = TimeOutSmoothiesProcess - 1
EndIf
EndIf
If TimeOutSmoothiesProcess = 2 Then
Machine DoorClose
EndIf
If TimeOutSmoothiesProcess = 0 Then
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_3.xml"
EndIf
@ -177,15 +180,14 @@
DEBUGVAR CH9994_Status
DEBUGVAR HaveCup
DEBUGVAR CupOnArm
DEBUGVAR CountDownCupStageRunningTimeout
DEBUGVAR DoorCupPosition
DEBUGVAR CupChecking
DEBUGVAR CupArmMove
DEBUGVAR buttonRemoveCup
DEBUGVAR SmoothieProcessState
DEBUGVAR AnyArmConfuse
DEBUGVAR SensorDoorCupStatus
DEBUGVAR ArmIDForMakeOrder
DEBUGVAR CountDownCertainConfuse
If ArmIDForMakeOrder = 2 Then
Var ChannelArmForProccessStatus = CH9992_Status
@ -207,7 +209,8 @@
Else
If SmoothieProcessState = "insert" Then
Var TextDoorButtonID = 001203
Machine CheckCupCurrentProcess
Var SmoothieProcessState = "checking"
Else
EndIf
@ -237,6 +240,11 @@
If AnyArmConfuse = 1 Then
If CountDownCertainConfuse = 0 Then
SAVELOG " CountDownCertainConfuse CountDownCertainConfuse "
Var CountDownCertainConfuse = 10
EndIf
If CountDownCertainConfuse > 0 Then
Var CountDownCertainConfuse = CountDownCertainConfuse - 1
@ -245,9 +253,23 @@
EndIf
EndIf
EndIf
If SmoothieProcessState = "checking" Then
If CountDownCupStageRunningTimeout > 0 Then
Var CountDownCupStageRunningTimeout = CountDownCupStageRunningTimeout - 1
EndIf
If CountDownCupStageRunningTimeout = 0 Then
Var SmoothieProcessState = "idle"
Var TextDoorButtonID = 001202
EndIf
EndIf
Else
If ChannelArmForProccessStatus = "RUNNING" Then
Var SmoothieProcessState = "blendnow"
EndIf
EndIf
@ -255,13 +277,7 @@
If SmoothieProcessState = "blendnow" Then
Var TextDoorButtonID = 001206
Var SelectDrink = Seeker.selected_a_drink
Var SelectSugarID = ""
Machine StrawOrder
Topping "Select" SelectDrink
Var SmoothieProcessState = "blending"
@ -283,10 +299,9 @@
Refresh
TimerReset
</EventTimeout>
; setvarint TimeOutSmoothiesProcess 2
;DEBUGVAR Var [ChannelArmForProccessStatus] = RUNNING
;include="ROOT/taobin_project/inc/video.inc"
<Image>
<X> 0 </X>
@ -399,10 +414,13 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG " SmoothieProcessState press "
Var SmoothieProcessState = "press"
If DoorCupPosition = "top" Then
Else
Var CountDownCupStageRunningTimeout = 15
Var CountDownCertainConfuse = 2
Var ArmIDForMakeOrderStr = "" + ArmIDForMakeOrder
DEBUGVAR ArmIDForMakeOrderStr
__CMD "UseArm" ArmIDForMakeOrderStr "-" "-"
@ -462,11 +480,15 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG " Cancel order press "
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
If DoorCupPosition = "bottom" Then
Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_2.xml"
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process_2.xml"
EndIf
</EventClick>
</Button>
@ -511,7 +533,7 @@
<Width> 1080 </Width>
<Align> end </Align>
<Color> 0xFF0000 </Color>
<Value> "V01 "</Value>
<Value> "V102 "</Value>
</Text>