BMS多包数据处理

DcPillar/Src/SmartAllocation/ChgPro_B_ChgRun_SmartAllocation.c

@@ -369,7 +369,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))
 	{
 		StructChargeSend FrameSend;
 
@@ -389,12 +389,9 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
 		FrameSend.Len = 8;
 
         BmsCommSendMsg_B(&FrameSend);
-		BcsMsg_B.RecvTick= GetSystemTick();
-		}
-		else
-		  CemMsg_B.Cem.Value.Bcs = 0;//ֶ֡
-		*/
-	if((GetSystemTick() - BcsMsg_B.RecvTick) > MsgTimeout_B_5S)
+		//BcsMsg_B.RecvTick= GetSystemTick();
+	}	
+	else if((GetSystemTick() - BcsMsg_B.RecvTick) > MsgTimeout_B_5S)
 	{
 		CemMsg_B.Cem.Value.Bcs = 1;
 		DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);

DcPillar/Src/SmartAllocation/ChgPro_ChgRun_SmartAllocation.c

@@ -404,7 +404,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))
 		{
 			StructChargeSend FrameSend;
 
@@ -424,13 +424,9 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl)
 			FrameSend.Len		= 8;
 
 			BmsCommSendMsg(&FrameSend);
-			BcsMsg.RecvTick 	= GetSystemTick();
+			//BcsMsg.RecvTick 	= GetSystemTick();
 		}
-		else 
-			CemMsg.Cem.Value.Bcs = 0; //ֶ֡
-		*/
-
-		if ((GetSystemTick() -BcsMsg.RecvTick) > MsgTimeout_5S)
+		else if ((GetSystemTick() -BcsMsg.RecvTick) > MsgTimeout_5S)
 		{
 			CemMsg.Cem.Value.Bcs = 1;
 			DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt * DcModuleManage.ValidNum);

DcPillar/Src/Thread/Charge/ChgPro_ChgConfigure.c

@@ -43,7 +43,29 @@ void ChgProChgConfigure(StructChargeCtrl *pChargeCtrl)
 
     ChgPgnRecv(&PgnRecv);
 
