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

This commit is contained in:
wanlop run 2025-04-01 18:20:21 +07:00
commit 33bbc3a927

View file

@ -766,7 +766,6 @@
Var MenuReasonStage = "Invisible" Var MenuReasonStage = "Invisible"
Var AdvertOpened = "false" Var AdvertOpened = "false"
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>
<EventTimeout> <EventTimeout>
@ -1894,9 +1893,15 @@
Var SpecialMix = "Enable" Var SpecialMix = "Enable"
Var showOreoAddEnable = "Disable" If showOreoAddEnable = "Enable" Then
Var showOvaltineEnable = "Disable" Var showOreoAddEnable = "Disable"
Var showCocoaEnable = "Disable" EndIf
If showOvaltineEnable = "Enable" Then
Var showOvaltineEnable = "Disable"
EndIf
If showCocoaEnable = "Enable" Then
Var showCocoaEnable = "Disable"
EndIf
@ -1906,10 +1911,6 @@
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
If cold_button_state = "PressForever" Then If cold_button_state = "PressForever" Then
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Disable"
Var showCocoaEnable = "Disable"
Var showStrawberryEnable = "Enable" Var showStrawberryEnable = "Enable"
Var showYuzuEnable = "Enable" Var showYuzuEnable = "Enable"
EndIf EndIf
@ -1919,51 +1920,30 @@
Var SpecialMix = "Enable" Var SpecialMix = "Enable"
Var CustomSyrup = "Enable" Var CustomSyrup = "Enable"
Var showOreoAddEnable = "Disable"
Var showOvaltineEnable = "Disable"
Var showCocoaEnable = "Disable"
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
EndIf EndIf
If toppingID6index3Status = "" Then
Var showCocoaEnable = "Invisible"
EndIf
If toppingID6index4Status = "" Then If toppingID6index2Status = "" Then
Var showOvaltineEnable = "Invisible"
EndIf
If toppingID6index5Status = "" Then
Var showStrawberryEnable = "Invisible" Var showStrawberryEnable = "Invisible"
EndIf EndIf
If toppingID6index6Status = "" Then If toppingID6index3Status = "" Then
Var showYuzuEnable = "Invisible" Var showYuzuEnable = "Invisible"
EndIf EndIf
If toppingID6index2Status = "Disable" Then If toppingID6index2Status = "Disable" Then
Var showOreoAddEnable = "Disable"
EndIf
If toppingID6index3Status = "Disable" Then
Var showCocoaEnable = "Disable"
EndIf
If toppingID6index4Status = "Disable" Then
Var showOvaltineEnable = "Disable"
EndIf
If toppingID6index5Status = "Disable" Then
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
EndIf EndIf
If toppingID6index6Status = "Disable" Then If toppingID6index3Status = "Disable" Then
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
EndIf EndIf
Var ExtraTopping = "Enable" Var ExtraTopping = "Enable"
@ -2032,91 +2012,29 @@
If CustomEnergyState[0] = "Enable" Then If CustomEnergyState[0] = "Enable" Then
If CustomEnergyState[1] = "Enable" Then If CustomEnergyState[1] = "Enable" Then
Var CustomEnergyState[3] = "PressForever" Var CustomEnergyState[3] = "Press"
EndIf EndIf
EndIf EndIf
Else
If CustomEnergyState[0] = "Enable" Then
Var ProductSodaDisableShot = "12-05-02-0114,12-05-02-0104,12-05-02-0094"
Var IsSodaDisableShot = "false"
Var IsSodaDisableShot2 = "false"
Var IsSodaDisableShot3 = "false"
DEBUGVAR IsSodaDisableShot
DEBUGVAR IsSodaDisableShot2
DEBUGVAR IsSodaDisableShot3
STRCONTAIN PD_CODE1 ProductSodaDisableShot IsSodaDisableShot
STRCONTAIN PD_CODE2 ProductSodaDisableShot IsSodaDisableShot2
STRCONTAIN PD_CODE3 ProductSodaDisableShot IsSodaDisableShot3
DEBUGVAR IsSodaDisableShot
DEBUGVAR IsSodaDisableShot2
DEBUGVAR IsSodaDisableShot3
If IsSodaDisableShot = "true" Then
Var CustomEnergyState[0] = "Disable" Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
If cold_button_state = "PressForever" Then
If toppingID12index2Status = "Disable" Then
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
Else
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
EndIf
Else
If toppingID12index2Status = "Enable" Then
Var CustomEnergyState[0] = "Enable"
Var CustomEnergyState[1] = "Enable"
EndIf
EndIf
EndIf EndIf
If CustomEnergyState[0] = "Press" Then
If IsSodaDisableShot2 = "true" Then
Var CustomEnergyState[0] = "Disable" Var CustomEnergyState[0] = "Disable"
EndIf
If CustomEnergyState[1] = "Enable" Then
Var CustomEnergyState[1] = "Disable" Var CustomEnergyState[1] = "Disable"
If cold_button_state = "PressForever" Then
If toppingID12index2Status = "Disable" Then
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
Else
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
EndIf
Else
If toppingID12index2Status = "Enable" Then
Var CustomEnergyState[0] = "Enable"
Var CustomEnergyState[1] = "Enable"
EndIf
EndIf
EndIf EndIf
If CustomEnergyState[1] = "Press" Then
If IsSodaDisableShot3 = "true" Then
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable" Var CustomEnergyState[1] = "Disable"
If cold_button_state = "PressForever" Then
If toppingID12index2Status = "Disable" Then
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
Else
Var CustomEnergyState[0] = "Disable"
Var CustomEnergyState[1] = "Disable"
EndIf
Else
If toppingID12index2Status = "Enable" Then
Var CustomEnergyState[0] = "Enable"
Var CustomEnergyState[1] = "Enable"
EndIf
EndIf
EndIf EndIf
If CustomEnergyState[3] = "Enable" Then
If toppingID12index2Status = "" Then Var CustomEnergyState[3] = "Disable"
Var CustomEnergyState[0] = "Invisible" EndIf
Var CustomEnergyState[1] = "Invisible" If CustomEnergyState[3] = "Press" Then
Var CustomEnergyState[3] = "Disable"
EndIf EndIf
EndIf EndIf
If TOPPING13 = "shot coffee" Then If TOPPING13 = "shot coffee" Then
@ -7988,37 +7906,30 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
If CustomEnergyState[3] = "Press" Then
Var CustomEnergyState[3] = "Enable" Var CustomEnergyState[3] = "Press"
If cold_button_state = "PressForever" Then
If cold_button_state = "PressForever" Then Var showShotNormalSoda = "Press"
Var showShotNormalSoda = "Enable" Var showShotEnableSoda = "Disable"
Var showShotEnableSoda = "Enable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
Else Else
Var CustomEnergyState[3] = "Press" Var showShotNormalSoda = "Disable"
If cold_button_state = "PressForever" Then Var showShotEnableSoda = "Disable"
Var showShotNormalSoda = "Press"
Var showShotEnableSoda = "Disable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
EndIf EndIf
If showShotNormalSoda = "Disable" Then If showShotNormalSoda = "Disable" Then
Var showShotNormalSoda = "Enable" If toppingID13index1Status = "Enable" Then
Var showShotNormalSoda = "Enable"
EndIf
EndIf EndIf
If showShotEnableSoda = "Disable" Then If showShotEnableSoda = "Disable" Then
Var showShotEnableSoda = "Enable" If toppingID13index2Status = "Enable" Then
Var showShotEnableSoda = "Enable"
EndIf
EndIf EndIf
Var CustomEnergyState[0] = "Enable" Var CustomEnergyState[0] = "Enable"
@ -8047,26 +7958,16 @@
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound> <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
If CustomEnergyState[0] = "Press" Then
Var CustomEnergyState[0] = "Enable" Var CustomEnergyState[0] = "Press"
If cold_button_state = "PressForever" Then
If cold_button_state = "PressForever" Then Var showShotNormalSoda = "Press"
Var showShotNormalSoda = "Press" Var showShotEnableSoda = "Disable"
Var showShotEnableSoda = "Enable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
Else Else
Var CustomEnergyState[0] = "Press" Var showShotNormalSoda = "Disable"
If cold_button_state = "PressForever" Then Var showShotEnableSoda = "Disable"
Var showShotNormalSoda = "Press"
Var showShotEnableSoda = "Disable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
EndIf EndIf
Var CustomEnergyState[1] = "Enable" Var CustomEnergyState[1] = "Enable"
Var CustomEnergyState[3] = "Enable" Var CustomEnergyState[3] = "Enable"
@ -8095,27 +7996,16 @@
<Volume> SoundVolume </Volume> <Volume> SoundVolume </Volume>
<EventClick> <EventClick>
If CustomEnergyState[1] = "Press" Then Var CustomEnergyState[1] = "Press"
Var CustomEnergyState[1] = "Enable"
If cold_button_state = "PressForever" Then If cold_button_state = "PressForever" Then
Var showShotNormalSoda = "Press" Var showShotNormalSoda = "Press"
Var showShotEnableSoda = "Enable" Var showShotEnableSoda = "Disable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
Else Else
Var CustomEnergyState[1] = "Press" Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
If cold_button_state = "PressForever" Then
Var showShotNormalSoda = "Press"
Var showShotEnableSoda = "Disable"
Else
Var showShotNormalSoda = "Disable"
Var showShotEnableSoda = "Disable"
EndIf
EndIf EndIf
Var CustomEnergyState[0] = "Enable" Var CustomEnergyState[0] = "Enable"
Var CustomEnergyState[3] = "Enable" Var CustomEnergyState[3] = "Enable"
@ -10094,16 +9984,16 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
If toppingID6index5Status = "Enable" Then If toppingID6index2Status = "Enable" Then
Var showStrawberryEnable = "Enable" Var showStrawberryEnable = "Enable"
Else Else
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
EndIf EndIf
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
If toppingID6index6Status = "Enable" Then If toppingID6index3Status = "Enable" Then
Var showYuzuEnable = "Enable" Var showYuzuEnable = "Enable"
Else Else
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
@ -10126,13 +10016,13 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
If toppingID6index5Status = "Enable" Then If toppingID6index2Status = "Enable" Then
Var showStrawberryEnable = "Press" Var showStrawberryEnable = "Press"
EndIf EndIf
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
EndIf EndIf
EndIf EndIf
@ -10184,16 +10074,16 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
If toppingID6index5Status = "Enable" Then If toppingID6index2Status = "Enable" Then
Var showStrawberryEnable = "Enable" Var showStrawberryEnable = "Enable"
Else Else
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
EndIf EndIf
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
If toppingID6index6Status = "Enable" Then If toppingID6index3Status = "Enable" Then
Var showYuzuEnable = "Enable" Var showYuzuEnable = "Enable"
Else Else
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
@ -10216,13 +10106,13 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
If toppingID6index5Status = "Enable" Then If toppingID6index2Status = "Enable" Then
Var showStrawberryEnable = "Press" Var showStrawberryEnable = "Press"
EndIf EndIf
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
EndIf EndIf
EndIf EndIf
@ -10306,16 +10196,16 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
If toppingID6index5Status = "Enable" Then If toppingID6index2Status = "Enable" Then
Var showStrawberryEnable = "Enable" Var showStrawberryEnable = "Enable"
Else Else
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
EndIf EndIf
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
If toppingID6index6Status = "Enable" Then If toppingID6index3Status = "Enable" Then
Var showYuzuEnable = "Enable" Var showYuzuEnable = "Enable"
Else Else
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
@ -10337,12 +10227,12 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
If toppingID6index6Status = "Enable" Then If toppingID6index3Status = "Enable" Then
Var showYuzuEnable = "Press" Var showYuzuEnable = "Press"
EndIf EndIf
EndIf EndIf
@ -10399,16 +10289,16 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
If toppingID6index5Status = "Enable" Then If toppingID6index2Status = "Enable" Then
Var showStrawberryEnable = "Enable" Var showStrawberryEnable = "Enable"
Else Else
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
EndIf EndIf
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
If toppingID6index6Status = "Enable" Then If toppingID6index3Status = "Enable" Then
Var showYuzuEnable = "Enable" Var showYuzuEnable = "Enable"
Else Else
Var showYuzuEnable = "Disable" Var showYuzuEnable = "Disable"
@ -10430,12 +10320,12 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
If toppingID6index5 = 94 Then If toppingID6index2 = 91 Then
Var showStrawberryEnable = "Disable" Var showStrawberryEnable = "Disable"
EndIf EndIf
If toppingID6index6 = 95 Then If toppingID6index3 = 92 Then
If toppingID6index6Status = "Enable" Then If toppingID6index3Status = "Enable" Then
Var showYuzuEnable = "Press" Var showYuzuEnable = "Press"
EndIf EndIf
EndIf EndIf
@ -11060,7 +10950,7 @@
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
Var strMulti6_5 = "TPID=94,multiply=1" Var strMulti6_5 = "TPID=91,multiply=1"
EndIf EndIf
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
@ -11088,7 +10978,7 @@
Var strMulti6_6 = "TPID=325,multiply=1" Var strMulti6_6 = "TPID=325,multiply=1"
EndIf EndIf
If TOPPING6 = "syrup-topping" Then If TOPPING6 = "syrup-topping" Then
Var strMulti6_6 = "TPID=95,multiply=1" Var strMulti6_6 = "TPID=92,multiply=1"
EndIf EndIf
Var DisableUsingCode = "true" Var DisableUsingCode = "true"
Else Else