交流接触器据动/粘连检测

DcPillar/Src/Thread/Thd_Mult.c

@@ -868,6 +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))
+		{
+			PillarError.Value.ACContactor2 = 1;
+        	PillarError_B.Value.ACContactor2 = 1;
+		}
       }
     }
     else
@@ -878,6 +888,10 @@ void Thd_Mult(void const *parameter)
       {
         PillarError.Value.ACContactor = 0;
         PillarError_B.Value.ACContactor = 0;
+		PillarError.Value.ACContactor1 = 0;
+        PillarError_B.Value.ACContactor1 = 0;
+		PillarError.Value.ACContactor2 = 0;
+        PillarError_B.Value.ACContactor2 = 0;
       }
 	  ACContactorChkCnt = 0;
     }
@@ -1114,7 +1128,7 @@ void OnesCheckTcikHandle(void)
 		PillarError.Value.PutBack = 0;
 	}
 
-	if(!GunStatusGet_B() && !CcStatusRead_B()&&(ChargeCtrl_B.CurProcess == eChgPro_ChgIdle))
+	if(!GunStatusGet_B() && !CcStatusRead_B()&&(ChargeCtrl_B.CurProcess == eChgPro_B_ChgIdle))
 	{
 		if(GunStatusCount_B < 60)
 		{
@@ -1131,3 +1145,4 @@ void OnesCheckTcikHandle(void)
 		PillarError_B.Value.PutBack = 0;
 	}
 }
+