Before pull

This commit is contained in:
kong 2022-03-24 11:42:29 +07:00
parent efacd73937
commit 7b92d69761
13 changed files with 1183 additions and 14 deletions

View file

@ -156,11 +156,6 @@
EndIf
EndIf
DEBUGVAR GetFreeFromError
If GetFreeFromError = 1 Then
Var btnAddCart = "Invisible"
EndIf
Var LidDeactiveButton = "Invisible"
Var StrawDeactiveButton = "Invisible"
@ -176,6 +171,11 @@
If new_layout = "true" Then
Var show_select_type = "Enable"
Var hot_button_state = PD_STAGE_1
Var cold_button_state = PD_STAGE_2
Var blend_button_state = PD_STAGE_3
Else
Var show_select_type = "Invisible"
EndIf
@ -184,6 +184,14 @@
DEBUGVAR PriceD1
DEBUGVAR PriceD2
DEBUGVAR PriceD3
DEBUGVAR PD_CODE1
DEBUGVAR PD_CODE2
DEBUGVAR PD_CODE3
DEBUGVAR PD_STAGE_1
DEBUGVAR PD_STAGE_2
DEBUGVAR PD_STAGE_3
@ -875,10 +883,12 @@
<Button>
<X> 456 </X>
<Y> 72 </Y>
<State> "Enable" </Stage>
<State> hot_button_state </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/bt_hot.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bt_hot_selected.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bt_hot_disable.png" ) </FilenameDisable>
<FilenameDisable2> Var( DirImage + "/bt_hot_disable2.png" ) </FilenameDisable2>
<FilenameForce> Var( DirImage + "/bt_hot_selected.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -886,16 +896,42 @@
SAVELOG "Press hot"
Var hot_button_state = "PressForever"
If cold_button_state = "Disable" Then
Else
If cold_button_state = "Diable2" Then
Else
Var cold_button_state = "Enable"
EndIf
EndIf
If blend_button_state = "Disable" Then
Else
If blend_button_state = "Disable2" Then
Else
Var blend_button_state = "Enable"
EndIf
EndIf
Refresh
</EventClick>
</Button>
<Button>
<X> 614 </X>
<Y> 72 </Y>
<State> "Enable" </Stage>
<State> cold_button_state </Stage>
<Mode> "No" </Mode>
<Filename> Var( DirImage + "/bt_cold.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bt_cold_selected.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bt_cold_disable.png" ) </FilenameDisable>
<FilenameDisable2> Var( DirImage + "/bt_cold_disable2.png" ) </FilenameDisable2>
<FilenameForce> Var( DirImage + "/bt_cold_selected.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
@ -903,6 +939,21 @@
SAVELOG "Press cold"
Var cold_button_state = "PressForever"
If hot_button_state = "Disable" Then
Else
Var hot_button_state = "Enable"
EndIf
If blend_button_state = "Disable" Then
Else
Var blend_button_state = "Enable"
EndIf
Refresh
</EventClick>
</Button>
@ -911,22 +962,35 @@
<Button>
<X> 772 </X>
<Y> 72 </Y>
<State> "Enable" </Stage>
<State> blend_button_state </Stage>
<Mode> "No" </Mode>
<Animation>
<Style> "shake-text" </Style>
<OnEvent> "OnValueChange" </OnEvent>
</Animation>
<Filename> Var( DirImage + "/bt_smoothie.png" ) </Filename>
<FilenamePress> Var( DirImage + "/bt_smoothie_selected.png" ) </FilenamePress>
<FilenameDisable> Var( DirImage + "/bt_smoothie_disable.png" ) </FilenameDisable>
<FilenameDisable2> Var( DirImage + "/bt_smoothie_disable2.png" ) </FilenameDisable2>
<FilenameForce> Var( DirImage + "/bt_smoothie_selected.png" ) </FilenameForce>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
SAVELOG "Press cold"
SAVELOG "Press blend"
Var blend_button_state = "PressForever"
If hot_button_state = "Disable" Then
Else
Var hot_button_state = "Enable"
EndIf
If cold_button_state = "Disable" Then
Else
Var cold_button_state = "Enable"
EndIf
Refresh
</EventClick>
</Button>