测试桩

DcPillar/Src/Drivers/Drv_DcModule.h

@@ -4,7 +4,7 @@
 
 #include "Global.h"
 
-#define DcModule_ZhongXing	1
+#define DcModule_ZhongXing	0
 
 
 #define DcModule_BaudRate        (250)

DcPillar/Src/SmartAllocation/Drv_SmartAllocation.c

@@ -955,7 +955,7 @@ void SendCheckToDcModule_ZhongXing(void)
 			if(DcModuleStatus_ALL[i].Temp == 0)//未分组
 			{
 				DcModuleSetGroupNum();
-				continue;
+				return;//continue;
 			}
 			
 			for (u8 j = 0; j < DcModuleGroup[i].num; j++)

DcPillar/Src/SmartAllocation/Drv_SmartAllocation_DcModule.c

@@ -757,7 +757,7 @@ void DcModuleMsgReceive_ZhongXing(CanRxMsg* RxMsg)
 		StructDcModuleStatus Data;
 		Data.Id 			= addr & 0x0F;
 		DcModuleManage_All.OnlineFlag |= ((long long) 1 << (addr&0x0f));
-		Data.Currt			= ((u16) RxMsg->Data[4] << 8) +RxMsg->Data[5];
+		Data.Currt			= (((u16) RxMsg->Data[4] << 8) +RxMsg->Data[5])/10;
 		Data.Volt			= ((u16) RxMsg->Data[2] << 8) +RxMsg->Data[3];
 		Data.State			= ((u16) RxMsg->Data[1] << 8) +RxMsg->Data[0];
 		Data.RecvTime		= GetSystemTick();

DcPillar/Src/SmartAllocation/SmartAllocation_B_ChgRun.c

@@ -356,7 +356,7 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 	}
 	else
 		CemMsg_B.Cem.Value.Bcl = 0;
-  if(((GetSystemTick() - BcsMsg_B.RecvTick) >1000+500)&&(eChgVer_2011 == UserParam.ChgVer))
+   /*if(((GetSystemTick() - BcsMsg_B.RecvTick) >1000+500)&&(eChgVer_2011 == UserParam.ChgVer))
 	{
 		StructChargeSend FrameSend;
 
@@ -380,7 +380,7 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 		}
 		else
 		  CemMsg_B.Cem.Value.Bcs = 0;//ֶ֡
-
+		*/
 	if((GetSystemTick() - BcsMsg_B.RecvTick) > MsgTimeout_B_5S)
 	{
 		CemMsg_B.Cem.Value.Bcs = 1;

DcPillar/Src/SmartAllocation/SmartAllocation_ChgRun.c

@@ -391,7 +391,7 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl)
 		else 
 			CemMsg.Cem.Value.Bcl = 0;
 
-		if (((GetSystemTick() -BcsMsg.RecvTick) > 1000 + 500) && (eChgVer_2011 == UserParam.ChgVer))
+		/*if (((GetSystemTick() -BcsMsg.RecvTick) > 1000 + 500) && (eChgVer_2011 == UserParam.ChgVer))
 		{
 			StructChargeSend FrameSend;
 
@@ -415,6 +415,7 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl)
 		}
 		else 
 			CemMsg.Cem.Value.Bcs = 0; //ֶ֡
+		*/
 
 		if ((GetSystemTick() -BcsMsg.RecvTick) > MsgTimeout_5S)
 		{

DcPillar/Src/Thread/Charge/ChgPro_ChgRecognize.c

@@ -57,15 +57,15 @@ void ChgProChgRecognize(StructChargeCtrl *pChargeCtrl)
 
     if(0 != BrmMsg.Valid)
     {//接收到Brm
-      if(1 == TCUCurChgRecd.TCUChargeEnable)
+      //if(1 == TCUCurChgRecd.TCUChargeEnable)
     	{
 			pChargeCtrl->CurProcess = eChgPro_ChgConfigure;
       		pChargeCtrl->Param = 0;
 		}
-		else if(2 == TCUCurChgRecd.TCUChargeEnable)
+		//else if(2 == TCUCurChgRecd.TCUChargeEnable)
 		{
-			if(TCUCurChgRecd.VehicleVerification == 0)
-				TCUCurChgRecd.VehicleVerification = 1;
+			//if(TCUCurChgRecd.VehicleVerification == 0)
+			//	TCUCurChgRecd.VehicleVerification = 1;
 		}
     }
     else if((GetSystemTick() - BrmMsg.RecvTick) > (MsgTimeout_5S))

DcPillar/Src/Thread/Charge/ChgPro_ChgRecognizeEx.c

@@ -57,15 +57,15 @@ void ChgProChgRecognizeEx(StructChargeCtrl *pChargeCtrl)
 
     if(0 != BrmMsg.Valid)
     {//接收到Brm
-    	if(1 == TCUCurChgRecd.TCUChargeEnable)
+    	//if(1 == TCUCurChgRecd.TCUChargeEnable)
     	{
 			pChargeCtrl->CurProcess = eChgPro_ChgConfigure;
       		pChargeCtrl->Param = 0;
 		}
-		else if(2 == TCUCurChgRecd.TCUChargeEnable)
+		//else if(2 == TCUCurChgRecd.TCUChargeEnable)
 		{
-			if(TCUCurChgRecd.VehicleVerification == 0)
-				TCUCurChgRecd.VehicleVerification = 1;
+		//	if(TCUCurChgRecd.VehicleVerification == 0)
+		//		TCUCurChgRecd.VehicleVerification = 1;
 		}
       
     }