This commit is contained in:
kong 2021-05-10 09:55:03 +07:00
parent feda304652
commit 0f894ff53b
9 changed files with 46 additions and 22 deletions

BIN
image/topping/bn_shot_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
image/topping/bn_shot_2.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
image/topping/bp_shot_1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View file

@ -139,7 +139,7 @@
Var buttonRemoveCup = "Invisible" Var buttonRemoveCup = "Invisible"
LED LedDoorCup Blink 255 255 255 255 LED LedDoorCup 1 255 255 255 255
LED LedDoorLid Off 255 255 255 255 LED LedDoorLid Off 255 255 255 255
</EventOpen> </EventOpen>

View file

@ -82,14 +82,6 @@
If lidAndStrawOldPageIgnore = "true" Then If lidAndStrawOldPageIgnore = "true" Then
Var lidAndStrawOldPageIgnore = "false" Var lidAndStrawOldPageIgnore = "false"
If StarwState = "Press" Then
Machine Straw
LED LedDoorLid Blink 255 255 255 255
EndIf
If LidState = "Press" Then
Machine Lid
LED LedDoorLid Blink 255 255 255 255
EndIf
Open "ROOT/taobin_project/xml/page_brewing3.xml" Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf EndIf
@ -97,11 +89,13 @@
DEBUGVAR BrewParam DEBUGVAR BrewParam
DEBUGVAR IgnoreLidStraw DEBUGVAR IgnoreLidStraw
DEBUGVAR Service_LidStraw
If IgnoreLidStraw = "true" Then If IgnoreLidStraw = "true" Then
Var IgnoreLidStraw = "false" Var IgnoreLidStraw = "false"
SAVELOG "Ignore lid straw because recipe disable"
Open "ROOT/taobin_project/xml/page_brewing3.xml" Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf EndIf

View file

@ -20,8 +20,13 @@
StopLongPlay StopLongPlay
LED LedDoorCup On 255 0 0 255 If LEDSet = "true" Then
LED LedDoorLid Off 255 255 255 255
Else
LED LedDoorCup On 255 0 0 255
LED LedDoorLid Off 255 255 255 255
EndIf
</EventOpen> </EventOpen>
<Timeout> 5000 </Timeout> <Timeout> 5000 </Timeout>
<EventTimeout> <EventTimeout>
@ -31,10 +36,14 @@
If MachineStage = "show-menu" Then If MachineStage = "show-menu" Then
Var LEDSet = "false"
Open "ROOT/taobin_project/xml/page_board.xml" Open "ROOT/taobin_project/xml/page_board.xml"
EndIf EndIf
If MachineStage = "remove-cup" Then If MachineStage = "remove-cup" Then
Var LEDSet = "false"
Open "ROOT/taobin_project/xml/page_remove_cup.xml" Open "ROOT/taobin_project/xml/page_remove_cup.xml"
EndIf EndIf
@ -42,7 +51,7 @@
;Refresh ;Refresh
;TimerReset ;TimerReset
Var LEDSet = "true"
Open "ROOT/taobin_project/xml/page_show_error.xml" Open "ROOT/taobin_project/xml/page_show_error.xml"
</EventTimeout> </EventTimeout>

View file

@ -34,6 +34,18 @@
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
EndIf EndIf
DEBUGVAR StarwState
DEBUGVAR LidState
If StarwState = "Press" Then
Machine Straw
LED LedDoorLid Blink 255 255 255 255
EndIf
If LidState = "Press" Then
Machine Lid
LED LedDoorLid Blink 255 255 255 255
EndIf
</EventOpen> </EventOpen>

View file

