提交 9d9d03a5 作者: wysheng

规范命名

上级 e7f08e14
...@@ -278,7 +278,7 @@ typedef enum ...@@ -278,7 +278,7 @@ typedef enum
eChgStop_BmsReady_Meter = 96, eChgStop_BmsReady_Meter = 96,
eChgStop_PillarReady_Meter = 97, eChgStop_PillarReady_Meter = 97,
eChgStop_Imd_Short = 98, eChgStop_Imd_Short = 98,
eChgStop_Imd_xx = 99, eChgStop_Bro00_After_BroAA = 99,//收到0xAA后又收到0x00
eChgStop_PillarReady_NoVolt= 100, eChgStop_PillarReady_NoVolt= 100,
eChgStop_Conf_BatVoltLessPillarMinVolt = 101, eChgStop_Conf_BatVoltLessPillarMinVolt = 101,
eChgStop_PillarReady_UniContactor, eChgStop_PillarReady_UniContactor,
......
...@@ -34,7 +34,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl) ...@@ -34,7 +34,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
CstSendCnt = 0; CstSendCnt = 0;
if(ChargeStopType != eChgStop_Imd_xx) if(ChargeStopType != eChgStop_Bro00_After_BroAA)
CST_Send(&CstMsg); CST_Send(&CstMsg);
CST_SendTick = GetSystemTick(); CST_SendTick = GetSystemTick();
...@@ -47,7 +47,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl) ...@@ -47,7 +47,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl)
while(1) while(1)
{ {
if((ChargeStopType != eChgStop_Imd_xx)&&(0== CemMsg.Cem.Value.Bst)&&(0 != CST_SendTick) && ((GetSystemTick() - CST_SendTick) > 7)) if((ChargeStopType != eChgStop_Bro00_After_BroAA)&&(0== CemMsg.Cem.Value.Bst)&&(0 != CST_SendTick) && ((GetSystemTick() - CST_SendTick) > 7))
{ {
CST_Send(&CstMsg); CST_Send(&CstMsg);
CST_SendTick = GetSystemTick(); CST_SendTick = GetSystemTick();
......
...@@ -107,10 +107,10 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -107,10 +107,10 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
// CstMsg.StopTruble.Value.Other = 1; // CstMsg.StopTruble.Value.Other = 1;
// CstMsg.StopFault.Value.Volt = 1; // CstMsg.StopFault.Value.Volt = 1;
CemMsg.Cem.Mult = 0; CemMsg.Cem.Mult = 0;
//鏀跺埌0xAA鍚庡張鏀跺埌0x00
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt); SendDataToDcModule_A(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType = eChgStop_Imd_xx; ChargeStopType = eChgStop_Bro00_After_BroAA;
pChargeCtrl->CurProcess = eChgPro_CommError; pChargeCtrl->CurProcess = eChgPro_CommError;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
......
...@@ -34,7 +34,8 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -34,7 +34,8 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl)
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
CstSendCnt = 0; CstSendCnt = 0;
CST_Send_B(&CstMsg_B); if(ChargeStopType_B != eChgStop_Bro00_After_BroAA)
CST_Send_B(&CstMsg_B);
CST_SendTick = GetSystemTick(); CST_SendTick = GetSystemTick();
CemSendCnt = 0; CemSendCnt = 0;
...@@ -46,7 +47,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -46,7 +47,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl)
while(1) while(1)
{ {
if((0 != CST_SendTick) && ((GetSystemTick() - CST_SendTick) > 10)) if((ChargeStopType_B != eChgStop_Bro00_After_BroAA)&&(0 != CST_SendTick) && ((GetSystemTick() - CST_SendTick) > 10))
{ {
CST_Send_B(&CstMsg_B); CST_Send_B(&CstMsg_B);
CST_SendTick = GetSystemTick(); CST_SendTick = GetSystemTick();
......
...@@ -206,7 +206,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -206,7 +206,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
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); SendDataToDcModule_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt);
ChargeStopType_B = eChgStop_Imd_xx; ChargeStopType_B = eChgStop_Bro00_After_BroAA;
pChargeCtrl->CurProcess = eChgPro_B_CommError; pChargeCtrl->CurProcess = eChgPro_B_CommError;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论