|
@@ -4376,7 +4376,6 @@ void checkChargingProfileLimit(uint8_t gun_index)
|
|
if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
|
|
if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
|
|
{
|
|
{
|
|
if((ocpp_get_smartcharging_profileId(gun_index) > 0) &&
|
|
if((ocpp_get_smartcharging_profileId(gun_index) > 0) &&
|
|
- (ocpp_get_profile_req(gun_index) != ON) &&
|
|
|
|
(((strlen((char*)ShmOCPP16Data->SmartChargingProfile[gun_index].ValidFrom)>0) && (strlen((char*)ShmOCPP16Data->SmartChargingProfile[gun_index].ValidTo)>0)) ? isProfileValid(gun_index) : ON))
|
|
(((strlen((char*)ShmOCPP16Data->SmartChargingProfile[gun_index].ValidFrom)>0) && (strlen((char*)ShmOCPP16Data->SmartChargingProfile[gun_index].ValidTo)>0)) ? isProfileValid(gun_index) : ON))
|
|
{
|
|
{
|
|
// Checking profile kind
|
|
// Checking profile kind
|
|
@@ -4402,7 +4401,7 @@ void checkChargingProfileLimit(uint8_t gun_index)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- else if((ShmOCPP16Data->SmartChargingProfile[gun_index].ChargingProfileId == 0) && (ShmOCPP16Data->CSUMsg.bits[gun_index].ChargingProfileReq != ON))
|
|
|
|
|
|
+ else if((ShmOCPP16Data->SmartChargingProfile[gun_index].ChargingProfileId == 0))
|
|
{
|
|
{
|
|
ShmCharger->gun_info[gun_index].targetCurrent = ShmCharger->gun_info[gun_index].primaryMcuState.rating_current;
|
|
ShmCharger->gun_info[gun_index].targetCurrent = ShmCharger->gun_info[gun_index].primaryMcuState.rating_current;
|
|
}
|
|
}
|
|
@@ -4410,7 +4409,7 @@ void checkChargingProfileLimit(uint8_t gun_index)
|
|
else if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_20)
|
|
else if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_20)
|
|
{
|
|
{
|
|
if((ocpp_get_smartcharging_profileId(gun_index) > 0) &&
|
|
if((ocpp_get_smartcharging_profileId(gun_index) > 0) &&
|
|
- (ocpp_get_profile_req(gun_index) != ON) &&
|
|
|
|
|
|
+ //(ocpp_get_profile_req(gun_index) != ON) &&
|
|
(((strlen((char*)ShmOCPP20Data->SmartChargingProfile[gun_index].validFrom)>0) && (strlen((char*)ShmOCPP20Data->SmartChargingProfile[gun_index].validTo)>0)) ? isProfileValid(gun_index) : ON))
|
|
(((strlen((char*)ShmOCPP20Data->SmartChargingProfile[gun_index].validFrom)>0) && (strlen((char*)ShmOCPP20Data->SmartChargingProfile[gun_index].validTo)>0)) ? isProfileValid(gun_index) : ON))
|
|
{
|
|
{
|
|
// Checking profile kind
|
|
// Checking profile kind
|
|
@@ -6096,6 +6095,7 @@ int main(void)
|
|
((ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_SOCKETE) && (!ShmCharger->gun_info[gun_index].primaryMcuState.socket_e.isSocketEPinOn)) ||
|
|
((ShmCharger->gun_info[gun_index].chargingMode == CHARGING_MODE_SOCKETE) && (!ShmCharger->gun_info[gun_index].primaryMcuState.socket_e.isSocketEPinOn)) ||
|
|
ocpp_get_reset_req())
|
|
ocpp_get_reset_req())
|
|
{
|
|
{
|
|
|
|
+ sleep(2);
|
|
ShmCharger->gun_info[gun_index].rfidReq = OFF;
|
|
ShmCharger->gun_info[gun_index].rfidReq = OFF;
|
|
ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop = OFF;
|
|
ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop = OFF;
|
|
ocpp_set_remotestop(gun_index, OFF);
|
|
ocpp_set_remotestop(gun_index, OFF);
|