无有效电流检测;通过小桔测试

DcPillar/Src/Drivers/Drv_TCUComm.h

@@ -220,14 +220,14 @@ typedef union {
 		   交流输入接触器拒动/误动故障
 		   交流输入接触器粘连故障
 		*/
-		u16 			Door			: 1;		//
-		u16 			DCOutConOn		: 1;		//母线接触器粘连故障
-		u16 			ImdWarm 		: 1;
-		u16 			DrainResist 	: 1;
-		u16 			tempOver		: 1;
-		u16 			gunTemp 		: 1;
-		u16 			AccContacON 	: 1;		//交流数日接触器据动/误动故障
-		u16 			AccContacOff	: 1;		//粘连故障
+		u32 			Door			: 1;		//
+		u32 			DCOutConOn		: 1;		//母线接触器粘连故障
+		u32 			ImdWarm 		: 1;
+		u32 			DrainResist 	: 1;
+		u32 			tempOver		: 1;
+		u32 			gunTemp 		: 1;
+		u32 			AccContacON 	: 1;		//交流数日接触器据动/误动故障
+		u32 			AccContacOff	: 1;		//粘连故障
 
 		/*
 		  辅助电源故障
@@ -239,10 +239,10 @@ typedef union {
 		  充电机柜门禁故障
 		  充电机柜水浸故障
 		*/
-		u16 			Power			: 1;		//辅助电源 
-		u16 			UniContactorOff : 1;		//接触器据动/误动故障
-		u16 			UniContactorOn	: 1;		//并联接触器粘连故障
-		u16 			reserve1		: 5;
+		u32 			Power			: 1;		//辅助电源 
+		u32 			UniContactorOff : 1;		//接触器据动/误动故障
+		u32 			UniContactorOn	: 1;		//并联接触器粘连故障
+		u32 			reserve1		: 5;
 
 		/*
 		  充电机柜烟感故障
@@ -254,7 +254,7 @@ typedef union {
 		  开关模块通信告警
 		  开关模块故障
 		*/
-		u16 			reserve2		: 8;
+		u32 			reserve2		: 8;
 
 		/*
 		  开关模块告警
@@ -266,9 +266,12 @@ typedef union {
 		  灯板通信故障
 		  电能表通信故障
 		*/
-		u16 			reserve3		: 4;
-		u16 			ImdCon			: 1;
-		u16 			reserve4		: 3;
+		u32 			reserve3		: 1;
+		u32 			bms		: 1;
+		u32 			bmsSend		: 1;
+		u32 			DcModDrain		: 1;
+		u32 			ImdCon			: 1;
+		u32 			reserve4		: 3;
 	} InfRe;
 
 

DcPillar/Src/Global.h

@@ -283,6 +283,7 @@ typedef enum
   eChgStop_Conf_BatVoltLessPillarMinVolt = 101,
   eChgStop_PillarReady_UniContactor,
   eChgStop_BatVoltOverBatMax,
+  eChgStop_Run_NoCurr,
 
 }EnumChgStopType;
 
@@ -382,6 +383,7 @@ typedef union
 	u32 DCMoudleOnTimeOut :1; //充电模块开机超时
 	u32 Bcp : 1;//BCP 报文数据项异常
 	u32 Bsm : 1;//动力蓄电池状态信息（BSM）超时
+	u32 VoltOutLowError  : 1; //输出欠压
   }Value;
 }UnionChgError;
 

DcPillar/Src/SmartAllocation/ChgPro_B_ChgRun_SmartAllocation.c

@@ -96,6 +96,9 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 	UniChgTick = 0;
 	u32 NeedPower = 0;
 	u32 NowPower = 0;
+	u32 NoCurrentCount = 0;
+	u32 NoCurrentTick = GetSystemTick();
+	
 	while(1)
 	{
 		if((GetSystemTick() - CCS_SendTick) > 50)
@@ -559,6 +562,30 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 			pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
 			pChargeCtrl->Param = 0;
 		}
