Browse Source

[Improve][AX80][main]

2022.02.22 / Folus Wen

Actions:
1. checkChargingProfileLimit() function. Arrange profiles do not look up request flag anymore.

Files:
1. As follow commit history

Image version: D0.01.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 3 years ago
parent
commit
57d0bb6672
1 changed files with 3 additions and 3 deletions
  1. 3 3
      EVSE/Projects/AX80/Apps/main.c

+ 3 - 3
EVSE/Projects/AX80/Apps/main.c

@@ -4376,7 +4376,6 @@ void checkChargingProfileLimit(uint8_t gun_index)
 	if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
 	{
 		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))
 		{
 			// 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;
 		}
@@ -4410,7 +4409,7 @@ void checkChargingProfileLimit(uint8_t gun_index)
 	else if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_20)
 	{
 		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))
 		{
 			// 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)) ||
 						   ocpp_get_reset_req())
 						{
+							sleep(2);
 							ShmCharger->gun_info[gun_index].rfidReq = OFF;
 							ShmCharger->gun_info[gun_index].bleConfigData.isRequestStop = OFF;
 							ocpp_set_remotestop(gun_index, OFF);