renovate remove cup and cup on arm

flash_deal/topping_page.ev

@@ -1,49 +1,3 @@
 
-;DEBUGVAR SystemDateMonthInt
-;DEBUGVAR SystemDateDayInt
 
-; Reset flag away.
-Var PromotionOreoToppingFreeEnable = 0
 
-If SystemDateMonthInt = 9 Then
-
-	If SystemDateDayInt = 6 Then
-		Var PromotionOreoToppingFreeEnable = 1
-
-	EndIf
-	If SystemDateDayInt = 7 Then
-		Var PromotionOreoToppingFreeEnable = 1
-
-	EndIf
-	If SystemDateDayInt = 8 Then
-		Var PromotionOreoToppingFreeEnable = 1
-
-	EndIf
-	If SystemDateDayInt = 9 Then
-		Var PromotionOreoToppingFreeEnable = 1
-
-	EndIf
-	If SystemDateDayInt = 10 Then
-		Var PromotionOreoToppingFreeEnable = 1
-
-	EndIf
-
-EndIf
-
-Var PromotionOreoToppingFreeEnable = 0
-
-If PromotionOreoToppingFreeEnable = 1 Then
-
-	SAVELOG "PromotionOreoToppingFreeEnable set!"
-	Var toppingID6price2 = 0
-	If show_eng = "true" Then
-
-		Var text_price_6 = "(9.9 FREE DEAL)"
-	Else
-		Var text_price_6 = "(9.9 แจกจัดหนัก)"
-	EndIf
-
-	Var text_color_6 = "0x2741A2"
-Else
-	Var text_color_6 = "0x84776F"
-EndIf

inc/button_remove_cup.inc

@@ -1,7 +1,7 @@
 <Button>
 <X> btnRemoveCupX </X>
 <Y> btnRemoveCupYNotPageBoard </Y>
-<State> buttonRemoveCup </State>
+<State> buttonRemoveCupOnArm </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
 <Filename> bnRemoveCup </Filename>
@@ -9,6 +9,16 @@
 <EventClick> 
     Machine RemoveCup
     Machine DoorLidOpen
-    Var buttonRemoveCup = "Invisible"
+    SAVELOG "Press button remove cup on-arm"
+    Var buttonRemoveCupOnArm = "Invisible"
+    
+    ; protect value update too slow.
+    Var DoorCupPosition = "-"
+
+    Var CheckCupStateDoorCupClose = "reset"
+    Var CheckCupStateDoorCupCloseCnt = 30
+    Var TimeoutForProtectButtonHideLongTime = 0
+
+    RefreshAll
 </EventClick>
 </Button>

inc/remove_cup_on_arm_step.inc

