Skip to content

D
DC360_1drap3_xiaoju_V1
提交 76c67dd4 作者: wysheng
操作

删除不在使用的泄放电路控制

上级 ec098bd1
正在显示 包含 96 行增加 和 90 行删除
DcPillar/Src/Drivers/Drv_BoardIo.c
...@@ -158,7 +158,7 @@ EnumSwitchStatus DcOutGet(void) ...@@ -158,7 +158,7 @@ EnumSwitchStatus DcOutGet(void)
return eSwSta_On; return eSwSta_On;
return eSwSta_Off; return eSwSta_Off;
}*/ }*/
#if 0
void DrainResistInit(void) void DrainResistInit(void)
{ {
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
...@@ -180,6 +180,7 @@ void DrainResistSet(EnumSwitchStatus Set) ...@@ -180,6 +180,7 @@ void DrainResistSet(EnumSwitchStatus Set)
// else // else
// DrainResist_Port->BSRRL = DrainResist_Pin; // DrainResist_Port->BSRRL = DrainResist_Pin;
} }
#endif
void ACContactorSet(EnumSwitchStatus Set) void ACContactorSet(EnumSwitchStatus Set)
{ {
if(eSwSta_Off == Set) if(eSwSta_Off == Set)
...@@ -489,6 +490,7 @@ EnumSwitchStatus DcOutGet_B(void) ...@@ -489,6 +490,7 @@ EnumSwitchStatus DcOutGet_B(void)
*/ */
//B枪BMS供电 12V/24V 切换 //B枪BMS供电 12V/24V 切换
#if 0
void DrainResistInit_B(void) void DrainResistInit_B(void)
{ {
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
...@@ -510,6 +512,7 @@ void DrainResistSet_B(EnumSwitchStatus Set) ...@@ -510,6 +512,7 @@ void DrainResistSet_B(EnumSwitchStatus Set)
else else
DrainResist_B_Port->BSRRL = DrainResist_B_Pin; DrainResist_B_Port->BSRRL = DrainResist_B_Pin;
} }
#endif
void ImdWorkSet_B(EnumSwitchStatus Set) void ImdWorkSet_B(EnumSwitchStatus Set)
{ {
...@@ -1015,8 +1018,8 @@ void DcOutSet_AB(EnumSwitchStatus Set) ...@@ -1015,8 +1018,8 @@ void DcOutSet_AB(EnumSwitchStatus Set)
} }
void DrainResistSet_AB(EnumSwitchStatus Set) void DrainResistSet_AB(EnumSwitchStatus Set)
{ {
DrainResistSet(Set); //DrainResistSet(Set);
DrainResistSet_B(Set); //DrainResistSet_B(Set);
} }
void FanSet_AB(EnumSwitchStatus Set) void FanSet_AB(EnumSwitchStatus Set)
......
DcPillar/Src/Drivers/Drv_BoardIo.h
...@@ -262,8 +262,8 @@ extern void DcOutSet(EnumSwitchStatus Set); ...@@ -262,8 +262,8 @@ extern void DcOutSet(EnumSwitchStatus Set);
extern EnumSwitchStatus DcOutPosGetSet(void); extern EnumSwitchStatus DcOutPosGetSet(void);
//extern EnumSwitchStatus DcOutGet(void); //extern EnumSwitchStatus DcOutGet(void);
extern void DrainResistInit(void); //extern void DrainResistInit(void);
extern void DrainResistSet(EnumSwitchStatus Set); //extern void DrainResistSet(EnumSwitchStatus Set);
extern void ACContactorSet(EnumSwitchStatus Set); extern void ACContactorSet(EnumSwitchStatus Set);
...@@ -296,8 +296,8 @@ extern void DcOutSet_B(EnumSwitchStatus Set); ...@@ -296,8 +296,8 @@ extern void DcOutSet_B(EnumSwitchStatus Set);
extern EnumSwitchStatus DcOutPosGetSet_B(void); extern EnumSwitchStatus DcOutPosGetSet_B(void);
//extern EnumSwitchStatus DcOutGet_B(void); //extern EnumSwitchStatus DcOutGet_B(void);
extern void DrainResistInit_B(void); //extern void DrainResistInit_B(void);
extern void DrainResistSet_B(EnumSwitchStatus Set); //extern void DrainResistSet_B(EnumSwitchStatus Set);
extern void LockInit_B(void); extern void LockInit_B(void);
extern void LockSet_B(EnumSwitchStatus Set); extern void LockSet_B(EnumSwitchStatus Set);
......
DcPillar/Src/SmartAllocation/SmartAllocation_B_ChgRun.c
...@@ -77,7 +77,7 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -77,7 +77,7 @@ void ChgProChgRun_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
CcsChgEnable = 1; CcsChgEnable = 1;
......
DcPillar/Src/SmartAllocation/SmartAllocation_ChgRun.c
...@@ -84,7 +84,7 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl) ...@@ -84,7 +84,7 @@ void ChgProChgRun(StructChargeCtrl * pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
CcsChgEnable = 1; CcsChgEnable = 1;
......
DcPillar/Src/Thread/Charge/ChgPro_ChgBreak.c
...@@ -26,7 +26,7 @@ void ChgProChgBreak(StructChargeCtrl *pChargeCtrl) ...@@ -26,7 +26,7 @@ void ChgProChgBreak(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
...@@ -161,7 +161,7 @@ void ChgProChgBreak(StructChargeCtrl *pChargeCtrl) ...@@ -161,7 +161,7 @@ void ChgProChgBreak(StructChargeCtrl *pChargeCtrl)
{ {
if((GetDcModuleVolt() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//С60V if((GetDcModuleVolt() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//С60V
{ {
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
ChgEndFlag = 1; ChgEndFlag = 1;
DrainResistTick = 0; DrainResistTick = 0;
} }
......
DcPillar/Src/Thread/Charge/ChgPro_ChgConfigure.c
...@@ -24,7 +24,7 @@ void ChgProChgConfigure(StructChargeCtrl *pChargeCtrl) ...@@ -24,7 +24,7 @@ void ChgProChgConfigure(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
......
DcPillar/Src/Thread/Charge/ChgPro_ChgIdle.c
...@@ -27,7 +27,7 @@ void ChgProChgIdle(StructChargeCtrl *pChargeCtrl) ...@@ -27,7 +27,7 @@ void ChgProChgIdle(StructChargeCtrl *pChargeCtrl)
FanSet(eSwSta_Off); FanSet(eSwSta_Off);
//붚없鍍친욥off--겜on //붚없鍍친욥off--겜on
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
......
DcPillar/Src/Thread/Charge/ChgPro_ChgRecognize.c
...@@ -35,7 +35,7 @@ void ChgProChgRecognize(StructChargeCtrl *pChargeCtrl) ...@@ -35,7 +35,7 @@ void ChgProChgRecognize(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
......
DcPillar/Src/Thread/Charge/ChgPro_ChgRecognizeEx.c
...@@ -35,7 +35,7 @@ void ChgProChgRecognizeEx(StructChargeCtrl *pChargeCtrl) ...@@ -35,7 +35,7 @@ void ChgProChgRecognizeEx(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
...@@ -62,6 +62,7 @@ void ChgProChgRecognizeEx(StructChargeCtrl *pChargeCtrl) ...@@ -62,6 +62,7 @@ void ChgProChgRecognizeEx(StructChargeCtrl *pChargeCtrl)
} }
else if((GetSystemTick() - BrmMsg.RecvTick) < (MsgTimeout_5S/2)) else if((GetSystemTick() - BrmMsg.RecvTick) < (MsgTimeout_5S/2))
{ {
} }
else if((GetSystemTick() - BrmMsg.RecvTick) < (MsgTimeout_10S)) else if((GetSystemTick() - BrmMsg.RecvTick) < (MsgTimeout_10S))
{ {
......
DcPillar/Src/Thread/Charge/ChgPro_ChgStart.c
...@@ -27,7 +27,7 @@ void ChgProChgStart(StructChargeCtrl *pChargeCtrl) ...@@ -27,7 +27,7 @@ void ChgProChgStart(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer)) if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer))
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
else else
......
DcPillar/Src/Thread/Charge/ChgPro_ChgStop.c
...@@ -31,7 +31,7 @@ void ChgProChgStop(StructChargeCtrl *pChargeCtrl) ...@@ -31,7 +31,7 @@ void ChgProChgStop(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
//DcOutSet(eSwSta_On);//有可能是充通信失败等待过来，保存原来状态 //DcOutSet(eSwSta_On);//有可能是充通信失败等待过来，保存原来状态
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
...@@ -135,7 +135,7 @@ void ChgProChgStop(StructChargeCtrl *pChargeCtrl) ...@@ -135,7 +135,7 @@ void ChgProChgStop(StructChargeCtrl *pChargeCtrl)
if((GetDcModuleCurrt() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120)) if((GetDcModuleCurrt() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120))
{//小于5A {//小于5A
DcOutSet(eSwSta_Off);//k1 k2 DcOutSet(eSwSta_Off);//k1 k2
DrainResistSet(eSwSta_On);//泄放电阻 //DrainResistSet(eSwSta_On);//泄放电阻
DrainResistTick = GetSystemTick(); DrainResistTick = GetSystemTick();
CurrtCheckTick = 0; CurrtCheckTick = 0;
} }
...@@ -145,7 +145,7 @@ void ChgProChgStop(StructChargeCtrl *pChargeCtrl) ...@@ -145,7 +145,7 @@ void ChgProChgStop(StructChargeCtrl *pChargeCtrl)
{ {
if((GetDcModuleVolt() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//小于60V if((GetDcModuleVolt() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//小于60V
{ {
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
ChgEndFlag = 1; ChgEndFlag = 1;
DrainResistTick = 0; DrainResistTick = 0;
} }
......
DcPillar/Src/Thread/Charge/ChgPro_CommBreak.c
...@@ -45,7 +45,7 @@ void ChgProCommBeak(StructChargeCtrl *pChargeCtrl) ...@@ -45,7 +45,7 @@ void ChgProCommBeak(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
//DcOutSet(eSwSta_On); //DcOutSet(eSwSta_On);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
......
DcPillar/Src/Thread/Charge/ChgPro_CommError.c
...@@ -29,7 +29,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl) ...@@ -29,7 +29,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
//DcOutSet(eSwSta_On); //DcOutSet(eSwSta_On);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
...@@ -75,7 +75,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl) ...@@ -75,7 +75,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl)
if((GetDcModuleCurrt() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120)) if((GetDcModuleCurrt() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120))
{//小于5A {//小于5A
DcOutSet(eSwSta_Off);//k1 k2 DcOutSet(eSwSta_Off);//k1 k2
DrainResistSet(eSwSta_On);//泄放电阻 //DrainResistSet(eSwSta_On);//泄放电阻
DrainResistTick = GetSystemTick(); DrainResistTick = GetSystemTick();
CurrtCheckTick = 0; CurrtCheckTick = 0;
} }
...@@ -85,7 +85,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl) ...@@ -85,7 +85,7 @@ void ChgProCommError(StructChargeCtrl *pChargeCtrl)
{ {
if((GetDcModuleVolt() < 600) || ((GetSystemTick() - DrainResistTick) > 4000)) if((GetDcModuleVolt() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))
{//小于60V {//小于60V
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
ChgEndFlag = 1; ChgEndFlag = 1;
DrainResistTick = 0; DrainResistTick = 0;
} }
......
DcPillar/Src/Thread/Charge/ChgPro_ImdCheck.c
...@@ -171,7 +171,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -171,7 +171,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -192,7 +192,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -192,7 +192,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
ChargeError.Value.IsolateError = 0;//绝缘故障 ChargeError.Value.IsolateError = 0;//绝缘故障
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -203,7 +203,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -203,7 +203,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
ChargeError.Value.IsolateError = 0;//绝缘故障 ChargeError.Value.IsolateError = 0;//绝缘故障
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -214,7 +214,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -214,7 +214,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
ChargeError.Value.IsolateError = 1;//绝缘故障 ChargeError.Value.IsolateError = 1;//绝缘故障
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -224,7 +224,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -224,7 +224,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
case eImdStep_Bleeder: case eImdStep_Bleeder:
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出 DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);//关直流模块输出
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
...@@ -233,14 +233,14 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -233,14 +233,14 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
if((GetSystemTick() - ImdTimeout) > BleederCheckTimeOut) if((GetSystemTick() - ImdTimeout) > BleederCheckTimeOut)
{//超时 {//超时
ChargeError.Value.DrainResist = 1;//泄放电阻警告 ChargeError.Value.DrainResist = 1;//泄放电阻警告
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
*pImdChckStep = eImdStep_Stop; *pImdChckStep = eImdStep_Stop;
} }
if(FALSE != GetBleederResult()) if(FALSE != GetBleederResult())
{ {
ChargeError.Value.DrainResist = 0;//泄放电阻警告 ChargeError.Value.DrainResist = 0;//泄放电阻警告
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
*pImdChckStep = eImdStep_Stop; *pImdChckStep = eImdStep_Stop;
} }
break; break;
...@@ -249,7 +249,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep) ...@@ -249,7 +249,7 @@ void ImdProcess(EnumImdChkStep *pImdChckStep)
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
ImdCheckSet(eSwSta_Off); ImdCheckSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
*pImdChckStep = eImdStep_Finish; *pImdChckStep = eImdStep_Finish;
break; break;
case eImdStep_Finish: case eImdStep_Finish:
...@@ -287,7 +287,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl) ...@@ -287,7 +287,7 @@ void ChgProImdCheck(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_On); ImdWorkSet(eSwSta_On);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
CHM_Send(); CHM_Send();
......
DcPillar/Src/Thread/Charge/ChgPro_ShakeHand.c
...@@ -61,7 +61,7 @@ void ChgProShakeHand(StructChargeCtrl *pChargeCtrl) ...@@ -61,7 +61,7 @@ void ChgProShakeHand(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_On); ImdWorkSet(eSwSta_On);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
......
DcPillar/Src/Thread/Charge/ChgPro_WaitBmsReady.c
...@@ -26,7 +26,7 @@ void ChgProWaitBmsReady(StructChargeCtrl *pChargeCtrl) ...@@ -26,7 +26,7 @@ void ChgProWaitBmsReady(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
......
DcPillar/Src/Thread/Charge/ChgPro_WaitPillarReady.c
...@@ -48,7 +48,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl) ...@@ -48,7 +48,7 @@ void ChgProWaitPillarReady(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
CroStarus = 0x00; CroStarus = 0x00;
......
DcPillar/Src/Thread/Charge/ChgPro_WaitVoltChgRun.c
...@@ -62,7 +62,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -62,7 +62,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer)) if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer))
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
else else
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgBreak.c
...@@ -26,7 +26,7 @@ void ChgProChgBreak_B(StructChargeCtrl_B*pChargeCtrl) ...@@ -26,7 +26,7 @@ void ChgProChgBreak_B(StructChargeCtrl_B*pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
...@@ -79,6 +79,7 @@ void ChgProChgBreak_B(StructChargeCtrl_B*pChargeCtrl) ...@@ -79,6 +79,7 @@ void ChgProChgBreak_B(StructChargeCtrl_B*pChargeCtrl)
Dtc = 0x01500DC2;//10 Dtc = 0x01500DC2;//10
} }
if((eChgStop_Shake_Contactor == ChargeStopType_B) if((eChgStop_Shake_Contactor == ChargeStopType_B)
|| (eChgStop_Imd_Contactor == ChargeStopType_B) || (eChgStop_Imd_Contactor == ChargeStopType_B)
|| (eChgStop_Reco_Contactor == ChargeStopType_B) || (eChgStop_Reco_Contactor == ChargeStopType_B)
...@@ -135,7 +136,7 @@ void ChgProChgBreak_B(StructChargeCtrl_B*pChargeCtrl) ...@@ -135,7 +136,7 @@ void ChgProChgBreak_B(StructChargeCtrl_B*pChargeCtrl)
{ {
if((GetDcModuleVolt_B() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//С60V if((GetDcModuleVolt_B() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//С60V
{ {
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
ChgEndFlag = 1; ChgEndFlag = 1;
DrainResistTick = 0; DrainResistTick = 0;
} }
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgConfigure.c
...@@ -24,7 +24,7 @@ void ChgProChgConfigure_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -24,7 +24,7 @@ void ChgProChgConfigure_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgIdle.c
...@@ -25,7 +25,7 @@ void ChgProChgIdle_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -25,7 +25,7 @@ void ChgProChgIdle_B(StructChargeCtrl_B *pChargeCtrl)
FanSet_B(eSwSta_Off); FanSet_B(eSwSta_Off);
//붚없鍍친욥off--겜on //붚없鍍친욥off--겜on
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgRecognize.c
...@@ -35,7 +35,7 @@ void ChgProChgRecognize_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -35,7 +35,7 @@ void ChgProChgRecognize_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgRecognizeEx.c
...@@ -35,7 +35,7 @@ void ChgProChgRecognizeEx_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -35,7 +35,7 @@ void ChgProChgRecognizeEx_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
...@@ -62,6 +62,7 @@ void ChgProChgRecognizeEx_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -62,6 +62,7 @@ void ChgProChgRecognizeEx_B(StructChargeCtrl_B *pChargeCtrl)
} }
else if((GetSystemTick() - BrmMsg_B.RecvTick) < (MsgTimeout_B_5S/2)) else if((GetSystemTick() - BrmMsg_B.RecvTick) < (MsgTimeout_B_5S/2))
{ {
} }
else if((GetSystemTick() - BrmMsg_B.RecvTick) < (MsgTimeout_B_10S)) else if((GetSystemTick() - BrmMsg_B.RecvTick) < (MsgTimeout_B_10S))
{ {
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgStart.c
...@@ -27,7 +27,7 @@ void ChgProChgStart_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -27,7 +27,7 @@ void ChgProChgStart_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer_B)) if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer_B))
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
else else
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ChgStop.c
...@@ -31,7 +31,7 @@ void ChgProChgStop_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -31,7 +31,7 @@ void ChgProChgStop_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
//DcOutSet_B(eSwSta_On);//有可能是充通信失败等待过来，保存原来状态 //DcOutSet_B(eSwSta_On);//有可能是充通信失败等待过来，保存原来状态
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
...@@ -135,7 +135,7 @@ void ChgProChgStop_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -135,7 +135,7 @@ void ChgProChgStop_B(StructChargeCtrl_B *pChargeCtrl)
if((GetDcModuleCurrt_B() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120)) if((GetDcModuleCurrt_B() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120))
{//小于5A {//小于5A
DcOutSet_B(eSwSta_Off);//k1 k2 DcOutSet_B(eSwSta_Off);//k1 k2
DrainResistSet_B(eSwSta_On);//泄放电阻 //DrainResistSet_B(eSwSta_On);//泄放电阻
DrainResistTick = GetSystemTick(); DrainResistTick = GetSystemTick();
CurrtCheckTick = 0; CurrtCheckTick = 0;
} }
...@@ -145,7 +145,7 @@ void ChgProChgStop_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -145,7 +145,7 @@ void ChgProChgStop_B(StructChargeCtrl_B *pChargeCtrl)
{ {
if((GetDcModuleVolt_B() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//小于60V if((GetDcModuleVolt_B() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))//小于60V
{ {
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
ChgEndFlag = 1; ChgEndFlag = 1;
DrainResistTick = 0; DrainResistTick = 0;
} }
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_CommBreak.c
...@@ -45,7 +45,7 @@ void ChgProCommBeak_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -45,7 +45,7 @@ void ChgProCommBeak_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
//DcOutSet_B(eSwSta_On); //DcOutSet_B(eSwSta_On);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_CommError.c
...@@ -29,7 +29,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -29,7 +29,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
//DcOutSet_B(eSwSta_On); //DcOutSet_B(eSwSta_On);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
...@@ -75,7 +75,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -75,7 +75,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl)
if((GetDcModuleCurrt_B() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120)) if((GetDcModuleCurrt_B() < 50) || ((GetSystemTick() - CurrtCheckTick) > 120))
{//小于5A {//小于5A
DcOutSet_B(eSwSta_Off);//k1 k2 DcOutSet_B(eSwSta_Off);//k1 k2
DrainResistSet_B(eSwSta_On);//泄放电阻 //DrainResistSet_B(eSwSta_On);//泄放电阻
DrainResistTick = GetSystemTick(); DrainResistTick = GetSystemTick();
CurrtCheckTick = 0; CurrtCheckTick = 0;
} }
...@@ -85,7 +85,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -85,7 +85,7 @@ void ChgProCommError_B(StructChargeCtrl_B *pChargeCtrl)
{ {
if((GetDcModuleVolt_B() < 600) || ((GetSystemTick() - DrainResistTick) > 4000)) if((GetDcModuleVolt_B() < 600) || ((GetSystemTick() - DrainResistTick) > 4000))
{//小于60V {//小于60V
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
ChgEndFlag = 1; ChgEndFlag = 1;
DrainResistTick = 0; DrainResistTick = 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)
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -192,7 +192,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -192,7 +192,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
ChargeError_B.Value.IsolateError = 0;//绝缘故障 ChargeError_B.Value.IsolateError = 0;//绝缘故障
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -203,7 +203,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -203,7 +203,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
ChargeError_B.Value.IsolateError = 0;//绝缘故障 ChargeError_B.Value.IsolateError = 0;//绝缘故障
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -214,7 +214,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -214,7 +214,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
ChargeError_B.Value.IsolateError = 1;//绝缘故障 ChargeError_B.Value.IsolateError = 1;//绝缘故障
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出
osDelay(100); osDelay(100);
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
*pImdChckStep = eImdStep_Bleeder; *pImdChckStep = eImdStep_Bleeder;
ImdTimeout = 0; ImdTimeout = 0;
...@@ -224,7 +224,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -224,7 +224,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
case eImdStep_Bleeder: case eImdStep_Bleeder:
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出 DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);//关直流模块输出
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
...@@ -233,14 +233,14 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -233,14 +233,14 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
if((GetSystemTick() - ImdTimeout) > BleederCheckTimeOut) if((GetSystemTick() - ImdTimeout) > BleederCheckTimeOut)
{//超时 {//超时
ChargeError_B.Value.DrainResist = 1;//泄放电阻警告 ChargeError_B.Value.DrainResist = 1;//泄放电阻警告
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
*pImdChckStep = eImdStep_Stop; *pImdChckStep = eImdStep_Stop;
} }
if(FALSE != GetBleederResult_B()) if(FALSE != GetBleederResult_B())
{ {
ChargeError_B.Value.DrainResist = 0;//泄放电阻警告 ChargeError_B.Value.DrainResist = 0;//泄放电阻警告
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
*pImdChckStep = eImdStep_Stop; *pImdChckStep = eImdStep_Stop;
} }
break; break;
...@@ -249,7 +249,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep) ...@@ -249,7 +249,7 @@ void ImdProcess_B(EnumImdChkStep *pImdChckStep)
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
ImdCheckSet_B(eSwSta_Off); ImdCheckSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
*pImdChckStep = eImdStep_Finish; *pImdChckStep = eImdStep_Finish;
break; break;
case eImdStep_Finish: case eImdStep_Finish:
...@@ -287,7 +287,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -287,7 +287,7 @@ void ChgProImdCheck_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_On); ImdWorkSet_B(eSwSta_On);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
CHM_Send_B(); CHM_Send_B();
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_ShakeHand.c
...@@ -64,7 +64,7 @@ void ChgProShakeHand_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -64,7 +64,7 @@ void ChgProShakeHand_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_On); ImdWorkSet_B(eSwSta_On);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_WaitBmsReady.c
...@@ -26,7 +26,7 @@ void ChgProWaitBmsReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -26,7 +26,7 @@ void ChgProWaitBmsReady_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_WaitPillarReady.c
...@@ -48,7 +48,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -48,7 +48,7 @@ void ChgProWaitPillarReady_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
CroStarus = 0x00; CroStarus = 0x00;
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_WaitVoltChgRun.c
...@@ -62,7 +62,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -62,7 +62,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer_B)) if((eChgVer_2011 != UserParam.ChgVer) && (eChgVer_2011 != ChgVer_B))
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
else else
......
DcPillar/Src/Thread/Lcd/LcdPro_B_FactoryChgInfor.c
...@@ -59,7 +59,7 @@ void LcdProFactoryChgInfor_B(StructLcdCtrl *pLcdCtrl) ...@@ -59,7 +59,7 @@ void LcdProFactoryChgInfor_B(StructLcdCtrl *pLcdCtrl)
LockSet_B(eSwSta_On); LockSet_B(eSwSta_On);
FanSet_B(eSwSta_On); FanSet_B(eSwSta_On);
ImdWorkSet_B(eSwSta_On); ImdWorkSet_B(eSwSta_On);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
ScreenChkTick = GetSystemTick(); ScreenChkTick = GetSystemTick();
...@@ -122,7 +122,7 @@ void LcdProFactoryChgInfor_B(StructLcdCtrl *pLcdCtrl) ...@@ -122,7 +122,7 @@ void LcdProFactoryChgInfor_B(StructLcdCtrl *pLcdCtrl)
LockSet_B(eSwSta_Off); LockSet_B(eSwSta_Off);
FanSet_B(eSwSta_Off); FanSet_B(eSwSta_Off);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
return; return;
......
DcPillar/Src/Thread/Lcd/LcdPro_B_FactoryChgSet.c
...@@ -51,7 +51,7 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl) ...@@ -51,7 +51,7 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl)
LockSet_B(eSwSta_Off); LockSet_B(eSwSta_Off);
FanSet_B(eSwSta_Off); FanSet_B(eSwSta_Off);
ImdWorkSet_B(eSwSta_Off); ImdWorkSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum); DcModuleSet_B(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage_B.ValidNum);
...@@ -79,7 +79,7 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl) ...@@ -79,7 +79,7 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl)
{ {
case BtnFactoryChgSet_B_Start: case BtnFactoryChgSet_B_Start:
TimeOutTick = GetSystemTick(); TimeOutTick = GetSystemTick();
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
ImdWorkSet_B(eSwSta_On); ImdWorkSet_B(eSwSta_On);
osDelay(200); osDelay(200);
DcModuleSet_B(eSwSta_On, NeedVolt, NeedCurrt); DcModuleSet_B(eSwSta_On, NeedVolt, NeedCurrt);
...@@ -91,21 +91,21 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl) ...@@ -91,21 +91,21 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl)
case BtnFactoryChgSet_B_Next: case BtnFactoryChgSet_B_Next:
TimeOutTick = GetSystemTick(); TimeOutTick = GetSystemTick();
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
pLcdCtrl->CurScreen = eLcdPro_FactoryDcModSet; pLcdCtrl->CurScreen = eLcdPro_FactoryDcModSet;
pLcdCtrl->Param = 0; pLcdCtrl->Param = 0;
break; break;
case BtnFactoryChgSet_B_Last: case BtnFactoryChgSet_B_Last:
TimeOutTick = GetSystemTick(); TimeOutTick = GetSystemTick();
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
pLcdCtrl->CurScreen = eLcdPro_B_FactoryTestTwo; pLcdCtrl->CurScreen = eLcdPro_B_FactoryTestTwo;
pLcdCtrl->Param = 0; pLcdCtrl->Param = 0;
break; break;
default: default:
LcdShowPage(ScrnFactoryChgSet_B); LcdShowPage(ScrnFactoryChgSet_B);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
break; break;
} }
} }
...@@ -130,7 +130,7 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl) ...@@ -130,7 +130,7 @@ void LcdProFactoryChgSet_B(StructLcdCtrl *pLcdCtrl)
if((GetSystemTick() - TimeOutTick) > TimeOutTime) if((GetSystemTick() - TimeOutTick) > TimeOutTime)
{ {
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
CloseKeyBoard(); CloseKeyBoard();
pLcdCtrl->CurScreen = eLcdPro_MainMenu; pLcdCtrl->CurScreen = eLcdPro_MainMenu;
pLcdCtrl->Param = 0; pLcdCtrl->Param = 0;
......
DcPillar/Src/Thread/Lcd/LcdPro_B_FactoryTest.c
...@@ -166,7 +166,7 @@ void LcdProFactoryTest_B(StructLcdCtrl *pLcdCtrl) ...@@ -166,7 +166,7 @@ void LcdProFactoryTest_B(StructLcdCtrl *pLcdCtrl)
FanSetExt_Top(eSwSta_Off); FanSetExt_Top(eSwSta_Off);
ChgLedSet_B(eSwSta_Off); ChgLedSet_B(eSwSta_Off);
IdleLedSet_B(eSwSta_Off); IdleLedSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
ScreenChkTick = GetSystemTick(); ScreenChkTick = GetSystemTick();
Update.RePaintTick = GetSystemTick(); Update.RePaintTick = GetSystemTick();
...@@ -238,10 +238,10 @@ void LcdProFactoryTest_B(StructLcdCtrl *pLcdCtrl) ...@@ -238,10 +238,10 @@ void LcdProFactoryTest_B(StructLcdCtrl *pLcdCtrl)
ChgLedSet_B(eSwSta_On); ChgLedSet_B(eSwSta_On);
break; break;
case BtnFactoryTest_B_DrainResistOff: case BtnFactoryTest_B_DrainResistOff:
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
break; break;
case BtnFactoryTest_B_DrainResistOn: case BtnFactoryTest_B_DrainResistOn:
DrainResistSet_B(eSwSta_On); //DrainResistSet_B(eSwSta_On);
break; break;
case BtnFactoryTest_B_eLockOff: case BtnFactoryTest_B_eLockOff:
LockSet_B(eSwSta_Off); LockSet_B(eSwSta_Off);
...@@ -274,7 +274,7 @@ void LcdProFactoryTest_B(StructLcdCtrl *pLcdCtrl) ...@@ -274,7 +274,7 @@ void LcdProFactoryTest_B(StructLcdCtrl *pLcdCtrl)
FanSetExt_Top(eSwSta_Off); FanSetExt_Top(eSwSta_Off);
ChgLedSet_B(eSwSta_Off); ChgLedSet_B(eSwSta_Off);
IdleLedSet(eSwSta_Off); IdleLedSet(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
return; return;
} }
......
DcPillar/Src/Thread/Lcd/LcdPro_B_FactoryTestTwo.c
...@@ -165,7 +165,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl) ...@@ -165,7 +165,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl)
IdleLedSet_B(eSwSta_Off); IdleLedSet_B(eSwSta_Off);
//DcOutNegSet_B(eSwSta_Off); //DcOutNegSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
LockSet_B(eSwSta_Off); LockSet_B(eSwSta_Off);
ScreenChkTick = GetSystemTick(); ScreenChkTick = GetSystemTick();
...@@ -260,7 +260,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl) ...@@ -260,7 +260,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl)
{ {
IdleLedSet_B(eSwSta_Off); IdleLedSet_B(eSwSta_Off);
//DcOutNegSet_B(eSwSta_Off); //DcOutNegSet_B(eSwSta_Off);
DrainResistSet_B(eSwSta_Off); //DrainResistSet_B(eSwSta_Off);
LockSet_B(eSwSta_Off); LockSet_B(eSwSta_Off);
return; return;
} }
......
DcPillar/Src/Thread/Lcd/LcdPro_FactoryChgInfor.c
...@@ -59,7 +59,7 @@ void LcdProFactoryChgInfor(StructLcdCtrl *pLcdCtrl) ...@@ -59,7 +59,7 @@ void LcdProFactoryChgInfor(StructLcdCtrl *pLcdCtrl)
LockSet(eSwSta_On); LockSet(eSwSta_On);
FanSet(eSwSta_On); FanSet(eSwSta_On);
ImdWorkSet(eSwSta_On); ImdWorkSet(eSwSta_On);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
ScreenChkTick = GetSystemTick(); ScreenChkTick = GetSystemTick();
...@@ -122,7 +122,7 @@ void LcdProFactoryChgInfor(StructLcdCtrl *pLcdCtrl) ...@@ -122,7 +122,7 @@ void LcdProFactoryChgInfor(StructLcdCtrl *pLcdCtrl)
LockSet(eSwSta_Off); LockSet(eSwSta_Off);
FanSet(eSwSta_Off); FanSet(eSwSta_Off);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
return; return;
......
DcPillar/Src/Thread/Lcd/LcdPro_FactoryChgSet.c
...@@ -50,7 +50,7 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl) ...@@ -50,7 +50,7 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl)
LockSet(eSwSta_Off); LockSet(eSwSta_Off);
FanSet(eSwSta_Off); FanSet(eSwSta_Off);
ImdWorkSet(eSwSta_Off); ImdWorkSet(eSwSta_Off);
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
...@@ -78,7 +78,7 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl) ...@@ -78,7 +78,7 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl)
{ {
case BtnFactoryChgSet_Start: case BtnFactoryChgSet_Start:
TimeOutTick = GetSystemTick(); TimeOutTick = GetSystemTick();
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
ImdWorkSet(eSwSta_On); ImdWorkSet(eSwSta_On);
osDelay(200); osDelay(200);
DcModuleSet(eSwSta_On, NeedVolt, NeedCurrt); DcModuleSet(eSwSta_On, NeedVolt, NeedCurrt);
...@@ -90,14 +90,14 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl) ...@@ -90,14 +90,14 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl)
case BtnFactoryChgSet_Next: case BtnFactoryChgSet_Next:
TimeOutTick = GetSystemTick(); TimeOutTick = GetSystemTick();
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
pLcdCtrl->CurScreen = eLcdPro_B_FactoryTest; pLcdCtrl->CurScreen = eLcdPro_B_FactoryTest;
pLcdCtrl->Param = 0; pLcdCtrl->Param = 0;
break; break;
case BtnFactoryChgSet_Last: case BtnFactoryChgSet_Last:
TimeOutTick = GetSystemTick(); TimeOutTick = GetSystemTick();
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
pLcdCtrl->CurScreen = eLcdPro_FactoryTestTwo; pLcdCtrl->CurScreen = eLcdPro_FactoryTestTwo;
pLcdCtrl->Param = 0; pLcdCtrl->Param = 0;
break; break;
...@@ -128,7 +128,7 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl) ...@@ -128,7 +128,7 @@ void LcdProFactoryChgSet(StructLcdCtrl *pLcdCtrl)
if((GetSystemTick() - TimeOutTick) > TimeOutTime) if((GetSystemTick() - TimeOutTick) > TimeOutTime)
{ {
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
CloseKeyBoard(); CloseKeyBoard();
pLcdCtrl->CurScreen = eLcdPro_MainMenu; pLcdCtrl->CurScreen = eLcdPro_MainMenu;
pLcdCtrl->Param = 0; pLcdCtrl->Param = 0;
......
DcPillar/Src/Thread/Lcd/LcdPro_FactoryTest.c
...@@ -166,7 +166,7 @@ void LcdProFactoryTest(StructLcdCtrl *pLcdCtrl) ...@@ -166,7 +166,7 @@ void LcdProFactoryTest(StructLcdCtrl *pLcdCtrl)
FanSetExt(eSwSta_Off); FanSetExt(eSwSta_Off);
ChgLedSet(eSwSta_Off); ChgLedSet(eSwSta_Off);
IdleLedSet(eSwSta_Off); IdleLedSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
ScreenChkTick = GetSystemTick(); ScreenChkTick = GetSystemTick();
Update.RePaintTick = GetSystemTick(); Update.RePaintTick = GetSystemTick();
...@@ -238,10 +238,10 @@ void LcdProFactoryTest(StructLcdCtrl *pLcdCtrl) ...@@ -238,10 +238,10 @@ void LcdProFactoryTest(StructLcdCtrl *pLcdCtrl)
ChgLedSet(eSwSta_On); ChgLedSet(eSwSta_On);
break; break;
case BtnFactoryTest_DrainResistOff: case BtnFactoryTest_DrainResistOff:
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
break; break;
case BtnFactoryTest_DrainResistOn: case BtnFactoryTest_DrainResistOn:
DrainResistSet(eSwSta_On); //DrainResistSet(eSwSta_On);
break; break;
case BtnFactoryTest_eLockOff: case BtnFactoryTest_eLockOff:
LockSet(eSwSta_Off); LockSet(eSwSta_Off);
...@@ -274,7 +274,7 @@ void LcdProFactoryTest(StructLcdCtrl *pLcdCtrl) ...@@ -274,7 +274,7 @@ void LcdProFactoryTest(StructLcdCtrl *pLcdCtrl)
FanSetExt(eSwSta_Off); FanSetExt(eSwSta_Off);
ChgLedSet(eSwSta_Off); ChgLedSet(eSwSta_Off);
IdleLedSet(eSwSta_Off); IdleLedSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
return; return;
} }
......
DcPillar/Src/Thread/Lcd/LcdPro_FactoryTestTwo.c
...@@ -184,7 +184,7 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl) ...@@ -184,7 +184,7 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl)
IdleLedSet(eSwSta_Off); IdleLedSet(eSwSta_Off);
//DcOutNegSet(eSwSta_Off); //DcOutNegSet(eSwSta_Off);
//DehumidifierSet(eSwSta_Off); //DehumidifierSet(eSwSta_Off);
DrainResistSet(eSwSta_Off); //DrainResistSet(eSwSta_Off);
LockSet(eSwSta_Off); LockSet(eSwSta_Off);
ScreenChkTick = GetSystemTick(); ScreenChkTick = GetSystemTick();
......
DcPillar/Src/Thread/Thd_Charge_B.c
...@@ -108,7 +108,7 @@ void Thd_Charge_B(void const *parameter) ...@@ -108,7 +108,7 @@ void Thd_Charge_B(void const *parameter)
//DcModuleInit_B(); //DcModuleInit_B();
//MeterInit_B(); //MeterInit_B();
DcOutInit_B(); DcOutInit_B();
DrainResistInit_B(); //DrainResistInit_B();
LockInit_B(); LockInit_B();
BmsPowerInit_B(); BmsPowerInit_B();
BmsCommInit_B(); BmsCommInit_B();
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论