接触器据动/粘连检测

DcPillar/Src/SmartAllocation/Drv_SmartAllocation.c

@@ -1360,31 +1360,65 @@ void RelayStatusCheck(void)
 		flag = 5;
 		PillarError.Value.UniContactor = 1;
 		PillarError_B.Value.UniContactor = 1;
+		if(GetDcModeleRelaySet(Relay_K5K6) == eSwSta_Off)
+		{
+			PillarError.Value.UniContactor2 = 1;
+			PillarError_B.Value.UniContactor2 = 1;
+		}
+		else
+		{
+			PillarError.Value.UniContactor1 = 1;
+			PillarError_B.Value.UniContactor1 = 1;
+		}
 	}
 	else
 	{
 		PillarError.Value.UniContactor = 0;
 		PillarError_B.Value.UniContactor = 0;
+		PillarError.Value.UniContactor1 = 0;
+		PillarError_B.Value.UniContactor1 = 0;
+		PillarError.Value.UniContactor2 = 0;
+		PillarError_B.Value.UniContactor2 = 0;
 	}
 
 	if(flag_A>=5)
 	{
 		flag_A = 5;
 		PillarError.Value.Contactor = 1;
+		if(GetDcModeleRelaySet(Relay_K1K2) == eSwSta_Off)
+		{
+			PillarError.Value.Contactor2 = 1;
+		}
+		else
+		{
+			PillarError.Value.Contactor1 = 1;
+		}
 	}
 	else
 	{
 		PillarError.Value.Contactor = 0;
+		PillarError.Value.Contactor1 = 0;
+		PillarError.Value.Contactor2 = 0;
 	}
 
 	if(flag_B>=5)
 	{
 		flag_B = 5;
 		PillarError_B.Value.Contactor = 1;
+		if(GetDcModeleRelaySet(Relay_K7K8) == eSwSta_Off)
+		{
+			PillarError_B.Value.Contactor2 = 1;
+		}
+		else
+		{
+			PillarError_B.Value.Contactor1 = 1;
+		}
 	}
 	else
 	{
 		PillarError_B.Value.Contactor = 0;
+		PillarError_B.Value.Contactor1 = 0;
+		PillarError_B.Value.Contactor2 = 0;
 	}
 }
 

DcPillar/Src/Thread/Thd_Mult.c

@@ -868,16 +868,16 @@ void Thd_Mult(void const *parameter)
       {
         PillarError.Value.ACContactor = 1;
         PillarError_B.Value.ACContactor = 1;
-		if((ACContactorSta==eSwSta_On)&&(ACContactorGet()==eSwSta_Off))
-		{
-			PillarError.Value.ACContactor1 = 1;
-        	PillarError_B.Value.ACContactor1 = 1;
-		}
-		else if((ACContactorSta==eSwSta_Off)&&(ACContactorGet()==eSwSta_On))
+		if((ACContactorSta==eSwSta_Off)&&(ACContactorGet()==eSwSta_On))
 		{
 			PillarError.Value.ACContactor2 = 1;
         	PillarError_B.Value.ACContactor2 = 1;
 		}
+		else// if((ACContactorSta==eSwSta_Off)&&(ACContactorGet()==eSwSta_On))
+		{
+			PillarError.Value.ACContactor1 = 1;
+        	PillarError_B.Value.ACContactor1 = 1;
+		}
       }
     }
     else