@@ -0,0 +1,169 @@
+; setvarint DebugRemoveCup 1
+If DebugRemoveCup = 1 Then
+    DEBUGVAR TimeoutForProtectButtonHideLongTime
+    DEBUGVAR TimeoutForDoorCupOpenLongTime
+
+
+    DEBUGVAR CupOnArm
+    DEBUGVAR DoorCupPosition
+    DEBUGVAR CupChecking
+    DEBUGVAR CupArmMove
+    DEBUGVAR buttonRemoveCupOnArm
+EndIf
+If TimeoutForDoorCupOpenLongTime = "" Then
+    Var TimeoutForDoorCupOpenLongTime = 1
+EndIf
+
+
+If TimeoutInstance0 = 3 Then
+    SAVELOG "remove cup on arm 1.0"
+EndIf
+
+;SAVELOG "++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"
+
+If Seeker = "curr" Then
+
+    If buttonRemoveCupOnArm = "Enable" Then
+
+    Else
+        If CupOnArm = "true" Then
+            Var TimeoutForProtectButtonHideLongTime = TimeoutForProtectButtonHideLongTime + 1
+                
+            If TimeoutForProtectButtonHideLongTime > 60 Then
+                Var TimeoutForProtectButtonHideLongTime = 0
+                If DoorCupPosition = "bottom" Then
+                    SAVELOG "Check Cup all from Long time button cup on arm hide"
+                    Var buttonRemoveCupOnArm = "Enable"
+                EndIf
+            EndIf
+        EndIf
+    EndIf
+
+
+    If DoorCupPosition = "bottom" Then
+        Var TimeoutForDoorCupOpenLongTime = 0
+    Else
+        Var TimeoutForDoorCupOpenLongTime = TimeoutForDoorCupOpenLongTime + 1
+    EndIf
+
+    If TimeoutForDoorCupOpenLongTime > 40 Then
+        Var TimeoutForDoorCupOpenLongTime = 0
+
+        If DoorCupPosition = "bottom" Then
+            Var TimeoutForDoorCupOpenLongTime = 0
+        Else
+            Machine DoorClose
+            Var DoorCloseFromTimeout = "set"
+        EndIf
+    EndIf
+
+
+
+    If PreviseDoorCupPosition = DoorCupPosition Then
+
+    Else
+        DEBUGVAR PreviseDoorCupPosition
+        DEBUGVAR DoorCupPosition
+        
+        If DoorCupPosition = "bottom" Then
+            Machine CheckCupLastIDProcess
+        EndIf
+        
+        Var PreviseDoorCupPosition = DoorCupPosition
+    EndIf
+
+    If show_eng = "true" Then 
+
+    Else
+        If Timeout = 14 Then
+            If buttonRemoveCupOnArm = "Enable" Then
+                If CupChecking = "false" Then
+                    If DoorCupPosition = "bottom" Then
+                        If InternationalEnable = 1 Then
+                            
+                        Else
+                            Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
+                        EndIf
+                    EndIf
+                EndIf
+                If CupArmMove = "false" Then
+                    If DoorCupPosition = "bottom" Then
+                        If InternationalEnable = 1 Then
+                            
+                        Else
+                            Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3"
+                        EndIf
+                    EndIf
+                EndIf
+            EndIf
+        EndIf
+    EndIf
+
+    Var Timeout = Timeout + 1
+
+
+
+    Var TimeoutInstance0 = TimeoutInstance0 + 1
+
+
+    ; Logic have differrent drinkfail3.xml 
+    ; protect lock 
+    ; 
+
+    If CheckCupStateDoorCupCloseCnt > 0 Then
+        Var CheckCupStateDoorCupCloseCnt = CheckCupStateDoorCupCloseCnt - 1
+        DEBUGVAR CheckCupStateDoorCupCloseCnt
+
+        If CheckCupStateDoorCupCloseCnt = 0 Then
+            Var CheckCupStateDoorCupClose = ""
+        EndIf
+        
+    EndIf
+
+
+    If DoorCupPosition = "bottom" Then
+        If CupOnArm = "true" Then
+
+        Else
+
+            Var CoundUpDelayCertainStage = CoundUpDelayCertainStage + 1
+            DEBUGVAR CoundUpDelayCertainStage
+            If CoundUpDelayCertainStage > 10 Then 
+            
+                Var buttonRemoveCupOnArm = "Invisible"
+            EndIf
+        EndIf
+    Else
+        Var CoundUpDelayCertainStage = 0
+    EndIf
+
+
+     ; zone cup on arm
+    If buttonRemoveCupOnArm = "Enable" Then
+
+    Else
+        If CupOnArm = "true" Then
+
+            If CheckCupStateDoorCupClose = "" Then
+                Var buttonRemoveCupOnArm = "Enable"
+            EndIf
+
+            If CheckCupStateDoorCupClose = "done" Then
+                Var buttonRemoveCupOnArm = "Enable"
+            EndIf
+        Else
+
+        EndIf
+    EndIf
+
+
+    
+Else
+    DEBUGVAR 
+    ; Next hide away
+    Var buttonRemoveCupOnArm = "Invisible"
+
+EndIf
+
+;cfe cup-on-arm-reset
+;

inc/remove_cup_step.inc

@@ -24,7 +24,6 @@ Else
     EndIf
 EndIf
 
-
 Var TiemoutForDoorCupOpenLongTime = TiemoutForDoorCupOpenLongTime + 1
 If TiemoutForDoorCupOpenLongTime > 60 Then
     Var TiemoutForDoorCupOpenLongTime = 0

inc/remove_cup_tag_on_arm.inc

@@ -0,0 +1,26 @@
+
+<EventMachineCupReady>
+	SAVELOG "EventMachineCupReady"
+	
+	
+	Refresh
+
+</EventMachineCupReady>
+
+<EventMachineCupNotReady>
+	SAVELOG "EventMachineCupNotReady"
+</EventMachineCupNotReady>
+
+<EventDrink>
+	SAVELOG "EventDrink"
+	DEBUGVAR HaveCup
+	DEBUGVAR CupOnArm
+	DEBUGVAR DoorCupPosition
+	DEBUGVAR CupChecking
+	DEBUGVAR CupArmMove
+	If CupOnArm = "false" Then
+		Var buttonRemoveCupOnArm = "Invisible"
+	EndIf
+	
+</EventDrink>
+

inter/tha/configure.ev

@@ -1,3 +1,4 @@
+
 	If BoxID = 173149 Then
 		Var EnableMultiInstanceFromBoxID = 1
 	EndIf
@@ -21,7 +22,7 @@
 	EndIf
 
 	If BoxID = 123456 Then
-		Var EnableMultiInstanceFromBoxID = 1
+
 	EndIf
 
 	If BoxID = 201193 Then
@@ -33,7 +34,7 @@
 	EndIf
 
 	If BoxID = 201714 Then
-		Var EnableMultiInstanceFromBoxID = 1
+		Var EnableMultiInstanceFromBoxID = 0
 	EndIf
 
 	If BoxID = 210699 Then
@@ -41,7 +42,7 @@
 	EndIf
 
 	If BoxID = 174565 Then
-		Var EnableMultiInstanceFromBoxID = 1
+		Var EnableMultiInstanceFromBoxID = 0
 	EndIf
 
 	If BoxID = 173319 Then
@@ -63,7 +64,13 @@
 
     ; Test
 	If BoxID > 200010 Then
-	    If BoxID < 200080 Then
+	    If BoxID < 200229 Then
 		    Var EnableMultiInstanceFromBoxID = 1
 		EndIf
 	EndIf
