Merge branch 'master' into DM30/DW30, DM30/DW30 is base on local test branch DEV_OCPP_verify.

.gitignore

@@ -21,3 +21,4 @@
 *.symtypes
 *.order
 *.elf
+.swp

EVSE/Modularization/Module_PhBackend.c

@@ -30,7 +30,7 @@ int StoreLogMsg(const char *fmt, ...)
 #endif
 
 #ifdef ConsloePrintLog
-	printf("[%04d.%02d.%02d %02d:%02d:%02d] - %s", tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec, buffer);
+	//printf("[%04d.%02d.%02d %02d:%02d:%02d] - %s", tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec, buffer);
 #endif
 
 	return rc;
@@ -1324,6 +1324,11 @@ int main(void)
 
 	for(;;)
 	{
+		while(!ShmSysConfigAndInfo->SysInfo.InternetConn)
+		{
+			sleep(1);
+		}
+
 		bzero(&info,sizeof(info));
 		ghbn = gethostbyname((char*)server_addr);
 		info.sin_family = PF_INET;

EVSE/Modularization/Module_Wifi.c

@@ -2,9 +2,9 @@
  *  Module_Wifi.c
  *
  *  Created on: 2020-01-14
- *  Update on: 2020-06-18
+ *  Update on: 2020-06-29
  *  Author: Jerry Wang, Eason Yang, Folus Wen
- *  Version: D0.04
+ *  Version: D0.05
  */
 
 #include 	<sys/time.h>
@@ -2222,8 +2222,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_PROTOCOL_VERSION:
-						DEBUG_INFO("WIFI_CMD_PROTOCOL_VERSION...\r\n");
-						
 						tx_size = 12;
 						outBuffer[0]  = 0xff;
 						outBuffer[1]  = 0xff;
@@ -2237,14 +2235,9 @@ int tcpSocketServerStart(void)
 						outBuffer[9]  = (protocol_Version[2] >> 0x00) & 0xff;
 						outBuffer[10] = (protocol_Version[2] >> 0x08) & 0xff;
 						outBuffer[11] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-					
+
 						break;
 					case WIFI_CMD_GET_MODEL_NAME:
-						DEBUG_INFO("WIFI_CMD_GET_MODEL_NAME...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2256,8 +2249,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_SERIAL_NUMBER:
-						DEBUG_INFO("WIFI_CMD_GET_SERIAL_NUMBER...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2269,8 +2260,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_SYSTEM_TIME:
-						DEBUG_INFO("WIFI_CMD_GET_SYSTEM_TIME...\r\n");
-					
 						tx_size = 10;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2285,8 +2274,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_WHITE_CARD:
-						DEBUG_INFO("WIFI_CMD_GET_WHITE_CARD...\r\n");
-						
 						tx_size = 40;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2300,8 +2287,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_SYS_ALARM_CODE:
-						DEBUG_INFO("WIFI_CMD_GET_SYS_ALARM_CODE...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2315,8 +2300,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_SYS_ID:
-						DEBUG_INFO("WIFI_CMD_GET_SYS_ID...\r\n");
-						
 						tx_size = 70;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2328,8 +2311,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_RATING_CURRENT:
-						DEBUG_INFO("WIFI_CMD_GET_RATING_CURRENT...\r\n");
-						
 						tx_size = 10;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2341,10 +2322,7 @@ int tcpSocketServerStart(void)
 						outBuffer[7] = (ShmSysConfigAndInfo->SysConfig.AcRatingCurrent>>0x08) & 0xff;
 						outBuffer[8] = (ShmSysConfigAndInfo->SysConfig.AcRatingCurrent>>0x00) & 0xff;
 						outBuffer[9] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-					
+											
 						break;
 					case WIFI_CMD_GET_VER_RFS:
 						tx_size = 38;
@@ -2448,8 +2426,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_GET_EVSE_CONFIG:
-						DEBUG_INFO("WIFI_CMD_GET_EVSE_CONFIG...\r\n");
-						
 						tx_size = 16;
 						outBuffer[0]  = 0xff;
 						outBuffer[1]  = 0xff;
@@ -2467,14 +2443,9 @@ int tcpSocketServerStart(void)
 						outBuffer[13] = (ShmSysConfigAndInfo->SysConfig.AcMaxChargingCurrent>>0x08) & 0xff;
 						outBuffer[14] = (ShmSysConfigAndInfo->SysConfig.AcMaxChargingCurrent>>0x00) & 0xff;
 						outBuffer[15] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_GET_GUN_STS:
-						DEBUG_INFO("WIFI_CMD_GET_GUN_STS...\r\n");
-						
 						tx_size = 21;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2485,13 +2456,8 @@ int tcpSocketServerStart(void)
 						getConnectorInfo(inputBuffer[9], outBuffer);
 						outBuffer[20] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_GET_GUN_USER:
-						DEBUG_INFO("WIFI_CMD_GET_GUN_USER...\r\n");
-						
 						tx_size = 40;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2502,13 +2468,8 @@ int tcpSocketServerStart(void)
 						getConnectorUser(inputBuffer[9], outBuffer);
 						outBuffer[39] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-						
 						break;
 					case WIFI_CMD_GET_SCHEDULE:
-						DEBUG_INFO("WIFI_CMD_GET_SCHEDULE...\r\n");
-					
 						tx_size = 10;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2519,9 +2480,6 @@ int tcpSocketServerStart(void)
 						getConnectorSchedule(inputBuffer[9], outBuffer);
 						outBuffer[9] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_GET_NETWORK_STS:
 						tx_size = 7;
@@ -2590,7 +2548,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_WIFI_MODE:
-						DEBUG_INFO("WIFI_CMD_GET_WIFI_MODE...\r\n");
 						tx_size = 7;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2646,8 +2603,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_GET_WIFI_MAC:
-						DEBUG_INFO("WIFI_CMD_GET_WIFI_MAC...\r\n");
-						
 						tx_size = 24;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -2657,9 +2612,6 @@ int tcpSocketServerStart(void)
 						memcpy(&outBuffer[5], ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress));
 						outBuffer[23] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_GET_WIFI_IP:
 						tx_size = 22;
@@ -2794,18 +2746,10 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_SET_SYSTEM_TIME:
-						DEBUG_INFO("WIFI_CMD_SET_SYSTEM_TIME...\r\n");
-						
-						DEBUG_INFO("inputBuffer[9] : %X...\r\n", inputBuffer[9]);
-						DEBUG_INFO("inputBuffer[10] : %X...\r\n", inputBuffer[10]);
-						DEBUG_INFO("inputBuffer[11] : %X...\r\n", inputBuffer[11]);
-						DEBUG_INFO("inputBuffer[12] : %X...\r\n", inputBuffer[12]);
 
 						rawtime = (inputBuffer[9]<<0) | (inputBuffer[10]<<8) | (inputBuffer[11]<<16) |(inputBuffer[12]<<24);
 						ts = *localtime(&rawtime);
 						
-						DEBUG_INFO("rawtime : %d...\r\n", rawtime);
-	
 						sprintf((char*)cmdBuf, "date -u -s \"%04d-%02d-%02d %02d:%02d:%02d\"", (ts.tm_year+1900),
 																							   (ts.tm_mon+1),
 																							   	ts.tm_mday,
@@ -2824,20 +2768,11 @@ int tcpSocketServerStart(void)
 						outBuffer[4] = WIFI_CMD_SET_SYSTEM_TIME;
 						outBuffer[5] = 0x01;
 						outBuffer[6] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_SET_WHITE_CARD:
-						DEBUG_INFO("WIFI_CMD_SET_WHITE_CARD...\r\n");
-
-						for(uint8_t count = 0;count< 40;count++)  
-							DEBUG_INFO("inputBuffer[%d] : %X...\r\n",count, inputBuffer[count]);
-
 						if((0<=inputBuffer[9]) && (inputBuffer[9]<10))
 						{
-							DEBUG_INFO("inputBuffer[10] : %X...\r\n", inputBuffer[10]);
 							if(inputBuffer[10] == REGISTER)
 							{
 								// Register white card 
@@ -2864,9 +2799,6 @@ int tcpSocketServerStart(void)
 						outBuffer[5] = inputBuffer[9];
 						outBuffer[7] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_SET_FACTORY_RESET:
 						ShmSysConfigAndInfo->SysInfo.FactoryConfiguration = ON;
@@ -2882,49 +2814,29 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_SET_EVSE_CONFIG:
-						DEBUG_INFO("WIFI_CMD_SET_EVSE_CONFIG...\r\n");
-
-						for(uint8_t count = 0;count< 22;count++)  
-							DEBUG_INFO("inputBuffer[%d] : %X...\r\n",count, inputBuffer[count]);
-						
 						if((inputBuffer[9]>>4)&0x01)
 						{
 							SysConfigTemporarily.AcMaxChargingCurrent =  (inputBuffer[18]) | (inputBuffer[19]<<8);
-							DEBUG_INFO("AcMaxChargingCurrent : %d...\r\n", SysConfigTemporarily.AcMaxChargingCurrent);
-							DEBUG_INFO("inputBuffer[18] : %X \r\n",inputBuffer[18]);
-							DEBUG_INFO("inputBuffer[19] : %X \r\n",inputBuffer[19]);
 						}
 						
 						if((inputBuffer[9]>>3)&0x01)
 						{
 							SysConfigTemporarily.MaxChargingEnergy =  (inputBuffer[10]) | (inputBuffer[11]<<8);
-							DEBUG_INFO("MaxChargingEnergy : %d...\r\n", SysConfigTemporarily.MaxChargingEnergy);
-							DEBUG_INFO("inputBuffer[10] : %X \r\n",inputBuffer[10]);
-							DEBUG_INFO("inputBuffer[11] : %X \r\n",inputBuffer[11]);
 						}
 
 						if((inputBuffer[9]>>2)&0x01)
 						{
 							SysConfigTemporarily.MaxChargingPower = (inputBuffer[12]) | (inputBuffer[13]<<8);
-							DEBUG_INFO("MaxChargingPower : %d...\r\n", SysConfigTemporarily.MaxChargingPower);
-							DEBUG_INFO("inputBuffer[12] : %X \r\n",inputBuffer[12]);
-							DEBUG_INFO("inputBuffer[13] : %X \r\n",inputBuffer[13]);
 						}
 
 						if((inputBuffer[9]>>1)&0x01)
 						{
 							SysConfigTemporarily.MaxChargingCurrent = (inputBuffer[14]) | (inputBuffer[15]<<8);
-							DEBUG_INFO("MaxChargingCurrent : %d...\r\n", SysConfigTemporarily.MaxChargingCurrent);
-							DEBUG_INFO("inputBuffer[14] : %X \r\n",inputBuffer[14]);
-							DEBUG_INFO("inputBuffer[15] : %X \r\n",inputBuffer[15]);
 						}
 
 						if(inputBuffer[9]&0x01)
 						{
 							SysConfigTemporarily.MaxChargingDuration = (inputBuffer[16]) | (inputBuffer[17]<<8);
-							DEBUG_INFO("MaxChargingDuration : %d...\r\n", SysConfigTemporarily.MaxChargingDuration);
-							DEBUG_INFO("inputBuffer[16] : %X \r\n",inputBuffer[16]);
-							DEBUG_INFO("inputBuffer[17] : %X \r\n",inputBuffer[17]);
 						}
 
 						tx_size = 7;
@@ -2936,9 +2848,6 @@ int tcpSocketServerStart(void)
 						outBuffer[5] = 0x01;
 						outBuffer[6] = chksumCal(outBuffer);
 						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
-
 						break;
 					case WIFI_CMD_SET_CHARGING_START:
 						tx_size = 7;
@@ -3034,11 +2943,8 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_SET_WIFI_MODE:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_MODE...\r\n");
-						DEBUG_INFO("Result : %d...\r\n", inputBuffer[9]);
 
 						SysConfigTemporarily.AthInterface.WifiMode = inputBuffer[9];
-						DEBUG_INFO("WifiMode : %d...\r\n", SysConfigTemporarily.AthInterface.WifiMode);
 						
 						tx_size = 7;
 						outBuffer[0] = 0xff;
@@ -3048,13 +2954,9 @@ int tcpSocketServerStart(void)
 						outBuffer[4] = WIFI_CMD_SET_WIFI_MODE;
 						outBuffer[5] = 0x01;
 						outBuffer[6] = chksumCal(outBuffer);
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_SET_WIFI_SSID:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_SSID...\r\n");
 						
 						memset(SysConfigTemporarily.AthInterface.WifiSsid, 0x00, ARRAY_SIZE(SysConfigTemporarily.AthInterface.WifiSsid));
 						memcpy(SysConfigTemporarily.AthInterface.WifiSsid, &inputBuffer[9], (((inputBuffer[2] << 8) | inputBuffer[3])-6));
@@ -3070,7 +2972,6 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_SET_WIFI_PASSWD:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_PASSWD...\r\n");
 						
 						memset(SysConfigTemporarily.AthInterface.WifiPassword, 0x00, ARRAY_SIZE(SysConfigTemporarily.AthInterface.WifiPassword));
 						memcpy(SysConfigTemporarily.AthInterface.WifiPassword, &inputBuffer[9], (((inputBuffer[2] << 8) | inputBuffer[3])-6));
@@ -3086,13 +2987,9 @@ int tcpSocketServerStart(void)
 						
 						break;
 					case WIFI_CMD_SET_WIFI_DHCP:
-						DEBUG_INFO("WIFI_CMD_SET_WIFI_DHCP...\r\n");
 						
 						SysConfigTemporarily.AthInterface.WifiDhcpClient = inputBuffer[9]^1;
 						
-						DEBUG_INFO("SysConfigTemporarily.AthInterface.WifiDhcpClient : %d...\r\n", SysConfigTemporarily.AthInterface.WifiDhcpClient);
-						DEBUG_INFO("ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpClient : %d...\r\n", ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpClient);
-						
 						tx_size = 7;
 						outBuffer[0] = 0xff;
 						outBuffer[1] = 0xff;
@@ -3209,7 +3106,6 @@ int tcpSocketServerStart(void)
 
 						break;
 					case WIFI_CMD_SET_CONFIRM:
-						DEBUG_INFO("WIFI_CMD_SET_CONFIRM...\r\n");
 						
 						// Copy SysConfigTemporarily to ShmSysConfigAndInfo->SysConfig
 						memcpy(&ShmSysConfigAndInfo->SysConfig,&SysConfigTemporarily, sizeof(struct SysConfigData));
@@ -3224,13 +3120,9 @@ int tcpSocketServerStart(void)
 						outBuffer[6] = chksumCal(outBuffer);
 						
 						Sys_Flag.isPkill = ON;
-						
-						for(uint8_t count = 0;count< tx_size;count++)  
-							DEBUG_INFO("outBuffer[%d] : %X...\r\n",count, outBuffer[count]);
 
 						break;
 					case WIFI_CMD_SET_DISCARD:
-						DEBUG_INFO("WIFI_CMD_SET_DISCARD...\r\n");
 						
 						// Copy ShmSysConfigAndInfo to SysConfigTemporarily
 						memcpy(&SysConfigTemporarily, &ShmSysConfigAndInfo->SysConfig, sizeof(struct SysConfigData));
@@ -3843,11 +3735,6 @@ int main(void)
 	DEBUG_INFO("=================[State 0]===================\n");
 	for(;;)
 	{
-		DEBUG_INFO("WifiMode : %d...\r\n",ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode);
-		DEBUG_INFO("InternetDisconnectViaWiFi : %d...\r\n",ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi);
-		DEBUG_INFO("ApDisconnectViaWiFi : %d...\r\n",ShmStatusCodeData->InfoCode.InfoEvents.bits.ApDisconnectViaWiFi);
-		DEBUG_INFO("WifiNetworkConn : %d...\r\n",ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn);
-
 		switch(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode)
 		{
 			case WIFI_MODE_STA:
@@ -3867,4 +3754,4 @@ int main(void)
 	}
 
 	return 0;
-}
+}

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -26,7 +26,7 @@ struct PsuData 						*ShmPsuData ;
 struct OCPP16Data 					*ShmOCPP16Data;
 
 //ConfigurationMaxKeys
-#define GetConfigurationMaxKeysNUM 	43
+#define GetConfigurationMaxKeysNUM 	44
 
 pthread_mutex_t lock_send 			= PTHREAD_MUTEX_INITIALIZER;
 char queuedata[QUEUE_MESSAGE_LENGTH]				= {0};
@@ -70,7 +70,6 @@ static int authorizeRetryTimes 		= 0;  //number of  Retry times
 //===============================
 // OCPP other variables
 //===============================
-//int isUpdateRequest = FALSE;
 static int HeartBeatWaitTime 						= 10;
 static int FirstHeartBeat 							= 0;
 static int FirmwareStatusNotificationStatus 		= FIRMWARE_STATUS_IDLE;  // Idle
@@ -2389,7 +2388,7 @@ void CheckSystemValue(void)
 	//==============================================
 	// Meter report
 	//==============================================
-	if(/*(server_sign == TRUE) &&*/(isOFFline() == TRUE) ||
+	if(/*(server_sign == TRUE) &&(isOFFline() == TRUE) ||*/
 	   (((time((time_t*)NULL) - clientTime.MeterValues[gun_index]) > (atoi((const char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValueSampleInterval].ItemData)- 1)) || ((atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData) > 0)?((getTimePassSinceToday()%(atoi((char*)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData)))==0):FALSE)))
 	{
 		//check Transaction active
@@ -2554,8 +2553,6 @@ void CheckSystemValue(void)
 			}//End for AC
 		}
 
-		clientTime.MeterValues[gun_index] = time((time_t*)NULL);
-
 		if(reqSampleMeter[gun_index] == 1)
 		{
 			sendMeterValuesRequest(gun_index, ReadingContext_Sample_Periodic);
@@ -2565,6 +2562,8 @@ void CheckSystemValue(void)
 		{
 			sendMeterValuesRequest(gun_index, ReadingContext_Sample_Clock);
 		}
+
+		clientTime.MeterValues[gun_index] = time((time_t*)NULL);
 		sleep(1);
 	}
 
@@ -2945,7 +2944,7 @@ int sendFirmwareStatusNotificationRequest(char *status)
 	}
 	else if(strcmp(status,"DownloadFailed")==0)
 	{
-		FirmwareStatusNotificationStatus = FIRMWARE_STATUS_DOWNLOAD_DAILED;
+		FirmwareStatusNotificationStatus = FIRMWARE_STATUS_DOWNLOAD_FAILED;
 	}
 	else if(strcmp(status,"Downloading")==0)
 	{
@@ -4425,7 +4424,7 @@ int sendStopTransactionRequest(int gun_index)
 
 	//----------------------------replace queue StopTransaction TransactionId ---------------------------//
 	//int gettransactionId = GetTransactionId(gun_index+1, ShmOCPP16Data->StopTransaction[gun_index].IdTag);
-	int gettransactionId = GetTransactionId(gun_index+1, ShmOCPP16Data->StartTransaction[gun_index].IdTag);
+	int gettransactionId = GetTransactionId(gun_index+1, ShmOCPP16Data->StartTransaction[gun_index].IdTag, TRUE);
 
 	if((ShmOCPP16Data->StopTransaction[gun_index].TransactionId != 0) && (gettransactionId != 0))
 	{
@@ -10542,6 +10541,7 @@ int handleTriggerMessageRequest(char *uuid, char *payload)
 	if( strcmp(requestedMessagestr, MessageTriggerStr[FirmwareStatusNotification]) == 0)
 	{
 		if((FirmwareStatusNotificationStatus != FIRMWARE_STATUS_DOWNLOADING) &&
+		   (FirmwareStatusNotificationStatus != FIRMWARE_STATUS_DOWNLOADED) &&
 		   (FirmwareStatusNotificationStatus != FIRMWARE_STATUS_IDLE) &&
 		   (FirmwareStatusNotificationStatus != FIRMWARE_STATUS_INSTALLING) )
 		{
@@ -10769,7 +10769,6 @@ int handleUpdateFirmwareRequest(char *uuid, char *payload)
 
 	//sendUpdateFirmwareConfirmation(uuid);
 	ShmOCPP16Data->MsMsg.bits.UpdateFirmwareConf =1;
-	//ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
 	return result;
 }
 
@@ -10875,7 +10874,7 @@ void *UpdateFirmwareProcess(void *data)
 	memset(path, 0, ARRAY_SIZE(path));
 
 	sendFirmwareStatusNotificationRequest(FirmwareStatusStr[FirmwareStatus_Downloading]);
-	ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
+	//ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
 
 	if(strncmp(locationstr,"http", 4) == 0)
 	{
@@ -10909,15 +10908,13 @@ void *UpdateFirmwareProcess(void *data)
 		memset(filenametemp, 0, ARRAY_SIZE(filenametemp));
 		strncpy(filenametemp, ftppath+(ftppathlen-i+1), i+1);
 		filenametemp[i+1] = 0;
-		//sendFirmwareStatusNotificationRequest(FirmwareStatusStr[FirmwareStatus_Downloading]);
-
 
-		 do{
+		do
+		{
 			 isSuccess = httpDownLoadFile(host, ftppath, filenametemp, locationstr);
-		    	 sleep(retryIntervalInt);
-		    }while((isSuccess == 0)&&(retriesInt > 0 && retriesInt --));
+		   	 sleep(retryIntervalInt);
+		}while((isSuccess == 0)&&(retriesInt > 0 && retriesInt --));
 
-	//	isSuccess = httpDownLoadFile(host, ftppath, filenametemp, locationstr);
 
 		if(!isSuccess)
 		{
@@ -10925,9 +10922,7 @@ void *UpdateFirmwareProcess(void *data)
 		}
 		else
 		{
-			//ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
 			sendFirmwareStatusNotificationRequest(FirmwareStatusStr[FirmwareStatus_Downloaded]);
-			//isUpdateRequest = TRUE;
 		}
 
 	}
@@ -10990,10 +10985,8 @@ void *UpdateFirmwareProcess(void *data)
     		port = 21;
     	}
 
-
-		//sendFirmwareStatusNotificationRequest(FirmwareStatusStr[FirmwareStatus_Downloading]);
-
-		do{
+		do
+		{
 			 isSuccess = ftpDownLoadFile(host1, user, password, port, ftppath, filenametemp, locationstr);
 			 sleep(retryIntervalInt);
 		}while((!isSuccess)&&(retriesInt > 0 && retriesInt --));
@@ -11007,21 +11000,15 @@ void *UpdateFirmwareProcess(void *data)
 		}
 		else
 		{
-			//ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
 			sendFirmwareStatusNotificationRequest(FirmwareStatusStr[FirmwareStatus_Downloaded]);
-			//isUpdateRequest = TRUE;
 		}
-		ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
-
 	}
     else
     {
-
     	sendFirmwareStatusNotificationRequest(FirmwareStatusStr[FirmwareStatus_DownloadFailed]);
-    	//ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
-
     }
 
+	ShmOCPP16Data->MsMsg.bits.UpdateFirmwareReq = 1;
 	pthread_exit(NULL);
 
 }
@@ -11657,7 +11644,6 @@ int initialConfigurationTable(void)
 		/*Core Profile*/
 		//AllowOfflineTxForUnknownId
 		ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemAccessibility = 1;
-		printf("AllowoddlineTXForUnknownId type: %d  \n", ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemAccessibility);
 		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemName, "AllowOfflineTxForUnknownId");
 		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemData, "FALSE" );
 
@@ -11931,7 +11917,15 @@ int initialConfigurationTable(void)
 
 		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","WebSocketPingInterval", "false", ShmOCPP16Data->ConfigurationTable.CoreProfile[WebSocketPingInterval].ItemData);
 
-			//* Local Auth List Management Profile*/
+		// QueueOffLineStartTransactionMessage
+		ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemAccessibility = 1;
+		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemName, "QueueOffLineStartTransactionMessage");
+		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemData, "TRUE" );
+
+		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","QueueOffLineStartTransactionMessage", "false", ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemData);
+
+
+		//* Local Auth List Management Profile*/
 		#if 0
 			//For OCTT Test Case
 			ShmOCPP16Data->ConfigurationTable.LocalAuthListManagementProfile[LocalAuthListEnabled].ItemAccessibility = 1;
