2020.07.04 / Folus Wen

Actions:
1. EVSE/Modularization/ocppfiles/MessageHandler.c handleRemoteStartRequest() save Txprofile to file.

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

@@ -7680,18 +7680,13 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 {
 	mtrace();
 	int result = FAIL;
-	int connectorIdInt=0, chargingProfileIdInt=0, transactionIdInt=0, stackLevelInt=0,
-		durationInt=0, startPeriodInt[10]={0}, numberPhasesInt[10]={0};
+	int connectorIdInt=0;
 	int tempIndex = 0;
-	char idTagstr[20]={0}, chargingProfilePurposestr[30]={0}, chargingProfileKindstr[14]={0}, recurrencyKindstr[10]={0},
-		validFromstr[30]={0}, validTostr[30]={0}, startSchedulestr[30]={0}, chargingRateUnitstr[4]={0};
-	int connectorIdIsNULL,chargingProfileIsNULL,transactionIdIsNULL,recurrencyKindIsNULL,validFromIsNULL,validToIsNULL,durationIsNULL,startScheduleIsNULL,minChargingRateIsNULL,numberPhasesIsNULL;
-	float minChargingRateflaot=0.0, limitflaot[10]={0.0};
-	int chargingSchedulePeriodCount = 0;
-	char sstr[30]={ 0 },sstrtemp[1600]={ 0 };//sstr[200]={ 0 };
-	int c = 0;
-	char *loc;
+	int connectorIdIsNULL, chargingProfileIsNULL;
 	char comfirmstr[20]={0};
+	char cmdBuf[512];
+	json_object *RemoteStartTransaction;
+	FILE *fp;
 
 	DEBUG_INFO("handleRemoteStartRequest ...\n");
 	if(server_pending == TRUE)
@@ -7699,360 +7694,105 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 		return 0;
 	}
 
-	connectorIdIsNULL = chargingProfileIsNULL = transactionIdIsNULL = recurrencyKindIsNULL = validFromIsNULL = validToIsNULL = durationIsNULL = startScheduleIsNULL = minChargingRateIsNULL = numberPhasesIsNULL= FALSE;
-
-	strcpy(sstrtemp, stringtrimspace(payload));
+	connectorIdIsNULL = chargingProfileIsNULL= FALSE;
 