+
+	READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig
+	If EnableMultiInstanceFromConfig = "true" Then
+	    DEBUGVAR EnableMultiInstanceFromConfig
+        Var EnableMultiInstanceFromBoxID = 1
+    EndIf

inter/tha/hardware/exhaust_fan_schedule.ev

@@ -25,8 +25,8 @@ If ExhaustFanAuto = "2" Then
         __CMD "CLI" "set-fan-mode=Fan_Auto" "-" "-"
     EndIf
 
-    If SystemTimeHourInt = ExhaustFanTime1Hour Then
+    If SystemTimeHourInt = 23 Then
-        SAVELOG " Exhaust Fan mode 2 come back to mode auto3 "
+        SAVELOG " Exhaust Fan mode 2 come back to mode auto4 "
         __CMD "CLI" "set-fan-mode=Fan_Auto" "-" "-"
     EndIf
 EndIf

inter/tha/hardware/powder_schedule_v2.ev

@@ -4,7 +4,7 @@
 
 DEBUGVAR LastTimeUseChannel10InMinute
 DEBUGVAR CurrentXMLFileName0
-SAVELOG "powder schedule version 2.01"
+SAVELOG "powder schedule version 2.03"
 
 DEBUGVAR PowderPayPushLowScheduleTurnOn10
 
@@ -19,15 +19,16 @@ If SystemTimeHourInt = 3 Then
 
         EndIf
     EndIf
-    If PowderStatus = "tricker" Then
-        If SystemTimeMinuteInt = 60 Then
-            ; idle
-            ; and time match
 
-            Var PowderStatus = ""
+EndIf
-            Var PowderTestStep = 0
+
-            SAVELOG "PowderScheduleGrind reset reset reset"
+If SystemTimeHourInt > 5 Then
-        EndIf
+    If PowderStatus = "tricker" Then
+        ; reset to idle
+
+        Var PowderStatus = ""
+        Var PowderTestStep = 0
+        SAVELOG "PowderScheduleGrind reset reset reset"
     EndIf
 EndIf
 

inter/tha/xml/event/script_common_for_open_promotion_xml.ev

@@ -3,10 +3,6 @@
 
 ; zone promote
 Var BigButtonEnable = "Enable"
-If OpenFromMulti = 1 Then
-	TabMenuVisibleInst 99
-EndIf
-Var OpenFromMulti = 0
 
 Var RecommendPage = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml"
 Var RecommendPageMulti = "ROOT/taobin_project/inter/tha/xml/multi/page_catalog_group_recommend.lxml"
@@ -36,6 +32,7 @@ Else
 
 	TRY "ROOT/taobin_project/inter/tha/show_lang.ev"
 
+    SAVELOG "============================================== script_common_for_open_promotion_xml ==========================="
 	If OpenFromPageBoard = 1 Then
 		If EnableMultiInstance = "true" Then
 			OpenInst 2 RecommendPageMulti
@@ -53,4 +50,3 @@ Else
 EndIf
 
 Var OpenFromPageBoard = 0
-

inter/tha/xml/multi/control_and_lang_swith.ev

@@ -99,6 +99,9 @@ Var InstanceTabOpenFile9 = "ROOT/taobin_project/inter/tha/xml/multi/" + layoutVe
 Var InstanceTabOpenFile9 = InstanceTabOpenFile9 + "/page_catalog_group_frozen_fruit.lxml"
 
 
+OpenRedirect "taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/recommend.ev"
+OpenRedirect "taobin_project/inter/tha/xml/page_catalog_group_recommend.xml" "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/recommend.ev"
+
 
 
 Var InstanceTabOpenFile11 = "ROOT/taobin_project/inter/tha/xml/topview_helper.lxml"

inter/tha/xml/multi/menu_catalog_new.lxml

@@ -16,8 +16,7 @@
 
 
     If SaveStringInst = "RefreshNow" Then
-        GetXMLFileNameCurrentRunning CurrentOpenFile
+        Refresh
-        Open CurrentOpenFile
     EndIf
 
 
@@ -140,4 +139,3 @@
     EndIf
 
 </EventWebApp>
-

inter/tha/xml/multi/page_catalog.lxml

@@ -310,25 +310,7 @@
 	EndIf
 
 
-    If Seeker = "Next" Then
+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
-	   Var buttonRemoveCup = "Invisible"
-	Else
-    	; zone cup on arm
-        If CupOnArm = "true" Then
-
-    		If CheckCupStateDoorCupClose = "" Then
-    			Var buttonRemoveCup = "Enable"
-    		EndIf
-
-    		If CheckCupStateDoorCupClose = "done" Then
-    			Var buttonRemoveCup = "Enable"
-    		EndIf
-    	Else
-    		If buttonRemoveCup = "Enable" Then
-    			Var buttonRemoveCup = "Invisible"
-    		EndIf
-    	EndIf
-	EndIf
 
 
 
@@ -1246,13 +1228,19 @@
 
 <EventUnitTest5>
 
+    <Name> "Test Redirect page_catalog_group_recommend.lxml" </Name>
+    <Script>
+	          Open "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml"
+	</Script>
 