@@ -12080,14 +12074,12 @@ int initialConfigurationTable(void)
 				//Charger.AuthorizationCacheEnabled = (value.toLowerCase().equals("true")?true:false);
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[AuthorizationCacheEnabled].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[AuthorizationCacheEnabled].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "AuthorizeRemoteTxRequests") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[AuthorizeRemoteTxRequests].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[AuthorizeRemoteTxRequests].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "BlinkRepeat") == 0)
@@ -12095,14 +12087,12 @@ int initialConfigurationTable(void)
 				//Charger.BlinkRepeat = Integer.parseInt(value);
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[BlinkRepeat].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[BlinkRepeat].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "ClockAlignedDataInterval") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[ClockAlignedDataInterval].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "ConnectionTimeOut") == 0 )
@@ -12115,7 +12105,6 @@ int initialConfigurationTable(void)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[GetConfigurationMaxKeys].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[GetConfigurationMaxKeys].ItemData, "%d", atoi(valuestr));
-
 			}
 
 			if(strcmp(keystr, "HeartbeatInterval") == 0)
@@ -12123,7 +12112,6 @@ int initialConfigurationTable(void)
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[HeartbeatInterval].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[HeartbeatInterval].ItemData, "%d", atoi(valuestr));
 				HeartBeatWaitTime = atoi(valuestr);
