2020-05-20 / Kathy Yeh

1. remove HeartBeat屏蔽
2. modify Temp StopTransaction offline logic

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -38,11 +38,11 @@
 #include	"TransactionQueue.h"
 
 
-#define PASS				1
-#define FAIL				-1
+#define PASS	1
+#define FAIL	-1
 
-#define FALSE 0
-#define TRUE 1       		// Option 1
+#define FALSE	0
+#define TRUE	1  // Option 1
 
 //ChargePointMaxProfile
 #define ChargePointMaxProfile_JSON     "/Storage/OCPP/ChargePointMaxProfile.json"
@@ -1386,9 +1386,9 @@ void CheckSystemValue(void)
 		statusModeChage[gun_index] = FALSE;
 
 		DEBUG_INFO("SystemInitial=%d !!!\n",SystemInitial);
-		DEBUG_INFO("difftime(time((time_t*)NULL), clientTime.Heartbeat)=%d !!!\n",difftime(time((time_t*)NULL), clientTime.Heartbeat));
-		DEBUG_INFO("HeartBeatWaitTime=%d !!!\n",HeartBeatWaitTime);
-		DEBUG_INFO("ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval=%d !!!\n",ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval);
+		//DEBUG_INFO("difftime(time((time_t*)NULL), clientTime.Heartbeat)=%d !!!\n",difftime(time((time_t*)NULL), clientTime.Heartbeat));
+		//DEBUG_INFO("HeartBeatWaitTime=%d !!!\n",HeartBeatWaitTime);
+		//DEBUG_INFO("ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval=%d !!!\n",ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval);
 
 	}
 
@@ -11518,7 +11518,7 @@ void handleBootNotificationResponse(char *payload, int gun_index)
 	ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval = intervalInt;
 	strcpy((char *)ShmOCPP16Data->BootNotification.ResponseStatus, statusStr);
 
-   	if((strcmp(statusStr, RegistrationStatusStr[RegistrationStatus_Accepted]) == 0 )/* ||
+	if((strcmp(statusStr, RegistrationStatusStr[RegistrationStatus_Accepted]) == 0 )/* ||
 		(strcmp(status, RegistrationStatusStr[RegistrationStatus_Pending]) == 0) ||
 		(strcmp(status, RegistrationStatusStr[RegistrationStatus_Rejected]) == 0)*/)
 	{
@@ -18422,16 +18422,6 @@ void checkTempStopTransaction(int gun_index)
 	char guid[37]={0};
 	char tempdata[65]={0};
 
-	//=====================================================
-	// Check InternetConn 0: disconnected, 1: connected
-	//====================================================
-	if(ShmSysConfigAndInfo->SysInfo.InternetConn == 0)
-	{
-		DEBUG_INFO("\n offline  now !!!\n");
-		return;
-	}
-
-
 	fptr1 = fopen("/Storage/OCPP/TempStopTransaction", "r");
 	if (!fptr1)
 	{
@@ -18447,7 +18437,7 @@ void checkTempStopTransaction(int gun_index)
 	{
 		// copy all contents to the temporary file except the specific line
 		while (fgets(str, 1200, fptr1) != NULL)
-	    {
+		{
 			str[strlen(str) - 1] = '\0'; // eat the newline fgets() stores
 
 			if(str[0]=='\0')
@@ -18464,10 +18454,9 @@ void checkTempStopTransaction(int gun_index)
 	    	queue_operation(4, guid, str );//addq(guid, queuedata); ---> remove temporally
 
 	    	memset(str,0,sizeof str);
+		}
 
-	    }
-
-	 }
+	}
 
 	// fptr1=freopen(NULL,"w",fptr1); // reset the fptr1 again
 	 fclose(fptr1);

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -34,6 +34,7 @@
 #include	"sqlite3.h"
 
 
+
 #ifndef SPEC_LATEST_SUPPORTED
 #define SPEC_LATEST_SUPPORTED 13
 #endif
@@ -397,12 +398,17 @@ int SendData(struct lws *wsi)
     return 0;
 
     memcpy (out + LWS_SEND_BUFFER_PRE_PADDING, SendBuffer, len );
+
+#if 0
     ret = strstr((const char *)(out + LWS_SEND_BUFFER_PRE_PADDING), "Heartbeat");
 
     if(ret == NULL)
     {
     	DEBUG_OCPPMESSAGE_INFO(" SendData= %s\n", out + LWS_SEND_BUFFER_PRE_PADDING);
     }
+#endif
+
+    DEBUG_OCPPMESSAGE_INFO(" SendData= %s\n", out + LWS_SEND_BUFFER_PRE_PADDING);
 
     n = lws_write(wsi, out + LWS_SEND_BUFFER_PRE_PADDING, len, LWS_WRITE_TEXT);
 
@@ -627,7 +633,7 @@ DEBUG_INFO("LWS_CALLBACK_CLIENT_ESTABLISHED\n");
 
 			((char *)in)[len] = '\0';
 
-			//Print out OCPP Message , except for HeartBeat
+			#if 0//Print out OCPP Message , except for HeartBeat
 			{
 				char *ret, *ret1;
 				ret = strstr((const char *)in, "currentTime");
@@ -637,6 +643,9 @@ DEBUG_INFO("LWS_CALLBACK_CLIENT_ESTABLISHED\n");
 					DEBUG_OCPPMESSAGE_INFO("Original Receive %s\n", (char *)in);
 				}
 			}
+			#endif
+
+			DEBUG_OCPPMESSAGE_INFO("Original Receive %s\n", (char *)in);
 
 			char tempin[65536]={0};