release 10.03

inc/button_topping_select_confirm_order.inc

@@ -392,17 +392,6 @@ EndIf
 GetLongTimeInMinute LastTimeClickOrder
 
 If CART_COUNT  = 0 Then
-    If UserSelectProductCode = "-" Then
-
-    Else
-
-        
-        If SelectDrinkType = 1 Then
-            ; Move to MenuReady
-            ;OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-            ;Open "ROOT/taobin_project/xml/page_payment.xml" 
-        EndIf
-    EndIf
     
     DEBUGVAR SelectToppingType
     If SelectDrinkType = 0 Then

inc/remove_cup_on_arm_step.inc

@@ -1,4 +1,5 @@
 
+;setvarint DebugRemoveCup 1
 ;Var DebugRemoveCup = 1
 If DebugRemoveCup = 1 Then
     DEBUGVAR TimeoutForProtectButtonHideLongTime
@@ -13,7 +14,7 @@ If DebugRemoveCup = 1 Then
     DEBUGVAR Seeker
     DEBUGVAR CountDownCupOnArmCertainStage
 
-
+    DEBUGVAR CountDownCupOnArmSuccessDelay
     DEBUGVAR CH9991_Status
     DEBUGVAR CH9992_Status
     DEBUGVAR CH9993_Status
@@ -28,10 +29,12 @@ EndIf
 If TimeoutInstance0 = "" Then
     Var TimeoutInstance0 = 0
     Var CountDownCupOnArmCertainStage = 0
+    Var CountDownCupOnArmSuccessDelay = 8
+    Var CountDownDrinkOK = 8
 EndIf
 
 If TimeoutInstance0 = 3 Then
-    SAVELOG "remove cup on arm 1.1"
+    SAVELOG "remove cup on arm 1.4"
 EndIf
 
 Var CupOnAnyArm = 0
@@ -49,6 +52,29 @@ If CH9994_Status = "SUCCESS" Then
     Var CupOnAnyArm = 1
 EndIf
 
+; from drink_ok.xml break show button.
+If CountDownDrinkOK > 0 Then
+    If DoorCupPosition = "bottom" Then
+        Var CountDownDrinkOK = CountDownDrinkOK - 1
+        DEBUGVAR CountDownDrinkOK
+        Var CountDownCupOnArmSuccessDelay = 10
+    EndIf
+    Var CupOnAnyArm = 0
+Else
+
+EndIf
+
+
+If CupOnAnyArm = 1 Then
+    If CountDownCupOnArmSuccessDelay = 0 Then
+
+    Else
+        Var CountDownCupOnArmSuccessDelay = CountDownCupOnArmSuccessDelay - 1
+        Var CupOnAnyArm = 0
+        DEBUGVAR CountDownCupOnArmSuccessDelay 
+    EndIf
+EndIf
+
 If CupOnAnyArm = 0 Then
     If Seeker = "curr" Then
         If CupOnArm = "true" Then