-
 			}
 
 			if(strcmp(keystr, "LightIntensity") == 0)
@@ -12155,28 +12143,24 @@ int initialConfigurationTable(void)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesAlignedData].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesAlignedData].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "MeterValuesAlignedDataMaxLength") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesAlignedDataMaxLength].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesAlignedDataMaxLength].ItemData, "%d", atoi(valuestr));
-
 			}
 
 			if(strcmp(keystr, "MeterValuesSampledData") == 0 )
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesSampledData].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesSampledData].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "MeterValuesSampledDataMaxLength") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesSampledDataMaxLength].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValuesSampledDataMaxLength].ItemData, "%d", atoi(valuestr));
-
 			}
 
 
@@ -12184,7 +12168,6 @@ int initialConfigurationTable(void)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValueSampleInterval].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[MeterValueSampleInterval].ItemData, "%d", atoi(valuestr));
-
 			}
 
 			if(strcmp(keystr, "MinimumStatusDuration") == 0)
@@ -12198,42 +12181,36 @@ int initialConfigurationTable(void)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[NumberOfConnectors].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[NumberOfConnectors].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "ResetRetries") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[ResetRetries].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[ResetRetries].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "ConnectorPhaseRotation") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[ConnectorPhaseRotation].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[ConnectorPhaseRotation].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "ConnectorPhaseRotationMaxLength") == 0)
 			{
 				 ShmOCPP16Data->ConfigurationTable.CoreProfile[ConnectorPhaseRotationMaxLength].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				 sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[ConnectorPhaseRotationMaxLength].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "StopTransactionOnEVSideDisconnect") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTransactionOnEVSideDisconnect].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTransactionOnEVSideDisconnect].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "StopTransactionOnInvalidId") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTransactionOnInvalidId].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTransactionOnInvalidId].ItemData, "%s", valuestr );
