|
@@ -435,7 +435,7 @@ bool isModelNameMatch = true;
|
|
|
//char* rfidPortName = "/dev/ttyS2";
|
|
|
#if ENABLE_PCBA_TEST == 0
|
|
|
char* fwVersion = "V2.05.00.0000.00";
|
|
|
-char* subVersion = "00";
|
|
|
+char* subVersion = "01";
|
|
|
#else
|
|
|
char* fwVersion = "PCBA.00.04";
|
|
|
char* subVersion = "00";
|
|
@@ -10812,11 +10812,10 @@ void ChkConnectorAction(void)
|
|
|
{
|
|
|
if(ShmChargerInfo->ConnectorActReq[i].Flag.bits.ChargingCancel)
|
|
|
{
|
|
|
- Clean_Ocpp_TcciSerialNo(i);
|
|
|
- if(ShmChargerInfo->AllBill.OccupancyInfo[i].Status == _Parking_NoOccupancy ||
|
|
|
- ShmChargerInfo->AllBill.OccupancyInfo[i].Status == _Parking_SyncOccupancy)
|
|
|
+ if(ShmChargerInfo->AllBill.OccupancyInfo[i].Status != _Parking_WaitToPay)
|
|
|
{
|
|
|
LOG_INFO("Gun %d Charging Canceled", i + 1);
|
|
|
+ Clean_Ocpp_TcciSerialNo(i);
|
|
|
}
|
|
|
else
|
|
|
{
|