-	Open "ROOT/taobin_project/xml/page_check_member2_campaign.xml"
 </EventUnitTest5>
 
 <EventUnitTest6>
+    <Name> "Test Redirect page_catalog_group_other_other.lxml" </Name>
+    <Script>
+	          Open "ROOT/taobin_project/inter/tha/xml/page_catalog_group_other_other.lxml"
+	</Script>
 
-	Open "ROOT/taobin_project/xml/page_before_check_member.xml"
 </EventUnitTest6>
 
 <EventUnitTest7>
@@ -1267,4 +1255,5 @@
 	Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml"
 </EventUnitTest8>
 
+
 </Popup>

inter/tha/xml/multi/recommend.ev

@@ -0,0 +1,3 @@
+SAVELOG "Call recommend"
+TabMenuVisibleInst 10
+Var RedirectTo = "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"

inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml

@@ -52,10 +52,16 @@
                 Var inst_show_exclude_group_counter = 45
             EndIf
         EndIf
+
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+
     EndIf
 
     Var RecommendTimeOut = RecommendTimeOut + 1
 
+
+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+
     TimerReset
 </EventTimeout>
 
@@ -139,40 +145,6 @@ OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_ap
 OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_happy_trios.lxml"
 			</EventOnClick>
 		</Banner>
-		<Banner>
-			<State> SchoolOvaltineProState </State>
-			<Type> VIDEO </Type>
-			<Media>
-				eval(
-					If show_eng = "true" Then
-						Var return = "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4"
-					Else
-						Var return = "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4"
-					EndIf
-				)
-			</Media>
-			<EventOnClick>
-				TabMenuVisibleInst 99
-OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_school_ovaltine.lxml"
-			</EventOnClick>
-		</Banner>
-		<Banner>
-			<State> OreoVolcanoProState </State>
-			<Type> IMAGE </Type>
-			<Media>
-				eval(
-					If show_eng = "true" Then
-						Var return = "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png"
-					Else
-						Var return = "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png"
-					EndIf
-				)
-			</Media>
-			<EventOnClick>
-				TabMenuVisibleInst 99
-OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml"
-			</EventOnClick>
-		</Banner>
 
 			; ==================> Len = 3
 		; - - 12-03-03-0032 
@@ -15192,4 +15164,6 @@ OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_or
 
 
 
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
+
 </Popup>

inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml

@@ -36,6 +36,7 @@
 
 	DEBUGVAR SlientRefreshIndex
 
+	Var buttonRemoveCupOnArm = "Invisible"
 
 	RefreshAll
 

inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev

@@ -8,12 +8,14 @@ Var ButtonLanguageListYPosition = 450 - 38
 Var LanguageButtonEnable = "Enable"
 OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 
+
+OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
+
 TabMenuVisibleInst 10
 OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/multi/page_instance2.xml"
 
 Var Menu1Selected = "PressForever"
 
-OpenInst 15 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
 RootLayoutVisible 15 "show"
 
 ;Var FileRecommendToOpen = "ROOT/taobin_project/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml"

inter/tha/xml/multi/v3/page_catalog_group_20_baht.lxml

@@ -30,6 +30,8 @@
 
 	DEBUGVAR SlientRefreshIndex
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_20_baht.skt

@@ -32,6 +32,8 @@
 
 	DEBUGVAR SlientRefreshIndex
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_coffee.lxml

@@ -40,6 +40,8 @@
     Var inst_show_coffee_counter = 4
 	DEBUGVAR SlientRefreshIndex
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_coffee.skt

@@ -42,6 +42,8 @@
     Var inst_show_coffee_counter = 4
 	DEBUGVAR SlientRefreshIndex
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.lxml

@@ -26,6 +26,8 @@
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_frozen_fruit.skt

@@ -28,6 +28,8 @@
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_health.lxml

@@ -31,6 +31,8 @@
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_health.skt

@@ -34,6 +34,8 @@
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_milk.lxml

@@ -31,6 +31,8 @@
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
     Var inst_show_milk_cupe_counter = 7
+
+    Var buttonRemoveCupOnArm = "Invisible"
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_milk.skt

@@ -33,6 +33,8 @@
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
     Var inst_show_milk_cupe_counter = 7
+
+    Var buttonRemoveCupOnArm = "Invisible"
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_other.lxml

@@ -28,6 +28,8 @@
 		Var SlientRefreshIndex = 8
 	EndIf
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>

inter/tha/xml/multi/v3/page_catalog_group_other.skt

@@ -31,6 +31,8 @@
 		Var SlientRefreshIndex = 8
 	EndIf
 
+    Var buttonRemoveCupOnArm = "Invisible"
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>

inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml

@@ -36,6 +36,7 @@
 
 	DEBUGVAR SlientRefreshIndex
 
+	Var buttonRemoveCupOnArm = "Invisible"
 
 	RefreshAll
 

inter/tha/xml/multi/v3/page_catalog_group_other_other.skt

@@ -39,6 +39,7 @@
 
 	DEBUGVAR SlientRefreshIndex
 