-	//**********connectorId****************/
-	c = 0;
-	memset(sstr ,0, ARRAY_SIZE(sstr) );
-	loc = strstr(sstrtemp, "connectorId");
-	if(loc == NULL)
-	{
-		connectorIdIsNULL = TRUE;
-	}
-	else
+	RemoteStartTransaction = json_tokener_parse(payload);
+	if(!is_error(RemoteStartTransaction))
 	{
-		while ((loc[strlen("connectorId")+2+c] != '}') && (loc[strlen("connectorId")+2+c] != ','))
-		{
-			sstr[c] = loc[strlen("connectorId")+2+c];
-			//printf("i=%d sstr=%c\n",c, sstr[c]);
-			c++;
-		}
-		sstr[c] = '\0';
-		connectorIdInt = atoi(sstr);
-	}
-
-	if(connectorIdIsNULL == TRUE)  // Number of the connector on which to start the transaction. connectorId SHALL be > 0
-	{
-		strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
-		goto end;
-	}
-
-	//****************idTag*******************/
-	c = 0;
-	memset(sstr ,0, ARRAY_SIZE(sstr) );
-	loc = strstr(sstrtemp, "idTag");
-	while (loc[3+strlen("idTag")+c] != '\"')
-	{
-		sstr[c] = loc[3+strlen("idTag")+c];
-		c++;
-	}
-	sstr[c] = '\0';
-	strcpy(idTagstr,sstr);
-
-	//****************chargingProfile*******************/
-	c = 0;
-	memset(sstr ,0, ARRAY_SIZE(sstr) );
-	loc = strstr(sstrtemp, "chargingProfile");
-	if(loc == NULL)
-	{
-		chargingProfileIsNULL = TRUE;
-	}
-	else
-	{
-		//****************chargingProfileId*******************/
-		c=0;
-		loc = strstr(sstrtemp, "chargingProfileId");
-		memset(sstr ,0, ARRAY_SIZE(sstr) );
-		while ((loc[strlen("chargingProfileId")+2+c] != '}') && (loc[strlen("chargingProfileId")+2+c] != ','))
-		{
-			sstr[c] = loc[strlen("chargingProfileId")+2+c];
-			//printf("i=%d sstr=%c\n",c, sstr[c]);
-			c++;
-		}
-		sstr[c] = '\0';
-		chargingProfileIdInt = atoi(sstr);
-
-		//****************transactionId*******************/
-
-		loc = strstr(sstrtemp, "transactionId");
-		if(loc == NULL)
-		{
-			transactionIdIsNULL = TRUE;
-		}
-		else
+		if(json_object_object_get(RemoteStartTransaction, "connectorId") != NULL)
 		{
-			c=0;
-			memset(sstr ,0, ARRAY_SIZE(sstr) );
-			while ((loc[strlen("transactionId")+2+c] != '}') && (loc[strlen("transactionId")+2+c] != ','))
-			{
-				sstr[c] = loc[strlen("transactionId")+2+c];
-				//printf("i=%d sstr=%c\n",c, sstr[c]);
-				c++;
-			}
-			sstr[c] = '\0';
-			transactionIdInt = atoi(sstr);
-		}
+			connectorIdInt = json_object_get_int(json_object_object_get(RemoteStartTransaction, "connectorId"));
 
-		//****************stackLevel*******************/
-		c=0;
-		loc = strstr(sstrtemp, "stackLevel");
-		memset(sstr ,0, ARRAY_SIZE(sstr) );
-		while ((loc[strlen("stackLevel")+2+c] != '}') && (loc[strlen("stackLevel")+2+c] != ','))
-		{
-			sstr[c] = loc[strlen("stackLevel")+2+c];
-			//printf("i=%d sstr=%c\n",c, sstr[c]);
-			c++;
-		}
-		sstr[c] = '\0';
-		stackLevelInt = atoi(sstr);
-
-		//****************chargingProfilePurpose*******************/
-		c = 0;
-		memset(sstr ,0, ARRAY_SIZE(sstr) );
-		loc = strstr(sstrtemp, "chargingProfilePurpose");
-		while (loc[3+strlen("chargingProfilePurpose")+c] != '\"')
-		{
-			sstr[c] = loc[3+strlen("chargingProfilePurpose")+c];
-			c++;
-		}
-		sstr[c] = '\0';
-		strcpy(chargingProfilePurposestr,sstr);
-
-		//****************chargingProfileKind*******************/
-		c = 0;
-		memset(sstr ,0, ARRAY_SIZE(sstr) );
-		loc = strstr(sstrtemp, "chargingProfileKind");
-		while (loc[3+strlen("chargingProfileKind")+c] != '\"')
-		{
-			sstr[c] = loc[3+strlen("chargingProfileKind")+c];
-			c++;
-		}
-		sstr[c] = '\0';
-		strcpy(chargingProfileKindstr,sstr);
-
-		//****************recurrencyKind*******************/
-		loc = strstr(sstrtemp, "recurrencyKind");
-		if(loc == NULL)
-		{
-			recurrencyKindIsNULL = TRUE;
-		}
-		else
-		{
-			c = 0;
-			memset(sstr ,0, ARRAY_SIZE(sstr) );
-			while (loc[3+strlen("recurrencyKind")+c] != '\"')
-			{
-				sstr[c] = loc[3+strlen("recurrencyKind")+c];
-				c++;
-			}
-			sstr[c] = '\0';
-			strcpy(recurrencyKindstr,sstr);
-		}
-
-		//****************validFrom*******************/
-		loc = strstr(sstrtemp, "validFrom");
-		if(loc == NULL)
-		{
-			validFromIsNULL = TRUE;
-		}
-		else
-		{
-			c = 0;
-			memset(sstr ,0, ARRAY_SIZE(sstr) );
-			while (loc[3+strlen("validFrom")+c] != '\"')
-			{
-				sstr[c] = loc[3+strlen("validFrom")+c];
-				c++;
-			}
-			sstr[c] = '\0';
-			strcpy(validFromstr,sstr);
-		}
+			memset(&ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1], 0x00, sizeof(struct StructRemoteStartTransaction));
+			// Required data
+			sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag, "%s", json_object_get_string(json_object_object_get(RemoteStartTransaction, "idTag")));
 
