1 files changed, 52 insertions, 28 deletions

diff --git a/Software/Stubs Collection/stubs/Scripts/Assemblies/ElectricalEnclosure/ElectricalEnclosure_Fans1.cs b/Software/Stubs Collection/stubs/Scripts/Assemblies/ElectricalEnclosure/ElectricalEnclosure_Fans1.cs
index af5a07543..ba39cb2b0 100644
--- a/Software/Stubs Collection/stubs/Scripts/Assemblies/ElectricalEnclosure/ElectricalEnclosure_Fans1.cs
+++ b/Software/Stubs Collection/stubs/Scripts/Assemblies/ElectricalEnclosure/ElectricalEnclosure_Fans1.cs
@@ -73,7 +73,7 @@ public void OnExecute(StubManager stubManager)
 	
 	for (int i = 0; i<1000; i++)
 	{
-		stubManager.Write("----------------------------------------\n");
+		stubManager.Write("\n----------------------------------------\n");
 //		Fpga_Read_Reg(FPGA1, F1_Tacho_reg0, 0); stubManager.Write("\n");
 //		Fpga_Read_Reg(FPGA1, F1_Tacho_reg1, 1); stubManager.Write("\n");
 //		Fpga_Read_Reg(FPGA1, F1_Tacho_reg2, 1); stubManager.Write("\n");
@@ -83,61 +83,85 @@ public void OnExecute(StubManager stubManager)
 		var RetVal=Fpga_Read_Reg(FPGA1, F1_Tacho_reg0, 0); 
 			stubManager.Write("\nFan5 Speed-");	
 			stubManager.WriteHex(RetVal.Value,4);
-
-			
+			if (RetVal.Value>0x440 && RetVal.Value<0x4d0)
+			stubManager.Write("\t Pass");					
+			else
+			stubManager.Write("\t Fail");					
 			
 			
 			 RetVal=Fpga_Read_Reg(FPGA1, F1_Tacho_reg1, 0); 
 			stubManager.Write("\nFan1 Speed-");	
 			stubManager.WriteHex(RetVal.Value,4);
+			if (RetVal.Value>0x220 && RetVal.Value<0x300)
+			stubManager.Write("\t Pass");					
+			else
+			stubManager.Write("\t Fail");					
+			
+			
+
 			
-			 RetVal = Fpga_Read_Reg(FPGA1, F1_gpi_FANS, 0);
-			Temp1=RetVal.Value & 0x0001;
-		if (Temp1 !=0x0001)
-			stubManager.Write("\tFan1 Running ");
-		else
-			stubManager.Write("\tFan1 Stop");
+//			 RetVal = Fpga_Read_Reg(FPGA1, F1_gpi_FANS, 0);
+//			Temp1=RetVal.Value & 0x0001;
+//		if (Temp1 !=0x0001)
+//			stubManager.Write("\tFan1 Running ");
+//		else
+//			stubManager.Write("\tFan1 Stop");
 			
 		
 		
 			RetVal=Fpga_Read_Reg(FPGA1, F1_Tacho_reg2, 0); 
 			stubManager.Write("\nFan2 Speed-");	
 			stubManager.WriteHex(RetVal.Value,4);
+			if (RetVal.Value>0x220 && RetVal.Value<0x300)
+			stubManager.Write("\t Pass");					
+			else
+			stubManager.Write("\t Fail");					
+			
 
-			Temp1=RetVal.Value & 0x0002;
-		if (Temp1 !=0x0002)
-			stubManager.Write("\tFan2 Running ");
-		else
-			stubManager.Write("\tFan2 Stop");
+//			Temp1=RetVal.Value & 0x0002;
+//		if (Temp1 !=0x0002)
+//			stubManager.Write("\tFan2 Running ");
+//		else
+//			stubManager.Write("\tFan2 Stop");
 			
 		
 			RetVal=Fpga_Read_Reg(FPGA1, F1_Tacho_reg3, 0); 
 			stubManager.Write("\nFan3 Speed-");	
 			stubManager.WriteHex(RetVal.Value,4);
+			if (RetVal.Value>0x220 && RetVal.Value<0x300)
+			stubManager.Write("\t Pass");					
+			else
+			stubManager.Write("\t Fail");					
+			
 
-			Temp1=RetVal.Value & 0x0004;
-		if (Temp1 !=0x0004)
-			stubManager.Write("\tFan3 Running ");
-		else
-			stubManager.Write("\tFan3 Stop");
+//			Temp1=RetVal.Value & 0x0004;
+//		if (Temp1 !=0x0004)
+//			stubManager.Write("\tFan3 Running ");
+//		else
+//			stubManager.Write("\tFan3 Stop");
 			
 		
 		
 			RetVal=Fpga_Read_Reg(FPGA1, F1_Tacho_reg4, 0); 
 			stubManager.Write("\nFan4 Speed-");	
 			stubManager.WriteHex(RetVal.Value,4);
+			if (RetVal.Value>0x220 && RetVal.Value<0x300)
+			stubManager.Write("\t Pass");					
+			else
+			stubManager.Write("\t Fail");					
+			
 		
-			Temp1=RetVal.Value & 0x0008;
-		if (Temp1 !=0x0008)
-			stubManager.Write("\tFan4 Running ");
-		else
-			stubManager.Write("\tFan4 Stop");
+//			Temp1=RetVal.Value & 0x0008;
+//		if (Temp1 !=0x0008)
+//			stubManager.Write("\tFan4 Running ");
+//		else
+//			stubManager.Write("\tFan4 Stop");
 		
 		
-		Fpga_Read_Reg(FPGA1, F1_Tacho_reg5, 1); stubManager.Write("\n");
-		Fpga_Read_Reg(FPGA1, F1_Tacho_reg6, 1); stubManager.Write("\n");
-		Fpga_Read_Reg(FPGA1, F1_Tacho_reg7, 1); stubManager.Write("\n");
-		Fpga_Read_Reg(FPGA2, F2_Tacho_reg0, 1); stubManager.Write("\n");
+//		Fpga_Read_Reg(FPGA1, F1_Tacho_reg5, 1); stubManager.Write("\n");
+//		Fpga_Read_Reg(FPGA1, F1_Tacho_reg6, 1); stubManager.Write("\n");
+//		Fpga_Read_Reg(FPGA1, F1_Tacho_reg7, 1); stubManager.Write("\n");
+//		Fpga_Read_Reg(FPGA2, F2_Tacho_reg0, 1); stubManager.Write("\n");
 		
 		//stubManager.Write("\n\n");
 		Thread.Sleep(1000);