-
 			}
 
 
@@ -12253,28 +12230,24 @@ int initialConfigurationTable(void)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTxnSampledData].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTxnSampledData].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "StopTxnSampledDataMaxLength") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTxnSampledDataMaxLength].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[StopTxnSampledDataMaxLength].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "SupportedFeatureProfiles") == 0)
 			{
 				 ShmOCPP16Data->ConfigurationTable.CoreProfile[SupportedFeatureProfiles].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				 sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[SupportedFeatureProfiles].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "SupportedFeatureProfilesMaxLength") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[SupportedFeatureProfilesMaxLength].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[SupportedFeatureProfilesMaxLength].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "TransactionMessageAttempts") == 0)
@@ -12282,7 +12255,6 @@ int initialConfigurationTable(void)
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[TransactionMessageAttempts].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[TransactionMessageAttempts].ItemData, "%d", atoi(valuestr) );
 				TransactionMessageAttemptsValue = atoi(valuestr);
-
 			}
 
 			if(strcmp(keystr, "TransactionMessageRetryInterval") == 0)
@@ -12290,85 +12262,78 @@ int initialConfigurationTable(void)
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[TransactionMessageRetryInterval].ItemAccessibility= (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[TransactionMessageRetryInterval].ItemData, "%d", atoi(valuestr) );
 				TransactionMessageRetryIntervalValue = atoi(valuestr);
-
 			}
 
 			if(strcmp(keystr, "UnlockConnectorOnEVSideDisconnect") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.CoreProfile[UnlockConnectorOnEVSideDisconnect].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[UnlockConnectorOnEVSideDisconnect].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "WebSocketPingInterval") == 0)
 			{
 				 ShmOCPP16Data->ConfigurationTable.CoreProfile[WebSocketPingInterval].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				 sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[WebSocketPingInterval].ItemData, "%d", atoi(valuestr) );
-
 			}
 
+			if(strcmp(keystr, "QueueOffLineStartTransactionMessage") == 0)
+			{
+				 ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
+				 sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemData, "%s", valuestr);
+			}
 
 			if(strcmp(keystr, "LocalAuthListEnabled") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.LocalAuthListManagementProfile[LocalAuthListEnabled].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.LocalAuthListManagementProfile[LocalAuthListEnabled].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "LocalAuthListMaxLength") == 0)
 			{
 				 ShmOCPP16Data->ConfigurationTable.LocalAuthListManagementProfile[LocalAuthListMaxLength].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				  sprintf((char *)ShmOCPP16Data->ConfigurationTable.LocalAuthListManagementProfile[LocalAuthListMaxLength].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "SendLocalListMaxLength") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.LocalAuthListManagementProfile[SendLocalListMaxLength].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.LocalAuthListManagementProfile[SendLocalListMaxLength].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "ReserveConnectorZeroSupported") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.ReservationProfile[ReserveConnectorZeroSupported].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.ReservationProfile[ReserveConnectorZeroSupported].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "ChargeProfileMaxStackLevel") == 0)
 			{
 				 ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ChargeProfileMaxStackLevel].ItemAccessibility  = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				 sprintf((char *)ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ChargeProfileMaxStackLevel].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "ChargingScheduleAllowedChargingRateUnit") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ChargingScheduleAllowedChargingRateUnit].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ChargingScheduleAllowedChargingRateUnit].ItemData, "%s", valuestr );
-
 			}
 
 			if(strcmp(keystr, "ChargingScheduleMaxPeriods") == 0)
 			{
 				ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ChargingScheduleMaxPeriods].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				sprintf((char *)ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ChargingScheduleMaxPeriods].ItemData, "%d", atoi(valuestr) );
-
 			}
 
 			if(strcmp(keystr, "ConnectorSwitch3to1PhaseSupported") == 0)
 			{
 				 ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ConnectorSwitch3to1PhaseSupported].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				 sprintf((char *)ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[ConnectorSwitch3to1PhaseSupported].ItemData, "%s", valuestr);
-
 			}
 
 			if(strcmp(keystr, "MaxChargingProfilesInstalled") == 0)
 			{
 				 ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[MaxChargingProfilesInstalled].ItemAccessibility = (strcmp(readonlystr, "true")==0) ? 0 : 1;
 				 sprintf((char *)ShmOCPP16Data->ConfigurationTable.SmartChargingProfile[MaxChargingProfilesInstalled].ItemData, "%d", atoi(valuestr) );
-
 			}
 		}
 
@@ -12709,6 +12674,16 @@ void StoreConfigurationTable(void)
 
 	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","WebSocketPingInterval", "false", (char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[WebSocketPingInterval].ItemData);
 
+	// QueueOffLineStartTransactionMessage
+	/*
+	ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemAccessibility = 0;
+	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemName, "QueueOffLineStartTransactionMessage");
+	strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemData, "TRUE" );
+	*/
+
+	fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","QueueOffLineStartTransactionMessage", "false", (char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemData);
+
+
 	//* Local Auth List Management Profile*/
 	//LocalAuthListEnabled
 	/*
@@ -13424,6 +13399,26 @@ void getKeyValue(char *keyReq)
 	    	  isKnowKey = TRUE;
 
 	      }
+
+	      if(isEmpty ||  strcmp(keyReq, "QueueOffLineStartTransactionMessage") == 0 )
+		  {
+			  strcpy((char *)ShmOCPP16Data->GetConfiguration.Key[GetConfiguration_QueueOffLineStartTransactionMessage].Item, "QueueOffLineStartTransactionMessage");
+			  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_QueueOffLineStartTransactionMessage].Key, "QueueOffLineStartTransactionMessage");
+
+			  if(ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemAccessibility == 1)
+			  {
+				  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_QueueOffLineStartTransactionMessage].ReadOnly, "0"/*"FALSE"*/);
+			  }
+			  else
+			  {
+				  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_QueueOffLineStartTransactionMessage].ReadOnly, "1"/*"TRUE"*/);
+			  }
+
+			  strcpy((char *)ShmOCPP16Data->GetConfiguration.ResponseConfigurationKey[GetConfiguration_QueueOffLineStartTransactionMessage].Value, (const char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemData );
+			  isKnowKey = TRUE;
+		  }
+
+
 #if 1
 	      if(isEmpty ||  strcmp(keyReq, "LocalAuthListEnabled") == 0 )
 	      {
@@ -14392,6 +14387,26 @@ int setKeyValue(char *key, char *value)
     	}
     }
 