-		//****************validTo*******************/
-		loc = strstr(sstrtemp, "validTo");
-		if(loc == NULL)
-		{
-			validToIsNULL = TRUE;
-		}
-		else
-		{
-			c = 0;
-			memset(sstr ,0, ARRAY_SIZE(sstr) );
-			while (loc[3+strlen("validTo")+c] != '\"')
+			// Optional data
+			if(json_object_object_get(RemoteStartTransaction, "chargingProfile") != NULL)
 			{
-				sstr[c] = loc[3+strlen("validTo")+c];
-				c++;
-			}
-			sstr[c] = '\0';
-			strcpy(validTostr,sstr);
-		}
+				ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingProfileId = json_object_get_int(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingProfileId"));
+				ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.StackLevel = json_object_get_int(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "stackLevel"));
+				sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingProfilePurpose, "%s", json_object_get_string(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingProfilePurpose")));
+				sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingProfileKind, "%s", json_object_get_string(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingProfileKind")));
 
-		//****************chargingSchedule*******************/
-		loc = strstr(sstrtemp, "chargingSchedule");
-		if(loc != NULL)
-		{
-			//****************duration*******************/
-			loc = strstr(sstrtemp, "duration");
+				if(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "transactionId") != NULL)
+					ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.TransactionId = json_object_get_int(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "transactionId"));
 
-			if(loc == NULL)
-			{
-				durationIsNULL = TRUE;
-			}
-			else
-			{
-				c=0;
-				memset(sstr ,0, ARRAY_SIZE(sstr) );
-				while ((loc[strlen("duration")+2+c] != '}') && (loc[strlen("duration")+2+c] != ','))
-				{
-					sstr[c] = loc[strlen("duration")+2+c];
-					//printf("i=%d sstr=%c\n",c, sstr[c]);
-					c++;
-				}
-				sstr[c] = '\0';
-				durationInt = atoi(sstr);
+				if(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "recurrencyKind") != NULL)
+					sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.RecurrencyKind , "%s", json_object_get_string(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "recurrencyKind")));
 
-			}
+				if(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "validFrom") != NULL)
+					sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ValidFrom , "%s", json_object_get_string(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "validFrom")));
 
-			//****************startSchedule******************/
-			loc = strstr(sstrtemp, "startSchedule");
-			if(loc == NULL)
-			{
-				startScheduleIsNULL = TRUE;
-			}
-			else
-			{
-				c = 0;
-				memset(sstr ,0, ARRAY_SIZE(sstr) );
-				while (loc[3+strlen("startSchedule")+c] != '\"')
-				{
-					sstr[c] = loc[3+strlen("startSchedule")+c];
-					c++;
-				}
-				sstr[c] = '\0';
-				strcpy(startSchedulestr,sstr);
-			}
-
-			//****************chargingRateUnit*******************/
-			c = 0;
-			memset(sstr ,0, ARRAY_SIZE(sstr) );
-			loc = strstr(sstrtemp, "chargingRateUnit");
-			while (loc[3+strlen("chargingRateUnit")+c] != '\"')
-			{
-				sstr[c] = loc[3+strlen("chargingRateUnit")+c];
-				c++;
-			}
-			sstr[c] = '\0';
-			strcpy(chargingRateUnitstr,sstr);
+				if(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "validTo") != NULL)
+					sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ValidTo , "%s", json_object_get_string(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "validTo")));
 
