Skip to content

D
DC360_1drap3_xiaoju_V1
提交 55cbd7d9 作者: wysheng
操作

优化代码

上级 d4f17265
正在显示 包含 83 行增加 和 82 行删除
DcPillar/Src/Thread/Charge/ChgPro_ChgIdle.c
...@@ -90,8 +90,8 @@ void ChgProChgIdle(StructChargeCtrl *pChargeCtrl) ...@@ -90,8 +90,8 @@ void ChgProChgIdle(StructChargeCtrl *pChargeCtrl)
if(DcModuleGroup[0].status == Hold_B) if(DcModuleGroup[0].status == Hold_B)
{ {
DcModuleGroup[0].status = Valid; DcModuleGroup[0].status = Valid;
//DcModuleGroup[0].flag = 1; DcModuleGroup[0].flag = 0;
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
} }
pChargeCtrl->CurProcess = eChgPro_ShakeHand; pChargeCtrl->CurProcess = eChgPro_ShakeHand;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
......
DcPillar/Src/Thread/Charge/ChgPro_ImdCheck.c
...@@ -117,7 +117,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -117,7 +117,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
else else
Tmep = DcModuleAbility.MinVolt; Tmep = DcModuleAbility.MinVolt;
SendDataToDcModule_A(eSwSta_On, Tmep, DcModuleAbility.MinCurrt/* *DcModuleManage.ValidNum */); SendDataToDcModule_A(eSwSta_On, Tmep, DcModuleAbility.MinCurrt);
*pImdChckStep = eImdStep_DcModOut; *pImdChckStep = eImdStep_DcModOut;
ImdTimeout = 0; ImdTimeout = 0;
break; break;
...@@ -171,7 +171,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -171,7 +171,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
ChargeError.Value.IsolateWarn = 1;//绝缘警告 ChargeError.Value.IsolateWarn = 1;//绝缘警告
ChargeError.Value.IsolateError = 0; ChargeError.Value.IsolateError = 0;
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
...@@ -192,7 +192,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -192,7 +192,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
{ {
ChargeError.Value.IsolateWarn = 0;//绝缘警告 ChargeError.Value.IsolateWarn = 0;//绝缘警告
ChargeError.Value.IsolateError = 0;//绝缘故障 ChargeError.Value.IsolateError = 0;//绝缘故障
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
...@@ -203,7 +203,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -203,7 +203,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
{ {
ChargeError.Value.IsolateWarn = 1;//绝缘警告 ChargeError.Value.IsolateWarn = 1;//绝缘警告
ChargeError.Value.IsolateError = 0;//绝缘故障 ChargeError.Value.IsolateError = 0;//绝缘故障
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
...@@ -214,7 +214,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -214,7 +214,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
{ {
ChargeError.Value.IsolateWarn = 0;//绝缘警告 ChargeError.Value.IsolateWarn = 0;//绝缘警告
ChargeError.Value.IsolateError = 1;//绝缘故障 ChargeError.Value.IsolateError = 1;//绝缘故障
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
...@@ -224,7 +224,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -224,7 +224,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
} }
break; break;
case eImdStep_Bleeder: case eImdStep_Bleeder:
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
//DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
...@@ -247,7 +247,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -247,7 +247,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
} }
break; break;
case eImdStep_Stop: case eImdStep_Stop:
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
...@@ -349,7 +349,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -349,7 +349,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
CcStatusChkTick = 0; CcStatusChkTick = 0;
if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick * 2)) if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick * 2))
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
CcStatusChkTick = 0; CcStatusChkTick = 0;
ChargeStopType = eChgStop_Imd_CcOpen; ChargeStopType = eChgStop_Imd_CcOpen;
...@@ -358,7 +358,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -358,7 +358,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.Emergency) if(0 != PillarError.Value.Emergency)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ChargeStopType = eChgStop_Imd_EmerClose; ChargeStopType = eChgStop_Imd_EmerClose;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -366,7 +366,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -366,7 +366,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.Door) if(0 != PillarError.Value.Door)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ChargeStopType = eChgStop_Imd_DoorOpen; ChargeStopType = eChgStop_Imd_DoorOpen;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -374,7 +374,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -374,7 +374,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.Contactor) if(0 != PillarError.Value.Contactor)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ChargeStopType = eChgStop_Imd_Contactor; ChargeStopType = eChgStop_Imd_Contactor;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -382,7 +382,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -382,7 +382,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.UniContactor) if(0 != PillarError.Value.UniContactor)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ChargeStopType = eChgStop_Imd_Contactor; ChargeStopType = eChgStop_Imd_Contactor;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -390,7 +390,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -390,7 +390,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.InVolt) if(0 != PillarError.Value.InVolt)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ChargeStopType = eChgStop_Imd_InVolt; ChargeStopType = eChgStop_Imd_InVolt;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -398,7 +398,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -398,7 +398,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.NoDcmod) if(0 != PillarError.Value.NoDcmod)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ChargeStopType = eChgStop_Imd_NoDcmod; ChargeStopType = eChgStop_Imd_NoDcmod;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -406,7 +406,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -406,7 +406,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.Meter) if(0 != PillarError.Value.Meter)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ChargeStopType = eChgStop_Imd_Meter; ChargeStopType = eChgStop_Imd_Meter;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
......
DcPillar/Src/Thread/Charge/ChgPro_WaitBmsReady.c
...@@ -31,10 +31,10 @@ void ChgProWaitBmsReady(StructChargeCtrl *pChargeCtrl) ...@@ -31,10 +31,10 @@ void ChgProWaitBmsReady(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
CTS_Send(); CTS_Send();
CTS_SendTick = GetSystemTick(); CTS_SendTick = GetSystemTick();
if(0 != UserParam.ChgFun.Value.SigUniChg) //if(0 != UserParam.ChgFun.Value.SigUniChg)
CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)), 4000 - DcModuleAbility.MinCurrt); // CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_All.ValidNum)), 4000 - DcModuleAbility.MinCurrt);
else //else
CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*DcModuleManage.ValidNum), 4000 - DcModuleAbility.MinCurrt); CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_All.ValidNum)), 4000 - DcModuleAbility.MinCurrt);
CML_SendTick = GetSystemTick(); CML_SendTick = GetSystemTick();
BroMsg.RecvTick = GetSystemTick(); BroMsg.RecvTick = GetSystemTick();
...@@ -44,10 +44,10 @@ void ChgProWaitBmsReady(StructChargeCtrl *pChargeCtrl) ...@@ -44,10 +44,10 @@ void ChgProWaitBmsReady(StructChargeCtrl *pChargeCtrl)
{ {
if((GetSystemTick() - CML_SendTick) > 250) if((GetSystemTick() - CML_SendTick) > 250)
{ {
if(0 != UserParam.ChgFun.Value.SigUniChg) //if(0 != UserParam.ChgFun.Value.SigUniChg)
CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)), 4000 - DcModuleAbility.MinCurrt); // CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)), 4000 - DcModuleAbility.MinCurrt);
else //else
CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*DcModuleManage.ValidNum), 4000 - DcModuleAbility.MinCurrt); CML_Send(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_All.ValidNum)), 4000 - DcModuleAbility.MinCurrt);
CML_SendTick = GetSystemTick(); CML_SendTick = GetSystemTick();
} }
if((GetSystemTick() - CTS_SendTick) > 480) if((GetSystemTick() - CTS_SendTick) > 480)
......
DcPillar/Src/Thread/Charge/ChgPro_WaitPillarReady.c
...@@ -72,7 +72,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -72,7 +72,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
CstMsg.StopTruble.Value.Other = 1; CstMsg.StopTruble.Value.Other = 1;
CstMsg.StopFault.Value.Volt = 1; CstMsg.StopFault.Value.Volt = 1;
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
//ChargeStopType = eChgStop_Conf_BatVoltLessPillarMinVolt; //ChargeStopType = eChgStop_Conf_BatVoltLessPillarMinVolt;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -109,7 +109,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -109,7 +109,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
CemMsg.Cem.Mult = 0; CemMsg.Cem.Mult = 0;
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_Imd_xx; ChargeStopType = eChgStop_Imd_xx;
pChargeCtrl->CurProcess = eChgPro_CommError; pChargeCtrl->CurProcess = eChgPro_CommError;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -125,7 +125,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -125,7 +125,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
CstMsg.StopTruble.Value.Other = 1; CstMsg.StopTruble.Value.Other = 1;
CstMsg.StopFault.Value.Volt = 1; CstMsg.StopFault.Value.Volt = 1;
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_BatVoltError; ChargeStopType = eChgStop_PillarReady_BatVoltError;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -138,7 +138,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -138,7 +138,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
CstMsg.StopTruble.Value.Other = 1; CstMsg.StopTruble.Value.Other = 1;
CstMsg.StopFault.Value.Volt = 1; CstMsg.StopFault.Value.Volt = 1;
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_BatVoltMismatchBcpVolt; ChargeStopType = eChgStop_PillarReady_BatVoltMismatchBcpVolt;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -149,7 +149,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -149,7 +149,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
CstMsg.StopTruble.Value.Other = 1; CstMsg.StopTruble.Value.Other = 1;
CstMsg.StopFault.Value.Volt = 1; CstMsg.StopFault.Value.Volt = 1;
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_BatVoltOverPillarMax; ChargeStopType = eChgStop_PillarReady_BatVoltOverPillarMax;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -178,7 +178,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -178,7 +178,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
CstMsg.StopTruble.Value.Other = 1; CstMsg.StopTruble.Value.Other = 1;
CstMsg.StopFault.Value.Volt = 1; CstMsg.StopFault.Value.Volt = 1;
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_NoVolt; ChargeStopType = eChgStop_PillarReady_NoVolt;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -220,7 +220,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -220,7 +220,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
if((GetSystemTick() - BroMsg.RecvTick) > MsgTimeout_5S) if((GetSystemTick() - BroMsg.RecvTick) > MsgTimeout_5S)
{ {
CemMsg.Cem.Value.Bro = 1; CemMsg.Cem.Value.Bro = 1;
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
pChargeCtrl->CurProcess = eChgPro_CommBreak; pChargeCtrl->CurProcess = eChgPro_CommBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
...@@ -229,14 +229,14 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -229,14 +229,14 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
if(0 != BemMsg.Valid) if(0 != BemMsg.Valid)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
pChargeCtrl->CurProcess = eChgPro_CommBreak; pChargeCtrl->CurProcess = eChgPro_CommBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 == TCUCurChgRecd.TCUChargeEnable) if(0 == TCUCurChgRecd.TCUChargeEnable)
{//外部控制结束充电 {//外部控制结束充电
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_UserCancel; ChargeStopType = eChgStop_PillarReady_UserCancel;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -251,7 +251,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -251,7 +251,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
CcStatusChkTick = 0; CcStatusChkTick = 0;
if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick * 2)) if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick * 2))
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
CcStatusChkTick = 0; CcStatusChkTick = 0;
ChargeStopType = eChgStop_PillarReady_CcOpen; ChargeStopType = eChgStop_PillarReady_CcOpen;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -259,49 +259,49 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -259,49 +259,49 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
} }
if(0 != PillarError.Value.Emergency) if(0 != PillarError.Value.Emergency)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_EmerClose; ChargeStopType = eChgStop_PillarReady_EmerClose;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError.Value.Door) if(0 != PillarError.Value.Door)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_DoorOpen; ChargeStopType = eChgStop_PillarReady_DoorOpen;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError.Value.Contactor) if(0 != PillarError.Value.Contactor)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_Contactor; ChargeStopType = eChgStop_PillarReady_Contactor;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError.Value.UniContactor) if(0 != PillarError.Value.UniContactor)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_Contactor; ChargeStopType = eChgStop_PillarReady_Contactor;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError.Value.InVolt) if(0 != PillarError.Value.InVolt)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_InVolt; ChargeStopType = eChgStop_PillarReady_InVolt;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError.Value.NoDcmod) if(0 != PillarError.Value.NoDcmod)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_NoDcmod; ChargeStopType = eChgStop_PillarReady_NoDcmod;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError.Value.Meter) if(0 != PillarError.Value.Meter)
{ {
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_PillarReady_Meter; ChargeStopType = eChgStop_PillarReady_Meter;
pChargeCtrl->CurProcess = eChgPro_ChgBreak; pChargeCtrl->CurProcess = eChgPro_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgIdle.c
...@@ -94,8 +94,8 @@ void ChgProChgIdle_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -94,8 +94,8 @@ void ChgProChgIdle_B(StructChargeCtrl_B *pChargeCtrl)
if(DcModuleGroup[2].status == Hold_A) if(DcModuleGroup[2].status == Hold_A)
{ {
DcModuleGroup[2].status = Valid; DcModuleGroup[2].status = Valid;
//DcModuleGroup[2].flag = 1; DcModuleGroup[2].flag = 0;
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
} }
pChargeCtrl->CurProcess = eChgPro_B_ShakeHand; pChargeCtrl->CurProcess = eChgPro_B_ShakeHand;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ImdCheck.c
...@@ -171,7 +171,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -171,7 +171,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
ChargeError_B.Value.IsolateWarn = 1;//绝缘警告 ChargeError_B.Value.IsolateWarn = 1;//绝缘警告
ChargeError_B.Value.IsolateError = 0; ChargeError_B.Value.IsolateError = 0;
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
...@@ -192,7 +192,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -192,7 +192,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
{ {
ChargeError_B.Value.IsolateWarn = 0;//绝缘警告 ChargeError_B.Value.IsolateWarn = 0;//绝缘警告
ChargeError_B.Value.IsolateError = 0;//绝缘故障 ChargeError_B.Value.IsolateError = 0;//绝缘故障
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
...@@ -203,7 +203,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -203,7 +203,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
{ {
ChargeError_B.Value.IsolateWarn = 1;//绝缘警告 ChargeError_B.Value.IsolateWarn = 1;//绝缘警告
ChargeError_B.Value.IsolateError = 0;//绝缘故障 ChargeError_B.Value.IsolateError = 0;//绝缘故障
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
...@@ -214,7 +214,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -214,7 +214,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
{ {
ChargeError_B.Value.IsolateWarn = 0;//绝缘警告 ChargeError_B.Value.IsolateWarn = 0;//绝缘警告
ChargeError_B.Value.IsolateError = 1;//绝缘故障 ChargeError_B.Value.IsolateError = 1;//绝缘故障
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
osDelay(100); osDelay(100);
//DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
...@@ -224,7 +224,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -224,7 +224,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
} }
break; break;
case eImdStep_Bleeder: case eImdStep_Bleeder:
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
//DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
...@@ -247,7 +247,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -247,7 +247,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
} }
break; break;
case eImdStep_Stop: case eImdStep_Stop:
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);//关直流模块输出
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
...@@ -349,7 +349,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -349,7 +349,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
CcStatusChkTick = 0; CcStatusChkTick = 0;
if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick_B * 2)) if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick_B * 2))
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
CcStatusChkTick = 0; CcStatusChkTick = 0;
ChargeStopType_B = eChgStop_Imd_CcOpen; ChargeStopType_B = eChgStop_Imd_CcOpen;
...@@ -358,7 +358,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -358,7 +358,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.Emergency) if(0 != PillarError_B.Value.Emergency)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Imd_EmerClose; ChargeStopType_B = eChgStop_Imd_EmerClose;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -366,7 +366,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -366,7 +366,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.Door) if(0 != PillarError_B.Value.Door)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Imd_DoorOpen; ChargeStopType_B = eChgStop_Imd_DoorOpen;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -374,7 +374,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -374,7 +374,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.Contactor) if(0 != PillarError_B.Value.Contactor)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Imd_Contactor; ChargeStopType_B = eChgStop_Imd_Contactor;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -382,7 +382,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -382,7 +382,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.UniContactor) if(0 != PillarError_B.Value.UniContactor)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Imd_Contactor; ChargeStopType_B = eChgStop_Imd_Contactor;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -390,7 +390,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -390,7 +390,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.InVolt) if(0 != PillarError_B.Value.InVolt)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Imd_InVolt; ChargeStopType_B = eChgStop_Imd_InVolt;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -398,7 +398,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -398,7 +398,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.NoDcmod) if(0 != PillarError_B.Value.NoDcmod)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Imd_NoDcmod; ChargeStopType_B = eChgStop_Imd_NoDcmod;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -406,7 +406,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -406,7 +406,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.Meter) if(0 != PillarError_B.Value.Meter)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Imd_Meter; ChargeStopType_B = eChgStop_Imd_Meter;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_WaitBmsReady.c
...@@ -32,10 +32,11 @@ void ChgProWaitBmsReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -32,10 +32,11 @@ void ChgProWaitBmsReady_B(StructChargeCtrl_B *pChargeCtrl)
CTS_Send_B(); CTS_Send_B();
CTS_SendTick = GetSystemTick(); CTS_SendTick = GetSystemTick();
if(0 != UserParam.ChgFun.Value.SigUniChg) //if(0 != UserParam.ChgFun.Value.SigUniChg)
CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)), 4000 - DcModuleAbility.MinCurrt); // CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)), 4000 - DcModuleAbility.MinCurrt);
else //else
CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*DcModuleManage_B.ValidNum), 4000 - DcModuleAbility.MinCurrt); // CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*DcModuleManage_B.ValidNum), 4000 - DcModuleAbility.MinCurrt);
CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage_B.ValidNum + DcModuleManage_All.ValidNum), 4000 - DcModuleAbility.MinCurrt);
CML_SendTick = GetSystemTick(); CML_SendTick = GetSystemTick();
BroMsg_B.RecvTick = GetSystemTick(); BroMsg_B.RecvTick = GetSystemTick();
...@@ -45,10 +46,10 @@ void ChgProWaitBmsReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -45,10 +46,10 @@ void ChgProWaitBmsReady_B(StructChargeCtrl_B *pChargeCtrl)
{ {
if((GetSystemTick() - CML_SendTick) > 250) if((GetSystemTick() - CML_SendTick) > 250)
{ {
if(0 != UserParam.ChgFun.Value.SigUniChg) //if(0 != UserParam.ChgFun.Value.SigUniChg)
CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)), 4000 - DcModuleAbility.MinCurrt); // CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)), 4000 - DcModuleAbility.MinCurrt);
else //else
CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*DcModuleManage_B.ValidNum), 4000 - DcModuleAbility.MinCurrt); CML_Send_B(DcModuleAbility.MaxVolt, DcModuleAbility.MinVolt, 4000 - (DcModuleAbility.MaxCurrt*(DcModuleManage_B.ValidNum + DcModuleManage_All.ValidNum), 4000 - DcModuleAbility.MinCurrt);
CML_SendTick = GetSystemTick(); CML_SendTick = GetSystemTick();
} }
if((GetSystemTick() - CTS_SendTick) > 500) if((GetSystemTick() - CTS_SendTick) > 500)
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_WaitPillarReady.c
...@@ -72,7 +72,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -72,7 +72,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
CstMsg_B.StopTruble.Value.Other = 1; CstMsg_B.StopTruble.Value.Other = 1;
CstMsg_B.StopFault.Value.Volt = 1; CstMsg_B.StopFault.Value.Volt = 1;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -100,7 +100,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -100,7 +100,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
CstMsg_B.StopTruble.Value.Other = 1; CstMsg_B.StopTruble.Value.Other = 1;
CstMsg_B.StopFault.Value.Volt = 1; CstMsg_B.StopFault.Value.Volt = 1;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_BatVoltError; ChargeStopType_B = eChgStop_PillarReady_BatVoltError;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -113,7 +113,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -113,7 +113,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
CstMsg_B.StopTruble.Value.Other = 1; CstMsg_B.StopTruble.Value.Other = 1;
CstMsg_B.StopFault.Value.Volt = 1; CstMsg_B.StopFault.Value.Volt = 1;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_BatVoltMismatchBcpVolt; ChargeStopType_B = eChgStop_PillarReady_BatVoltMismatchBcpVolt;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -143,7 +143,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -143,7 +143,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
CstMsg_B.StopTruble.Value.Other = 1; CstMsg_B.StopTruble.Value.Other = 1;
CstMsg_B.StopFault.Value.Volt = 1; CstMsg_B.StopFault.Value.Volt = 1;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B= eChgStop_PillarReady_NoVolt; ChargeStopType_B= eChgStop_PillarReady_NoVolt;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -185,7 +185,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -185,7 +185,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
if((GetSystemTick() - BroMsg_B.RecvTick) > MsgTimeout_B_5S) if((GetSystemTick() - BroMsg_B.RecvTick) > MsgTimeout_B_5S)
{ {
CemMsg_B.Cem.Value.Bro = 1; CemMsg_B.Cem.Value.Bro = 1;
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
pChargeCtrl->CurProcess = eChgPro_B_CommBreak; pChargeCtrl->CurProcess = eChgPro_B_CommBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
...@@ -205,7 +205,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -205,7 +205,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
// CstMsg.StopFault.Value.Volt = 1; // CstMsg.StopFault.Value.Volt = 1;
CemMsg_B.Cem.Mult = 0; CemMsg_B.Cem.Mult = 0;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_Imd_xx; ChargeStopType_B = eChgStop_Imd_xx;
pChargeCtrl->CurProcess = eChgPro_B_CommError; pChargeCtrl->CurProcess = eChgPro_B_CommError;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -213,14 +213,14 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -213,14 +213,14 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
if(0 != BemMsg_B.Valid) if(0 != BemMsg_B.Valid)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
pChargeCtrl->CurProcess = eChgPro_B_CommBreak; pChargeCtrl->CurProcess = eChgPro_B_CommBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 == TCUCurChgRecd_B.TCUChargeEnable) if(0 == TCUCurChgRecd_B.TCUChargeEnable)
{//外部控制结束充电 {//外部控制结束充电
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_UserCancel; ChargeStopType_B = eChgStop_PillarReady_UserCancel;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -235,7 +235,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -235,7 +235,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
CcStatusChkTick = 0; CcStatusChkTick = 0;
if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick_B * 2)) if((0 != CcStatusChkTick) && ((GetSystemTick() - CcStatusChkTick) > CC_CheckTick_B * 2))
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
CcStatusChkTick = 0; CcStatusChkTick = 0;
ChargeStopType_B = eChgStop_PillarReady_CcOpen; ChargeStopType_B = eChgStop_PillarReady_CcOpen;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -243,49 +243,49 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -243,49 +243,49 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
} }
if(0 != PillarError_B.Value.Emergency) if(0 != PillarError_B.Value.Emergency)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_EmerClose; ChargeStopType_B = eChgStop_PillarReady_EmerClose;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError_B.Value.Door) if(0 != PillarError_B.Value.Door)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_DoorOpen; ChargeStopType_B = eChgStop_PillarReady_DoorOpen;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError_B.Value.Contactor) if(0 != PillarError_B.Value.Contactor)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_Contactor; ChargeStopType_B = eChgStop_PillarReady_Contactor;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError_B.Value.UniContactor) if(0 != PillarError_B.Value.UniContactor)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_UniContactor; ChargeStopType_B = eChgStop_PillarReady_UniContactor;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError_B.Value.InVolt) if(0 != PillarError_B.Value.InVolt)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_InVolt; ChargeStopType_B = eChgStop_PillarReady_InVolt;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError_B.Value.NoDcmod) if(0 != PillarError_B.Value.NoDcmod)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_NoDcmod; ChargeStopType_B = eChgStop_PillarReady_NoDcmod;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
if(0 != PillarError_B.Value.Meter) if(0 != PillarError_B.Value.Meter)
{ {
SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_PillarReady_Meter; ChargeStopType_B = eChgStop_PillarReady_Meter;
pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论