Skip to content

D
DC360_1drap3_xiaoju_V1
提交 e360e1d9 作者: wysheng
操作

删除直流输出接触器反馈检测

上级 22d26c45
正在显示 包含 347 行增加 和 225 行删除
DcPillar/Src/Drivers/Drv_BoardIo.c
...@@ -21,11 +21,11 @@ EnumSwitchStatus EleLockSta = eSwSta_Off; ...@@ -21,11 +21,11 @@ EnumSwitchStatus EleLockSta = eSwSta_Off;
EnumSwitchStatus EleLockSta_B = eSwSta_Off; EnumSwitchStatus EleLockSta_B = eSwSta_Off;
EnumSwitchStatus DcOutPosSta = eSwSta_Off; EnumSwitchStatus DcOutPosSta = eSwSta_Off;
EnumSwitchStatus DcOutNegSta = eSwSta_Off; //EnumSwitchStatus DcOutNegSta = eSwSta_Off;
EnumSwitchStatus DcOutPosSta_B = eSwSta_Off; EnumSwitchStatus DcOutPosSta_B = eSwSta_Off;
EnumSwitchStatus DcOutNegSta_B = eSwSta_Off; //EnumSwitchStatus DcOutNegSta_B = eSwSta_Off;
EnumSwitchStatus DcOutPosSta_Uni = eSwSta_Off; //EnumSwitchStatus DcOutPosSta_Uni = eSwSta_Off;
EnumSwitchStatus DcOutNegSta_Uni = eSwSta_Off; //EnumSwitchStatus DcOutNegSta_Uni = eSwSta_Off;
void BmsPowerInit(void) void BmsPowerInit(void)
{ {
...@@ -68,16 +68,7 @@ void DcOutInit(void) ...@@ -68,16 +68,7 @@ void DcOutInit(void)
RCC_AHB1PeriphClockCmd(DcOutPos_RCC, ENABLE); RCC_AHB1PeriphClockCmd(DcOutPos_RCC, ENABLE);
GPIO_Init(DcOutPos_Port, &GPIO_InitStructure); GPIO_Init(DcOutPos_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutPos_Port, DcOutPos_Pin); GPIO_ResetBits(DcOutPos_Port, DcOutPos_Pin);
#if 0
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStructure.GPIO_Pin = DcOutChkPos_Pin;
RCC_AHB1PeriphClockCmd(DcOutChkPos_RCC, ENABLE);
GPIO_Init(DcOutChkPos_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutChkPos_Port, DcOutChkPos_Pin);
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
...@@ -95,7 +86,7 @@ void DcOutInit(void) ...@@ -95,7 +86,7 @@ void DcOutInit(void)
RCC_AHB1PeriphClockCmd(DcOutChkNeg_RCC, ENABLE); RCC_AHB1PeriphClockCmd(DcOutChkNeg_RCC, ENABLE);
GPIO_Init(DcOutChkNeg_Port, &GPIO_InitStructure); GPIO_Init(DcOutChkNeg_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutChkNeg_Port, DcOutChkNeg_Pin); GPIO_ResetBits(DcOutChkNeg_Port, DcOutChkNeg_Pin);
#endif
/* Create a Timer */ /* Create a Timer */
osTimerDef(DCOutDelayTimer, DCOutDelayHandle); osTimerDef(DCOutDelayTimer, DCOutDelayHandle);
DCOutDelayTimer = osTimerCreate(osTimer(DCOutDelayTimer), osTimerOnce, (void *)0); DCOutDelayTimer = osTimerCreate(osTimer(DCOutDelayTimer), osTimerOnce, (void *)0);
...@@ -109,6 +100,7 @@ void DcOutPosSet(EnumSwitchStatus Set) ...@@ -109,6 +100,7 @@ void DcOutPosSet(EnumSwitchStatus Set)
DcOutPos_Port->BSRRL = DcOutPos_Pin; DcOutPos_Port->BSRRL = DcOutPos_Pin;
DcOutPosSta = Set; DcOutPosSta = Set;
} }
/*
void DcOutNegSet(EnumSwitchStatus Set) void DcOutNegSet(EnumSwitchStatus Set)
{ {
if(eSwSta_Off == Set) if(eSwSta_Off == Set)
...@@ -116,20 +108,20 @@ void DcOutNegSet(EnumSwitchStatus Set) ...@@ -116,20 +108,20 @@ void DcOutNegSet(EnumSwitchStatus Set)
else else
DcOutNeg_Port->BSRRL = DcOutNeg_Pin; DcOutNeg_Port->BSRRL = DcOutNeg_Pin;
DcOutNegSta = Set; DcOutNegSta = Set;
} }*/
#if 1 #if 1
void DcOutSet(EnumSwitchStatus Set) void DcOutSet(EnumSwitchStatus Set)
{ {
if(eSwSta_Off == Set) if(eSwSta_Off == Set)
{ {
DcOutPosSet(Set); DcOutPosSet(Set);
DcOutNegSet(Set); //DcOutNegSet(Set);
osTimerStop(DCOutDelayTimer); osTimerStop(DCOutDelayTimer);
} }
else else
{ {
//DcOutPosSet(Set); //DcOutPosSet(Set);
DcOutNegSet(Set); //DcOutNegSet(Set);
osTimerStart(DCOutDelayTimer, 200); osTimerStart(DCOutDelayTimer, 200);
} }
} }
...@@ -140,7 +132,7 @@ void DcOutSet(EnumSwitchStatus Set) ...@@ -140,7 +132,7 @@ void DcOutSet(EnumSwitchStatus Set)
DcOutNegSet(Set); DcOutNegSet(Set);
} }
#endif #endif
EnumSwitchStatus DcOutPosGet(void) /*EnumSwitchStatus DcOutPosGet(void)
{ {
if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkPos_Port, DcOutChkPos_Pin)) if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkPos_Port, DcOutChkPos_Pin))
return eSwSta_On; return eSwSta_On;
...@@ -151,12 +143,12 @@ EnumSwitchStatus DcOutNegGet(void) ...@@ -151,12 +143,12 @@ EnumSwitchStatus DcOutNegGet(void)
if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkNeg_Port, DcOutChkNeg_Pin)) if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkNeg_Port, DcOutChkNeg_Pin))
return eSwSta_On; return eSwSta_On;
return eSwSta_Off; return eSwSta_Off;
} }*/
EnumSwitchStatus DcOutPosGetSet(void) EnumSwitchStatus DcOutPosGetSet(void)
{ {
return DcOutPosSta; return DcOutPosSta;
} }
EnumSwitchStatus DcOutNegGetSet(void) /*EnumSwitchStatus DcOutNegGetSet(void)
{ {
return DcOutNegSta; return DcOutNegSta;
} }
...@@ -165,7 +157,7 @@ EnumSwitchStatus DcOutGet(void) ...@@ -165,7 +157,7 @@ EnumSwitchStatus DcOutGet(void)
if(eSwSta_On == DcOutPosGet())// && eSwSta_On == DcOutNegGet() if(eSwSta_On == DcOutPosGet())// && eSwSta_On == DcOutNegGet()
return eSwSta_On; return eSwSta_On;
return eSwSta_Off; return eSwSta_Off;
} }*/
void DrainResistInit(void) void DrainResistInit(void)
{ {
...@@ -390,32 +382,16 @@ void DcOutInit_B(void) ...@@ -390,32 +382,16 @@ void DcOutInit_B(void)
GPIO_Init(DcOutPos_B_Port, &GPIO_InitStructure); GPIO_Init(DcOutPos_B_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutPos_B_Port, DcOutPos_B_Pin); GPIO_ResetBits(DcOutPos_B_Port, DcOutPos_B_Pin);
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN; /*GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStructure.GPIO_Pin = DcOutChkPos_B_Pin;
RCC_AHB1PeriphClockCmd(DcOutChkPos_B_RCC, ENABLE);
GPIO_Init(DcOutChkPos_B_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutChkPos_B_Port, DcOutChkPos_B_Pin);
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP; GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_InitStructure.GPIO_Pin = DcOutNeg_B_Pin; GPIO_InitStructure.GPIO_Pin = DcOutNeg_B_Pin;
RCC_AHB1PeriphClockCmd(DcOutNeg_B_RCC, ENABLE); RCC_AHB1PeriphClockCmd(DcOutNeg_B_RCC, ENABLE);
GPIO_Init(DcOutNeg_B_Port, &GPIO_InitStructure); GPIO_Init(DcOutNeg_B_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutNeg_B_Port, DcOutNeg_B_Pin); GPIO_ResetBits(DcOutNeg_B_Port, DcOutNeg_B_Pin);*/
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStructure.GPIO_Pin = DcOutChkNeg_B_Pin;
RCC_AHB1PeriphClockCmd(DcOutChkNeg_B_RCC, ENABLE);
GPIO_Init(DcOutChkNeg_B_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutChkNeg_B_Port, DcOutChkNeg_B_Pin);
/* Create a Timer */ /* Create a Timer */
osTimerDef(DCOutDelayTimer_B, DCOutDelayHandle_B); osTimerDef(DCOutDelayTimer_B, DCOutDelayHandle_B);
DCOutDelayTimer_B = osTimerCreate(osTimer(DCOutDelayTimer_B), osTimerOnce, (void *)0); DCOutDelayTimer_B = osTimerCreate(osTimer(DCOutDelayTimer_B), osTimerOnce, (void *)0);
...@@ -429,7 +405,8 @@ void DcOutPosSet_B(EnumSwitchStatus Set) ...@@ -429,7 +405,8 @@ void DcOutPosSet_B(EnumSwitchStatus Set)
DcOutPos_B_Port->BSRRL = DcOutPos_B_Pin; DcOutPos_B_Port->BSRRL = DcOutPos_B_Pin;
DcOutPosSta_B = Set; DcOutPosSta_B = Set;
} }
void DcOutNegSet_B(EnumSwitchStatus Set)
/*void DcOutNegSet_B(EnumSwitchStatus Set)
{ {
if(eSwSta_Off == Set) if(eSwSta_Off == Set)
DcOutNeg_B_Port->BSRRH = DcOutNeg_B_Pin; DcOutNeg_B_Port->BSRRH = DcOutNeg_B_Pin;
...@@ -437,19 +414,20 @@ void DcOutNegSet_B(EnumSwitchStatus Set) ...@@ -437,19 +414,20 @@ void DcOutNegSet_B(EnumSwitchStatus Set)
DcOutNeg_B_Port->BSRRL = DcOutNeg_B_Pin; DcOutNeg_B_Port->BSRRL = DcOutNeg_B_Pin;
DcOutNegSta_B = Set; DcOutNegSta_B = Set;
} }
*/
#if 1 #if 1
void DcOutSet_B(EnumSwitchStatus Set) void DcOutSet_B(EnumSwitchStatus Set)
{ {
if(eSwSta_Off == Set) if(eSwSta_Off == Set)
{ {
DcOutPosSet_B(Set); DcOutPosSet_B(Set);
DcOutNegSet_B(Set); //DcOutNegSet_B(Set);
osTimerStop(DCOutDelayTimer_B); osTimerStop(DCOutDelayTimer_B);
} }
else else
{ {
//DcOutPosSet_B(Set); //DcOutPosSet_B(Set);
DcOutNegSet_B(Set); // DcOutNegSet_B(Set);
osTimerStart(DCOutDelayTimer_B, 200); osTimerStart(DCOutDelayTimer_B, 200);
} }
} }
...@@ -461,12 +439,7 @@ void DcOutSet_B(EnumSwitchStatus Set) ...@@ -461,12 +439,7 @@ void DcOutSet_B(EnumSwitchStatus Set)
} }
#endif #endif
EnumSwitchStatus ACContactorGet(void) #if 0
{
if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkNeg_B_Port, DcOutChkNeg_B_Pin))
return eSwSta_On;
return eSwSta_Off;
}
EnumSwitchStatus DcOutPosGet_B(void) EnumSwitchStatus DcOutPosGet_B(void)
{ {
...@@ -480,11 +453,12 @@ EnumSwitchStatus DcOutNegGet_B(void) ...@@ -480,11 +453,12 @@ EnumSwitchStatus DcOutNegGet_B(void)
return eSwSta_On; return eSwSta_On;
return eSwSta_Off; return eSwSta_Off;
} }
#endif
EnumSwitchStatus DcOutPosGetSet_B(void) EnumSwitchStatus DcOutPosGetSet_B(void)
{ {
return DcOutPosSta_B; return DcOutPosSta_B;
} }
EnumSwitchStatus DcOutNegGetSet_B(void) /*EnumSwitchStatus DcOutNegGetSet_B(void)
{ {
return DcOutNegSta_B; return DcOutNegSta_B;
} }
...@@ -494,7 +468,7 @@ EnumSwitchStatus DcOutGet_B(void) ...@@ -494,7 +468,7 @@ EnumSwitchStatus DcOutGet_B(void)
return eSwSta_On; return eSwSta_On;
return eSwSta_Off; return eSwSta_Off;
} }
*/
void DrainResistInit_B(void) void DrainResistInit_B(void)
{ {
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
...@@ -642,7 +616,7 @@ void IdleLedSet_B(EnumSwitchStatus Set) ...@@ -642,7 +616,7 @@ void IdleLedSet_B(EnumSwitchStatus Set)
} }
/**************************************************************/ /**************************************************************/
#if 0
static void DCOutDelayHandle_Uni(void const *Param) static void DCOutDelayHandle_Uni(void const *Param)
{ {
DcOutPos_Uni_Port->BSRRL = DcOutPos_Uni_Pin; DcOutPos_Uni_Port->BSRRL = DcOutPos_Uni_Pin;
...@@ -760,7 +734,7 @@ EnumSwitchStatus DcOutGet_Uni(void) ...@@ -760,7 +734,7 @@ EnumSwitchStatus DcOutGet_Uni(void)
return eSwSta_On; return eSwSta_On;
return eSwSta_Off; return eSwSta_Off;
} }
#endif
void DehumidifierInit(void) void DehumidifierInit(void)
{ {
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
...@@ -1036,11 +1010,13 @@ void ImdWorkSet_AB(EnumSwitchStatus Set) ...@@ -1036,11 +1010,13 @@ void ImdWorkSet_AB(EnumSwitchStatus Set)
} }
void LockSet_AB(EnumSwitchStatus Set) void LockSet_AB(EnumSwitchStatus Set)
{ {
LockSet(Set); LockSet(Set);
LockSet_B(Set); LockSet_B(Set);
} }
EnumSwitchStatus LockGet_AB(void) EnumSwitchStatus LockGet_AB(void)
{ {
if((eSwSta_Off == LockGet()) || (eSwSta_Off == LockGet_B())) if((eSwSta_Off == LockGet()) || (eSwSta_Off == LockGet_B()))
return eSwSta_Off; return eSwSta_Off;
else else
...@@ -1056,10 +1032,12 @@ void SystemReboot(void) ...@@ -1056,10 +1032,12 @@ void SystemReboot(void)
NVIC_SystemReset(); NVIC_SystemReset();
} }
//交流接触器
void ACContactorInit(void) void ACContactorInit(void)
{ {
GPIO_InitTypeDef GPIO_InitStructure; GPIO_InitTypeDef GPIO_InitStructure;
//控制脚
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz; GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP; GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
...@@ -1068,8 +1046,65 @@ void ACContactorInit(void) ...@@ -1068,8 +1046,65 @@ void ACContactorInit(void)
RCC_AHB1PeriphClockCmd(ACContactor_RCC, ENABLE); RCC_AHB1PeriphClockCmd(ACContactor_RCC, ENABLE);
GPIO_Init(ACContactor_Port, &GPIO_InitStructure); GPIO_Init(ACContactor_Port, &GPIO_InitStructure);
GPIO_ResetBits(ACContactor_Port, ACContactor_Pin); GPIO_ResetBits(ACContactor_Port, ACContactor_Pin);
//反馈脚
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStructure.GPIO_Pin = DcOutChkNeg_B_Pin;
RCC_AHB1PeriphClockCmd(DcOutChkNeg_B_RCC, ENABLE);
GPIO_Init(DcOutChkNeg_B_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutChkNeg_B_Port, DcOutChkNeg_B_Pin);
}
EnumSwitchStatus ACContactorGet(void)
{
if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkNeg_B_Port, DcOutChkNeg_B_Pin))
return eSwSta_On;
return eSwSta_Off;
}
//枪归位检测
void GunStatusChkInit(void)
{
GPIO_InitTypeDef GPIO_InitStructure;
//A
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStructure.GPIO_Pin = DcOutChkPos_B_Pin;
RCC_AHB1PeriphClockCmd(DcOutChkPos_B_RCC, ENABLE);
GPIO_Init(DcOutChkPos_B_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutChkPos_B_Port, DcOutChkPos_B_Pin);
//B
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
GPIO_InitStructure.GPIO_Pin = DcOutChkPos_Pin;
RCC_AHB1PeriphClockCmd(DcOutChkPos_RCC, ENABLE);
GPIO_Init(DcOutChkPos_Port, &GPIO_InitStructure);
GPIO_ResetBits(DcOutChkPos_Port, DcOutChkPos_Pin);
} }
EnumSwitchStatus GunStatusGet(void)
{
if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkPos_B_Port, DcOutChkPos_B_Pin))
return eSwSta_On;
return eSwSta_Off;
}
EnumSwitchStatus GunStatusGet_B(void)
{
if(Bit_RESET == GPIO_ReadInputDataBit(DcOutChkPos_Port, DcOutChkPos_Pin))
return eSwSta_On;
return eSwSta_Off;
}
DcPillar/Src/Drivers/Drv_BoardIo.h
...@@ -222,24 +222,24 @@ extern EnumSwitchStatus EleLockSta; ...@@ -222,24 +222,24 @@ extern EnumSwitchStatus EleLockSta;
extern EnumSwitchStatus EleLockSta_B; extern EnumSwitchStatus EleLockSta_B;
extern EnumSwitchStatus DcOutPosSta; extern EnumSwitchStatus DcOutPosSta;
extern EnumSwitchStatus DcOutNegSta; //extern EnumSwitchStatus DcOutNegSta;
extern EnumSwitchStatus DcOutPosSta_B; extern EnumSwitchStatus DcOutPosSta_B;
extern EnumSwitchStatus DcOutNegSta_B; //extern EnumSwitchStatus DcOutNegSta_B;
extern EnumSwitchStatus DcOutPosSta_Uni; //extern EnumSwitchStatus DcOutPosSta_Uni;
extern EnumSwitchStatus DcOutNegSta_Uni; //extern EnumSwitchStatus DcOutNegSta_Uni;
extern void BmsPowerInit(void); extern void BmsPowerInit(void);
extern void BmsPowerSet(EnumSwitchStatus Set); extern void BmsPowerSet(EnumSwitchStatus Set);
extern void DcOutInit(void); extern void DcOutInit(void);
extern void DcOutPosSet(EnumSwitchStatus Set); extern void DcOutPosSet(EnumSwitchStatus Set);
extern void DcOutNegSet(EnumSwitchStatus Set); //extern void DcOutNegSet(EnumSwitchStatus Set);
extern void DcOutSet(EnumSwitchStatus Set); extern void DcOutSet(EnumSwitchStatus Set);
extern EnumSwitchStatus DcOutNegGet(void); //extern EnumSwitchStatus DcOutNegGet(void);
extern EnumSwitchStatus DcOutPosGet(void); //extern EnumSwitchStatus DcOutPosGet(void);
extern EnumSwitchStatus DcOutNegGetSet(void); //extern EnumSwitchStatus DcOutNegGetSet(void);
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);
...@@ -265,13 +265,13 @@ extern void BmsPowerSet_B(EnumSwitchStatus Set); ...@@ -265,13 +265,13 @@ extern void BmsPowerSet_B(EnumSwitchStatus Set);
extern void DcOutInit_B(void); extern void DcOutInit_B(void);
extern void DcOutPosSet_B(EnumSwitchStatus Set); extern void DcOutPosSet_B(EnumSwitchStatus Set);
extern void DcOutNegSet_B(EnumSwitchStatus Set); //extern void DcOutNegSet_B(EnumSwitchStatus Set);
extern void DcOutSet_B(EnumSwitchStatus Set); extern void DcOutSet_B(EnumSwitchStatus Set);
extern EnumSwitchStatus DcOutNegGet_B(void); //extern EnumSwitchStatus DcOutNegGet_B(void);
extern EnumSwitchStatus DcOutPosGet_B(void); //extern EnumSwitchStatus DcOutPosGet_B(void);
extern EnumSwitchStatus DcOutNegGetSet_B(void); //extern EnumSwitchStatus DcOutNegGetSet_B(void);
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);
...@@ -299,15 +299,15 @@ extern void FanSetExt(EnumSwitchStatus Set); ...@@ -299,15 +299,15 @@ extern void FanSetExt(EnumSwitchStatus Set);
extern void FanSetExt_Top(EnumSwitchStatus Set); extern void FanSetExt_Top(EnumSwitchStatus Set);
extern void DcOutInit_Uni(void); //extern void DcOutInit_Uni(void);
extern void DcOutPosSet_Uni(EnumSwitchStatus Set); //extern void DcOutPosSet_Uni(EnumSwitchStatus Set);
extern void DcOutNegSet_Uni(EnumSwitchStatus Set); //extern void DcOutNegSet_Uni(EnumSwitchStatus Set);
extern void DcOutSet_Uni(EnumSwitchStatus Set); //extern void DcOutSet_Uni(EnumSwitchStatus Set);
extern EnumSwitchStatus DcOutNegGet_Uni(void); //extern EnumSwitchStatus DcOutNegGet_Uni(void);
extern EnumSwitchStatus DcOutPosGet_Uni(void); //extern EnumSwitchStatus DcOutPosGet_Uni(void);
extern EnumSwitchStatus DcOutNegGetSet_Uni(void); //extern EnumSwitchStatus DcOutNegGetSet_Uni(void);
extern EnumSwitchStatus DcOutPosGetSet_Uni(void); //extern EnumSwitchStatus DcOutPosGetSet_Uni(void);
extern EnumSwitchStatus DcOutGet_Uni(void); //extern EnumSwitchStatus DcOutGet_Uni(void);
extern void DehumidifierInit(void); extern void DehumidifierInit(void);
extern void DehumidifierSet(EnumSwitchStatus Set); extern void DehumidifierSet(EnumSwitchStatus Set);
......
DcPillar/Src/Drivers/Drv_TCUComm.c
...@@ -2280,7 +2280,7 @@ void InformationReporting_22_A(void) ...@@ -2280,7 +2280,7 @@ void InformationReporting_22_A(void)
InformainReport_A.InfRe.DCModFan = 0; InformainReport_A.InfRe.DCModFan = 0;
InformainReport_A.InfRe.CCConnect = !CcStatusRead(); InformainReport_A.InfRe.CCConnect = !CcStatusRead();
InformainReport_A.InfRe.InsertGunSta = InsertGunStatu_A(); InformainReport_A.InfRe.InsertGunSta = InsertGunStatu_A();
InformainReport_A.InfRe.DcOutContSta = DcOutPosGet(); InformainReport_A.InfRe.DcOutContSta = DcOutPosGetSet();
InformainReport_A.InfRe.ElectLock = LockGet(); InformainReport_A.InfRe.ElectLock = LockGet();
if (((InformainReport_A.data[0] &0xf0) != 0) || ((InformainReport_A.data[1] &0xff) != 0) || if (((InformainReport_A.data[0] &0xf0) != 0) || ((InformainReport_A.data[1] &0xff) != 0) ||
...@@ -2408,7 +2408,7 @@ void InformationReporting_22_B(void) ...@@ -2408,7 +2408,7 @@ void InformationReporting_22_B(void)
InformainReport_B.InfRe.DCModFan = 0; InformainReport_B.InfRe.DCModFan = 0;
InformainReport_B.InfRe.CCConnect = !CcStatusRead_B(); InformainReport_B.InfRe.CCConnect = !CcStatusRead_B();
InformainReport_B.InfRe.InsertGunSta = InsertGunStatu_B(); InformainReport_B.InfRe.InsertGunSta = InsertGunStatu_B();
InformainReport_B.InfRe.DcOutContSta = DcOutPosGet_B(); InformainReport_B.InfRe.DcOutContSta = DcOutPosGetSet_B();
InformainReport_B.InfRe.ElectLock = LockGet_B(); InformainReport_B.InfRe.ElectLock = LockGet_B();
if (((InformainReport_B.data[0] &0xf0) != 0) || ((InformainReport_B.data[1] &0xff) != 0) || if (((InformainReport_B.data[0] &0xf0) != 0) || ((InformainReport_B.data[1] &0xff) != 0) ||
......
DcPillar/Src/Drivers/Drv_TCUComm.h
...@@ -108,29 +108,46 @@ typedef struct ...@@ -108,29 +108,46 @@ typedef struct
}StructTCUCControl; }StructTCUCControl;
/*
其它类型故障
*/
typedef union typedef union
{ {
u8 data[5]; u8 data[5];
struct struct
{ {
u8 workStau : 2; u8 workStau : 2;//工作状态
u8 sumFalt : 1; u8 sumFalt : 1;//总故障
u8 sumWarm : 1; u8 sumWarm : 1;//总告警
u8 Emergency: 1; u8 Emergency: 1;//急停按钮动作 故障
u8 smoke : 1; u8 smoke : 1;//烟感故障
u8 AccContac: 1; u8 AccContac: 1;//交流输入断路器故障
u8 DCOutConOff: 1;//母线接触器据动/误动故障 u8 DCOutConOff: 1;//直流母线输出接触器拒动/误动故障
u8 DCFuse : 1;//熔断器 u8 DCFuse : 1;//熔断器故障
u8 EleLock : 1; u8 EleLock : 1;//充电接口电子锁故障
u8 Fan : 1; u8 Fan : 1;//充电桩风扇故障
u8 SPD : 1; u8 SPD : 1;//避雷器故障
u8 ImdDev : 1; u8 ImdDev : 1;//绝缘监测故障
u8 BattPola : 1; u8 BattPola : 1;//电池极性反接故障
u8 ContGuid : 1; u8 ContGuid : 1;//充电中控制导引故障
u8 tempOver : 1; u8 tempOver : 1;//充电桩过温故障
/*
充电接口过温故障
充电枪未归位告警
BMS 通信故障
交流输入电压过压故障
交流输入电压欠压故障
直流母线输出 过压故障
直流母线输出 欠压故障
直流母线输出过流故障
*/
u8 ConnTemp : 1; u8 ConnTemp : 1;
u8 PutBack : 1; u8 PutBack : 1;
u8 BMSComm : 1; u8 BMSComm : 1;
...@@ -140,6 +157,16 @@ typedef union ...@@ -140,6 +157,16 @@ typedef union
u8 DcVolLo : 1; u8 DcVolLo : 1;
u8 DCCurrHi : 1; u8 DCCurrHi : 1;
/*
充电模块故障
充电模块交流输入故障
充电模块交流输入过压故障
充电模块交流输入欠压故障
充电模块交流输入缺相故障
充电模块直流输出短路故障
充电模块直流输出过流故障
充电模块直流输出过压故障
*/
u8 DcModErr : 1; u8 DcModErr : 1;
u8 DCModIn : 1; u8 DCModIn : 1;
u8 DCModInHi: 1; u8 DCModInHi: 1;
...@@ -149,14 +176,24 @@ typedef union ...@@ -149,14 +176,24 @@ typedef union
u8 DCModOutCuHi: 1; u8 DCModOutCuHi: 1;
u8 DCModOutVoHi: 1; u8 DCModOutVoHi: 1;
/*
充电模块直流输出欠压故障
充电模块过温故障
充电模块通信故障
充电模块风扇故障
车辆连接状态
充电桩充电枪座状态
充电接口电子锁状态
直流输出接触器状态
*/
u8 DCModOutVoLo: 1; u8 DCModOutVoLo: 1;
u8 DCModTempHi : 1; u8 DCModTempHi : 1;
u8 DCModComm : 1; u8 DCModComm : 1;
u8 DCModFan : 1; u8 DCModFan : 1;
u8 CCConnect : 1; u8 CCConnect : 1;
u8 InsertGunSta: 1; u8 InsertGunSta: 1;
u8 DcOutContSta: 1;
u8 ElectLock : 1; u8 ElectLock : 1;
u8 DcOutContSta: 1;
}InfRe; }InfRe;
}UnionInformainReport1; }UnionInformainReport1;
...@@ -165,18 +202,60 @@ typedef union ...@@ -165,18 +202,60 @@ typedef union
u16 data; u16 data;
struct struct
{ {
u16 Door : 1;//熔断器 /*
充电桩门禁故障
直流输出接触器粘连故障
绝缘监测告警
泄放回路故障
充电桩过温告警
充电枪过温告警
交流输入接触器拒动/误动故障
交流输入接触器粘连故障
*/
u16 Door : 1;//
u16 DCOutConOn : 1;//母线接触器粘连故障 u16 DCOutConOn : 1;//母线接触器粘连故障
u16 ImdWarm : 1; u16 ImdWarm : 1;
u16 DrainResist : 1; u16 DrainResist : 1;
u16 tempOver : 1; u16 tempOver : 1;
u16 gunTemp : 1; u16 gunTemp : 1;
u16 AccContacON : 1;//交流数日接触器据动/误动故障 u16 AccContacON : 1;//交流数日接触器据动/误动故障
u16 AccContacOff: 1;//粘连故障 u16 AccContacOff: 1;//粘连故障
/*
辅助电源故障
并联接触器拒动/误动故障
并联接触器粘连故障
并联接触器状态
模块紧急停机状态
充电桩水浸故障
充电机柜门禁故障
充电机柜水浸故障
*/
u16 Power : 1;//辅助电源 u16 Power : 1;//辅助电源
u16 UniContactorOff : 1;//母线接触器据动/误动故障 u16 UniContactorOff : 1;//母线接触器据动/误动故障
u16 UniContactorOn : 1;//母线接触器据动/误动故障 u16 UniContactorOn : 1;//并联接触器粘连故障
/*
充电机柜烟感故障
功率控制模块通信故障
功率控制模块通信告警
功率控制模块故障
功率控制模块告警
开关模块通信故障
开关模块通信告警
开关模块故障
*/
/*
开关模块告警
直流充电主控模块判断BMS故障
BMS发送故障信息
充电模块泄放故障
绝缘监测仪通信故障
环境监控板通信故障
灯板通信故障
电能表通信故障
*/
}InfRe; }InfRe;
}UnionInformainReport2; }UnionInformainReport2;
......
DcPillar/Src/Thread/Charge/ChgPro_WaitVoltChgRun.c
...@@ -122,7 +122,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -122,7 +122,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
&& (NeedCurrt > (u16)((u32)GetDcModuleCurrt()*11/10)) && (NeedCurrt > (u16)((u32)GetDcModuleCurrt()*11/10))
&& (eChgPro_B_ChgIdle == ChargeCtrl_B.CurProcess)//B枪空闲 && (eChgPro_B_ChgIdle == ChargeCtrl_B.CurProcess)//B枪空闲
&& (eSwSta_Off == DcOutPosGetSet_B()) //B枪继电器闭合 && (eSwSta_Off == DcOutPosGetSet_B()) //B枪继电器闭合
&& (eSwSta_Off == DcOutGet_B()) //B枪继电器没闭合 //&& (eSwSta_Off == DcOutGet_B()) //B枪继电器没闭合
&& (0 == (PillarError_B.Mult&~0x20200)) //B无错误 && (0 == (PillarError_B.Mult&~0x20200)) //B无错误
) )
{ {
...@@ -244,7 +244,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -244,7 +244,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
ChargeError.Value.VoltOutError = 1; ChargeError.Value.VoltOutError = 1;
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeStopType = eChgStop_Run_VoltOutHighErr; ChargeStopType = eChgStop_Run_VoltOutHighErr;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
//pChargeCtrl->CurProcess = eChgPro_ChgBreak; //pChargeCtrl->CurProcess = eChgPro_ChgBreak;
...@@ -277,7 +277,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -277,7 +277,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
ChargeError.Value.CurrtOutError = 1; ChargeError.Value.CurrtOutError = 1;
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeStopType = eChgStop_Run_CurrtOutHighErr; ChargeStopType = eChgStop_Run_CurrtOutHighErr;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -305,7 +305,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -305,7 +305,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
if((0 == UserParam.ChgFun.Value.SigUniChg) if((0 == UserParam.ChgFun.Value.SigUniChg)
|| (eChgPro_B_ChgIdle != ChargeCtrl_B.CurProcess)//非空闲 || (eChgPro_B_ChgIdle != ChargeCtrl_B.CurProcess)//非空闲
|| (eSwSta_Off != DcOutPosGetSet_B()) //B枪继电器闭合 || (eSwSta_Off != DcOutPosGetSet_B()) //B枪继电器闭合
|| (eSwSta_Off != DcOutGet_B()) //B枪继电器闭合 //|| (eSwSta_Off != DcOutGet_B()) //B枪继电器闭合
|| (0 != PillarError_B.Mult) //有错误 || (0 != PillarError_B.Mult) //有错误
) )
{/*立即断开*/ {/*立即断开*/
...@@ -313,7 +313,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -313,7 +313,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
UniChgTick = 0; UniChgTick = 0;
CcsChgEnable = 0; CcsChgEnable = 0;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
} }
else if(NeedCurrt < (u16)((u32)DcModuleAbility.MaxCurrt*DcModuleManage.ValidNum))//小于单桩能力 else if(NeedCurrt < (u16)((u32)DcModuleAbility.MaxCurrt*DcModuleManage.ValidNum))//小于单桩能力
...@@ -326,7 +326,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -326,7 +326,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
UniChgTick = 0; UniChgTick = 0;
CcsChgEnable = 0; CcsChgEnable = 0;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
} }
else if((GetSystemTick() - UniChgTick) > (25 * 1000))//近半分钟后关闭模块输出 进入挂起模式 else if((GetSystemTick() - UniChgTick) > (25 * 1000))//近半分钟后关闭模块输出 进入挂起模式
...@@ -344,13 +344,13 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -344,13 +344,13 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady()) <= 100) else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady()) <= 100)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else else
{ {
...@@ -389,13 +389,13 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -389,13 +389,13 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady()) <= 100) else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady()) <= 100)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet(eSwSta_On); DcOutSet(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else else
{ {
...@@ -439,7 +439,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -439,7 +439,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
ChargeError.Value.VoltOutError = 1; ChargeError.Value.VoltOutError = 1;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_VoltOutHighErr; ChargeStopType = eChgStop_Run_VoltOutHighErr;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
...@@ -473,7 +473,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -473,7 +473,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
ChargeError.Value.CurrtOutError = 1; ChargeError.Value.CurrtOutError = 1;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_CurrtOutHighErr; ChargeStopType = eChgStop_Run_CurrtOutHighErr;
pChargeCtrl->CurProcess = eChgPro_ChgStop; pChargeCtrl->CurProcess = eChgPro_ChgStop;
...@@ -493,7 +493,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -493,7 +493,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_SinglBatVolt; ChargeStopType = eChgStop_Run_SinglBatVolt;
...@@ -509,7 +509,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -509,7 +509,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_SocOver; ChargeStopType = eChgStop_Run_SocOver;
...@@ -525,7 +525,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -525,7 +525,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_CurrtOver; ChargeStopType = eChgStop_Run_CurrtOver;
...@@ -541,7 +541,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -541,7 +541,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_BatTempOver; ChargeStopType = eChgStop_Run_BatTempOver;
...@@ -557,7 +557,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -557,7 +557,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_BatIsolate; ChargeStopType = eChgStop_Run_BatIsolate;
...@@ -573,7 +573,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -573,7 +573,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_Cc2Error; ChargeStopType = eChgStop_Run_Cc2Error;
...@@ -586,7 +586,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -586,7 +586,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
if(0 == BmsPauseTick) if(0 == BmsPauseTick)
...@@ -600,7 +600,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -600,7 +600,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_BmsPause; ChargeStopType = eChgStop_Run_BmsPause;
...@@ -619,7 +619,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -619,7 +619,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
pChargeCtrl->CurProcess = eChgPro_CommBreak; pChargeCtrl->CurProcess = eChgPro_CommBreak;
...@@ -635,7 +635,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -635,7 +635,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
pChargeCtrl->CurProcess = eChgPro_CommBreak; pChargeCtrl->CurProcess = eChgPro_CommBreak;
...@@ -650,7 +650,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -650,7 +650,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
pChargeCtrl->CurProcess = eChgPro_CommBreak; pChargeCtrl->CurProcess = eChgPro_CommBreak;
...@@ -664,7 +664,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -664,7 +664,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_BmsStop; ChargeStopType = eChgStop_Run_BmsStop;
...@@ -680,7 +680,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -680,7 +680,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_UserCancel; ChargeStopType = eChgStop_Run_UserCancel;
...@@ -703,7 +703,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -703,7 +703,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_Soc98; ChargeStopType = eChgStop_Run_Soc98;
...@@ -720,7 +720,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -720,7 +720,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet(eSwSta_Off); ChargeTimerSet(eSwSta_Off);
ChargeStopType = eChgStop_Run_SinglBatVoltOverPermitMax; ChargeStopType = eChgStop_Run_SinglBatVoltOverPermitMax;
...@@ -745,7 +745,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -745,7 +745,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
CcStatusChkTick = 0; CcStatusChkTick = 0;
...@@ -762,7 +762,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -762,7 +762,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_EmerClose; ChargeStopType = eChgStop_Run_EmerClose;
...@@ -778,7 +778,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -778,7 +778,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_DoorOpen; ChargeStopType = eChgStop_Run_DoorOpen;
...@@ -794,7 +794,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -794,7 +794,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_Contactor; ChargeStopType = eChgStop_Run_Contactor;
...@@ -810,7 +810,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -810,7 +810,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_Contactor; ChargeStopType = eChgStop_Run_Contactor;
...@@ -826,7 +826,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -826,7 +826,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_InVolt; ChargeStopType = eChgStop_Run_InVolt;
...@@ -842,7 +842,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -842,7 +842,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_NoDcmod; ChargeStopType = eChgStop_Run_NoDcmod;
...@@ -858,7 +858,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl) ...@@ -858,7 +858,7 @@ void ChgProWaitVoltChgRun(StructChargeCtrl *pChargeCtrl)
DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum); DcModuleSet(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*DcModuleManage.ValidNum);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
DcOutSet(eSwSta_Off); DcOutSet(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType = eChgStop_Run_Meter; ChargeStopType = eChgStop_Run_Meter;
......
DcPillar/Src/Thread/Charge_B/ChgPro_B_WaitVoltChgRun.c
...@@ -121,7 +121,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -121,7 +121,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
&& (NeedCurrt > (u16)((u32)GetDcModuleCurrt_B()*11/10)) && (NeedCurrt > (u16)((u32)GetDcModuleCurrt_B()*11/10))
&& (eChgPro_ChgIdle == ChargeCtrl.CurProcess)//A枪空闲 && (eChgPro_ChgIdle == ChargeCtrl.CurProcess)//A枪空闲
&& (eSwSta_Off == DcOutPosGetSet()) //a枪继电器闭合 && (eSwSta_Off == DcOutPosGetSet()) //a枪继电器闭合
&& (eSwSta_Off == DcOutGet()) //a枪继电器没闭合 //&& (eSwSta_Off == DcOutGet()) //a枪继电器没闭合
&& (0 == (PillarError.Mult&~0x20200)) //a无错误 && (0 == (PillarError.Mult&~0x20200)) //a无错误
) )
{ {
...@@ -243,7 +243,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -243,7 +243,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
ChargeError_B.Value.VoltOutError = 1; ChargeError_B.Value.VoltOutError = 1;
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);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_VoltOutHighErr; ChargeStopType_B = eChgStop_Run_VoltOutHighErr;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
//pChargeCtrl->CurProcess = eChgPro_B_ChgBreak; //pChargeCtrl->CurProcess = eChgPro_B_ChgBreak;
...@@ -276,7 +276,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -276,7 +276,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
ChargeError_B.Value.CurrtOutError = 1; ChargeError_B.Value.CurrtOutError = 1;
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);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_CurrtOutHighErr; ChargeStopType_B = eChgStop_Run_CurrtOutHighErr;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
pChargeCtrl->Param = 0; pChargeCtrl->Param = 0;
...@@ -304,7 +304,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -304,7 +304,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
if((0 == UserParam.ChgFun.Value.SigUniChg) if((0 == UserParam.ChgFun.Value.SigUniChg)
|| (eChgPro_ChgIdle != ChargeCtrl.CurProcess)//非空闲 || (eChgPro_ChgIdle != ChargeCtrl.CurProcess)//非空闲
|| (eSwSta_Off != DcOutPosGetSet()) //B枪继电器闭合 || (eSwSta_Off != DcOutPosGetSet()) //B枪继电器闭合
|| (eSwSta_Off != DcOutGet()) //B枪继电器闭合 //|| (eSwSta_Off != DcOutGet()) //B枪继电器闭合
|| (0 != PillarError.Mult) //有错误 || (0 != PillarError.Mult) //有错误
) )
{/*立即断开*/ {/*立即断开*/
...@@ -312,7 +312,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -312,7 +312,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
UniChgTick = 0; UniChgTick = 0;
CcsChgEnable = 0; CcsChgEnable = 0;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
} }
else if(NeedCurrt < (u16)((u32)DcModuleAbility.MaxCurrt*DcModuleManage_B.ValidNum))//小于单桩能力 else if(NeedCurrt < (u16)((u32)DcModuleAbility.MaxCurrt*DcModuleManage_B.ValidNum))//小于单桩能力
...@@ -325,7 +325,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -325,7 +325,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
UniChgTick = 0; UniChgTick = 0;
CcsChgEnable = 0; CcsChgEnable = 0;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
} }
else if((GetSystemTick() - UniChgTick) > (25 * 1000))//近半分钟后关闭模块输出 进入挂起模式 else if((GetSystemTick() - UniChgTick) > (25 * 1000))//近半分钟后关闭模块输出 进入挂起模式
...@@ -343,13 +343,13 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -343,13 +343,13 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady_B()) <= 100) else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady_B()) <= 100)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else else
{ {
...@@ -389,13 +389,13 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -389,13 +389,13 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady_B()) <= 100) else if(abs(GetDcModuleVolt_AB()- GetBatVoltWaitPillarReady_B()) <= 100)
{ {
VoltReadyTick = 0; VoltReadyTick = 0;
DcOutSet_B(eSwSta_On); DcOutSet_B(eSwSta_On);
DcOutSet_Uni(eSwSta_On); //DcOutSet_Uni(eSwSta_On);
} }
else else
{ {
...@@ -439,7 +439,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -439,7 +439,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
ChargeError_B.Value.VoltOutError = 1; ChargeError_B.Value.VoltOutError = 1;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType_B = eChgStop_Run_VoltOutHighErr; ChargeStopType_B = eChgStop_Run_VoltOutHighErr;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
...@@ -473,7 +473,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -473,7 +473,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl)
ChargeError_B.Value.CurrtOutError = 1; ChargeError_B.Value.CurrtOutError = 1;
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeStopType_B = eChgStop_Run_CurrtOutHighErr; ChargeStopType_B = eChgStop_Run_CurrtOutHighErr;
pChargeCtrl->CurProcess = eChgPro_B_ChgStop; pChargeCtrl->CurProcess = eChgPro_B_ChgStop;
...@@ -493,7 +493,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -493,7 +493,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_SinglBatVolt; ChargeStopType_B = eChgStop_Run_SinglBatVolt;
...@@ -509,7 +509,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -509,7 +509,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_SocOver; ChargeStopType_B = eChgStop_Run_SocOver;
...@@ -525,7 +525,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -525,7 +525,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_CurrtOver; ChargeStopType_B = eChgStop_Run_CurrtOver;
...@@ -541,7 +541,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -541,7 +541,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_BatTempOver; ChargeStopType_B = eChgStop_Run_BatTempOver;
...@@ -557,7 +557,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -557,7 +557,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_BatIsolate; ChargeStopType_B = eChgStop_Run_BatIsolate;
...@@ -573,7 +573,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -573,7 +573,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_Cc2Error; ChargeStopType_B = eChgStop_Run_Cc2Error;
...@@ -586,7 +586,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -586,7 +586,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
if(0 == BmsPauseTick) if(0 == BmsPauseTick)
...@@ -600,7 +600,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -600,7 +600,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_BmsPause; ChargeStopType_B = eChgStop_Run_BmsPause;
...@@ -619,7 +619,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -619,7 +619,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
pChargeCtrl->CurProcess = eChgPro_B_CommBreak; pChargeCtrl->CurProcess = eChgPro_B_CommBreak;
...@@ -635,7 +635,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -635,7 +635,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
pChargeCtrl->CurProcess = eChgPro_B_CommBreak; pChargeCtrl->CurProcess = eChgPro_B_CommBreak;
...@@ -650,7 +650,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -650,7 +650,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
pChargeCtrl->CurProcess = eChgPro_B_CommBreak; pChargeCtrl->CurProcess = eChgPro_B_CommBreak;
...@@ -664,7 +664,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -664,7 +664,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_BmsStop; ChargeStopType_B = eChgStop_Run_BmsStop;
...@@ -680,7 +680,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -680,7 +680,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_UserCancel; ChargeStopType_B = eChgStop_Run_UserCancel;
...@@ -703,7 +703,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -703,7 +703,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_Soc98; ChargeStopType_B = eChgStop_Run_Soc98;
...@@ -720,7 +720,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -720,7 +720,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
ChargeTimerSet_B(eSwSta_Off); ChargeTimerSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_SinglBatVoltOverPermitMax; ChargeStopType_B = eChgStop_Run_SinglBatVoltOverPermitMax;
...@@ -745,7 +745,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -745,7 +745,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
CcStatusChkTick = 0; CcStatusChkTick = 0;
...@@ -762,7 +762,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -762,7 +762,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_EmerClose; ChargeStopType_B = eChgStop_Run_EmerClose;
...@@ -778,7 +778,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -778,7 +778,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_DoorOpen; ChargeStopType_B = eChgStop_Run_DoorOpen;
...@@ -794,7 +794,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -794,7 +794,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_Contactor; ChargeStopType_B = eChgStop_Run_Contactor;
...@@ -810,7 +810,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -810,7 +810,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_Contactor; ChargeStopType_B = eChgStop_Run_Contactor;
...@@ -826,7 +826,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -826,7 +826,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_InVolt; ChargeStopType_B = eChgStop_Run_InVolt;
...@@ -842,7 +842,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -842,7 +842,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_NoDcmod; ChargeStopType_B = eChgStop_Run_NoDcmod;
...@@ -858,7 +858,7 @@ void ChgProWaitVoltChgRun_B(StructChargeCtrl_B *pChargeCtrl) ...@@ -858,7 +858,7 @@ void ChgProWaitVoltChgRun_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);
else else
DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum)); DcModuleSet_AB(eSwSta_Off, DcModuleAbility.MinVolt, DcModuleAbility.MinCurrt*(DcModuleManage.ValidNum + DcModuleManage_B.ValidNum));
DcOutSet_Uni(eSwSta_Off); //DcOutSet_Uni(eSwSta_Off);
UniChgEnable = FALSE; UniChgEnable = FALSE;
DcOutSet_B(eSwSta_Off); DcOutSet_B(eSwSta_Off);
ChargeStopType_B = eChgStop_Run_Meter; ChargeStopType_B = eChgStop_Run_Meter;
......
DcPillar/Src/Thread/Lcd/LcdPro_B_FactoryTest.c
...@@ -77,9 +77,9 @@ void FactoryTestPaint_B(void) ...@@ -77,9 +77,9 @@ void FactoryTestPaint_B(void)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_B_Emergency, TempU16); LcdShowData16(IconFactoryTestAddr_B_Emergency, TempU16);
if(eSwSta_On == DcOutPosGet_B()) //if(eSwSta_On == DcOutPosGet_B())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_B_DcOutSta, TempU16); LcdShowData16(IconFactoryTestAddr_B_DcOutSta, TempU16);
...@@ -118,9 +118,9 @@ void FactoryTestUpdate_B(StructFactoryTestUpdate *pUpdate) ...@@ -118,9 +118,9 @@ void FactoryTestUpdate_B(StructFactoryTestUpdate *pUpdate)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_B_Emergency, TempU16); LcdShowData16(IconFactoryTestAddr_B_Emergency, TempU16);
if(eSwSta_On == DcOutPosGet_B()) //if(eSwSta_On == DcOutPosGet_B())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_B_DcOutSta, TempU16); LcdShowData16(IconFactoryTestAddr_B_DcOutSta, TempU16);
......
DcPillar/Src/Thread/Lcd/LcdPro_B_FactoryTestTwo.c
...@@ -67,9 +67,9 @@ void FactoryTestTwoPaint_B(void) ...@@ -67,9 +67,9 @@ void FactoryTestTwoPaint_B(void)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_B_DoorSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_B_DoorSta, TempU16);
if(eSwSta_On == DcOutNegGet_B()) //if(eSwSta_On == DcOutPosGetSet_B())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_B_DcOutNegSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_B_DcOutNegSta, TempU16);
...@@ -79,15 +79,15 @@ void FactoryTestTwoPaint_B(void) ...@@ -79,15 +79,15 @@ void FactoryTestTwoPaint_B(void)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_B_eLockSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_B_eLockSta, TempU16);
if(eSwSta_On == DcOutPosGet_Uni()) //if(eSwSta_On == DcOutPosGet_Uni())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutPosSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutPosSta, TempU16);
if(eSwSta_On == DcOutNegGet_Uni()) //if(eSwSta_On == DcOutNegGet_Uni())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutNegSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutNegSta, TempU16);
...@@ -121,9 +121,9 @@ void FactoryTestTwoUpdate_B(StructFactoryTestTwoUpdate *pUpdate) ...@@ -121,9 +121,9 @@ void FactoryTestTwoUpdate_B(StructFactoryTestTwoUpdate *pUpdate)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_B_DoorSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_B_DoorSta, TempU16);
if(eSwSta_On == DcOutNegGet_B()) //if(eSwSta_On == DcOutNegGet_B())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_B_DcOutNegSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_B_DcOutNegSta, TempU16);
...@@ -133,15 +133,15 @@ void FactoryTestTwoUpdate_B(StructFactoryTestTwoUpdate *pUpdate) ...@@ -133,15 +133,15 @@ void FactoryTestTwoUpdate_B(StructFactoryTestTwoUpdate *pUpdate)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_B_eLockSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_B_eLockSta, TempU16);
if(eSwSta_On == DcOutPosGet_Uni()) //if(eSwSta_On == DcOutPosGet_Uni())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutPosSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutPosSta, TempU16);
if(eSwSta_On == DcOutNegGet_Uni()) //if(eSwSta_On == DcOutNegGet_Uni())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutNegSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_Uni_DcOutNegSta, TempU16);
...@@ -164,7 +164,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl) ...@@ -164,7 +164,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl)
StructFactoryTestTwoUpdate Update; StructFactoryTestTwoUpdate Update;
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);
...@@ -214,10 +214,10 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl) ...@@ -214,10 +214,10 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl)
IdleLedSet_B(eSwSta_On); IdleLedSet_B(eSwSta_On);
break; break;
case BtnFactoryTestTwo_B_DcOutNegOff: case BtnFactoryTestTwo_B_DcOutNegOff:
DcOutNegSet_B(eSwSta_Off); //DcOutNegSet_B(eSwSta_Off);
break; break;
case BtnFactoryTestTwo_B_DcOutNegOn: case BtnFactoryTestTwo_B_DcOutNegOn:
DcOutNegSet_B(eSwSta_On); //DcOutNegSet_B(eSwSta_On);
break; break;
case BtnFactoryTestTwo_B_eLockOff: case BtnFactoryTestTwo_B_eLockOff:
LockSet_B(eSwSta_Off); LockSet_B(eSwSta_Off);
...@@ -227,17 +227,17 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl) ...@@ -227,17 +227,17 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl)
break; break;
case BtnFactoryTestTwo_Uni_DcOutPosOff: case BtnFactoryTestTwo_Uni_DcOutPosOff:
DcOutPosSet_Uni(eSwSta_Off); //DcOutPosSet_Uni(eSwSta_Off);
break; break;
case BtnFactoryTestTwo_Uni_DcOutPosOn: case BtnFactoryTestTwo_Uni_DcOutPosOn:
DcOutPosSet_Uni(eSwSta_On); //DcOutPosSet_Uni(eSwSta_On);
break; break;
case BtnFactoryTestTwo_Uni_DcOutNegOff: case BtnFactoryTestTwo_Uni_DcOutNegOff:
DcOutNegSet_Uni(eSwSta_Off); //DcOutNegSet_Uni(eSwSta_Off);
break; break;
case BtnFactoryTestTwo_Uni_DcOutNegOn: case BtnFactoryTestTwo_Uni_DcOutNegOn:
DcOutNegSet_Uni(eSwSta_On); //DcOutNegSet_Uni(eSwSta_On);
break; break;
default: default:
...@@ -259,7 +259,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl) ...@@ -259,7 +259,7 @@ void LcdProFactoryTestTwo_B(StructLcdCtrl *pLcdCtrl)
if(eLcdPro_B_FactoryTestTwo != pLcdCtrl->CurScreen) if(eLcdPro_B_FactoryTestTwo != pLcdCtrl->CurScreen)
{ {
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_FactoryTest.c
...@@ -77,9 +77,9 @@ void FactoryTestPaint(void) ...@@ -77,9 +77,9 @@ void FactoryTestPaint(void)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_Emergency, TempU16); LcdShowData16(IconFactoryTestAddr_Emergency, TempU16);
if(eSwSta_On == DcOutPosGet()) //if(eSwSta_On == DcOutPosGet())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_DcOutSta, TempU16); LcdShowData16(IconFactoryTestAddr_DcOutSta, TempU16);
...@@ -118,9 +118,9 @@ void FactoryTestUpdate(StructFactoryTestUpdate *pUpdate) ...@@ -118,9 +118,9 @@ void FactoryTestUpdate(StructFactoryTestUpdate *pUpdate)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_Emergency, TempU16); LcdShowData16(IconFactoryTestAddr_Emergency, TempU16);
if(eSwSta_On == DcOutPosGet()) //if(eSwSta_On == DcOutPosGet())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestAddr_DcOutSta, TempU16); LcdShowData16(IconFactoryTestAddr_DcOutSta, TempU16);
......
DcPillar/Src/Thread/Lcd/LcdPro_FactoryTestTwo.c
...@@ -63,9 +63,9 @@ void FactoryTestTwoPaint(void) ...@@ -63,9 +63,9 @@ void FactoryTestTwoPaint(void)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_DoorSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_DoorSta, TempU16);
if(eSwSta_On == DcOutNegGet()) //if(eSwSta_On == DcOutNegGet())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_DcOutNegSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_DcOutNegSta, TempU16);
...@@ -130,9 +130,9 @@ void FactoryTestTwoUpdate(StructFactoryTestTwoUpdate *pUpdate) ...@@ -130,9 +130,9 @@ void FactoryTestTwoUpdate(StructFactoryTestTwoUpdate *pUpdate)
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_DoorSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_DoorSta, TempU16);
if(eSwSta_On == DcOutNegGet()) //if(eSwSta_On == DcOutNegGet())
TempU16 = 1; // TempU16 = 1;
else //else
TempU16 = 0; TempU16 = 0;
LcdShowData16(IconFactoryTestTwoAddr_DcOutNegSta, TempU16); LcdShowData16(IconFactoryTestTwoAddr_DcOutNegSta, TempU16);
...@@ -182,7 +182,7 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl) ...@@ -182,7 +182,7 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl)
StructFactoryTestTwoUpdate Update; StructFactoryTestTwoUpdate Update;
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);
...@@ -233,10 +233,10 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl) ...@@ -233,10 +233,10 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl)
IdleLedSet(eSwSta_On); IdleLedSet(eSwSta_On);
break; break;
case BtnFactoryTestTwo_DcOutNegOff: case BtnFactoryTestTwo_DcOutNegOff:
DcOutNegSet(eSwSta_Off); //DcOutNegSet(eSwSta_Off);
break; break;
case BtnFactoryTestTwo_DcOutNegOn: case BtnFactoryTestTwo_DcOutNegOn:
DcOutNegSet(eSwSta_On); //DcOutNegSet(eSwSta_On);
break; break;
case BtnFactoryTestTwo_DehOff: case BtnFactoryTestTwo_DehOff:
DehumidifierSet(eSwSta_Off); DehumidifierSet(eSwSta_Off);
...@@ -270,7 +270,7 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl) ...@@ -270,7 +270,7 @@ void LcdProFactoryTestTwo(StructLcdCtrl *pLcdCtrl)
if(eLcdPro_FactoryTestTwo != pLcdCtrl->CurScreen) if(eLcdPro_FactoryTestTwo != pLcdCtrl->CurScreen)
{ {
IdleLedSet(eSwSta_Off); IdleLedSet(eSwSta_Off);
DcOutNegSet(eSwSta_Off); //DcOutNegSet(eSwSta_Off);
DehumidifierSet(eSwSta_Off); DehumidifierSet(eSwSta_Off);
LockSet(eSwSta_Off); LockSet(eSwSta_Off);
return; return;
......
DcPillar/Src/Thread/Thd_Mult.c
...@@ -673,8 +673,8 @@ void Thd_Mult(void const *parameter) ...@@ -673,8 +673,8 @@ void Thd_Mult(void const *parameter)
} }
else if((3 == DoorChkCnt) && (0 != UserParam.ChgFun.Value.Door)) else if((3 == DoorChkCnt) && (0 != UserParam.ChgFun.Value.Door))
{ {
//PillarError_B.Value.Door = 1; //0504 test PillarError_B.Value.Door = 1; //0504 test
//PillarError.Value.Door = 1; PillarError.Value.Door = 1;
} }
/*防雷器故障检测*/ /*防雷器故障检测*/
if(eSwSta_Off == SPDGet()) if(eSwSta_Off == SPDGet())
...@@ -761,11 +761,13 @@ void Thd_Mult(void const *parameter) ...@@ -761,11 +761,13 @@ void Thd_Mult(void const *parameter)
;// PillarError_B.Value.NoDcmod = 1; ;// PillarError_B.Value.NoDcmod = 1;
else else
PillarError_B.Value.NoDcmod = 0; PillarError_B.Value.NoDcmod = 0;
#if 0
/*B枪位电能表通讯故障判断*/ /*B枪位电能表通讯故障判断*/
if(eMeterSta_Unavail == MeterComm.Status_B) if(eMeterSta_Unavail == MeterComm.Status_B)
;//PillarError_B.Value.Meter = 1; //0505 屏蔽B枪电表错误 PillarError_B.Value.Meter = 1; //0505 屏蔽B枪电表错误
else else
PillarError_B.Value.Meter = 0; PillarError_B.Value.Meter = 0;
#endif
/*B枪位绝缘错误判断*/ /*B枪位绝缘错误判断*/
if(0 != ChargeError_B.Value.IsolateError) if(0 != ChargeError_B.Value.IsolateError)
PillarError_B.Value.Insulation = 1; PillarError_B.Value.Insulation = 1;
...@@ -807,7 +809,7 @@ void Thd_Mult(void const *parameter) ...@@ -807,7 +809,7 @@ void Thd_Mult(void const *parameter)
{ {
PillarError_B.Value.EleLock = 1; PillarError_B.Value.EleLock = 1;
} }
/*B枪位接触器故障判断*/ #if 0 /*B枪位接触器故障判断*/
if(((0 == UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta_B == DcOutPosGet_B()))\ if(((0 == UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta_B == DcOutPosGet_B()))\
||((0 != UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta_B == DcOutPosGet_B()) && (DcOutNegSta_B == DcOutNegGet_B()))) ||((0 != UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta_B == DcOutPosGet_B()) && (DcOutNegSta_B == DcOutNegGet_B())))
{ {
...@@ -839,6 +841,8 @@ void Thd_Mult(void const *parameter) ...@@ -839,6 +841,8 @@ void Thd_Mult(void const *parameter)
{ {
//PillarError_B.Value.Contactor = 1; //PillarError_B.Value.Contactor = 1;
} }
#endif
//交流接触器
if((PillarError.Value.Emergency == 0) && (ACContactorSta != ACContactorGet())) if((PillarError.Value.Emergency == 0) && (ACContactorSta != ACContactorGet()))
{ {
if(ACContactorChkCnt < 20) if(ACContactorChkCnt < 20)
...@@ -879,11 +883,13 @@ void Thd_Mult(void const *parameter) ...@@ -879,11 +883,13 @@ void Thd_Mult(void const *parameter)
;// PillarError.Value.NoDcmod = 1; ;// PillarError.Value.NoDcmod = 1;
else else
PillarError.Value.NoDcmod = 0; PillarError.Value.NoDcmod = 0;
#if 0 //屏蔽电能表错误
/*电能表通讯故障判断*/ /*电能表通讯故障判断*/
if(eMeterSta_Unavail == MeterComm.Status) if(eMeterSta_Unavail == MeterComm.Status)
PillarError.Value.Meter = 0;//1; 0504 屏蔽电表错误 PillarError.Value.Meter = 1;
else else
PillarError.Value.Meter = 0; PillarError.Value.Meter = 0;
#endif
/*绝缘错误判断*/ /*绝缘错误判断*/
if(0 != ChargeError.Value.IsolateError) if(0 != ChargeError.Value.IsolateError)
PillarError.Value.Insulation = 1; PillarError.Value.Insulation = 1;
...@@ -925,6 +931,7 @@ void Thd_Mult(void const *parameter) ...@@ -925,6 +931,7 @@ void Thd_Mult(void const *parameter)
{ {
PillarError.Value.EleLock = 1; PillarError.Value.EleLock = 1;
} }
#if 0 ////不再检测直流接触器
/*接触器故障判断*/ /*接触器故障判断*/
if(((0 == UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta == DcOutPosGet()))\ if(((0 == UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta == DcOutPosGet()))\
||((0 != UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta == DcOutPosGet()) && (DcOutNegSta == DcOutNegGet())))//两个接触器 ||((0 != UserParam.ChgFun.Value.NegContactor) && (DcOutPosSta == DcOutPosGet()) && (DcOutNegSta == DcOutNegGet())))//两个接触器
...@@ -957,7 +964,8 @@ void Thd_Mult(void const *parameter) ...@@ -957,7 +964,8 @@ void Thd_Mult(void const *parameter)
{ {
PillarError.Value.Contactor = 0;//1; 0504 test PillarError.Value.Contactor = 0;//1; 0504 test
} }
#endif
#if 0 //不再检测联级接触器
/*联级接触器故障判断*/ /*联级接触器故障判断*/
if(((0 == UserParam.ChgFun.Value.SigUniChg))\ if(((0 == UserParam.ChgFun.Value.SigUniChg))\
||((DcOutPosSta_Uni == DcOutPosGet_Uni()) && (DcOutNegSta_Uni == DcOutNegGet_Uni())))//两个接触器 ||((DcOutPosSta_Uni == DcOutPosGet_Uni()) && (DcOutNegSta_Uni == DcOutNegGet_Uni())))//两个接触器
...@@ -992,7 +1000,7 @@ void Thd_Mult(void const *parameter) ...@@ -992,7 +1000,7 @@ void Thd_Mult(void const *parameter)
// PillarError.Value.UniContactor = 1; // PillarError.Value.UniContactor = 1;
// PillarError_B.Value.UniContactor = 1; // PillarError_B.Value.UniContactor = 1;
} }
#endif
/*绝缘检测通讯故障判断*/ /*绝缘检测通讯故障判断*/
if((GetSystemTick() - ImdCheckTcik) >= 600) if((GetSystemTick() - ImdCheckTcik) >= 600)
{ {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论