before merge from inter

xml/event/tricker.ev

@@ -33,7 +33,7 @@ Var MomDayEnable = 0
 Var GameEnableFromTrickerEv = 0
 
 ; Enable pro Pepween
-Var PepweenEnable = 1
+Var PepweenEnable = 0
 
 ; Enable pro Tamatian. 16-30 Sep
 Var TamatianEnable = 0
@@ -90,6 +90,10 @@ If BoxID = 172644 Then
 	Var MilkChoiceVeganEnable = 1
 EndIf
 
+If ConfigNumer = 1581 Then
+	Var PepweenEnable = 0
+EndIf
+
 
 Var GameEnableFromTrickerEv = 1
 

xml/page_board.xml

@@ -1000,7 +1000,12 @@
 
 			Var NETCORE_EVENT_CNT_X = NETCORE_EVENT_CNT_X + 1
 			
-			DEBUGVAR NETCORE_EVENT_CNT_X
+			If NETCORE_EVENT_CNT_X = 30 Then
+				DEBUGVAR NETCORE_EVENT_CNT_X
+			EndIf
+			If NETCORE_EVENT_CNT_X = 90 Then
+				DEBUGVAR NETCORE_EVENT_CNT_X
+			EndIf
 
 			If NETCORE_EVENT_CNT_X > 300 Then
 				Var stop_now = "true"

xml/page_brewing3.xml

@@ -9,6 +9,7 @@
 
 	Var GetMoreStrawCount = 3
 
+	Var CountUpWhenBREW_CNT = 0
 	DEBUGVAR TxRef1
 
 	SAVELOG "page_brewing3.xml"
@@ -809,6 +810,22 @@
 	EndIf
 	
 
+	If BREW_CNT = 0 Then
+		If CountUpWhenBREW_CNT > 56 Then
+			Var CountUpWhenBREW_CNT = 0
+			Var drink_success_set = "-"
+			READ_FILE "/mnt/sdcard/coffeevending/log/drink-success" drink_success_set
+			DEBUGVAR drink_success_set
+			If drink_success_set = "1" Then
+				Var MachineState_Result = 1
+			EndIf
+
+		EndIf
+
+		Var CountUpWhenBREW_CNT = CountUpWhenBREW_CNT + 1
+
+	EndIf
+
 	If Timeout > 480 Then
 		SAVELOG " Timeout > 480"
 		Var MachineState_Result = 2

xml/page_drinkok.xml

@@ -180,6 +180,7 @@
 	EndIf
 
 
+	WRITE_FILE "/mnt/sdcard/coffeevending/log/drink-success" "0"
 
 </EventOpen>
 <Timeout> 500 </Timeout>

xml/page_topping_select5.xml

@@ -48,7 +48,7 @@
 	Var CHECK_EventOpen_Double = 0
 
 	If RecipeTag3 = "CoffeePlay" Then
-		;Open "ROOT/taobin_project/xml/page_topping_select8.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select8.xml"
 	EndIf
 
 	If BoxID = 200001 Then