+
+		if(GetSystemTick() - NoCurrentTick > 1000)
+		{
+			NoCurrentTick = GetSystemTick();
+			if(GetDcModuleCurrt_B() < 50)
+			{
+				NoCurrentCount++;
+				if(NoCurrentCount>=600)
+				{
+					CstMsg_B.StopReason.Value.Manual = 1;
+					CST_Send_B(&CstMsg_B);
+					DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt * DcModuleManage_B.ValidNum);
+					ChargeTimerSet_B(eSwSta_Off);
+					ChargeStopType_B		= eChgStop_Run_NoCurr;
+					pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
+					pChargeCtrl->Param	= 0;
+				}
+			}
+			else
+			{
+					NoCurrentCount = 0;
+			}
+		}
+		
 		if(eChgPro_B_ChgRun != pChargeCtrl->CurProcess)
 		{
 			release_DcModule(2);

DcPillar/Src/SmartAllocation/ChgPro_ChgRun_SmartAllocation.c

@@ -102,6 +102,8 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl)
 	u32 NeedPower = 0;
 	u32 NowPower = 0;
 	u32 NowMaxCurrt = 0;
+	u32 NoCurrentCount = 0;
+	u32 NoCurrentTick = GetSystemTick();
 	while (1)
 	{
 		if ((GetSystemTick() -CCS_SendTick) > 50)
@@ -613,6 +615,29 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl)
 			pChargeCtrl->Param	= 0;
 		}
 
