Merge apple

xml/page_thankyouConti.xml

@@ -167,7 +167,7 @@
 
 	Var buttonRemoveCup = "Invisible"
 
-	Var thankyouContiVersion = "TCV9 "
+	Var thankyouContiVersion = "TC12 "
 	SAVELOG "Thank you conti version " + thankyouContiVersion
 	SAVELOG "Support NextSmoothie and fix bug next"
 	SAVELOG "DirImage detele. use DirImage2"
@@ -182,6 +182,13 @@
 	Var CupErrorCodeForNextOrder = 0
 	Var CountDownForShowMenuNextOrderToBrew = 4
 
+	Var CountDownFailErrorHappendClear = 30
+
+	Var ThankyouContiString = ""
+	
+	DEBUGVAR FailErrorHappend
+	; setvarint FailErrorHappend 1
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
@@ -189,14 +196,30 @@
 
 	DEBUGVAR MachineStage
 	DEBUGVAR HaveCup
-	DEBUGVAR CHECKCUP
-	DEBUGVAR CupChecking
 	DEBUGVAR MaybeHaveCup
 	DEBUGVAR DoorCupPosition
 	DEBUGVAR CountUpDoorCupOpen
 	DEBUGVAR Timeout
 	DEBUGVAR Timeout2
+	DEBUGVAR FailErrorHappend
+	DEBUGVAR CountDownFailErrorHappendClear
 
+	If FailErrorHappend = 1 Then
+
+		If CountDownFailErrorHappendClear > 0 Then
+			If CountDownFailErrorHappendClear = 29 Then
+				__CMD "CLI" "clear-ice-for-next-drink" "-" "-"
+			EndIf
+			If CountDownFailErrorHappendClear = 25 Then
+				__CMD "error-code-clear-all" "-" "-" "-"
+				
+			EndIf
+
+			Var CountDownFailErrorHappendClear = CountDownFailErrorHappendClear - 1
+		EndIf
+		Var ThankyouContiString = "" + CountDownFailErrorHappendClear
+
+	EndIf
 
 
 	Var Timeout2 = Timeout2 + 1
@@ -366,6 +389,10 @@
 
 		Var ShowCountDownBrewing = CountDownBrewing
 		Var MachineState_Result = 0
+		
+		If FailErrorHappend = 1 Then
+
+		EndIf
 
 		If MenuReadyForCup = "YES" Then
 
@@ -594,6 +621,18 @@
 </Text>
 
 
+<Text>
+<X> 0 </X>
+<Y> 1888 </Y>
+<State> "Enable" </State>
+<Font> KanitTTF </Font>
+<Size> 22 </Size>
+<Width> 1078 </Width>
+<Align> end </Align>
+<Color> 0xFF0000 </Color>
+<Value> ThankyouContiString</Value>
+</Text>
+
 
 <EventUnitTest1>
 	Var Timeout2 = 0