+    if(strcmp(key, "QueueOffLineStartTransactionMessage") == 0)
+    {
+    	if(ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemAccessibility == 1)
+		{
+			strcpy(str, (const char*)value);
+			for(int i = 0; str[i]; i++)
+			{
+			   str[i] = tolower(str[i]);
+			}
+			//Charger.QueueOffLineStartTransactionMessage = (value.toLowerCase().equals("true")?true:false);
+			sprintf((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[QueueOffLineStartTransactionMessage].ItemData, "%s", (strcmp(str, "true")==0) ?"TRUE":"FALSE" );
+			isSuccess = ConfigurationStatus_Accepted;
+		}
+		else
+	   {
+		isSuccess = ConfigurationStatus_Rejected;
+	   }
+
+    }
+
 #if 0
     //For OCPP Test Case
     if(strcmp(key, "LocalAuthorizationListEnabled") == 0)
@@ -15186,7 +15201,7 @@ void GetStartTransactionIdTag(int gun_index)
 	strcpy((char *)StartTransactionIdTagTemp, (const char *)ShmOCPP16Data->StartTransaction[gun_index].IdTag);
 }
 
-int GetTransactionId(int gunindex, unsigned char idTag[])
+int GetTransactionId(int gunindex, unsigned char idTag[], uint8_t isStopTransaction)
 {
 	char ch;
 	FILE *fptr1;
@@ -15226,17 +15241,36 @@ int GetTransactionId(int gunindex, unsigned char idTag[])
 			}
 			char *revbuf[8] = {0}; //存放分割後的子字串
 			int num = 0;//分割後子字串的個數
+			DEBUG_INFO("str: %s\n", str);
 			splitstring(str,",",revbuf,&num); //呼叫函式進行分割
+			DEBUG_INFO("revbuf[0]: %s\n", revbuf[0]);
+			DEBUG_INFO("revbuf[1]: %s\n", revbuf[1]);
+			DEBUG_INFO("revbuf[2]: %s\n", revbuf[2]);
+
 			if((revbuf[1][0] != '\0')&&(revbuf[2][0] != '\0'))
 			{
-				if((atoi(revbuf[0])==gunindex) || (strcmp(revbuf[1],(const char *)idTag)==0))
+				if(isStopTransaction)
 				{
-					temptransactionId = atoi(revbuf[2]);
-					break;
+					if((atoi(revbuf[0])==gunindex) && (strcmp(revbuf[1],(const char *)idTag)==0))
+					{
+						temptransactionId = atoi(revbuf[2]);
+						break;
+					}
+				}
+				else
+				{
+					if((atoi(revbuf[0])==gunindex) || (strcmp(revbuf[1],(const char *)idTag)==0))
+					{
+						temptransactionId = atoi(revbuf[2]);
+						break;
+					}
 				}
 			}
 		}
 	}
+	else
+		DEBUG_INFO("EOF\n");
+
 
 	fclose(fptr1);
 	/*------- End of reading ---------------*/
@@ -16460,6 +16494,6 @@ void LWS_Send(char * str)
 	pthread_mutex_unlock(&lock_send);
 
 	lws_callback_on_writable(wsi_client);
-	lws_service(context, 0);
+	//lws_service(context, 0);
 	//sleep(1);
 }

EVSE/Modularization/ocppfiles/MessageHandler.h