-			//****************minChargingRate*******************/
-			loc = strstr(sstrtemp, "minChargingRate");
-			if(loc == NULL)
-			{
-				minChargingRateIsNULL = TRUE;
-			}
-			else
-			{
-				c=0;
-				memset(sstr ,0, ARRAY_SIZE(sstr) );
-				while ((loc[strlen("minChargingRate")+2+c] != '}') && (loc[strlen("minChargingRate")+2+c] != ','))
+				if(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule") != NULL)
 				{
-					sstr[c] = loc[strlen("minChargingRate")+2+c];
-					//printf("i=%d sstr=%c\n",c, sstr[c]);
-					c++;
-				}
-				sstr[c] = '\0';
-				minChargingRateflaot = atof(sstr);
-			}
-
-			//****************chargingSchedulePeriod count*******************/
-			int what_len = strlen("startPeriod");
-
-			char *where = sstrtemp;
-
+					sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingRateUnit , "%s", json_object_get_string(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "chargingRateUnit")));
 
-			while ((where = strstr(where, "startPeriod"))) {
-				        where += what_len;
-				        chargingSchedulePeriodCount++;
-			}
+					if(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "duration") != NULL)
+						ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.Duration = json_object_get_int(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "duration"));
 
-			where = sstrtemp;
+					if(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "minChargingRate") != NULL)
+						ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.MinChargingRate = json_object_get_double(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "minChargingRate"));
 
-			for(int periodNums=0; periodNums < chargingSchedulePeriodCount; periodNums++)
-			{
-				//****************startPeriod*******************/
-				c=0;
-				loc = strstr(where, "startPeriod");
-				memset(sstr ,0, ARRAY_SIZE(sstr) );
-				while ((loc[strlen("startPeriod")+2+c] != '}') && (loc[strlen("startPeriod")+2+c] != ','))
-				{
-					sstr[c] = loc[strlen("startPeriod")+2+c];
-					//printf("i=%d sstr=%c\n",c, sstr[c]);
-					c++;
-				}
-				sstr[c] = '\0';
-				startPeriodInt[periodNums] = atoi(sstr);
+					if(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "startSchedule") != NULL)
+						sprintf((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.StartSchedule, "%s", json_object_get_string(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "startSchedule")));
 
-				//****************limit*******************/
-				c=0;
-				loc = strstr(where, "limit");
-				memset(sstr ,0, ARRAY_SIZE(sstr) );
-				while ((loc[strlen("limit")+2+c] != '}') && (loc[strlen("limit")+2+c] != ','))
-				{
-					sstr[c] = loc[strlen("limit")+2+c];
-					//printf("i=%d sstr=%c\n",c, sstr[c]);
-					c++;
-				}
-				sstr[c] = '\0';
-				limitflaot[periodNums] = atof(sstr);
-
-				//****************numberPhases*******************/
-				loc = strstr(where, "numberPhases");
-				if(loc == NULL)
-				{
-					numberPhasesIsNULL = TRUE;
-				}
-				else
-				{
-					c=0;
-					memset(sstr ,0, ARRAY_SIZE(sstr) );
-					while ((loc[strlen("numberPhases")+2+c] != '}') && (loc[strlen("numberPhases")+2+c] != ','))
+					if(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "chargingSchedulePeriod") != NULL)
 					{
-						sstr[c] = loc[strlen("numberPhases")+2+c];
-						//printf("i=%d sstr=%c\n",c, sstr[c]);
-						c++;
+						for(int idxPeriod=0;idxPeriod<json_object_array_length(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "chargingSchedulePeriod"));idxPeriod++)
+						{
+							ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingSchedulePeriod[idxPeriod].StartPeriod = json_object_get_int(json_object_object_get(json_object_array_get_idx(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "chargingSchedulePeriod"), idxPeriod), "startPeriod"));
+							ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingSchedulePeriod[idxPeriod].Limit = json_object_get_double(json_object_object_get(json_object_array_get_idx(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "chargingSchedulePeriod"), idxPeriod), "limit"));
+
+							if(json_object_object_get(json_object_array_get_idx(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "chargingSchedulePeriod"), idxPeriod), "numberPhases") != NULL)
+								ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingSchedulePeriod[idxPeriod].NumberPhases = json_object_get_int(json_object_object_get(json_object_array_get_idx(json_object_object_get(json_object_object_get(json_object_object_get(RemoteStartTransaction, "chargingProfile"), "chargingSchedule"), "chargingSchedulePeriod"), idxPeriod), "numberPhases"));
+						}
 					}
