2020.06.21 / Folus Wen

Actions:
1. EVSE/Modularization/ocppfiles/MessageHandler.c sendBootNotification() cancel skip send message logic when charging mode.
2. EVSE/Modularization/ocppfiles/MessageHandler.c handleTriggerMessageRequest() statusNotification & heartbeat operation method change from send directly to by flag.
3. EVSE/Modularization/ocppfiles/Module_OcppBackend.c isWebsocketSendable set to 0 only send message initiated by charger.
4. EVSE/Modularization/ocppfiles/Module_OcppBackend.c watch dog timeout specification change to 10 seconds.

Files:
1. As follow commit history

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

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -2752,6 +2752,7 @@ int sendBootNotificationRequest(void)
 	char message[500]={0}, payload[700]={0};
     char guid[37]={0};
     char tempdata[65]={0};
+/*
     int IsGunCharging = FALSE;
 
     //check Transaction active
@@ -2792,7 +2793,7 @@ int sendBootNotificationRequest(void)
     	server_sign = TRUE;
     	return result;
     }
-
+*/
 	// Fill BootNotification fields
 	strcpy((char *)ShmOCPP16Data->BootNotification.CbSN,(const char *)ShmOCPP16Data->ChargeBoxId);
 	strcpy((char *)ShmOCPP16Data->BootNotification.CpModel,(const char *)ShmSysConfigAndInfo->SysConfig.ModelName);
@@ -10575,7 +10576,7 @@ int handleTriggerMessageRequest(char *uuid, char *payload)
 	}
 	else if(strcmp(requestedMessagestr, MessageTriggerStr[Heartbeat]) == 0 )
 	{
-		sendHeartbeatRequest(connectorIdInt);
+		clientTime.Heartbeat = time((time_t*)NULL) - (ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval);
 		//sprintf(comfirmstr, "%s",TriggerMessageStatusStr[TriggerMessageStatus_Accepted] );
 	}
 	else if (strcmp(requestedMessagestr, MessageTriggerStr[MeterValues]) == 0 )
@@ -10605,14 +10606,14 @@ int handleTriggerMessageRequest(char *uuid, char *payload)
 		{
 			if((connectorIdInt > 0) && ((connectorIdInt -1) < gunTotalNumber))
 			{
-				sendStatusNotificationRequest(connectorIdInt -1);
+				cpinitateMsg.bits[connectorIdInt -1].StatusNotificationReq = 1;
 				//sprintf(comfirmstr, "%s",TriggerMessageStatusStr[TriggerMessageStatus_Accepted] );
 			}
 		}
 		else
 		{
 			for(int idx=0;idx< gunTotalNumber;idx++)
-				sendStatusNotificationRequest(idx);
+				cpinitateMsg.bits[idx].StatusNotificationReq = 1;
 
 			//sprintf(comfirmstr, "%s",TriggerMessageStatusStr[TriggerMessageStatus_Accepted] );
 		}

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -102,7 +102,20 @@ int SendData(struct lws *wsi)
     int len;
     unsigned char out[LWS_SEND_BUFFER_PRE_PADDING + 4096 + LWS_SEND_BUFFER_POST_PADDING] = {0};
 
-    isWebsocketSendable = 0;
+    // Only disable isWebsocketSendable operation initiated by charger
+    if((strstr((char*)SendBuffer, "\"Authorize\"") != NULL)
+    || (strstr((char*)SendBuffer, "\"BootNotification\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"DataTransfer\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"DiagnosticsStatusNotification\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"FirmwareStatusNotification\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"Heartbeat\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"MeterValues\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"StartTransaction\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"StatusNotification\"") != NULL)
+	|| (strstr((char*)SendBuffer, "\"StopTransaction\"") != NULL))
+    {
+    	isWebsocketSendable = 0;
+    }
 
     len = strlen((char *)SendBuffer);
 
@@ -1134,7 +1147,7 @@ void* processWatchdog()
 {
 	for(;;)
 	{
-		if(((time((time_t*)NULL) - startTimeDog) > 30) && (context != NULL))
+		if(((time((time_t*)NULL) - startTimeDog) > 10) && (context != NULL))
 		{
 			DEBUG_INFO("LWS watch dog timeout.\n");
 			lws_cancel_service(context);
@@ -1344,6 +1357,7 @@ int main(void)
 	for(;;)
 	{
 		startTimeDog = time((time_t*)NULL);
+		counterLwsRestart = 0;
 		// Connect server
 		while(ConnectionEstablished==0) // Check InternetConn 0: disconnected, 1: connected
 		{