@@ -385,6 +385,7 @@ enum GetConfigurationKey {
 	GetConfiguration_TransactionMessageRetryInterval,
 	GetConfiguration_UnlockConnectorOnEVSideDisconnect,
 	GetConfiguration_WebSocketPingInterval,
+	GetConfiguration_QueueOffLineStartTransactionMessage,
 	GetConfiguration_LocalAuthListEnabled,
 	GetConfiguration_LocalAuthListMaxLength,
 	GetConfiguration_SendLocalListMaxLength,
@@ -399,7 +400,7 @@ enum GetConfigurationKey {
 enum FIRMWARE_NOTIFICATION_STATUS
 {
 	FIRMWARE_STATUS_DOWNLOADED = 0,
-	FIRMWARE_STATUS_DOWNLOAD_DAILED = 1,
+	FIRMWARE_STATUS_DOWNLOAD_FAILED = 1,
 	FIRMWARE_STATUS_DOWNLOADING = 2,
 	FIRMWARE_STATUS_IDLE = 3,
 	FIRMWARE_STATUS_INSTALLATION_FAILED =4,
@@ -535,7 +536,7 @@ extern int queue_operation(int type, char *frontUUID, char *frontData);
 int GetOcppServerURL();
 int GetOcppPath();
 int GetOcppPort();
-int GetTransactionId(int gunindex, unsigned char idTag[]);
+int GetTransactionId(int gunindex, unsigned char idTag[], uint8_t isStopTransaction);
 void SetTransactionIdZero(int transactionId);
 void GetChargingProfileRequest(int gunindex);
 void FillStartTransaction(int ConnectorId, unsigned char IdTag[], int MeterStart,int ReservationId,unsigned char Timestamp[]);

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -36,7 +36,8 @@ unsigned char StartTransactionIdTagTemp[20]={0};
 uint32_t startTimeDog;
 uint32_t startTimeQueue;
 uint8_t	isWebsocketSendable = 1;
-uint8_t	counterLwsRestart=0;;
+uint8_t	counterLwsRestart = 0;;
+uint8_t counterQueueSent = 0;
 
 sqlite3 *db;
 char *errMsg = NULL;
@@ -1024,7 +1025,7 @@ int sentqueue(){
 
 			//From StartTransaction取得IdTag, 存到 StartTransactionIdTagTemp,主要是 給Queue中StopTransaction使用(StartTransaction. StopTransaction不同卡號 ),取得真正的TransactionId
 			GetStartTransactionIdTag(tempconnectorId-1);
-			gettransactionId = GetTransactionId(tempconnectorId, (uint8_t *)StartTransactionIdTagTemp);
+			gettransactionId = GetTransactionId(tempconnectorId, (uint8_t *)StartTransactionIdTagTemp, IsStopTransaction);
 
 			DEBUG_INFO("tempconnectorId = %d\n", tempconnectorId);
 			DEBUG_INFO("temptransactionId = %d\n",temptransactionId);
@@ -1072,7 +1073,7 @@ void* processTransactionQueue(void* data)
 
 	while(1)
 	{
-		if(!req_SendQueue && ((((time((time_t*)NULL) - startTimeQueue) > (TransactionMessageRetryIntervalGet()>10?TransactionMessageRetryIntervalGet():10))) || isWebsocketSendable))
+		if(!req_SendQueue && ((((time((time_t*)NULL) - startTimeQueue) > (TransactionMessageRetryIntervalGet()>10?TransactionMessageRetryIntervalGet():10))) || (isWebsocketSendable && ((time((time_t*)NULL) - startTimeQueue) >= ((counterQueueSent>=10)?10:1)))))
 		{
 			if(FirstHeartBeatResponse() == 1)
 			{
@@ -1134,6 +1135,14 @@ void* processTransactionQueue(void* data)
 
 			// Refresh queue timer
 			startTimeQueue = time((time_t*)NULL);
+			if(counterQueueSent >= 10)
+			{
+				counterQueueSent = 0;
+			}
+			else
+			{
+				counterQueueSent += 1;
+			}
 		}
 
 		usleep(100000);
@@ -1359,7 +1368,7 @@ int main(void)
 		startTimeDog = time((time_t*)NULL);
 		counterLwsRestart = 0;
 		// Connect server
-		while(ConnectionEstablished==0) // Check InternetConn 0: disconnected, 1: connected
+		if(ConnectionEstablished==0) // Check InternetConn 0: disconnected, 1: connected
 		{
 			isWebsocketSendable = 1;
 			SetOcppConnStatus(FALSE);
@@ -1367,52 +1376,56 @@ int main(void)
 			InitialSystemValue();
 			if((time((time_t*)NULL)-startTime.connect) >= 30)
 			{
-				DEBUG_INFO("Server connecting...\n");
-				pthread_create(&tid_connectServer, NULL, ConnectWsServer, NULL);
+				if(GetInternetConn())
+				{
+					DEBUG_INFO("Server connecting...\n");
+					pthread_create(&tid_connectServer, NULL, ConnectWsServer, NULL);
+				}
 				startTime.connect=time((time_t*)NULL);
 			}
 			CheckSystemValue();
-			lws_service(context, 100);//timeout_ms
 		}
-
-		// Sign in
-		if( ((GetBootNotificationInterval() != 0  && ((time((time_t*)NULL)-startTime.bootNotification)>= GetBootNotificationInterval()) )  ||
-			((time((time_t*)NULL)-startTime.bootNotification) >= defaultWaitingTime) ) && (GetServerSign() == FALSE))
-		{
-			sendBootNotificationRequest();
-			startTime.bootNotification=time((time_t*)NULL);
-		}
-
-		// On line operation
-		if(GetServerSign() == TRUE)
+		else
 		{
-			SetOcppConnStatus(TRUE);
-
-			// Send message from queue
-			if((req_SendQueue == 1) && isWebsocketSendable)
+			// Sign in
+			if( ((GetBootNotificationInterval() != 0  && ((time((time_t*)NULL)-startTime.bootNotification)>= GetBootNotificationInterval()) )  ||
+				((time((time_t*)NULL)-startTime.bootNotification) >= defaultWaitingTime) ) && (GetServerSign() == FALSE))
 			{
-				queue_operation(QUEUE_OPERATION_SENT, "", "");
-				req_SendQueue = 0;
+				sendBootNotificationRequest();
+				startTime.bootNotification=time((time_t*)NULL);
 			}
 
-			// Check System Value
-			CheckSystemValue();
-
-			if(GetHeartBeatWithNOResponse() >= 3)
+			// On line operation
+			if(GetServerSign() == TRUE)
 			{
-				lws_context_destroy(context);
-				ConnectionEstablished = 0;
-				context = NULL;
-				SetHeartBeatWithNOResponse();
-			}
+				SetOcppConnStatus(TRUE);
 
-			if((changeChageWebSocketPingInterval == TRUE) || (GetInternetConn() == 0))
-			{
-				DEBUG_INFO("GetInternetConn() = %d\n", GetInternetConn());
-				changeChageWebSocketPingInterval = FALSE;
-				lws_context_destroy(context);
-				ConnectionEstablished = 0;
-				context = NULL;
+				// Send message from queue
+				if((req_SendQueue == 1) && isWebsocketSendable)
+				{
+					queue_operation(QUEUE_OPERATION_SENT, "", "");
+					req_SendQueue = 0;
+				}
+
+				// Check System Value
+				CheckSystemValue();
+
+				if(GetHeartBeatWithNOResponse() >= 3)
+				{
+					lws_context_destroy(context);
+					ConnectionEstablished = 0;
+					context = NULL;
+					SetHeartBeatWithNOResponse();
+				}
+
+				if((changeChageWebSocketPingInterval == TRUE) || (GetInternetConn() == 0))
+				{
+					DEBUG_INFO("GetInternetConn() = %d\n", GetInternetConn());
+					changeChageWebSocketPingInterval = FALSE;
+					lws_context_destroy(context);
+					ConnectionEstablished = 0;
+					context = NULL;
+				}
 			}
 		}
 		lws_service(context, 0);//timeout_ms

EVSE/Modularization/ocppfiles/Module_OcppBackend.h

@@ -120,4 +120,5 @@ extern uint32_t						startTimeDog;
 extern uint32_t						startTimeQueue;
 extern uint8_t						isWebsocketSendable;
 extern uint8_t						counterLwsRestart;
+extern uint8_t 						counterQueueSent;
 #endif /* HEADER_MODULE_OCPPBACKEND_H_ */

EVSE/Projects/AW-CCS/Apps/main.c

@@ -1196,7 +1196,7 @@ void get_firmware_version(unsigned char gun_index)
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 
 	// Get CSU root file system version
-	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.23.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "D0.24.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -2447,6 +2447,7 @@ int main(void)
 									{
 										// On line
 										ShmOCPP16Data->SpMsg.bits.AuthorizeReq = ON;
+										setLedMotion(gun_index,LED_ACTION_AUTHED);
 									}
 									else
 									{

EVSE/Projects/Noodoe/Apps/Module_AlarmDetect.c

@@ -92,7 +92,7 @@ int StoreLogMsg(const char *fmt, ...)
 
 	if((ShmSysConfigAndInfo->SysConfig.ModelName != NULL) && (ShmSysConfigAndInfo->SysConfig.SerialNumber != NULL) && (strlen((char*)ShmSysConfigAndInfo->SysConfig.ModelName) >= 14))
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1,
@@ -101,7 +101,7 @@ int StoreLogMsg(const char *fmt, ...)
 	}
 	else
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1);

EVSE/Projects/Noodoe/Apps/Module_FactoryConfig.c

@@ -66,7 +66,7 @@ int StoreLogMsg(const char *fmt, ...)
 	memset(Buf,0,sizeof(Buf));
 	CurrentTime = time(NULL);
 	tm=localtime(&CurrentTime);
-	sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/%04d-%02d_%s_%s_SystemLog",
+	sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/%04d-%02d_%s_%s_SystemLog",
 			tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 			buffer,
 			tm->tm_year+1900,tm->tm_mon+1,

EVSE/Projects/Noodoe/Apps/Module_InternalComm.c

@@ -75,7 +75,7 @@ int StoreLogMsg(const char *fmt, ...)
 
 	if((ShmSysConfigAndInfo->SysConfig.ModelName != NULL) && (ShmSysConfigAndInfo->SysConfig.SerialNumber != NULL) && (strlen((char*)ShmSysConfigAndInfo->SysConfig.ModelName) >= 14))
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1,
@@ -84,7 +84,7 @@ int StoreLogMsg(const char *fmt, ...)
 	}
 	else
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1);

EVSE/Projects/Noodoe/Apps/Module_Speaker.c

@@ -83,7 +83,7 @@ int StoreLogMsg(const char *fmt, ...)
 
 	if((ShmSysConfigAndInfo->SysConfig.ModelName != NULL) && (ShmSysConfigAndInfo->SysConfig.SerialNumber != NULL) && (strlen((char*)ShmSysConfigAndInfo->SysConfig.ModelName) >= 14))
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1,
@@ -92,7 +92,7 @@ int StoreLogMsg(const char *fmt, ...)
 	}
 	else
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1);

EVSE/Projects/Noodoe/Apps/main.c

@@ -156,7 +156,7 @@ int StoreLogMsg(const char *fmt, ...)
 
 	if((ShmSysConfigAndInfo->SysConfig.ModelName != NULL) && (ShmSysConfigAndInfo->SysConfig.SerialNumber != NULL) && (strlen((char*)ShmSysConfigAndInfo->SysConfig.ModelName) >= 14))
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]%s_%s_SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1,
@@ -165,7 +165,7 @@ int StoreLogMsg(const char *fmt, ...)
 	}
 	else
 	{
-		sprintf(Buf,"echo \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
+		sprintf(Buf,"echo -n \"[%04d.%02d.%02d %02d:%02d:%02d] - %s\" >> /Storage/SystemLog/[%04d.%02d]SystemLog",
 					tm->tm_year+1900,tm->tm_mon+1,tm->tm_mday,tm->tm_hour,tm->tm_min,tm->tm_sec,
 					buffer,
 					tm->tm_year+1900,tm->tm_mon+1);
@@ -974,7 +974,6 @@ void InitEthernet()
 		{
 			if(isReachableInternet() == PASS)
 			{
-				ShmSysConfigAndInfo->SysInfo.InternetConn = ON;
 				ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet=OFF;
 				cnt_pingDNS_Fail = 0;
 			}
@@ -982,10 +981,20 @@ void InitEthernet()
 			{
 				if(++cnt_pingDNS_Fail > 3)
 				{
-					ShmSysConfigAndInfo->SysInfo.InternetConn = OFF;
 					ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet=ON;
 				}
 			}
+			
+			if(ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet &&
+			   ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi &&
+			   ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi)
+			{
+				ShmSysConfigAndInfo->SysInfo.InternetConn = OFF;
+			}
+			else
+			{
+				ShmSysConfigAndInfo->SysInfo.InternetConn = ON;
+			}
 
 			sleep(5);
 		}
@@ -1181,7 +1190,7 @@ void get_firmware_version(unsigned char gun_index)
 	strcpy((char*)ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, ShmCharger->gun_info[gun_index].ver.Version_FW);
 
 	// Get CSU root file system version
-	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.37.00.0000.00");
+	sprintf((char*)ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "B0.40.00.0000.00");
 
 	// Get AC connector type from model name
 	for(uint8_t idx=0;idx<3;idx++)
@@ -1636,8 +1645,7 @@ int isReachableInternet()
 
 	for(int idx=0;idx<ARRAY_SIZE(valid_Internet);idx++)
 	{
-		strcpy(cmd, "ping -c 1 -w 3 ");
-		strcat(cmd, valid_Internet[idx]);
+		sprintf(cmd, "ping -c 1 -w 3 -I eth0 %s", valid_Internet[idx]);
 		fp = popen(cmd, "r");
 		if(fp != NULL)
 		{
@@ -1884,10 +1892,13 @@ void checkTask()
 		system("/root/Module_EventLogging &");
 	}
 
-	if(system("pidof -s OcppBackend > /dev/null") != 0)
+	if(strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") != 0)
 	{
-		DEBUG_INFO("OcppBackend not running, restart it.\r\n");
-		system("/root/OcppBackend &");
+		if(system("pidof -s OcppBackend > /dev/null") != 0)
+		{
+			DEBUG_INFO("OcppBackend not running, restart it.\r\n");
+			system("/root/OcppBackend &");
+		}
 	}
 
 	if(system("pidof -s Module_AlarmDetect > /dev/null") != 0)
@@ -2250,6 +2261,18 @@ int main(void)
 
 						// Set max current to rating current
 						ShmCharger->gun_info[gun_index].primaryMcuCp_Pwn_Duty.max_current = ShmCharger->gun_info[gun_index].primaryMcuState.rating_current;
+						
+						// Default Ethernet / Wifi / 4G to 1:disconnected 
+						ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaEthernet = ON;
+						ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi = ON;
+						ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectVia4Gi = ON;
+						
+						// If Web Server OPCC URL is empty kill Module_OcppBackend
+						if(strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") == 0)
+						{
+							DEBUG_INFO("URL is empty kill Module_OcppBackend...\r\n");
+							system ("pkill OcppBackend");
+						}
 
 						// If rotate switch equal zero, the system needs to change Debug mode
 						if(ShmCharger->gun_info[gun_index].primaryMcuState.rotatory_switch == 0)
@@ -2434,7 +2457,7 @@ int main(void)
 							case START_METHOD_RFID:
 								if((ShmOCPP16Data->SpMsg.bits.AuthorizeConf) ||
 								   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)) ||
-								   (!ShmOCPP16Data->OcppConnStatus && (isValidLocalWhiteCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)) ||
+								   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)) ||
 								   (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_NOCHARGE))
 								{
 									if((strcmp((char*)ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status, "Accepted")==0) ||
@@ -2542,6 +2565,8 @@ int main(void)
 						ftime(&startChargingTime[gun_index]);
 						ftime(&startTime[gun_index][TMR_IDX_LOGPPRINTOUT]);
 						ftime(&startTime[gun_index][TMR_IDX_PROFILE_PREPARE]);
+						startTime[gun_index][TMR_IDX_AUTH].time -= TIMEOUT_SPEC_AUTH;
+						ShmOCPP16Data->SpMsg.bits.AuthorizeReq = OFF;
 					}
 
 					if((ShmCharger->gun_info[gun_index].rfidReq == ON) ||
@@ -2551,7 +2576,132 @@ int main(void)
 					   (ShmOCPP16Data->MsMsg.bits.ResetReq) ||
 					   (ShmCharger->gun_info[ShmOCPP16Data->UnlockConnector[gun_index].ConnectorId-1].isUnlockerConnetor == ON))
 					{
-						setChargerMode(gun_index, SYS_MODE_TERMINATING);
+
+						if(ShmCharger->gun_info[gun_index].rfidReq)
+						{
+							// If RFID SN different with start user, it need to authorize ID
+							if((ShmCharger->gun_info[gun_index].rfidReq == ON) && !isMatchStartUser(gun_index))
+							{
+								if((DiffTimebWithNow(startTime[gun_index][TMR_IDX_AUTH]) > TIMEOUT_SPEC_AUTH) && !ShmOCPP16Data->SpMsg.bits.AuthorizeReq)
+								{
+									// Request authorization
+									ftime(&startTime[gun_index][TMR_IDX_AUTH]);
+									memset(ShmSysConfigAndInfo->SysConfig.UserId, 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId));
+									if(ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian)
+									{
+										// Big endian
+										switch(rfid.snType)
+										{
+											case RFID_SN_TYPE_6BYTE:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3], rfid.currentCard[4], rfid.currentCard[5]);
+												break;
+											case RFID_SN_TYPE_7BYTE:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3], rfid.currentCard[4], rfid.currentCard[5], rfid.currentCard[6]);
+												break;
+											case RFID_SN_TYPE_10BYTE:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3], rfid.currentCard[4], rfid.currentCard[5], rfid.currentCard[6], rfid.currentCard[7], rfid.currentCard[8], rfid.currentCard[9]);
+												break;
+											case RFID_SN_TYPE_4BYTE:
+											default:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3]);
+												break;
+										}
+									}
+									else
+									{
+										// Little endian
+										switch(rfid.snType)
+										{
+											case RFID_SN_TYPE_6BYTE:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X", rfid.currentCard[5], rfid.currentCard[4], rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
+												break;
+											case RFID_SN_TYPE_7BYTE:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[6], rfid.currentCard[5], rfid.currentCard[4], rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
+												break;
+											case RFID_SN_TYPE_10BYTE:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[9], rfid.currentCard[8], rfid.currentCard[7], rfid.currentCard[6], rfid.currentCard[5], rfid.currentCard[4], rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
+												break;
+											case RFID_SN_TYPE_4BYTE:
+											default:
+												sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X", rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
+												break;
+										}
+									}
+									DEBUG_INFO("End request User Id : %s\r\n", ShmSysConfigAndInfo->SysConfig.UserId);
+									DEBUG_INFO("Start method : %d...\r\n ", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod);
+
+									if((ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_RFID) ||
+									   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BACKEND) ||
+									   (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BLE))
+									{
+										switch(ShmSysConfigAndInfo->SysConfig.AuthorisationMode)
+										{
+											case AUTH_MODE_ENABLE:
+												if(ShmOCPP16Data->OcppConnStatus)
+												{
+													// On line
+													ShmOCPP16Data->SpMsg.bits.AuthorizeReq = ON;
+												}
+												else
+												{
+													// Off line
+													switch(ShmSysConfigAndInfo->SysConfig.OfflinePolicy)
+													{
+														case OFF_POLICY_LOCALLIST:
+															ShmOCPP16Data->SpMsg.bits.AuthorizeReq = ON;
+															break;
+														case OFF_POLICY_PH_RFID:
+															break;
+														case OFF_POLICY_FREE:
+															break;
+														case OFF_POLICY_NOCHARGE:
+														default:
+															break;
+													}
+												}
+												break;
+											case AUTH_MODE_DISABLE:
+											default:
+												break;
+										}
+									}
+								}
+								else
+								{
+									if(ShmOCPP16Data->SpMsg.bits.AuthorizeConf ||
+									  (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) ||
+									  (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)) ||
+									  (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)))
+									{
+										if((strcmp((char*)ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status, "Accepted")==0) ||
+										   (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) ||
+										   (!ShmOCPP16Data->OcppConnStatus && (isValidLocalWhiteCard() == PASS) && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_LOCALLIST)) ||
+										   (!ShmOCPP16Data->OcppConnStatus && (ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)))
+										{
+											ShmCharger->gun_info[gun_index].isAuthPassEnd = ON;
+										}
+										else
+										{
+											ShmCharger->gun_info[gun_index].rfidReq = OFF;
+											ShmOCPP16Data->SpMsg.bits.AuthorizeReq = OFF;
+											DEBUG_INFO("Authorize fail.\r\n");
+											setSpeaker(ON,SPEAKER_INTERVAL_3COUNT);
+											setLedMotion(gun_index,LED_ACTION_RFID_FAIL);
+											sleep(3);
+										}
+
+										startTime[gun_index][TMR_IDX_AUTH].time -= TIMEOUT_SPEC_AUTH;
+										ShmOCPP16Data->SpMsg.bits.AuthorizeConf = OFF;
+									}
+								}
+							}
+
+							// If Authorize is accpted or Rfid card match with start User, The system should terminating to the end
+							if(ShmCharger->gun_info[gun_index].isAuthPassEnd || isMatchStartUser(gun_index))
+								setChargerMode(gun_index, SYS_MODE_TERMINATING);
+						}
+						else
+							setChargerMode(gun_index, SYS_MODE_TERMINATING);
 					}
 					else
 					{
@@ -2778,132 +2928,6 @@ int main(void)
 						getDateTimeString((char*)ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StopDateTime);
 					}
 