-					sstr[c] = '\0';
-					numberPhasesInt[periodNums] = atoi(sstr);
 				}
+			}
+			else
+				chargingProfileIsNULL = TRUE;
+		}
+		else
+			connectorIdIsNULL = TRUE;
+	}
+	else
+		connectorIdIsNULL = TRUE;
 
-				where = loc;
-
-			} // END FOR chargingSchedulePeriodCount
-		}// END IF chargingSchedule
 
-	} // END chargingProfile
+	if(connectorIdIsNULL == TRUE)  // Number of the connector on which to start the transaction. connectorId SHALL be > 0
+	{
+		DEBUG_WARN("Connector id is NULL\n.");
+		strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
+		goto end;
+	}
 
 	/*
-
 	enum _SYSTEM_STATUS
 	{
-	S_BOOTING               = 0,
-	S_IDLE,                 = 1
-	S_AUTHORIZING,          =2
-	S_REASSIGN_CHECK,       =3
-	S_REASSIGN,             =4
-	S_PRECHARGE,            =5
-	S_PREPARING_FOR_EV,     =6
-	S_PREPARING_FOR_EVSE,   =7
-	S_CHARGING,             =8
-	S_TERMINATING,          =9
-	S_COMPLETE,             =10
-	S_ALARM,                =11
-	S_FAULT                 =12
+		S_BOOTING               = 0,
+		S_IDLE,                 = 1
+		S_AUTHORIZING,          = 2
+		S_REASSIGN_CHECK,       = 3
+		S_REASSIGN,             = 4
+		S_PRECHARGE,            = 5
+		S_PREPARING_FOR_EV,     = 6
+		S_PREPARING_FOR_EVSE,   = 7
+		S_CHARGING,             = 8
+		S_TERMINATING,          = 9
+		S_COMPLETE,             = 10
+		S_ALARM,                = 11
+		S_FAULT                 = 12
 	}
 	 */
 	if((connectorIdIsNULL == FALSE)&&(connectorIdInt > 0) && ((connectorIdInt -1) <= gunTotalNumber/*(CHAdeMO_QUANTITY + CCS_QUANTITY + GB_QUANTITY)*/))
 	{
-		sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag, "%s" , idTagstr);
-		ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.TransactionId = transactionIdInt;
-	    //0: Booting, 1: idle, 2: authorizing, 3: preparing, 4: charging, 5: terminating, 6: alarm, 7: fault  8: Reserved
-
 		//check Transaction active
 		if(gunType[connectorIdInt -1] == 'J')
 		{
-
 			if(ShmSysConfigAndInfo->SysConfig.ModelName[8] != '0')
 			{
 				tempIndex =  ((connectorIdInt -1) == 2) ? 1: 0;
@@ -8067,12 +7807,12 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 				if (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].Index == tempIndex )
 				{
 
-					if((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) == 0))
+					if((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) == 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!!The idTag matches the idTag of Reservation!!!\n");
 					}
-					else if((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) != 0))
+					else if((ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) != 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!! The idTag does NOT match the idTag of Reservation!!! Reject it!!!\n");
@@ -8086,13 +7826,13 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 							&& (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EV ) 	//S_PREPARING_FOR_EV
 							&& (ShmSysConfigAndInfo->SysInfo.ChademoChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EVSE ))   // S_PREPARING_FOR_EVSE
 						{
+							DEBUG_WARN("CHAdeMO connector not allow start\n.");
 							strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
 							goto end;
 						}
 					}//END FOR ELSE
 				}
 			}// END FOR CHAdeMO_QUANTITY