+	Var buttonRemoveCupOnArm = "Invisible"
 
 	RefreshAll
 

inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.lxml

@@ -34,6 +34,9 @@
     SetInstanceIgnoreTouch
 
     Var inst_show_pepsi_7up_counter = 4
+
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_pepsi_7up.skt

@@ -37,6 +37,9 @@
     SetInstanceIgnoreTouch
 
     Var inst_show_pepsi_7up_counter = 4
+
+    Var buttonRemoveCupOnArm = "Invisible"
+
     RefreshAll
 	DEBUGVAR SlientRefreshIndex
 </EventOnShow>

inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml

@@ -52,10 +52,16 @@
                 Var inst_show_exclude_group_counter = 45
             EndIf
         EndIf
+
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+
     EndIf
 
     Var RecommendTimeOut = RecommendTimeOut + 1
 
+
+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+
     TimerReset
 </EventTimeout>
 
@@ -15124,4 +15130,6 @@
 
 
 
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
+
 </Popup>

inter/tha/xml/multi/v3/page_catalog_group_recommend.skt

@@ -54,10 +54,16 @@
                 Var inst_show_exclude_group_counter = 45
             EndIf
         EndIf
+
+        ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+
     EndIf
 
     Var RecommendTimeOut = RecommendTimeOut + 1
 
+
+    ;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
+
     TimerReset
 </EventTimeout>
 
@@ -71,4 +77,6 @@
 
 
 
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
+
 </Popup>

inter/tha/xml/multi/v3/page_catalog_group_tea.lxml

@@ -37,6 +37,7 @@
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
+    Var buttonRemoveCupOnArm = "Invisible"
     RefreshAll
 </EventOnShow>
 

inter/tha/xml/multi/v3/page_catalog_group_tea.skt

@@ -40,6 +40,7 @@
 
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
+    Var buttonRemoveCupOnArm = "Invisible"
     RefreshAll
 </EventOnShow>
 

inter/tha/xml/multi/v3/page_catalog_group_whey.lxml

@@ -37,6 +37,7 @@
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
 	DEBUGVAR SlientRefreshIndex
+	Var buttonRemoveCupOnArm = "Invisible"
 </EventOnShow>
 
 <Timeout> 1000 </Timeout>

inter/tha/xml/multi/v3/page_catalog_group_whey.skt

@@ -40,6 +40,7 @@
     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
 
 	DEBUGVAR SlientRefreshIndex
+	Var buttonRemoveCupOnArm = "Invisible"
 </EventOnShow>
 
 <Timeout> 1000 </Timeout>

menu/page_catalog_group_recommend.skt

@@ -42,8 +42,6 @@
 
 </EventOpen>
 
-;include="ROOT/taobin_project/inc/button_remove_cup.inc"
-
 <?hurr
     #generate_layout=menu_v1
 ?>

video/sync_1.file

@@ -1,4 +1,4 @@
-total 322772
+total 322784
 -rw-rw---- 1 root sdcard_rw 12354151 2025-05-08 10:24 Mixer_proof3.mp4
 -rw-rw---- 1 root sdcard_rw 10151578 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3.mp4
 -rw-rw---- 1 root sdcard_rw    76993 2025-05-08 10:24 TaoBin_Tao_Pun_motion_proof3_pause.mp4
@@ -44,11 +44,11 @@ total 322772
 -rw-rw---- 1 root sdcard_rw 17402219 2024-07-16 14:21 main_page.mp4
 -rw-rw---- 1 root sdcard_rw 10634530 2024-10-29 11:51 main_page_event.mp4
 -rw-rw---- 1 root sdcard_rw 10065192 2025-02-21 16:58 remove_cup_how_to.mp4
--rw-rw---- 1 root sdcard_rw     7991 2025-05-28 12:22 script1.ev
+-rw-rw---- 1 root sdcard_rw     7991 2025-05-29 08:36 script1.ev
 -rw-rw---- 1 root sdcard_rw     1020 2025-04-10 18:50 script2.ev
 -rw-rw---- 1 root sdcard_rw      210 2024-11-10 09:20 script3_brew.ev
 -rw-rw---- 1 root sdcard_rw    11044 2025-05-28 12:17 script3_first_brewing.ev
--rw-rw---- 1 root sdcard_rw        0 2025-05-28 13:47 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2025-05-29 10:59 sync_1.file
 -rw-rw---- 1 root sdcard_rw  4806758 2023-09-18 18:44 taobin_save_world1.mp4
 -rw-rw---- 1 root sdcard_rw  6428830 2023-09-18 18:44 taobin_save_world2.mp4
 -rw-rw---- 1 root sdcard_rw  4634942 2023-09-18 18:44 taobin_save_world3.mp4

xml/event/script_common_for_open_promotion_xml.ev

@@ -92,9 +92,3 @@ Else
 	EndIf
 EndIf
 Var OpenFromPageBoard = 0
-
-If OpenFromMulti = 1 Then
-	TabMenuVisibleInst 99
-EndIf
-Var OpenFromMulti = 0
-

xml/menu_catalog_new.xml

@@ -75,39 +75,7 @@
 
 
     ; zone cup on arm