+		if(GetSystemTick() - NoCurrentTick > 1000)
+		{
+			NoCurrentTick = GetSystemTick();
+			if(GetDcModuleCurrt() < 50)
+			{
+				NoCurrentCount++;
+				if(NoCurrentCount>=600)
+				{
+					CstMsg.StopReason.Value.Manual = 1;
+					CST_Send(&CstMsg);
+					DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt * DcModuleManage.ValidNum);
+					ChargeTimerSet(eSwSta_Off);
+					ChargeStopType		= eChgStop_Run_NoCurr;
+					pChargeCtrl->CurProcess = eChgPro_ChgStop;
+					pChargeCtrl->Param	= 0;
+				}
+			}
+			else
+			{
+					NoCurrentCount = 0;
+			}
+		}
+
 		if (eChgPro_ChgRun != pChargeCtrl->CurProcess)
 		{
 			release_DcModule(1);

DcPillar/Src/SmartAllocation/Drv_DcModule_SmartAllocation.c

@@ -691,7 +691,7 @@ s8 getDcMoudleVoltChkCnt(void)
 
 void setDcMoudleVoltChkCnt(s8 val)
 {
-	DcModleVoltChkCnt = 0;
+	DcModleVoltChkCnt = val;
 }
 
 void DcModuleMsgReceive_ZhongXing(CanRxMsg* RxMsg)

DcPillar/Src/SmartAllocation/Drv_SmartAllocation.c

@@ -1309,8 +1309,7 @@ void RelayStatusCheck(void)
 {
 	static u32		Tick = 0;
 	static u8		flag = 0;
-	static u8		flag_A = 0;
-	static u8		flag_B = 0;
+
 	if ((GetSystemTick() -Tick) < 100)
 	{
 		return;
@@ -1318,8 +1317,8 @@ void RelayStatusCheck(void)
 	Tick = GetSystemTick();
 
 	if((GetDcModeleRelaySet(Relay_K5K6) != GetK5K6Status())
-		/*|| (GetDcModeleRelaySet(Relay_K1K2) != GetK1K2Status())
-		|| (GetDcModeleRelaySet(Relay_K7K8) != GetK7K8Status())*/)
+		|| (GetDcModeleRelaySet(Relay_K1K2) != GetK1K2Status())
+		|| (GetDcModeleRelaySet(Relay_K7K8) != GetK7K8Status()))
 	{
 		flag++;
 	}
@@ -1338,88 +1337,19 @@ void RelayStatusCheck(void)
 		flag = 0;
 	}
 
-	if(GetDcModeleRelaySet(Relay_K1K2) != GetK1K2Status())
-	{
-		flag_A++;
-	}
-	else
-	{
-		flag_A = 0;
-	}
-	
-	if(GetDcModeleRelaySet(Relay_K7K8) != GetK7K8Status())
-	{
-		flag_B++;
-	}
-	else
-	{
-		flag_B = 0;
-	}
+
 	if(flag>=5)
 	{
 		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/Charge/ChgPro_ChgIdle.c

@@ -35,9 +35,20 @@ void ChgProChgIdle(StructChargeCtrl *pChargeCtrl)
   osDelay(20);
 
   u32 ACContactorSetCount = 0;
-  //TCUCurChgRecd.TCUChargeEnable = 1;
+
+	memset(&BemMsg, 0, sizeof(BemMsg));
+	memset(&CemMsg, 0, sizeof(CemMsg));
+	//memset(&BstMsg, 0, sizeof(BstMsg));
+	memset(&CstMsg, 0, sizeof(CstMsg));
+	memset(&BsdMsg, 0, sizeof(BsdMsg));
+	memset(&CsdMsg, 0, sizeof(CsdMsg));
+
+	memset(&BmvMsg, 0xFF, sizeof(BmvMsg));
+	memset(&BmtMsg, 0xFF, sizeof(BmtMsg));
+	
   while(1)
   {
+  	memset(&BemMsg, 0, sizeof(BemMsg));
     ChgPgnRecv(&PgnRecv);
     
     if(eSwSta_On == CcStatusRead())
@@ -49,7 +60,7 @@ void ChgProChgIdle(StructChargeCtrl *pChargeCtrl)
     else
     {
       CcStatusChkTick = 0;
-	  CemMsg.Cem.Mult = 0;
+	  ChargeStopType = eChgStop_None;
 	  if(eSwSta_Off == CcStatusRead_B())
 	  {
 	  	ACContactorSetCount++;
@@ -64,7 +75,9 @@ void ChgProChgIdle(StructChargeCtrl *pChargeCtrl)
 	  {
 		ACContactorSetCount = 0;
 	  }
-	  
+
+	  memset(&BstMsg, 0, sizeof(BstMsg));
+	  memset(&BsmMsg, 0, sizeof(BsmMsg));
     }
 
     if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > 1500))

DcPillar/Src/Thread/Charge/ChgPro_WaitPillarReady.c

@@ -28,7 +28,7 @@ s32 IsBatPnCorrect(void)
 {
   if(0 == ImdValue.Vaild)
     return 0;
-  if((0 == ImdValue.PositVolt) && (0 == ImdValue.NegatVolt) && (0 == ImdValue.PnVolt))
+  if((5 >= ImdValue.PositVolt) && (5 >= ImdValue.NegatVolt) && (5 >= ImdValue.PnVolt))
     return -1;
   return 1;
 }

DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgIdle.c

@@ -33,8 +33,20 @@ void ChgProChgIdle_B(StructChargeCtrl_B *pChargeCtrl)
   BmsCanInit_B();
   osDelay(20);
   u32 ACContactorSetCount = 0;
+
+  memset(&BemMsg_B, 0, sizeof(BemMsg));
+		memset(&CemMsg_B, 0, sizeof(CemMsg));
+		memset(&BstMsg_B, 0, sizeof(BstMsg));
+		memset(&CstMsg_B, 0, sizeof(CstMsg));
+		memset(&BsdMsg_B, 0, sizeof(BsdMsg));
+		memset(&CsdMsg_B, 0, sizeof(CsdMsg));
+
+		memset(&BmvMsg_B, 0xFF, sizeof(BmvMsg));
+		memset(&BmtMsg_B, 0xFF, sizeof(BmtMsg));
+		
   while(1)
   {
+  memset(&BemMsg_B, 0, sizeof(BemMsg));
     if(0 == UserParam.ChgFun.Value.Num_B)
     {
       osDelay(1000);
@@ -52,7 +64,9 @@ void ChgProChgIdle_B(StructChargeCtrl_B *pChargeCtrl)
     else
     {
       CcStatusChkTick = 0;
-	  CemMsg_B.Cem.Mult = 0;
+	  ChargeStopType_B = eChgStop_None;
+	  memset(&BstMsg_B, 0, sizeof(BstMsg));
+	  memset(&BsmMsg_B, 0, sizeof(BsmMsg));
 	   if(eSwSta_Off == CcStatusRead())
 	  {
 	  	ACContactorSetCount++;
@@ -67,6 +81,8 @@ void ChgProChgIdle_B(StructChargeCtrl_B *pChargeCtrl)
 	  {
 		ACContactorSetCount = 0;
 	  }
+
+	 
     }
 
     if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > 1500))

DcPillar/Src/Thread/Charge_B/ChgPro_B_WaitPillarReady.c

@@ -28,7 +28,7 @@ s32 IsBatPnCorrect_B(void)
 {
   if(0 == ImdValue_B.Vaild)
     return 0;
-  if((0 == ImdValue_B.PositVolt) && (0 == ImdValue_B.NegatVolt) && (0 == ImdValue_B.PnVolt))
+  if((5 >= ImdValue_B.PositVolt) && (5 >= ImdValue_B.NegatVolt) && (5 >= ImdValue_B.PnVolt))
     return -1;
   return 1;
 }

DcPillar/Src/Thread/Thd_Mult.c

@@ -11,6 +11,8 @@
 #include "Drv_ImdJyc.h"
 #include "Drv_Dht12.h"
 
+#define XIAO_JU_TEST 0
+
 void ImdModeProcess(void)
 {
   static EnumChargeProcess ChgCurProcessLast = eChgPro_ChgIdle;
@@ -704,6 +706,8 @@ void Thd_Mult(void const *parameter)
     {
       PillarError_B.Value.SPD = 1;
       PillarError.Value.SPD = 1;
+	  TCUCurChgRecd.TCUChargeEnable = 0;
+	  TCUCurChgRecd_B.TCUChargeEnable = 0;
     }
     /*网络故障判断 可禁用*/
     if((0 == CommuStatus.ConnectFlag) && (1 == UserParam.HadSigned))
@@ -1101,6 +1105,11 @@ void Thd_Mult(void const *parameter)
 		extern void OnesCheckTcikHandle(void);
 		OnesCheckTcikHandle();
 	}
+
+	#if XIAO_JU_TEST
+	extern void Test_XiaoJu(void);
+	Test_XiaoJu();
+	#endif
     osDelay(25);
   }
 }
@@ -1146,3 +1155,330 @@ void OnesCheckTcikHandle(void)
 	}
 }
 
