2020-04-23 /Kathy Yeh

1. modify crash issue: charging profile
2. Change Configuration issue
3. Modify Packet format issue: filter more spaces

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -136,10 +136,10 @@ int OcppPort=0;
 //===============================
 // OCPP sign variable
 //===============================
-int server_sign = FALSE;
+static int server_sign = FALSE;
 int server_pending = FALSE;
 int PRE_SYS_MODE[CHAdeMO_QUANTITY+ CCS_QUANTITY + GB_QUANTITY + AC_QUANTITY];
-int BootNotificationInterval = 0;
+static int BootNotificationInterval = 0;
 static int SystemInitial = CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY;	// System Boot UP
 
 //===============================
@@ -1045,6 +1045,7 @@ int InitShareMemory()
     /****************************** For Initial Settings************************************************/
 
    	gunTotalNumber =  (ShmSysConfigAndInfo->SysConfig.ModelName[0]=='D') ? (CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY): AC_QUANTITY;
+   	server_sign = FALSE;
 
 	for(int gun_index=0; gun_index < gunTotalNumber; gun_index++ )
 	{
@@ -1176,6 +1177,7 @@ void CheckSystemValue(void)
 	//===============================
 	// send Heartbeat
 	//===============================
+	HeartBeatWaitTime = ShmOCPP16Data->BootNotification.ResponseHeartbeatInterval;
 	if((server_sign == TRUE) && (difftime(time((time_t*)NULL), clientTime.Heartbeat) >= HeartBeatWaitTime))
 	{
 		printf("Heartbeat !!!\n");
@@ -1188,69 +1190,17 @@ void CheckSystemValue(void)
 		HeartBeatWithNOResponse = HeartBeatWithNOResponse + 1;
 
 	}
-
-#if 0
-	//==============================================
-	// Update firmware request
-	//==============================================
-	if(isUpdateRequest == TRUE )
+	else if((server_sign == TRUE) &&(FirstHeartBeat == 0)) // Send First HeartBeat
 	{
-		if(ShmSysConfigAndInfo->SysConfig.ModelName[0]=='D')
-		{
-			for(int gun_index=0;gun_index < (CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY) ;gun_index++)
-			{
-				//check SystemStatus
-				/*************************DC*******************************/
-				for (int index = 0; index < CHAdeMO_QUANTITY; index++)
-				{
-					if ((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index == gun_index)&&(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus == SYS_MODE_IDLE)) //S_IDLE
-					{
-						IdleModeCnt = IdleModeCnt + 1;
-					}
-				}
-
-				for (int index = 0; index < CCS_QUANTITY; index++)
-				{
-					if ((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index == gun_index)&&(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus == SYS_MODE_IDLE)) //S_IDLE
-					{
-						IdleModeCnt = IdleModeCnt + 1;
-					}
-				}
-
-				for (int index = 0; index < GB_QUANTITY; index++)
-				{
-					if ((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index == gun_index)&&(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus == 1)) //S_IDLE
-					{
-						IdleModeCnt = IdleModeCnt + 1;
-					}
-				}
-			}
-
-
-			if(IdleModeCnt == (CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY ))
-			{
-				isUpdateRequest = FALSE;
-			}
-
-		}
-		else
-		{
-			/*************************AC*******************************/
-			for (int index = 0; index < AC_QUANTITY; index++)
-			{
-				if(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus == 1) //S_IDLE
-				{
-					IdleModeCnt = IdleModeCnt + 1;
-				}
-			}
-
-			if(IdleModeCnt == AC_QUANTITY)
-			{
-				isUpdateRequest = FALSE;
-			}
-		}
+		printf("Heartbeat !!!\n");
+		//parameter for test
+		sendHeartbeatRequest(0);
+		//==============================================
+	    // Reset Waiting Time
+		//==============================================
+		clientTime.Heartbeat=time((time_t*)NULL);
+		HeartBeatWithNOResponse = HeartBeatWithNOResponse + 1;
 	}
-#endif
 
 	for(int gun_index=0;gun_index < gunTotalNumber ;gun_index++)
 	{
@@ -1397,18 +1347,18 @@ void CheckSystemValue(void)
 
 		}// END OF ELSE
 
-		if(((SystemInitial != 0)&& (server_sign == TRUE))||
-		   ((server_sign == TRUE) && ((statusModeChage[gun_index] == TRUE) ||
-	       ((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > (server_cycle_Status + (GunStatusInterval*gun_index)))
-					|| ((cpinitateMsg.bits[gun_index].StatusNotificationReq == 1)&&((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > 30)))))
-		{
-			if(SystemInitial != 0)
+	if(((SystemInitial != 0)&& (server_sign == TRUE))||
+	   ((server_sign == TRUE) && ((statusModeChage[gun_index] == TRUE) ||
+	   ((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > (server_cycle_Status + (GunStatusInterval*gun_index)))
+	   || ((cpinitateMsg.bits[gun_index].StatusNotificationReq == 1)&&((time((time_t*)NULL)-clientTime.StatusNotification[gun_index]) > 30)))))
+	{
+		if(SystemInitial != 0)
 			SystemInitial = SystemInitial -1;
 
-			sendStatusNotificationRequest(gun_index);
-			clientTime.StatusNotification[gun_index] = time((time_t*)NULL);
-			statusModeChage[gun_index] = FALSE;
-		}
+		sendStatusNotificationRequest(gun_index);
+		clientTime.StatusNotification[gun_index] = time((time_t*)NULL);
+		statusModeChage[gun_index] = FALSE;
+	}
 
 	//==============================================
 	// Meter report
@@ -1691,7 +1641,6 @@ int sendBootNotificationRequest(void)
     char tempdata[65]={0};
     int IsGunCharging = FALSE;
 
-
     //check Transaction active
     if(ShmSysConfigAndInfo->SysConfig.ModelName[0]=='D')
     {
@@ -1733,7 +1682,6 @@ int sendBootNotificationRequest(void)
 
    }
 
-
     if(IsGunCharging == TRUE)
     {
     	server_sign = TRUE;
@@ -3897,6 +3845,7 @@ int handleChangeAvailabilityRequest(char *uuid, char *payload)
 	mtrace();
 	int result = FAIL;
     int gunIndex = 0;
+    int copyTo = 0;
 	char sstr[90]={0};
 	char typeStr[16]={0};
 	char comfirmstr[20];
@@ -3909,15 +3858,21 @@ int handleChangeAvailabilityRequest(char *uuid, char *payload)
 	int c = 0;
 
 	/*** connectorId ****/
-	c = 0;
 	loc = strstr(payload, "connectorId");
 	memset(sstr ,0, sizeof(sstr) );
+	c = 0;
+	copyTo = 0;
 	while ((loc != NULL) &&(loc[strlen("connectorId")+2+c] != ',') &&(loc[strlen("connectorId")+2+c] != '}')  )
 	{
-		sstr[c] = loc[strlen("connectorId")+2+c];
+		if(loc[strlen("connectorId")+2+c] != ' ')
+		{
+			sstr[copyTo] = loc[strlen("connectorId")+2+c];
+			copyTo = copyTo + 1;
+		}
+
 		c++;
 	}
-	sstr[c] = '\0';
+	sstr[copyTo] = '\0';
 	gunIndex = atoi(sstr);
 
 
@@ -3925,12 +3880,18 @@ int handleChangeAvailabilityRequest(char *uuid, char *payload)
     loc = strstr(payload, "type");
 	memset(sstr ,0, sizeof(sstr) );
 	c = 0;
+	copyTo = 0;
 	while ((loc != NULL) &&(loc[3+strlen("type")+c] != '\"'))
 	{
-		sstr[c] = loc[3+strlen("type")+c];
+		if(loc[3+strlen("type")+c] != ' ')
+		{
+			sstr[copyTo] = loc[3+strlen("type")+c];
+			copyTo = copyTo + 1;
+		}
+
 		c++;
 	}
-	sstr[c] = '\0';
+	sstr[copyTo] = '\0';
 	strcpy(typeStr, sstr);
 
 
@@ -10775,6 +10736,40 @@ void handleAuthorizeResponse(char *payload, int gun_index)
 	authorizeRetryTimes = 0;
 }
 
+char * strtrimc( char * s )
+{
+    char * p1 = s;
+	char * p2 = s;
+	while(*p1 != '\0')
+	{
+		while(*p1 == ' ' || *p1 == '\t' || *p1 == '\"' || *p1 == '\n' || *p1 == '}' || *p1 == '\r')
+		{
+			if(*p1 != ',')
+			{
+				p1 ++;
+			}
+			else
+			{
+				break;
+			}
+
+		}
+
+		if(*p1 != ',')
+		{
+			* p2 ++ = *p1 ++;
+			//printf("p2=%s\n",p2);
+		}
+		else
+		{
+			break;
+		}
+
+	}
+	*p2 = '\0';
+	return (s);
+}
+
 void handleBootNotificationResponse(char *payload, int gun_index)
 {
 	mtrace();
@@ -10965,41 +10960,35 @@ void handleHeartbeatResponse(char *payload, int gun_index)
 
 	HeartBeatWithNOResponse = 0;
 
-	//--------Print Out HeartBeat log
+	//===============================================
+	//Print Out HeartBeat log
+	//===============================================
 	{
 		double diff_t;
 		struct tm tp,tp1;
 
-
 		// BootNotification Receive Time
 
 		strptime((const char *)ShmOCPP16Data->BootNotification.ResponseCurrentTime, "%Y-%m-%dT%H:%M:%S", &tp);
 		tp.tm_isdst = -1;
 		time_t BootNotificationReceiveTime = mktime(&tp);
 
-
 		//HeartBeat Receive Time
 		strptime((const char *)ShmOCPP16Data->Heartbeat.ResponseCurrentTime, "%Y-%m-%dT%H:%M:%S", &tp1);
 		tp1.tm_isdst = -1;
 		time_t HeartBeatReceiveTime = mktime(&tp1);
 
-
 		diff_t = difftime(HeartBeatReceiveTime, BootNotificationReceiveTime);
 
 		printf("handleHeartbeatResponse differnt time=%f..\n",diff_t);
 
-
-
 		if(((int)diff_t / 3600) > HeartBeatCountPerHour)
 		{
 			HeartBeatCountPerHour =  (int)diff_t / 3600;
 			DEBUG_INFO("handleHeartbeatResponse ...\n");
 			DEBUG_INFO("After 1 hour, It will print out Heartbeat.\n");
 		}
-
 	}
-
-
 }
 
 void handleMeterValuesResponse(char *payload, int gun_index)
@@ -16932,6 +16921,21 @@ int GetWebSocketPingInterval(void)
 	return atoi((const char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[WebSocketPingInterval].ItemData);
 }
 
+int GetServerSign(void)
+{
+	return server_sign;
+}
+
+void SetServerSign(int value)
+{
+	server_sign = value;
+}
+
+int GetBootNotificationInterval(void)
+{
+	return BootNotificationInterval;
+}
+
 int GetInternetConn(void)
 {
 	return ShmSysConfigAndInfo->SysInfo.InternetConn;

EVSE/Modularization/ocppfiles/MessageHandler.h

@@ -129,6 +129,9 @@ void FillStartTransaction(int ConnectorId, unsigned char IdTag[], int MeterStart
 void splitstring(char *src,const char *separator,char **dest,int *num);
 int GetWebSocketPingInterval(void);
 int GetInternetConn(void);
+int GetServerSign(void);
+void SetServerSign(int value);
+int GetBootNotificationInterval(void);
  //===============================================
  // sqlite related routine
  //===============================================

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -49,7 +49,7 @@ struct lws 								*wsi_client;
 struct lws_context 						*context;
 static int sendbuffer = 0;
 pthread_t pid;
-extern int server_sign;
+//extern int server_sign;
 
 extern void CheckSystemValue(void);
 extern int FirstHeartBeatResponse(void);
@@ -113,7 +113,7 @@ char OcppProtocol[10]={0},OcppHost[50]={0}, OcppTempPath[50]={0};
 //static int SentQueueTransactionId[10]={0};
 
 
-extern int BootNotificationInterval;
+//extern int BootNotificationInterval;
 //char guid[37];
 //map_t hashMap;
 //data_struct_t* mapItem; --- remove for temporally
@@ -301,6 +301,25 @@ int strposs(char *source, char *substr, int idx)
    return result;
 }
 
+char * strtrim( char * s )
+{
+    char * p1 = s;
+	char * p2 = s;
+	while(*p1 != '\0')
+	{
+		while(*p1 == ' ' || *p1 == '\t' || *p1 == '\n' || *p1 == '\r')
+		{
+			p1 ++;
+
+		}
+
+		* p2 ++ = *p1 ++;
+		//printf("p2=%s\n",p2);
+	}
+	*p2 = '\0';
+	return (s);
+}
+
 static int testnum = 0;
 char *random_uuid( char buf[37] )
 {
@@ -466,7 +485,8 @@ static int OCPP16Callback(struct lws *wsi, enum lws_callback_reasons reason, voi
 			DEBUG_INFO("LWS_CALLBACK_WSI_DESTROY\n");
 			#endif
 			pthread_detach(pid);
-			server_sign = FALSE;
+			SetServerSign(FALSE);
+			//server_sign = FALSE;
 			ConnectionEstablished=0;
 			context = NULL;
 			break;
@@ -660,7 +680,8 @@ DEBUG_INFO("LWS_CALLBACK_CLIENT_ESTABLISHED\n");
 		  		strcpy(tempin,(char *)in);
 		  	}
 
-		  	ReceivedMessage((void *)tempin, len);
+		  	//ReceivedMessage((void *)tempin, len);
+		  	ReceivedMessage((void *)strtrim(tempin), len);
 
 			break;
 
@@ -786,7 +807,7 @@ void* ConnectWsServer(void* data)  //int ConnectWsServer()
 	ConnInfo.ietf_version_or_minus_one = -1;
 
 	if(use_ssl)
-		ConnInfo.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED | LCCSCF_SKIP_SERVER_CERT_HOSTNAME_CHECK;;
+		ConnInfo.ssl_connection = LCCSCF_USE_SSL | LCCSCF_ALLOW_SELFSIGNED | LCCSCF_SKIP_SERVER_CERT_HOSTNAME_CHECK;
 
 	wsi_client = lws_client_connect_via_info(&ConnInfo);
 	if (!wsi_client)
@@ -1728,6 +1749,7 @@ int main(void)
 		while(ConnectionEstablished==0) // Check InternetConn 0: disconnected, 1: connected
 		{
 			SetOcppConnStatus(FALSE);
+			SetServerSign(FALSE);
 			if((time((time_t*)NULL)-startTime.connect)>=60)
 			{
 				#ifdef Debug
@@ -1746,14 +1768,14 @@ int main(void)
 
 		}
 
-		if(( (BootNotificationInterval != 0  && ((time((time_t*)NULL)-startTime.bootNotification)>=BootNotificationInterval) )  || ((time((time_t*)NULL)-startTime.bootNotification)>=defaultWaitingTime) ) && ((server_sign == FALSE)/*|| (server_pending == TRUE)*/))
+		if(((GetBootNotificationInterval() != 0  && ((time((time_t*)NULL)-startTime.bootNotification)>= GetBootNotificationInterval()) )  || ((time((time_t*)NULL)-startTime.bootNotification)>=defaultWaitingTime) ) && (GetServerSign() == FALSE))
 		{
 			//hashmapForMessageNew();
 			sendBootNotificationRequest();
 			startTime.bootNotification=time((time_t*)NULL);
 		}
 
-		if(server_sign == TRUE)
+		if(GetServerSign() == TRUE)
 		{
 			if(sendbuffer == 1)
 			{