|
@@ -2146,17 +2146,26 @@ void setPresentConnectionTimeout(uint8_t gun_index)
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- time = ShmCharger->timeoutSpec.Handshake_Timeout;
|
|
|
- if(time <= 0)
|
|
|
+ if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_A))
|
|
|
{
|
|
|
- strcpy((char*)not_counting, "000");
|
|
|
- string2ByteArray(not_counting, data);
|
|
|
- lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_CONNECTION_TIMER, data, ARRAY_SIZE(data));
|
|
|
+ time = ShmCharger->timeoutSpec.Handshake_Timeout;
|
|
|
+ if(time <= 0)
|
|
|
+ {
|
|
|
+ strcpy((char*)not_counting, "000");
|
|
|
+ string2ByteArray(not_counting, data);
|
|
|
+ lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_CONNECTION_TIMER, data, ARRAY_SIZE(data));
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ sprintf((char *)conntectionTimeout, "%03d ", time);
|
|
|
+ string2ByteArray(conntectionTimeout, data);
|
|
|
+ lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_CONNECTION_TIMER, data, ARRAY_SIZE(data));
|
|
|
+ }
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
- sprintf((char *)conntectionTimeout, "%03d ", time);
|
|
|
- string2ByteArray(conntectionTimeout, data);
|
|
|
+ strcpy((char*)not_counting, "-----");
|
|
|
+ string2ByteArray(not_counting, data);
|
|
|
lcdRegisterWrite(Uart1Fd, REG_TYPE_RAM, TEXT_PREPARING_CONNECTION_TIMER, data, ARRAY_SIZE(data));
|
|
|
}
|
|
|
}
|