-    if((GetSystemTick() - BcpMsg.RecvTick) > MsgTimeout_5S)
+	if((GetSystemTick() - BcpMsg.RecvTick) > (2000))
+	{
+      StructChargeSend FrameSend;
+      
+      FrameSend.Id.Mult = 0;
+      FrameSend.Id.Disp.Prio = 7;
+      FrameSend.Id.Disp.PF = TPCM>>8;
+      FrameSend.Id.Disp.DA_PS = Card1939Addr;
+      FrameSend.Id.Disp.SA = Charger1939Addr;
+      FrameSend.Data[0] = 0x13;
+      FrameSend.Data[1] = 0x09;
+      FrameSend.Data[2] = 0x00;
+      FrameSend.Data[3] = 0x02;
+      FrameSend.Data[4] = 0xFe;
+      FrameSend.Data[5] = 0x00;
+      FrameSend.Data[6] = 0x11;
+      FrameSend.Data[7] = 0x00;
+      FrameSend.Len = 8;
+      
+      BmsCommSendMsg(&FrameSend);
+      //BrmMsg.RecvTick = GetSystemTick(); 
+	}
+    else if((GetSystemTick() - BcpMsg.RecvTick) > MsgTimeout_5S)
     {
       CemMsg.Cem.Value.Bcp = 1;
       pChargeCtrl->CurProcess = eChgPro_CommBreak;

DcPillar/Src/Thread/Charge/ChgPro_ChgRecognize.c

@@ -57,17 +57,32 @@ void ChgProChgRecognize(StructChargeCtrl *pChargeCtrl)
 
     if(0 != BrmMsg.Valid)
     {//接收到Brm
-      //if(1 == TCUCurChgRecd.TCUChargeEnable)
-    	{
-			pChargeCtrl->CurProcess = eChgPro_ChgConfigure;
-      		pChargeCtrl->Param = 0;
-		}
-		//else if(2 == TCUCurChgRecd.TCUChargeEnable)
-		{
-			//if(TCUCurChgRecd.VehicleVerification == 0)
-			//	TCUCurChgRecd.VehicleVerification = 1;
-		}
+
+		pChargeCtrl->CurProcess = eChgPro_ChgConfigure;
+  		pChargeCtrl->Param = 0;
     }
+	else if((GetSystemTick() - BrmMsg.RecvTick) > (2000))
+	{
+      StructChargeSend FrameSend;
+      
+      FrameSend.Id.Mult = 0;
+      FrameSend.Id.Disp.Prio = 7;
+      FrameSend.Id.Disp.PF = TPCM>>8;
+      FrameSend.Id.Disp.DA_PS = Card1939Addr;
+      FrameSend.Id.Disp.SA = Charger1939Addr;
+      FrameSend.Data[0] = 0x13;
+      FrameSend.Data[1] = 0x09;
+      FrameSend.Data[2] = 0x00;
+      FrameSend.Data[3] = 0x02;
+      FrameSend.Data[4] = 0xFe;
+      FrameSend.Data[5] = 0x00;
+      FrameSend.Data[6] = 0x11;
+      FrameSend.Data[7] = 0x00;
+      FrameSend.Len = 8;
+      
+      BmsCommSendMsg(&FrameSend);
+      //BrmMsg.RecvTick = GetSystemTick(); 
+	}
     else if((GetSystemTick() - BrmMsg.RecvTick) > (MsgTimeout_5S))
     {
       CemMsg.Cem.Value.Brm = 1;

DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgConfigure.c

@@ -43,7 +43,29 @@ void ChgProChgConfigure_B(StructChargeCtrl_B *pChargeCtrl)
 
     ChgPgnRecv_B(&PgnRecv);
 
-    if((GetSystemTick() - BcpMsg_B.RecvTick) > MsgTimeout_B_5S)
+	if((GetSystemTick() - BcpMsg_B.RecvTick) > 2000)
+	{
+      StructChargeSend FrameSend;
+      
+      FrameSend.Id.Mult = 0;
+      FrameSend.Id.Disp.Prio = 7;
+      FrameSend.Id.Disp.PF = TPCM>>8;
+      FrameSend.Id.Disp.DA_PS = Card1939Addr;
+      FrameSend.Id.Disp.SA = Charger1939Addr;
+      FrameSend.Data[0] = 0x13;
+      FrameSend.Data[1] = 0x09;
+      FrameSend.Data[2] = 0x00;
+      FrameSend.Data[3] = 0x02;
+      FrameSend.Data[4] = 0xFe;
+      FrameSend.Data[5] = 0x00;
+      FrameSend.Data[6] = 0x11;
+      FrameSend.Data[7] = 0x00;
+      FrameSend.Len = 8;
+      
+      BmsCommSendMsg_B(&FrameSend);
+      //BrmMsg.RecvTick = GetSystemTick(); 
+	}
+    else if((GetSystemTick() - BcpMsg_B.RecvTick) > MsgTimeout_B_5S)
     {
       CemMsg_B.Cem.Value.Bcp = 1;
       pChargeCtrl->CurProcess = eChgPro_B_CommBreak;

DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgRecognize.c

@@ -60,6 +60,28 @@ void ChgProChgRecognize_B(StructChargeCtrl_B *pChargeCtrl)
       pChargeCtrl->CurProcess = eChgPro_B_ChgConfigure;
       pChargeCtrl->Param = 0;
     }
+	else if((GetSystemTick() - BrmMsg_B.RecvTick) > (2000))
+	{
+      StructChargeSend FrameSend;
+      
+      FrameSend.Id.Mult = 0;
+      FrameSend.Id.Disp.Prio = 7;
+      FrameSend.Id.Disp.PF = TPCM>>8;
+      FrameSend.Id.Disp.DA_PS = Card1939Addr;
+      FrameSend.Id.Disp.SA = Charger1939Addr;
+      FrameSend.Data[0] = 0x13;
+      FrameSend.Data[1] = 0x09;
+      FrameSend.Data[2] = 0x00;
+      FrameSend.Data[3] = 0x02;
+      FrameSend.Data[4] = 0xFe;
+      FrameSend.Data[5] = 0x00;
+      FrameSend.Data[6] = 0x11;
+      FrameSend.Data[7] = 0x00;
+      FrameSend.Len = 8;
+      
+      BmsCommSendMsg_B(&FrameSend);
+      //BrmMsg.RecvTick = GetSystemTick(); 
+	}
     else if((GetSystemTick() - BrmMsg_B.RecvTick) > (MsgTimeout_B_5S))
     {
       CemMsg_B.Cem.Value.Brm = 1;