-    If Seeker = "curr" Then
-		If CupOnArm = "true" Then
     
-			If CheckCupStateDoorCupClose = "" Then
-				If buttonRemoveCup =  "Enable" Then
-
-				Else
-					Refresh
-				EndIf
-
-				Var buttonRemoveCup = "Enable"
-
-			EndIf
-
-			If CheckCupStateDoorCupClose = "done" Then
-				If buttonRemoveCup =  "Enable" Then
-
-				Else
-					Refresh
-				EndIf
-				
-				Var buttonRemoveCup = "Enable"
-		
-			EndIf
-		Else
-			If buttonRemoveCup = "Enable" Then
-				Var buttonRemoveCup = "Invisible"
-				Refresh
-			EndIf
-		EndIf
-	Else
-		Var buttonRemoveCup = "Invisible"
-	EndIf
 
     Var Timeout = Timeout + 1
     TimerReset

xml/page_board.xml

@@ -389,7 +389,6 @@
 	Var TimerFirst = "true"
 
 
-	Var buttonRemoveCup = "Invisible"
 
 	Var led_new = "0"
 	READ_FILE "/mnt/sdcard/coffeevending/led_new" led_new
@@ -1334,9 +1333,27 @@
 	; New mode
 	; Inter + Multi-Instance  available ./inter/tha/multi
 
-
+	Var EnableMultiInstanceFromBoxID = 0
 	TRY "ROOT/taobin_project/inter/tha/configure.ev"
 	
+	DEBUGVAR EnableMultiInstanceFromBoxID
+
+	If MAT_ID_2301 = "Enable" Then
+		If EnableMultiInstanceFromBoxID = 0 Then
+			
+			If CountUpForRestartApp = "" Then
+				Var CountUpForRestartApp = 0
+			EndIf
+			DEBUGVAR CountUpForRestartApp
+			Var CountUpForRestartApp = CountUpForRestartApp + 1
+			
+			If CountUpForRestartApp > 1 Then
+				WRITE_FILE "/mnt/sdcard/enable_ui_v3" "true"
+				FINISH
+			EndIf
+		EndIf
+	EndIf
+
 
 	If BoxID = 173372 Then
 		Var SpiralOnline = "true"
@@ -1580,20 +1597,7 @@
 		Var bpRemoveCup = CountryRootPath + "/image/main_page/bp_remove_cup.png"
 	EndIf
 
-	If CupOnArm = "true" Then
 
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
 
 	If IgnoreProfileFromRunEV = "" Then
 		Var IgnoreProfileFromRunEV = 0
@@ -1753,10 +1757,14 @@
 
 	   	OpenInst 2 PepsiFullScreenPageBoard
 	EndIf
+	If CupOnArm = "true" Then
 
-	; tap screen for press popup when app hang
+	Else
-	TapScreen 860 1004
+		; tap screen for press popup when app hang
+		TapScreen 860 1004
+	EndIf
 	
+	Var buttonRemoveCupOnArm = "Invisible"
 	Var CountDownFailErrorHappendClear = 8
 </EventOpen>
 
@@ -1906,17 +1914,17 @@ PRICE "Reset" "-"
  </EventUnitTest7>
 
  <EventUnitTest8>
-    Var buttonRemoveCup = "Enable"
+    Var buttonRemoveCupOnArm = "Enable"
-    DEBUGVAR buttonRemoveCup
+    DEBUGVAR buttonRemoveCupOnArm
 	DEBUGVAR bnRemoveCup
 	DEBUGVAR bpRemoveCup
 
  </EventUnitTest8>
 
   <EventUnitTest9>
-	Var buttonRemoveCup = "Enable"
+	Var buttonRemoveCupOnArm = "Enable"
 	Var UseVeryBigRemoveCupButton = "Enable"
-    DEBUGVAR buttonRemoveCup
+    DEBUGVAR buttonRemoveCupOnArm
 
 
  </EventUnitTest9>
@@ -1943,10 +1951,14 @@ PRICE "Reset" "-"
 	DEBUGVAR FailErrorHappend
 	
 	If FailErrorHappend = 1 Then
-		If CountDownFailErrorHappendClear > 0 Then
+		If CupOnArm = "true" Then
-			Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
+
-			If CountDownFailErrorHappendClear = 1 Then
+		Else
-				__CMD "error-code-clear-all" "-" "-" "-"
+			If CountDownFailErrorHappendClear > 0 Then
+				Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
+				If CountDownFailErrorHappendClear = 1 Then
+					__CMD "error-code-clear-all" "-" "-" "-"
+				EndIf
 			EndIf
 		EndIf
 	EndIf
@@ -2288,23 +2300,7 @@ PRICE "Reset" "-"
 		EndIf
 	EndIf
 
-
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
-
-
-	If CupOnArm = "true" Then
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
 
 
 
@@ -2656,7 +2652,7 @@ PRICE "Reset" "-"
 <Button>
 <X> btnRemoveCupX </X>
 <Y> btnRemoveCupY </Y>
-<State> buttonRemoveCup </State>
+<State> buttonRemoveCupOnArm </State>
 ;<Color> "0x00BDFF" </Color>
 <Interval> 500 </Interval>
 <Filename> bnRemoveCup </Filename>