+#if XIAO_JU_TEST
+
+typedef struct {
+	u8 Temp; //桩内温度
+	u8 GunTemp; //枪温度
+	u8 GunTemp_B; //枪温度
+	u8 accIn; //输入电压
+	u8 Bcp;	//
+	u8 Bcp_B;	//
+	u8 Bsm;	//
+	u8 Bsm_B;	//
+	u8 DCModPhas; //模块缺相
+	u8 DCModPhas_B; //模块缺相
+	u8 DCModOutCuHi;//模块输出电流高
+	u8 DCModOutCuHi_B;//模块输出电流高
+	u8 DCModError;//
+	u8 DCModError_B;//
+	u8 DrainError ; //泄放回路故障
+	u8 DrainError_B ; //泄放回路故障
+	u8 DCMoudleOnTimeOut; //充电模块开机超时
+	u8 DCMoudleOnTimeOut_B; //充电模块开机超时
+	u8 DcVol; //输出过压
+	u8 DcVol_B;
+	u8 OutShort; //输出短路
+	u8 OutShort_B;
+	u8 Contactor;
+	u8 Contactor_B;
+	u8 UniContactor;
+	u8 UniContactor_B;
+} StructTestXiaoJu;
+
+StructTestXiaoJu TestXiaoJu = {0};
+
+u8 Test_XiaoJu_flag = 0;
+void Test_XiaoJu(void)
+{
+	static u32 tick = 0;
+	if((GetSystemTick() - tick) < 100)
+		return;
+	tick = GetSystemTick();
+
+	if(Test_XiaoJu_flag == 1)
+	{
+		memset(&TestXiaoJu,0,sizeof(StructTestXiaoJu));
+		Test_XiaoJu_flag = 0;
+		
+		ChargeError.Value.TempWarn = 0;
+		ChargeError_B.Value.TempWarn = 0;
+		ChargeError.Value.TempError = 0;
+		ChargeError_B.Value.TempError = 0;
+
+		ChargeError.Value.GunTempWarn = 0;
+		ChargeError.Value.GunTempError = 0;
+
+		ChargeError_B.Value.GunTempWarn = 0;
+		ChargeError_B.Value.GunTempError = 0;
+
+		setDcMoudleVoltChkCnt(0);
+
+		CemMsg.Cem.Value.Bcp = 0;
+		ChargeError.Value.Bcp = 0;
+		CemMsg_B.Cem.Value.Bcp = 0;
+		ChargeError_B.Value.Bcp = 0;
+
+		ChargeError.Value.Bsm = 0;
+		ChargeError_B.Value.Bsm = 0;
+
+		InformainReport_A.InfRe.DCModPhas = 0;
+		InformainReport_A.InfRe.DCModOutCuHi = 0;
+		PillarError.Value.DCmodError = 0;
+		InformainReport_B.InfRe.DCModPhas = 0;
+		InformainReport_B.InfRe.DCModOutCuHi = 0;
+		PillarError_B.Value.DCmodError = 0;
+
+		ChargeError.Value.DrainError = 0;
+		ChargeError_B.Value.DrainError = 0;
+
+		ChargeError.Value.DCMoudleOnTimeOut = 0;
+		ChargeError_B.Value.DCMoudleOnTimeOut = 0;
+
+		ChargeError.Value.VoltOutError = 0;
+		ChargeError_B.Value.VoltOutError = 0;
+		InformainReport_A.InfRe.DcVolLo = 0;
+		InformainReport_B.InfRe.DcVolLo = 0;
+		
+		PillarError.Value.OutShort = 0;
+		PillarError_B.Value.OutShort = 0;
+
+		PillarError.Value.UniContactor = 0;
+		PillarError.Value.UniContactor1 = 0;
+		PillarError.Value.UniContactor2 = 0;
+		PillarError_B.Value.UniContactor = 0;
+		PillarError_B.Value.UniContactor1 = 0;
+		PillarError_B.Value.UniContactor2 = 0;
+		PillarError.Value.Contactor = 0;
+		PillarError.Value.Contactor1 = 0;
+		PillarError.Value.Contactor2 = 0;
+		PillarError_B.Value.Contactor = 0;
+		PillarError_B.Value.Contactor1 = 0;
+		PillarError_B.Value.Contactor2 = 0;
+	}
+	
+	if(TestXiaoJu.Temp ==1)
+	{
+		//过温故障
+		ChargeError.Value.TempError = 1;
+		ChargeError_B.Value.TempError = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.Temp ==2)
+	{
+		//过温告警
+		ChargeError.Value.TempWarn = 1;
+		ChargeError_B.Value.TempWarn = 1;
+	}
+
+
+	if(TestXiaoJu.GunTemp ==1)
+	{
+		//过温故障
+		ChargeError.Value.GunTempError = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.GunTemp ==2)
+	{
+		ChargeError.Value.GunTempWarn = 1;
+	}
+
+	if(TestXiaoJu.GunTemp_B ==1)
+	{
+		//过温故障
+		ChargeError_B.Value.GunTempError = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.GunTemp_B ==2)
+	{
+		ChargeError_B.Value.GunTempWarn = 1;
+	}
+	
+	if(TestXiaoJu.accIn ==1)
+	{
+		//交流输入过压
+		setDcMoudleVoltChkCnt(5);
+	}
+	else if(TestXiaoJu.accIn ==2)
+	{
+		//交流输入欠压
+		setDcMoudleVoltChkCnt(-5);
+	}
+
+	if(TestXiaoJu.Bcp ==1)
+	{
+		//超时
+		CemMsg.Cem.Value.Bcp = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.Bcp ==2)
+	{
+		//异常
+		ChargeError.Value.Bcp = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+
+
+	if(TestXiaoJu.Bcp_B ==1)
+	{
+		//超时
+		CemMsg_B.Cem.Value.Bcp = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.Bcp_B ==2)
+	{
+		//异常
+		ChargeError_B.Value.Bcp = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+
+
+	if(TestXiaoJu.Bsm ==1)
+	{
+		//超时
+		ChargeError.Value.Bsm = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+
+
+	if(TestXiaoJu.Bsm_B ==1)
+	{
+		//超时
+		ChargeError_B.Value.Bsm = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+
+	if(TestXiaoJu.DCModPhas ==1)
+	{
+		InformainReport_A.InfRe.DCModPhas = 1;
+	}
+	if(TestXiaoJu.DCModPhas_B ==1)
+	{
+		InformainReport_B.InfRe.DCModPhas = 1;
+	}
+	if(TestXiaoJu.DCModOutCuHi ==1)
+	{
+		InformainReport_A.InfRe.DCModOutCuHi = 1;
+	}
+	if(TestXiaoJu.DCModPhas_B ==1)
+	{
+		InformainReport_B.InfRe.DCModOutCuHi = 1;
+	}
+	if(TestXiaoJu.DCModError ==1)
+	{
+		PillarError.Value.DCmodError = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.DCModError_B ==1)
+	{
+		PillarError_B.Value.DCmodError = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+
+	if(TestXiaoJu.DrainError)
+	{
+		ChargeError.Value.DrainError = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.DrainError_B )
+	{
+		ChargeError_B.Value.DrainError = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+
+	if(TestXiaoJu.DCMoudleOnTimeOut)
+	{
+		ChargeError.Value.DCMoudleOnTimeOut = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.DCMoudleOnTimeOut_B )
+	{
+		ChargeError_B.Value.DCMoudleOnTimeOut = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+
+	if(TestXiaoJu.DcVol == 1)
+	{
+		ChargeError.Value.VoltOutError = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.DcVol == 2)
+	{
+		InformainReport_A.InfRe.DcVolLo = 01;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.DcVol_B == 1)
+	{
+		ChargeError_B.Value.VoltOutError = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.DcVol_B == 2)
+	{
+		InformainReport_B.InfRe.DcVolLo = 01;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	
+	if(TestXiaoJu.OutShort == 1)
+	{
+		PillarError.Value.OutShort = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.OutShort_B == 1)
+	{
+		PillarError_B.Value.OutShort = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+
+	if(TestXiaoJu.Contactor == 1)
+	{
+		PillarError.Value.Contactor = 1;
+		PillarError.Value.Contactor1 = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.Contactor == 2)
+	{
+		PillarError.Value.Contactor = 1;
+		PillarError.Value.Contactor2 = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.Contactor_B == 1)
+	{
+		PillarError_B.Value.Contactor = 1;
+		PillarError_B.Value.Contactor1 = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.Contactor_B == 2)
+	{
+		PillarError_B.Value.Contactor = 1;
+		PillarError_B.Value.Contactor2 = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.UniContactor == 1)
+	{
+		PillarError.Value.UniContactor = 1;
+		PillarError.Value.UniContactor = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.UniContactor == 2)
+	{
+		PillarError.Value.UniContactor = 1;
+		PillarError.Value.UniContactor = 1;
+		TCUCurChgRecd.TCUChargeEnable = 0;
+	}
+	if(TestXiaoJu.UniContactor_B == 1)
+	{
+		PillarError_B.Value.UniContactor = 1;
+		PillarError_B.Value.UniContactor = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+	else if(TestXiaoJu.UniContactor_B == 2)
+	{
+		PillarError_B.Value.UniContactor = 1;
+		PillarError_B.Value.UniContactor = 1;
+		TCUCurChgRecd_B.TCUChargeEnable = 0;
+	}
+}
+
+#endif
+