继续修改AB抢地址

DcPillar/Src/Drivers/Drv_TCUComm.c

@@ -561,7 +561,7 @@ void StartMeg(StructTCUSend * pPgnRecv)
 			 ((eLcdPro_TCUMainMenu == TCUCtrl.CurScreen) || (eLcdPro_TCUChargeSummary_B == TCUCtrl.CurScreen)))
 		{
 
-			StartMeg_A.GunNum	= pPgnRecv->Data[0];
+			StartMeg_A.GunNum	= 1;//pPgnRecv->Data[0];
 			StartMeg_A.LoadSswitch = pPgnRecv->Data[1];
 			StartMeg_A.PlugToChgFlag = pPgnRecv->Data[2];
 
@@ -598,7 +598,7 @@ void StartMeg(StructTCUSend * pPgnRecv)
 		if ((TCUCurChgRecd_B.TCUChgStartNotetrl == 0) && (TCUCurChgRecd_B.TCUChargeEnable == 0) &&
 			 ((eLcdPro_TCUMainMenu == TCUCtrl.CurScreen) || (eLcdPro_TCUChargeSummary == TCUCtrl.CurScreen)))
 		{
-			StartMeg_B.GunNum	= pPgnRecv->Data[0];
+			StartMeg_B.GunNum	= 2;//pPgnRecv->Data[0];
 			StartMeg_B.LoadSswitch = pPgnRecv->Data[1];
 			StartMeg_B.PlugToChgFlag = pPgnRecv->Data[2];
 
@@ -1082,9 +1082,9 @@ void startCompSend_B(void)
 
 void ACkStartCompMeg(StructTCUSend * pPgnRecv)
 {
-	if (pPgnRecv->Data[0] == 0x00)
+	if (pPgnRecv->DA == ChargerCont1939Addr)
 	{
-		AckStartCompMeg_A.GunNum = pPgnRecv->Data[0];
+		AckStartCompMeg_A.GunNum = 1;//pPgnRecv->Data[0];
 		AckStartCompMeg_A.LoadSswitch = pPgnRecv->Data[1];
 		AckStartCompMeg_A.AckFlag = pPgnRecv->Data[2];
 
@@ -1095,9 +1095,9 @@ void ACkStartCompMeg(StructTCUSend * pPgnRecv)
 
 		TCUCurChgRecd.TCUChgStarCompNotetrl = 3;
 	}
-	else if (pPgnRecv->Data[0] == 0x00)
+	else if (pPgnRecv->DA == ChargerCont1939Addr_B)
 	{
-		AckStartCompMeg_B.GunNum = pPgnRecv->Data[0];
+		AckStartCompMeg_B.GunNum = 2;//pPgnRecv->Data[0];
 		AckStartCompMeg_B.LoadSswitch = pPgnRecv->Data[1];
 		AckStartCompMeg_B.AckFlag = pPgnRecv->Data[2];
 
@@ -1406,16 +1406,16 @@ void stopCompSend_B(void)
 void stopCompAck(StructTCUSend * pPgnRecv)
 {
 
-	if (pPgnRecv->Data[0] == 0x00)
+	if (pPgnRecv->DA == ChargerCont1939Addr)
 	{
-		AckStopCompMeg_A.GunNum = pPgnRecv->Data[0];
+		AckStopCompMeg_A.GunNum = 1;//pPgnRecv->Data[0];
 		AckStopCompMeg_A.StopReason = pPgnRecv->Data[1];
 		AckStopCompMeg_A.AckFlag = pPgnRecv->Data[2];
 		TCUCurChgRecd.TCUChgStopCompNotetrl = 3;	//停止完成帧命令发送
 	}
-	else if (pPgnRecv->Data[0] == 0x00)
+	else if (pPgnRecv->DA == ChargerCont1939Addr_B)
 	{
-		AckStopCompMeg_B.GunNum = pPgnRecv->Data[0];
+		AckStopCompMeg_B.GunNum = 2;//pPgnRecv->Data[0];
 		AckStopCompMeg_B.StopReason = pPgnRecv->Data[1];
 		AckStopCompMeg_B.AckFlag = pPgnRecv->Data[2];
 		TCUCurChgRecd_B.TCUChgStopCompNotetrl = 3;	//停止完成帧命令发送
@@ -1457,7 +1457,7 @@ void TCUHeartBeat_B(void)
 
 void AckTCUHeartBeat(StructTCUSend * pPgnRecv)
 {
-	if (pPgnRecv->Data[0] == 0)
+	if (pPgnRecv->DA == ChargerCont1939Addr)
 	{
 		TCUCommuStatus.HeartBeatErrCnt = 0;
 		TCUCommuStatus.HeartBeatRecvTime = GetSystemTick();

DcPillar/Src/SmartAllocation/Drv_SmartAllocation_DcModule.c

@@ -307,7 +307,7 @@ void DcModule(void const * parameter)
 	osDelay(6000);
 	DcModeleRelayInit();
 	DcModuleCanInit();
-
+        //ACContactorSet(eSwSta_On);
 	DcModuleAbility.MaxVolt = UserParam.DcMaxVolt;
 	DcModuleAbility.MinVolt = UserParam.DcMinVolt;
 	DcModuleAbility.MaxCurrt = UserParam.DcMaxCurrt;

DcPillar/Src/Thread/Thd_TCU.c

@@ -838,7 +838,7 @@ void TCUWorkProcess(void)
 void TCULinkProcess(void) //心跳帧处理
 {
 	TCUPillarHeartBeat();							//心跳处理
-	//TCUPillarHeartBeat_B(); 						//心跳处理
+	TCUPillarHeartBeat_B(); 						//心跳处理
 	CommutionConfigurationStage();					//配置阶段
 	CommutionRunStage();							//运行阶段
 	ConEMSend();									//ab超时发送逻辑