-					// If RFID SN different with start user, it need to authorize ID
-					if((ShmCharger->gun_info[gun_index].rfidReq == ON) && !isMatchStartUser(gun_index))
-					{
-						if((DiffTimebWithNow(startTime[gun_index][TMR_IDX_AUTH]) > TIMEOUT_SPEC_AUTH) && !ShmOCPP16Data->SpMsg.bits.AuthorizeReq)
-						{
-							// Request authorization
-							ftime(&startTime[gun_index][TMR_IDX_AUTH]);
-							memset(ShmSysConfigAndInfo->SysConfig.UserId, 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.UserId));
-							if(ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian)
-							{
-								// Big endian
-								switch(rfid.snType)
-								{
-									case RFID_SN_TYPE_6BYTE:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3], rfid.currentCard[4], rfid.currentCard[5]);
-										break;
-									case RFID_SN_TYPE_7BYTE:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3], rfid.currentCard[4], rfid.currentCard[5], rfid.currentCard[6]);
-										break;
-									case RFID_SN_TYPE_10BYTE:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3], rfid.currentCard[4], rfid.currentCard[5], rfid.currentCard[6], rfid.currentCard[7], rfid.currentCard[8], rfid.currentCard[9]);
-										break;
-									case RFID_SN_TYPE_4BYTE:
-									default:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X", rfid.currentCard[0], rfid.currentCard[1], rfid.currentCard[2], rfid.currentCard[3]);
-										break;
-								}
-							}
-							else
-							{
-								// Little endian
-								switch(rfid.snType)
-								{
-									case RFID_SN_TYPE_6BYTE:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X", rfid.currentCard[5], rfid.currentCard[4], rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
-										break;
-									case RFID_SN_TYPE_7BYTE:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[6], rfid.currentCard[5], rfid.currentCard[4], rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
-										break;
-									case RFID_SN_TYPE_10BYTE:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X", rfid.currentCard[9], rfid.currentCard[8], rfid.currentCard[7], rfid.currentCard[6], rfid.currentCard[5], rfid.currentCard[4], rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
-										break;
-									case RFID_SN_TYPE_4BYTE:
-									default:
-										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X", rfid.currentCard[3], rfid.currentCard[2], rfid.currentCard[1], rfid.currentCard[0]);
-										break;
-								}
-							}
-							DEBUG_INFO("End request User Id : %s\r\n", ShmSysConfigAndInfo->SysConfig.UserId);
-							DEBUG_INFO("Start method : %d...\r\n ", ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod);
-
-							if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_RFID)
-							{
-								switch(ShmSysConfigAndInfo->SysConfig.AuthorisationMode)
-								{
-									case AUTH_MODE_ENABLE:
-										if(ShmOCPP16Data->OcppConnStatus)
-										{
-											// On line
-											ShmOCPP16Data->SpMsg.bits.AuthorizeReq = ON;
-										}
-										else
-										{
-											// Off line
-											switch(ShmSysConfigAndInfo->SysConfig.OfflinePolicy)
-											{
-												case OFF_POLICY_LOCALLIST:
-													ShmOCPP16Data->SpMsg.bits.AuthorizeReq = ON;
-													break;
-												case OFF_POLICY_PH_RFID:
-													break;
-												case OFF_POLICY_FREE:
-													break;
-												case OFF_POLICY_NOCHARGE:
-												default:
-													break;
-											}
-										}
-										break;
-									case AUTH_MODE_DISABLE:
-									default:
-										break;
-								}
-							}
-							else if(ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BACKEND)
-							{
-								ShmCharger->gun_info[gun_index].rfidReq = OFF;
-								DEBUG_INFO("Need to match with start method : START_METHOD_BACKEND...\r\n");
-								setChargerMode(gun_index, SYS_MODE_CHARGING);
-							}
-							else if (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].StartMethod == START_METHOD_BLE)
-							{
-								ShmCharger->gun_info[gun_index].rfidReq = OFF;
-								DEBUG_INFO("Need to match with start method : START_METHOD_BLE...\r\n");
-								setChargerMode(gun_index, SYS_MODE_CHARGING);
-							}
-							else
-							{}
-						}
-						else
-						{
-							if(ShmOCPP16Data->SpMsg.bits.AuthorizeConf ||
-							  (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) ||
-							  (!ShmOCPP16Data->OcppConnStatus&&(ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)))
-							{
-								if((strcmp((char*)ShmOCPP16Data->Authorize.ResponseIdTagInfo.Status, "Accepted")==0) ||
-								   (ShmSysConfigAndInfo->SysConfig.AuthorisationMode == AUTH_MODE_DISABLE) ||
-								   (!ShmOCPP16Data->OcppConnStatus&&(ShmSysConfigAndInfo->SysConfig.OfflinePolicy == OFF_POLICY_FREE)))
-								{
-									ShmCharger->gun_info[gun_index].isAuthPassEnd = ON;
-								}
-								else
-								{
-									ShmCharger->gun_info[gun_index].rfidReq = OFF;
-
-									DEBUG_INFO("Authorize fail.\r\n");
-									setSpeaker(ON,SPEAKER_INTERVAL_3COUNT);
-									setLedMotion(gun_index,LED_ACTION_RFID_FAIL);
-									sleep(3);
-								}
-
-								ShmOCPP16Data->SpMsg.bits.AuthorizeConf = OFF;
-							}
-						}
-					}
-
 					// End authorize pass
 					if(((ShmCharger->gun_info[gun_index].rfidReq == ON) && isMatchStartUser(gun_index)) ||
 					   (ShmCharger->gun_info[gun_index].isAuthPassEnd) ||
@@ -3259,4 +3283,4 @@ int main(void)
 	}
 
 	return FAIL;