-
 		}
 		else if((gunType[connectorIdInt -1] == 'U')||(gunType[connectorIdInt -1] == 'E'))
 		{
@@ -8109,12 +7849,12 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 			{
 				if (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].Index == tempIndex)
 				{
-					if((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) == 0))
+					if((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) == 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!!The idTag matches the idTag of Reservation!!!\n");
 					}
-					else if((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) != 0))
+					else if((ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) != 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!! The idTag does NOT match the idTag of Reservation!!! Reject it!!!\n");
@@ -8128,6 +7868,7 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 							&& (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EV)   	//S_PREPARING_FOR_EV
 							&& (ShmSysConfigAndInfo->SysInfo.CcsChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EVSE)) 	// S_PREPARING_FOR_EVSE
 						{
+							DEBUG_WARN("CCS connector not allow start\n.");
 							strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
 							goto end;
 						}
@@ -8151,12 +7892,12 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 			{
 				if (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].Index == tempIndex )
 				{
-					if((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) == 0))
+					if((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) == 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!!The idTag matches the idTag of Reservation!!!\n");
 					}
-					else if((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) != 0))
+					else if((ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.GbChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) != 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!! The idTag does NOT match the idTag of Reservation!!! Reject it!!!\n");
@@ -8170,6 +7911,7 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 							&& (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EV)		//S_PREPARING_FOR_EV
 							&& (ShmSysConfigAndInfo->SysInfo.GbChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EVSE)) 		// S_PREPARING_FOR_EVSE
 						{
+							DEBUG_WARN("GB connector not allow start\n.");
 							strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
 							goto end;
 						}
@@ -8195,12 +7937,12 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 				if (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].Index == tempIndex )
 				{
 
-					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) == 0))
+					if((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) == 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!!The idTag matches the idTag of Reservation!!!\n");
 					}
-					else if((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, idTagstr) != 0))
+					else if((ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId != -1)&&(ShmSysConfigAndInfo->SysInfo.AcChargingData[index].ReservationId >= 0)&&(strcmp((const char *)ShmOCPP16Data->ReserveNow[index].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag) != 0))
 					{
 						//Reserved
 						DEBUG_INFO("Reserved now !!! The idTag does NOT match the idTag of Reservation!!! Reject it!!!\n");
@@ -8214,6 +7956,7 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 							&& (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EV) 	//S_PREPARING_FOR_EV
 							&& (ShmSysConfigAndInfo->SysInfo.AcChargingData[index].SystemStatus != SYS_MODE_PREPARE_FOR_EVSE))   // S_PREPARING_FOR_EVSE
 						{
+							DEBUG_WARN("AC connector not allow start\n.");
 							strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
 							goto end;
 						}
@@ -8225,101 +7968,59 @@ int handleRemoteStartRequest(char *uuid, char *payload)
 
 		if(chargingProfileIsNULL == FALSE)
 		{
-			//ChargingProfile
-			ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingProfileId = chargingProfileIdInt;
-			sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingProfileKind, "%s" ,chargingProfileKindstr);
-			sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingProfilePurpose, "%s" ,chargingProfilePurposestr);
-
-			if(recurrencyKindIsNULL == FALSE) //OPTION
-			sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.RecurrencyKind, "%s" ,recurrencyKindstr);
-
-			ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.StackLevel = stackLevelInt;
-
-			if(transactionIdIsNULL == FALSE) // OPTION
-			ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.TransactionId = transactionIdInt;
-
-			if(validFromIsNULL == FALSE) // OPTION
-			sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ValidFrom, "%s" ,validFromstr);
-
-			if(validToIsNULL == FALSE) //OPTION
-			sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ValidTo, "%s" ,validTostr);
-
-			//ChargingSchedule
-			sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingRateUnit, "%s" ,chargingRateUnitstr);
-
-			if(durationIsNULL == FALSE) //OPTION
-			ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.Duration = durationInt;
-
-			if(minChargingRateIsNULL == FALSE) //OPTION
-			ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.MinChargingRate = minChargingRateflaot;
-
-			if(startScheduleIsNULL == FALSE) //OPTION
-			sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.StartSchedule, "%s" ,startSchedulestr);
-
-
-			for(int periodNums=0; periodNums < chargingSchedulePeriodCount; periodNums++)
-			{
-				//ChargingSchedulePeriod
-				ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingSchedulePeriod[periodNums].Limit = limitflaot[periodNums] ;
-
-				if(numberPhasesIsNULL == FALSE)
-				{
-					ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingSchedulePeriod[periodNums].NumberPhases = numberPhasesInt[periodNums];
-
-				}
-
-				ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingSchedule.ChargingSchedulePeriod[periodNums].StartPeriod = startPeriodInt[periodNums];
-
-			}
-
-			if(strcmp(chargingProfilePurposestr, ChargingProfilePurposeTypeStr[TxProfile]) == 0)
+			if(strcmp((char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ChargingProfile.ChargingProfilePurpose, ChargingProfilePurposeTypeStr[TxProfile]) == 0)
 			{
 				ShmOCPP16Data->CsMsg.bits[connectorIdInt -1].RemoteStartTransactionReq = 1;
 				strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Accepted]);
 
