枪归位检测

DcPillar/Src/Drivers/Drv_TCUComm.h

@@ -374,7 +374,7 @@ typedef enum
 
   ///////////数据帧/直流////////////
   eCmd_DCConMeasu	   =0x002000,// 充电控制器遥测帧
-  eCmd_DCTCUMeasu      =0x002100,// 计费单元遥测 帧
+  eCmd_DCTCUMeasu      =0x002100,// 计费单元遥测帧
   eCmd_DCConInfor1	   =0x002200,// 充电控制器遥信帧
   eCmd_DCConInfor2     =0x002300,//  充电控制器遥信帧
   ///////////数据帧/交流////////////

DcPillar/Src/Thread/Thd_Mult.c

@@ -574,9 +574,9 @@ void Thd_Mult(void const *parameter)
   u8 MergencyCheckCnt = 0;
   u8 DoorChkCnt = 0;
   u8 SPDChkCnt = 0;
-  u8 ContactorChkCnt = 0;
-  u8 ContactorChkCnt_B = 0;
-  u8 ContactorChkCnt_Uni = 0;
+  //u8 ContactorChkCnt = 0;
+  //u8 ContactorChkCnt_B = 0;
+  //u8 ContactorChkCnt_Uni = 0;
   u8 EleLockChkCnt = 0;
   u8 EleLockChkCnt_B = 0;
   u8 ImdErrorCnt = 0;
@@ -584,6 +584,9 @@ void Thd_Mult(void const *parameter)
   u32 ImdCheckTcik,ImdCheckTcik_B;
   u8 ACContactorChkCnt = 0;
   u8 ACContactorOnCnt = 0;
+
+  u32 OnesCheckTcik = 0;
+  OnesCheckTcik = GetSystemTick();
   MergencyCheckCnt = 0;
   DoorChkCnt = 0;
   ImdErrorCnt = 0;
@@ -1072,8 +1075,54 @@ void Thd_Mult(void const *parameter)
       PillarError_B.Value.ImdDev = 0;
     else if((5 == ImdErrorCnt_B)&&((TCUCurChgRecd_B.TCUChargeEnable == 0)&&(TCUCurChgRecd.TCUChargeEnable==0)&&(eChgVer_2011 != UserParam.ChgVer)))
       PillarError_B.Value.ImdDev = 1;
-
+	
+	if((GetSystemTick() - OnesCheckTcik) >= 1000)
+	{
+		OnesCheckTcik = GetSystemTick();
+		extern void OnesCheckTcikHandle(void);
+		OnesCheckTcikHandle();
+	}
     osDelay(25);
   }
 }
 
+
+void OnesCheckTcikHandle(void)
+{
+	static u8 GunStatusCount = 0;
+	static u8 GunStatusCount_B = 0;
+
+	if(!GunStatusGet() && !CcStatusRead())
+	{
+		if(GunStatusCount < 5)
+		{
+			GunStatusCount++;
+		}
+		else
+		{
+			PillarError.Value.PutBack = 1;
+		}
+	}
+	else
+	{
+		GunStatusCount = 0;
+		PillarError.Value.PutBack = 0;
+	}
+
+	if(!GunStatusGet_B() && !CcStatusRead_B())
+	{
+		if(GunStatusCount_B < 5)
+		{
+			GunStatusCount_B++;
+		}
+		else
+		{
+			PillarError_B.Value.PutBack = 1;
+		}
+	}
+	else
+	{
+		GunStatusCount_B = 0;
+		PillarError_B.Value.PutBack = 0;
+	}
+}