-}
+}

EVSE/Projects/define.h

@@ -235,6 +235,7 @@ enum CoreProfile {
 	 TransactionMessageRetryInterval,
 	 UnlockConnectorOnEVSideDisconnect,
 	 WebSocketPingInterval,
+	 QueueOffLineStartTransactionMessage,
 	 _CoreProfile_CNT
 };
 
@@ -1678,6 +1679,7 @@ struct PsuGroupData
 	unsigned int 			GroupAvailablePower;			//Watt
 	unsigned short 		GroupPresentOutputVoltage; 	//abcd=abc.d volt
 	unsigned short 		GroupPresentOutputCurrent;		//abcd=abc.d Amps
+	unsigned int		GroupPresentOutputPower;	//Watt
 	struct PsuModuleData 	PsuModule[MAX_PSU_QUANTITY];
 };
 
@@ -3794,7 +3796,7 @@ struct OCPP16ConfigurationItem
 struct OCPP16ConfigurationTable
 {
 	//please refer to OCPP 1.6 chapter 9
-	struct OCPP16ConfigurationItem 			CoreProfile[34];
+	struct OCPP16ConfigurationItem 			CoreProfile[35];
 	struct OCPP16ConfigurationItem 			LocalAuthListManagementProfile[3];
 	struct OCPP16ConfigurationItem 			ReservationProfile[1];
 	struct OCPP16ConfigurationItem 			SmartChargingProfile[5];

EVSE/rootfs/root/.gitignore

@@ -5,3 +5,4 @@ logPackTools
 OcppBackend
 Module_ProduceUtils
 Module_EventLogging
+Module_PhBackend

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/.version

@@ -1 +1 @@
-7
+9

board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/arch/arm/boot/dts/[AW-CCS]am335x-evm.dts

@@ -509,7 +509,7 @@
 		};
 		partition@13 {
 			label = "Storage";
-			reg = <0x0A200000 0x75E00000>;
+			reg = <0x0A200000 0x35E00000>;
 		};
 	};
 };

board-support/u-boot-2017.01+gitAUTOINC+340fb36f04-g340fb36f04/arch/arm/dts/[AW-CCS]am335x-evm.dts

@@ -607,7 +607,7 @@
 		};
 		partition@13 {
 			label = "Storage";
-			reg = <0x0A200000 0x75E00000>;
+			reg = <0x0A200000 0x35E00000>;
 		};
 	};
 };