@@ -2666,7 +2662,8 @@ PRICE "Reset" "-"
 	Machine DoorLidOpen
 
 	Var CheckCupStateDoorCupClose = "reset"
-	Var buttonRemoveCup = "Invisible"
+	Var buttonRemoveCupOnArm = "Invisible"
+	RefreshAll
 </EventClick>
 </Button>
 
@@ -2806,4 +2803,6 @@ PRICE "Reset" "-"
 </Text>
 
 
+;include="ROOT/inc/remove_cup_tag_on_arm.inc"
+
 </Page>

xml/page_catalog2.xml

@@ -228,21 +228,8 @@
 
 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/tricker.ev"
 
-	; zone cup on arm
-	If CupOnArm = "true" Then
 
-		If CheckCupStateDoorCupClose = "" Then
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
 
 	If CounterEnable = 1 Then
 		If OnTaobinVending = 1 Then
@@ -695,5 +682,6 @@
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
 </EventUnitTest4>
 
+;include="ROOT/inc/remove_cup_tag_on_arm.inc"
 
 </Popup>

xml/page_catalog3.xml

@@ -224,6 +224,10 @@
 
 	; zone cup on arm
 	If Seeker = "curr" Then
+
+		Var buttonRemoveCup = "Invisible"
+
+	Else
 		If CupOnArm = "true" Then
 
 			If CheckCupStateDoorCupClose = "" Then
@@ -234,14 +238,8 @@
 				Var buttonRemoveCup = "Enable"
 			EndIf
 		Else
-			If buttonRemoveCup = "Enable" Then
+
-				Var buttonRemoveCup = "Invisible"
-			EndIf
 		EndIf
-
-
-	Else
-		Var buttonRemoveCup = "Invisible"
 	EndIf
 
 
@@ -300,25 +298,7 @@
         EndIf
 	EndIf
 
-	; zone cup on arm
+	;include="ROOT/taobin_project/inc/remove_cup_on_arm_step.inc"
-	If Seeker = "curr" Then
-		If CupOnArm = "true" Then
-
-			If CheckCupStateDoorCupClose = "" Then
-				Var buttonRemoveCup = "Enable"
-			EndIf
-
-			If CheckCupStateDoorCupClose = "done" Then
-				Var buttonRemoveCup = "Enable"
-			EndIf
-		Else
-			If buttonRemoveCup = "Enable" Then
-				Var buttonRemoveCup = "Invisible"
-			EndIf
-		EndIf
-	Else
-		Var buttonRemoveCup = "Invisible"
-	EndIf
 
 
 
@@ -754,4 +734,7 @@
 </EventUnitTest4>
 
 
+;include="ROOT/inc/remove_cup_tag_on_arm.inc"
+
+
 </Popup>

xml/page_catalog_group_recommend.skt

@@ -46,7 +46,6 @@
 ;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
 
 
-
 <?hurr 
     #include=menu_new_layout_gen_v2.py
 ?>
@@ -60,7 +59,6 @@
 
 ;BigLogoLayout
 
-;include="ROOT/taobin_project/inc/button_remove_cup.inc"
 
 </Popup>
 

xml/page_catalog_group_recommend.xml

@@ -43,6 +43,10 @@
 
 ;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
 
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+  SAVELOG "Timeout another tag Timeout another tag Timeout another tag Timeout another tag" 
+</EventTimeout> 
 
 
 
@@ -16838,7 +16842,6 @@ Limenade Soda" </Value>
 
 ;BigLogoLayout
 
-;include="ROOT/taobin_project/inc/button_remove_cup.inc"
 
 </Popup>
 

xml/page_remove_cup.xml

@@ -14,6 +14,8 @@
 	READ_FILE "/mnt/sdcard/coffeevending/country/short" StrCountryShort
 	DEBUGVAR StrCountryShort
 
+	Var buttonRemoveCupOnArm = "Invisible"
+
 	; Don't forget
 	; This file can open before page_board.xml
 	If StrCountryShort = "MYS" Then

xml/page_thankyouConti.xml

@@ -167,10 +167,11 @@
 
 	Var buttonRemoveCup = "Invisible"
 
-	Var thankyouContiVersion = "TC12 "
+	Var thankyouContiVersion = "TC13 "
 	SAVELOG "Thank you conti version " + thankyouContiVersion
 	SAVELOG "Support NextSmoothie and fix bug next"
-	SAVELOG "DirImage detele. use DirImage2"
+	SAVELOG "MenuErrorCode"
+	
 
     DEBUGVAR NextSmoothie
     DEBUGVAR Seeker.SmoothieToPayment
@@ -210,8 +211,9 @@
 			If CountDownFailErrorHappendClear = 29 Then
 				__CMD "CLI" "clear-ice-for-next-drink" "-" "-"
 			EndIf
+			
 			If CountDownFailErrorHappendClear = 25 Then
-				__CMD "error-code-clear-all" "-" "-" "-"
+				;__CMD "error-code-clear-all" "-" "-" "-"
 				
 			EndIf
 