-
 				//memset idTag
 				memset((char *)ShmOCPP16Data->StartTransaction[connectorIdInt -1].IdTag,0, 20);
-				strcpy((char *)ShmOCPP16Data->StartTransaction[connectorIdInt -1].IdTag, idTagstr);
-
+				strcpy((char *)ShmOCPP16Data->StartTransaction[connectorIdInt -1].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag);
 
 				memset((char *)ShmOCPP16Data->StopTransaction[connectorIdInt -1].IdTag,0, 20);
-				strcpy((char *)ShmOCPP16Data->StopTransaction[connectorIdInt -1].IdTag, idTagstr);
+				strcpy((char *)ShmOCPP16Data->StopTransaction[connectorIdInt -1].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag);
 
+				// Save profile to file
+				sprintf(cmdBuf, "rm -f /Storage/OCPP/TxProfile_%d.json", connectorIdInt);
+				system(cmdBuf);
 
+				sprintf(cmdBuf, "/Storage/OCPP/TxProfile_%d.json", connectorIdInt);
+				fp = fopen(cmdBuf, "w");
+				fprintf(fp, "{\"connectorId\":%d,\"csChargingProfiles\":%s}\n", connectorIdInt, json_object_to_json_string(json_object_object_get(RemoteStartTransaction, "chargingProfile")));
+				fclose(fp);
 			}
 			else
 			{
+				DEBUG_WARN("Carging profile purpose not TxProfile.\n.");
 				strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
 			}
-
 		}
 		else
 		{
 			ShmOCPP16Data->CsMsg.bits[connectorIdInt -1].RemoteStartTransactionReq = 1;
 			strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Accepted]);
 
-
 			//memset idTag
 			memset((char *)ShmOCPP16Data->StartTransaction[connectorIdInt -1].IdTag,0, 20);
-			strcpy((char *)ShmOCPP16Data->StartTransaction[connectorIdInt -1].IdTag, idTagstr);
+			strcpy((char *)ShmOCPP16Data->StartTransaction[connectorIdInt -1].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag);
 
 			memset((char *)ShmOCPP16Data->StopTransaction[connectorIdInt -1].IdTag,0, 20);
-			strcpy((char *)ShmOCPP16Data->StopTransaction[connectorIdInt -1].IdTag, idTagstr);
-
+			strcpy((char *)ShmOCPP16Data->StopTransaction[connectorIdInt -1].IdTag, (char*)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag);
 		}
 	 }
 	 else
 	 {
+		 DEBUG_WARN("Connector id over\n.");
 		 strcpy(comfirmstr, RemoteStartStopStatusStr[RemoteStartStopStatus_Rejected]);
 		 //sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ResponseStatus, "%s" ,comfirmstr);
 	 }
 
 end:
+	json_object_put(RemoteStartTransaction);
+
 	if(connectorIdIsNULL == FALSE)
 		ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ConnectorId = connectorIdInt;
 
-	strcpy((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].IdTag, idTagstr);
 	sprintf((char *)ShmOCPP16Data->RemoteStartTransaction[connectorIdInt -1].ResponseStatus, "%s" ,comfirmstr);
 
 	//OCPP send RemoteStartConfirmation by first.