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

Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
miggaze 2022-08-23 16:45:05 +07:00
commit 012febb4f2
13 changed files with 48 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

18
xml/page_brewing3.xml
View file

@ -201,14 +201,15 @@
EndIf
DEBUGVAR LastMakeDrinkResult
If LastMakeDrinkResult = "success" Then
Var MachineState_Result = 1
EndIf
If LastMakeDrinkResult = "fail" Then
Var MachineState_Result = 2
SAVELOG "LastMakeDrinkResult is 2"
Var MachineState_Result = 2
EndIf
@ -374,6 +375,8 @@
Var Timeout = Timeout + 1
DEBUGVAR MachineState_Result
If MOVE_CUP_TO_DOOR = "true" Then
Var MOVE_CUP_TO_DOOR = "false"
@ -426,6 +429,7 @@
If Timeout > 480 Then
SAVELOG " Timeout > 480"
Var MachineState_Result = 2
EndIf
@ -548,6 +552,7 @@
Var waitAckPay = 2
Var Timeout = 5
Var ActionOKCase = 1
SAVELOG "ActionOKCase = change OK 2"
EndIf
EndIf
@ -608,6 +613,7 @@
Var waitAckPay = 2
Var Timeout = 5
Var ActionOKCase = 1
SAVELOG "ActionOKCase = change time out"
EndIf
EndIf
@ -652,6 +658,7 @@
PAYEXT SVT ACC VendingTSIDTmp DEE
Var ActionOKCase = 1
SAVELOG "ActionOKCase = change OK 3"
If Seeker.CodeChannel = 0 Then
SAVELOG "back_to_main from line > 391."
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
@ -667,7 +674,7 @@
EndIf
If MachineState_Result = 1 Then
;Var MachineState_Result = 2
EndIf
If MachineState_Result = 1 Then
@ -884,6 +891,7 @@
If RoadShow = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
Else
SAVELOG " drink-failed...."
Var MachineState_Result = 2
EndIf
EndIf
@ -1009,10 +1017,14 @@
Var MachineState_Result = 1
EndIf
DEBUGVAR MachineStage
If MachineStage = "drink-failed" Then
If RoadShow = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_error.xml"
Else
SAVELOG "Event Machine drink fail"
Var MachineState_Result = 2
EndIf
EndIf

18
xml/page_camera.xml
View file

@ -44,15 +44,21 @@
</EventChangeStatus>
<CameraX>
<X> 0 </X>
<Y> 381 </Y>
<X> 753 </X>
<Y> 1394 </Y>
<Name>"usbfront"</Name>
;<Width> 1280 </Width>
;<Height> 720 </Height>
<Width> 700 </Width>
<Height> 394 </Height>
<Width> 326 </Width>
<Height> 236 </Height>
</CameraX>
;<CameraX>
;<X> 0 </X>
;<Y> 381 </Y>
;<Name>"usbfront"</Name>
;<Width> 700 </Width>
;<Height> 394 </Height>
;</CameraX>
<EventCamera>
DEBUGVAR BugFlag
If BugFlag = 0 Then

12
xml/page_topping_select4.xml
View file

@ -396,11 +396,13 @@
CRLFToSpace showname
CRLFToSpace showdesc
If SelectDrinkType = 1 Then
If show_eng = "true" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
If BGSugar = "Enable" Then
If SelectDrinkType = 1 Then
If show_eng = "true" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
EndIf
EndIf
EndIf