@ -60,6 +60,7 @@
EndIf EndIf
Machine DoorClose
@ -235,6 +236,7 @@
;PressForever ;PressForever
If TOPPING1 = "Sugar" Then If TOPPING1 = "Sugar" Then
Var BGSugar = "Enable"
Var ShiftSugarStep = 1 Var ShiftSugarStep = 1
Var SugarState1 = "Enable" Var SugarState1 = "Enable"
Var SugarState2 = "Enable" Var SugarState2 = "Enable"
@ -265,6 +267,7 @@
EndIf EndIf
If TOPPING1 = "Powder Sugar" Then If TOPPING1 = "Powder Sugar" Then
Var BGSugar = "Enable"
Var ShiftSugarStep = 1 Var ShiftSugarStep = 1
Var SugarState1 = "Enable" Var SugarState1 = "Enable"
Var SugarState2 = "Enable" Var SugarState2 = "Enable"
@ -296,6 +299,7 @@
If TOPPING1 = "Sugar Premix 25" Then If TOPPING1 = "Sugar Premix 25" Then
Var BGSugar = "Enable"
Var ShiftSugarStep = 2 Var ShiftSugarStep = 2
Var SugarState2 = "Enable" Var SugarState2 = "Enable"
Var SugarState3 = "Enable" Var SugarState3 = "Enable"
@ -321,6 +325,7 @@
EndIf EndIf
If TOPPING1 = "Powder Sugar Premix 50" Then If TOPPING1 = "Powder Sugar Premix 50" Then
Var BGSugar = "Enable"
Var ShiftSugarStep = 3 Var ShiftSugarStep = 3
Var SugarState3 = "Enable" Var SugarState3 = "Enable"
Var SugarState4 = "Enable" Var SugarState4 = "Enable"
@ -341,6 +346,7 @@
EndIf EndIf
If TOPPING1 = "Powder Sugar Premix 25" Then If TOPPING1 = "Powder Sugar Premix 25" Then
Var BGSugar = "Enable"
Var ShiftSugarStep = 2 Var ShiftSugarStep = 2
Var SugarState2 = "Enable" Var SugarState2 = "Enable"
Var SugarState3 = "Enable" Var SugarState3 = "Enable"
@ -367,18 +373,21 @@
Var BGSugar = "Enable"
Var BugFlag = 1 Var BugFlag = 1
Var topping1 = toppingID1Default Var topping1 = toppingID1Default
Var ToppingGotoPayment = "false" Var ToppingGotoPayment = "false"
If show_eng = "true" Then If BGSugar = "Enable" Then
Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" If show_eng = "true" Then
Else Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3"
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" Else
Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3"
EndIf
EndIf EndIf
Refresh Refresh
@ -496,7 +505,7 @@
<EventClick> <EventClick>
Var PriceDrink = PriceDrinkTmp Var PriceDrink = PriceDrinkTmp
SAVELOG "USER press next ( topping )"
DEBUGVAR topping1 DEBUGVAR topping1
DEBUGVAR topping2 DEBUGVAR topping2
DEBUGVAR topping3 DEBUGVAR topping3
@ -688,7 +697,7 @@
Var SugarState3 = "Enable" Var SugarState3 = "Enable"
Var SugarState4 = "PressForever" Var SugarState4 = "PressForever"
Var SugarState5 = "Enable" Var SugarState5 = "Enable"
Var topping1 = toppingID1index4 Var topping1 = toppingID1index2
EndIf EndIf
@ -750,7 +759,7 @@
;-BEGIN shot layout ;-BEGIN shot layout
<Block> <Block>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 232 </Height> <Height> 224 </Height>
<MarginTop> 5 </MarginTop> <MarginTop> 5 </MarginTop>
<State> ShotCoffeeBG </State> <State> ShotCoffeeBG </State>
<Image> <Image>
@ -833,7 +842,7 @@
;-BEGIN shot layout ;-BEGIN shot layout
<Block> <Block>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 232 </Height> <Height> 224 </Height>
<MarginTop> 5 </MarginTop> <MarginTop> 5 </MarginTop>
<State> ShotCoffeePremium </State> <State> ShotCoffeePremium </State>
<Image> <Image>