@@ -313,6 +315,7 @@
 			Var PictureFile = PictureFile + "1"
 			Var PictureFile = PictureFile + PictureEnd
 
+			SAVELOG "============ Older condition ================="
 			DEBUGVAR Seeker.selected_a_drink
 			If NextOrderStatus = "Disable" Then
 				Var LastMakeDrinkResult = "fail"
@@ -327,54 +330,6 @@
 
 	DEBUGVAR CountDownThankyou
 
-	; obsolete
-	If CountDownThankyou = 99 Then
-
-		; reset all var
-		DEBUGVAR MachineStage
-		SAVELOG "CountDownThankyou = 0"
-
-		Var CountDownBrewing = BrewTime
-		Var CountUpBrewing = 0
-		SAVELOG BrewTime
-
-		Var ShowCountDownBrewing = CountDownBrewing
-		Var MachineState_Result = 0
-
-		If MachineStage = "show-menu" Then
-			If HaveCup = "false" Then
-
-				Var LastMakeDrinkResult = "-"
-				If New_Payment = 1 Then
-					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
-				EndIf
-				MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
-
-				If CountryName = "Thailand" Then
-
-					If New_Payment = 1 Then
-						Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
-					Else
-						Open "ROOT/taobin_project/xml/page_brewing3.xml"
-					EndIf
-				Else
-
-					If InternationalEnable = 1 Then
-						Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
-						Open Brew3Inter
-					Else
-						;obsolete
-						If New_Payment = 1 Then
-							Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
-						Else
-							Open "ROOT/taobin_project/xml/page_brewing3.xml"
-						EndIf
-					EndIf
-				EndIf
-			EndIf
-     	EndIf
-
-	EndIf
 
 		; run test;
 	If CountDownThankyou = 0 Then
@@ -421,8 +376,6 @@
 
 				If New_Payment = 1 Then
 					Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
-				Else
-					Open "ROOT/taobin_project/xml/page_brewing3.xml"
 				EndIf
 			Else
 
@@ -458,6 +411,7 @@
 
 
 	;include=ROOT/taobin_project/inc/remove_cup_step.inc
+	
 	If Timeout2 < 3 Then
     	Var buttonRemoveCup = "Invisible"
     EndIf
@@ -477,6 +431,7 @@
     EndIf
 
 	DEBUGVAR MenuReadyForCup
+	DEBUGVAR MenuErrorCode
 
 	If MenuReadyForCup = "YES" Then
 
@@ -515,6 +470,32 @@
 		Var buttonRemoveCup = "Invisible"
 
 	Else
+		If MenuErrorCode > 0 Then
+			
+			If Timeout2 > 40 Then
+				SAVELOG "Timeout2 40 MenuErrorCode not zero"
+
+
+				Var error_code_stop_now = MenuErrorCode
+
+
+				If DoorCupPosition = "bottom" Then
+
+				Else
+					Var error_code_stop_now = 1296
+					__CMD "error-code-1296" 0 "-" "-"
+				EndIf
+
+				If New_Payment = 1 Then
+					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
+				EndIf
+
+				Var LastMakeDrinkResult = "fail"
+				Open "ROOT/taobin_project/xml/page_cannotConti.xml"
+
+			EndIf
+
+		EndIf
 
 
 	EndIf

xml/page_topping_select7.xml

@@ -13,6 +13,8 @@
 	EndIf
 	Machine WakeUp
 
+	Var EndOfTopping = 0
+	
 	Var Seeker.orderFromNewTopping  = 0
 
 	Var TextSelfTestCntColor = "0x746253"

xml/topview2.xml

@@ -793,4 +793,10 @@
 </ListView1>
 ;
 
+
+
+
+;include="ROOT/taobin_project/inc/button_remove_cup.inc"
+
+
 </Popup>

xml/vending_info.xml

@@ -185,6 +185,14 @@
 
 	Var CountTouchButton = 0
 
+	DEBUGVAR FrontDoorVersionInt
+	
+	If FrontDoorVersionInt > 2000 Then
+		Var EnableTestRGB = "Enable"
+	Else
+		Var EnableTestRGB = "Invisible"
+	EndIf
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@@ -1041,6 +1049,7 @@
 <Image>
 <X> info2_startX </X>
 <Y> info_15Y </Y>
+<State> EnableTestRGB </State>
 <Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
 <EventClick>
 	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_test_color.xml"
@@ -1051,6 +1060,7 @@
 <X> info2_text_startX </X>
 <Y> info_text_15Y </Y>
 <Size> 30 </Size>
+<State> EnableTestRGB </State>
 <Font> fontType1 </Font>
 <Color> 0x000000 </Color>
 <Value> "Test RGB" </Value>

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "9.99"
+	Var XMLPageVersion = "10.01"
-	Var XMLPageVersionInt = 999
+	Var XMLPageVersionInt = 1001
 	
 	Var CurrentMainVideo = 2
 </EventOpen>

xml_main/startup_dev.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "10.99"
+	Var XMLPageVersion = "11.01"
-	Var XMLPageVersionInt = 1099
+	Var XMLPageVersionInt = 1101
 ;Oreo
 Var OreoGuarantee = 0