Merge branch 'masterpiece' into sgp_blue

inc/remove_cup_event_open.inc

@@ -1,14 +1,14 @@
-Var TimeoutInstance0 = 0
-Var buttonRemoveCup = "Enable
-Var CheckCupStateDoorCupClose = "-"
-Var CheckCupStateDoorCupCloseCnt = 0
-Var CoundUpDelayCertainStage = 0
-Var TimeoutForProtectButtonHideLongTime = 0
-Var Timeout = 0
+    Var TimeoutInstance0 = 0
+    Var buttonRemoveCup = "Enable
+    Var CheckCupStateDoorCupClose = "-"
+    Var CheckCupStateDoorCupCloseCnt = 0
+    Var CoundUpDelayCertainStage = 0
+    Var TimeoutForProtectButtonHideLongTime = 0
+    Var Timeout = 0
 
 
-If show_eng = "true" Then 
+    If show_eng = "true" Then 
 
-Else
-    Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
-EndIf
+    Else
+        Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" 
+    EndIf

inc/remove_cup_step.inc

@@ -1,15 +1,6 @@
-; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
-If HaveCup = "false" Then
-    If MachineStage = "show-menu" Then
-        Open "ROOT/taobin_project/xml/page_board.xml"
 
-    EndIf
-EndIf
 
-If MachineStage = "close-maintenance" Then
-    Open "ROOT/taobin_project/xml/page_show_error.xml"
-
-EndIf
+DEBUGVAR TimeoutForProtectButtonHideLongTime
 
 Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1
 If TimeoutForProtectButtonHideLongTime > 120 Then

inc/select_drink_current.inc

@@ -1,20 +1,20 @@
 
-Topping "Select" Seeker.selected_a_drink
+    Topping "Select" Seeker.selected_a_drink
 
-; Set option toppinng and pack 
-Topping "Select1-ID" Seeker.topping1
-Topping "Select2-ID" Seeker.topping2
-Topping "Select3-ID" Seeker.topping3
+    ; Set option toppinng and pack 
+    Topping "Select1-ID" Seeker.topping1
+    Topping "Select2-ID" Seeker.topping2
+    Topping "Select3-ID" Seeker.topping3
 
-Topping "Select6-ID" Seeker.topping6
+    Topping "Select6-ID" Seeker.topping6
 
-Topping "Select7-ID" Seeker.topping7
-Topping "Select8-ID" Seeker.topping8
-Topping "Select9-ID" Seeker.topping9
-Topping "Select10-ID" Seeker.topping10
+    Topping "Select7-ID" Seeker.topping7
+    Topping "Select8-ID" Seeker.topping8
+    Topping "Select9-ID" Seeker.topping9
+    Topping "Select10-ID" Seeker.topping10
 
-Topping "PostTopping1-ID" Seeker.PostTopping1
-; Pack
-Topping "Pack" ExtendDataCurr
+    Topping "PostTopping1-ID" Seeker.PostTopping1
+    ; Pack
+    Topping "Pack" ExtendDataCurr
 
 

inc/select_drink_next.inc

@@ -1,27 +1,28 @@
-Topping "SetNextOrder" UserSelectProductCode
+
+    Topping "SetNextOrder" UserSelectProductCode
 
 
-Topping "__select" UserSelectProductCode
-; Set option toppinng and pack 
-Topping "__select1-id" topping1
-Topping "__select2-id" topping2
-Topping "__select3-id" topping3
-Topping "__select6-id" topping6
-Topping "__select7-id" topping7
-Topping "__select8-id" topping8
-Topping "__select9-id" topping9
-Topping "__select10-id" topping10
+    Topping "__select" UserSelectProductCode
+    ; Set option toppinng and pack 
+    Topping "__select1-id" topping1
+    Topping "__select2-id" topping2
+    Topping "__select3-id" topping3
+    Topping "__select6-id" topping6
+    Topping "__select7-id" topping7
+    Topping "__select8-id" topping8
+    Topping "__select9-id" topping9
+    Topping "__select10-id" topping10
 
-Topping "__posttopping1-ID" sugarToppingID
-; Pack
-Topping "__pack" ExtendDataNext
+    Topping "__posttopping1-ID" sugarToppingID
+    ; Pack
+    Topping "__pack" ExtendDataNext
 
-Var NextUserSelectDrinkFromPaid = UserSelectProductCode
-Var NextUserSelecttopping1Paid = topping1
-Var NextUserSelecttopping2Paid = topping2
-Var NextUserSelecttopping3Paid = topping3
-Var NextUserSelecttopping6Paid = topping6
-Var NextUserSelecttopping7Paid = topping7
-Var NextUserSelecttopping8Paid = topping8
-Var NextUserSelecttopping9Paid = topping9
-Var NextUserSelecttopping10Paid = topping10
+    Var NextUserSelectDrinkFromPaid = UserSelectProductCode
+    Var NextUserSelecttopping1Paid = topping1
+    Var NextUserSelecttopping2Paid = topping2
+    Var NextUserSelecttopping3Paid = topping3
+    Var NextUserSelecttopping6Paid = topping6
+    Var NextUserSelecttopping7Paid = topping7
+    Var NextUserSelecttopping8Paid = topping8
+    Var NextUserSelecttopping9Paid = topping9
+    Var NextUserSelecttopping10Paid = topping10