2022-02-24/Jerry Wang

Action:
1. Fix the problem that clock-aligned meterValue would not be sent as too many message need to be processed at the same time.
2. Fix the problem that BootNotificationInterval may cause that BootNotification cannot be triggered.
3. Add Http PUT function.

File:
1. EVSE/Modularization/ocppfiles/MessageHandler.c
--> Action 1,2,3
2. EVSE/Modularization/ocppph/MessageHandler.c
--> Action 1,2,3

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -4563,7 +4563,7 @@ void CheckSystemValue(void)
 	for(int gun_index=0;gun_index < gunTotalNumber;gun_index++)
 	{
 		// ClockAlign MeterValue
-		if(isWebsocketSendable && (server_sign == TRUE) && ((atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData) > 0)?((getTimePassSinceToday(gun_index)%(atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData)))==0):FALSE))
+		if((server_sign == TRUE) && ((atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData) > 0)?((getTimePassSinceToday(gun_index)%(atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData)))==0):FALSE))
 		{
 			if(gunType[gun_index] == GUN_TYPE_CHAdeMO)
 			{
@@ -15244,7 +15244,6 @@ void handleBootNotificationResponse(char *payload, int gun_index)
 	}
 	json_object_put(BootNotification);
 
-
 	ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval = intervalInt;
 	BootNotificationInterval = intervalInt;
 
@@ -15255,7 +15254,7 @@ void handleBootNotificationResponse(char *payload, int gun_index)
 
 	if((strcmp(statusStr, RegistrationStatusStr[RegistrationStatus_Accepted]) == 0 ))
 	{
-
+		BootNotificationInterval = 0;
 		if((intervalInt == 0) || (intervalInt >= 10))
 		{
 			sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[HeartbeatInterval].ItemData, "%d", intervalInt);
@@ -19680,8 +19679,25 @@ int httpUploadFile(char *location, char *path, char *filename,char *url)
 
 	if(systemresult != 1)
 	{
-		DEBUG_INFO("HTTP upload error!\n");
-		return FALSE;
+		DEBUG_WARN("HTTP POST upload error, change to PUT method\n");
+		FILE *phpFP = popen("/bin/php-cgi /var/www/ocpp_upload_put.php", "r");
+		if(phpFP == NULL)
+		{
+			DEBUG_WARN("PHP PUT upload fail.\n");
+			return FALSE;
+		}
+		else
+		{
+			while(fgets(buf, sizeof(buf), phpFP) != NULL)
+			{
+				if(strstr(buf, "result") != NULL)
+				{
+					sscanf(buf, "result: %d", &systemresult);
+					DEBUG_INFO("PHP HTTP PUT upload result: %d\n", systemresult);
+				}
+			}
+			pclose(phpFP);
+		}
 	}
 
 	return TRUE;

EVSE/Modularization/ocppph/MessageHandler.c

@@ -4083,7 +4083,7 @@ void CheckSystemValue(void)
 	for(int gun_index=0;gun_index < gunTotalNumber;gun_index++)
 	{
 		// ClockAlign MeterValue
-		if(isWebsocketSendable && (server_sign == TRUE) && ((atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData) > 0)?((getTimePassSinceToday(gun_index)%(atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData)))==0):FALSE))
+		if((server_sign == TRUE) && ((atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData) > 0)?((getTimePassSinceToday(gun_index)%(atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData)))==0):FALSE))
 		{
 			if(gunType[gun_index] == GUN_TYPE_CHAdeMO)
 			{
@@ -14746,10 +14746,8 @@ void handleBootNotificationResponse(char *payload, int gun_index)
 	}
 	json_object_put(BootNotification);
 
-
 	ShmOCPP16DataPH->BootNotification.ResponseHeartbeatInterval = intervalInt;
 	BootNotificationInterval = intervalInt;
-	HeartBeatWaitTime = intervalInt;
 
 	//write back to ShmOCPP16DataPH->BootNotification
 	strcpy((char *)ShmOCPP16DataPH->BootNotification.ResponseCurrentTime, currentTimeStr);
@@ -14758,6 +14756,7 @@ void handleBootNotificationResponse(char *payload, int gun_index)
 
 	if((strcmp(statusStr, RegistrationStatusStr[RegistrationStatus_Accepted]) == 0 ))
 	{
+		BootNotificationInterval = 0;
 		if((intervalInt == 0) || (intervalInt >= 10))
 		{
 			sprintf((char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[HeartbeatInterval].ItemData, "%d", intervalInt);
@@ -14770,6 +14769,7 @@ void handleBootNotificationResponse(char *payload, int gun_index)
 	}
 	else if(strcmp(statusStr, RegistrationStatusStr[RegistrationStatus_Pending]) == 0)
 	{
+		BootNotificationInterval = intervalInt;
 		server_pending = TRUE;
 	}
 	//syncDateTimeRTC(ShmOCPP16DataPH->BootNotification.ResponseCurrentTime);
@@ -19031,8 +19031,25 @@ int httpUploadFile(char *location, char *path, char *filename,char *url)
 
 	if(systemresult != 1)
 	{
-		DEBUG_INFO("HTTP upload error!\n");
-		return FALSE;
+		DEBUG_WARN("HTTP POST upload error, change to PUT method\n");
+		FILE *phpFP = popen("/bin/php-cgi /var/www/ocpp_upload_put.php", "r");
+		if(phpFP == NULL)
+		{
+			DEBUG_WARN("PHP PUT upload fail.\n");
+			return FALSE;
+		}
+		else
+		{
+			while(fgets(buf, sizeof(buf), phpFP) != NULL)
+			{
+				if(strstr(buf, "result") != NULL)
+				{
+					sscanf(buf, "result: %d", &systemresult);
+					DEBUG_INFO("PHP HTTP PUT upload result: %d\n", systemresult);
+				}
+			}
+			pclose(phpFP);
+		}
 	}
 
 	return TRUE;