2019-12-23 / ct_chen

Actions:
1. 修正Webservice寫入nand flash錯誤

Files:
1. EVSE/Modularization/WebService.c

EVSE/Modularization/WebService.c

@@ -139,7 +139,7 @@ void split(char **arr, char *str, const char *del) {
 }
 
 int ConnectorType(char* connector){
-	int* result;
+	int result;
 	if(strcmp(connector, "0") == 0){
 		result= 0;
 	}
@@ -266,7 +266,6 @@ int StoreUsrConfigData(struct SysConfigData *UsrData)
 		#endif
 		return 0;
 	}
-   	InitShareMemory();
 	return 1;
 }
 //================================================
@@ -285,18 +284,6 @@ int main(int argc, char *argv[]) {
 	}
 	//web page submit
 	if ((argc == 3) & (strlen(argv[1]) == 1)) {
-		struct SysConfigData 	SysConfig;
-		unsigned char *ptr;
-		ptr=malloc(sizeof(struct SysConfigData));
-		if(ptr==NULL)
-		{
-			#ifdef SystemLogMessage
-			DEBUG_ERROR("malloc for SysConfigData NG");
-			#endif
-			return 0;
-		}
-		memset(ptr,0,sizeof(struct SysConfigData));
-		memset(&SysConfig,0,sizeof(struct SysConfigData));
 		//web page submit system
 		if (strcmp(argv[1], "1") == 0) {
 			struct json_object *jobj = json_tokener_parse(argv[2]);
@@ -336,12 +323,6 @@ int main(int argc, char *argv[]) {
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AuthorisationMode,AuthorisationMode);
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.DefaultLanguage,DefaultLanguage);
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian,RfidCardNumEndian);
-			//Set default configuration
-			strcpy((char *)&SysConfig.SystemId, SystemId);
-			strcpy((char *)&SysConfig.AcPhaseCount, AcPhaseCount);
-			strcpy((char *)&SysConfig.AuthorisationMode, AuthorisationMode);
-			strcpy((char *)&SysConfig.DefaultLanguage, DefaultLanguage);
-			strcpy((char *)&SysConfig.RfidCardNumEndian,RfidCardNumEndian);
 
 			if(strlen(SystemDateTime)>0){
 				char cmd[100];
@@ -431,22 +412,6 @@ int main(int argc, char *argv[]) {
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[7],LocalWhiteCard7);
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[8],LocalWhiteCard8);
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[9],LocalWhiteCard9);
-			//Set default configuration
-			SysConfig.MaxChargingEnergy = MaxChargingEnergy;
-			SysConfig.MaxChargingPower = MaxChargingPower;
-			SysConfig.MaxChargingCurrent = MaxChargingCurrent;
-			SysConfig.MaxChargingDuration = MaxChargingDuration;
-			strcpy((char *)&SysConfig.PhaseLossPolicy,PhaseLossPolicy);
-			strcpy((char *)&SysConfig.LocalWhiteCard[0],LocalWhiteCard0);
-			strcpy((char *)&SysConfig.LocalWhiteCard[1],LocalWhiteCard1);
-			strcpy((char *)&SysConfig.LocalWhiteCard[2],LocalWhiteCard2);
-			strcpy((char *)&SysConfig.LocalWhiteCard[3],LocalWhiteCard3);
-			strcpy((char *)&SysConfig.LocalWhiteCard[4],LocalWhiteCard4);
-			strcpy((char *)&SysConfig.LocalWhiteCard[5],LocalWhiteCard5);
-			strcpy((char *)&SysConfig.LocalWhiteCard[6],LocalWhiteCard6);
-			strcpy((char *)&SysConfig.LocalWhiteCard[7],LocalWhiteCard7);
-			strcpy((char *)&SysConfig.LocalWhiteCard[8],LocalWhiteCard8);
-			strcpy((char *)&SysConfig.LocalWhiteCard[9],LocalWhiteCard9);
 		}
 		if (strcmp(argv[1], "3") == 0) {
 			struct json_object *jobj = json_tokener_parse(argv[2]);
@@ -557,28 +522,6 @@ int main(int argc, char *argv[]) {
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomChapPapId,TelcomChapPapId);
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomChapPapPwd,TelcomChapPapPwd);
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress,TelcomIpAddress);
-			//Set default configuration
-			strcpy((char *)&SysConfig.FtpServer, FtpServer);
-			strcpy((char *)&SysConfig.Eth0Interface.EthDhcpClient, Eth0DhcpClient);
-			strcpy((char *)&SysConfig.Eth0Interface.EthIpAddress, Eth0IpAddress);
-			strcpy((char *)&SysConfig.Eth0Interface.EthSubmaskAddress, Eth0SubmaskAddress);
-			strcpy((char *)&SysConfig.Eth0Interface.EthGatewayAddress, Eth0GatewayAddress);
-			strcpy((char *)&SysConfig.Eth1Interface.EthDhcpClient, Eth1DhcpClient);
-			strcpy((char *)&SysConfig.Eth1Interface.EthIpAddress, Eth1IpAddress);
-			strcpy((char *)&SysConfig.Eth1Interface.EthSubmaskAddress, Eth1SubmaskAddress);
-			strcpy((char *)&SysConfig.Eth1Interface.EthGatewayAddress, Eth1GatewayAddress);
-			strcpy((char *)&SysConfig.AthInterface.WifiMode, WifiMode);
-			strcpy((char *)&SysConfig.AthInterface.WifiSsid, WifiSsid);
-			strcpy((char *)&SysConfig.AthInterface.WifiPassword, WifiPassword);
-			strcpy((char *)&SysConfig.AthInterface.WifiDhcpServer, WifiDhcpServer);
-			strcpy((char *)&SysConfig.AthInterface.WifiDhcpClient, WifiDhcpClient);
-			strcpy((char *)&SysConfig.AthInterface.WifiIpAddress, WifiIpAddress);
-			strcpy((char *)&SysConfig.AthInterface.WifiSubmaskAddress, WifiSubmaskAddress);
-			strcpy((char *)&SysConfig.AthInterface.WifiGatewayAddress, WifiGatewayAddress);
-			strcpy((char *)&SysConfig.TelecomInterface.TelcomApn, TelcomApn);
-			strcpy((char *)&SysConfig.TelecomInterface.TelcomChapPapId, TelcomChapPapId);
-			strcpy((char *)&SysConfig.TelecomInterface.TelcomChapPapPwd, TelcomChapPapPwd);
-			strcpy((char *)&SysConfig.TelecomInterface.TelcomIpAddress, TelcomIpAddress);
 		}
 		if (strcmp(argv[1], "4") == 0) {
 			struct json_object *jobj = json_tokener_parse(argv[2]);
@@ -618,16 +561,9 @@ int main(int argc, char *argv[]) {
 			ShmSysConfigAndInfo->SysConfig.OfflineMaxChargeDuration = OfflineMaxChargeDuration;
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,OcppServerURL);
 			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ChargeBoxId,ChargeBoxId);
-			//Set default configuration
-			SysConfig.BackendConnTimeout=(int)BackendConnTimeout;
-			strcpy((char *)&SysConfig.OfflinePolicy, OfflinePolicy);
-			SysConfig.OfflineMaxChargeEnergy=(int)OfflineMaxChargeEnergy;
-			SysConfig.OfflineMaxChargeDuration=(int)OfflineMaxChargeDuration;
-			strcpy((char *)&SysConfig.OcppServerURL, OcppServerURL);
-			strcpy((char *)&SysConfig.ChargeBoxId, ChargeBoxId);
 		}
 
-		StoreUsrConfigData(&SysConfig);
+		StoreUsrConfigData(&ShmSysConfigAndInfo->SysConfig);
 
 		#ifdef SystemLogMessage
 			DEBUG_INFO("WebServiceConfig update OK");
@@ -1045,7 +981,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StoptDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp,1);
 				CcsGunQty++;
@@ -1068,7 +1004,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StopDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StoptDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].ConnectorTemp,1);
 				GbGunQty++;
@@ -1091,7 +1027,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StopDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StoptDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].ConnectorTemp,1);
 				CHAdeMOGunQty++;
@@ -1114,7 +1050,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].CardNumber);
 				StartUserId[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartUserId);
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartDateTime);
-				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StopDateTime);
+				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StoptDateTime);
 				StartMethod[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartMethod,1);
 				ConnectorTemp[0] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].ConnectorTemp,1);
 				AcGunQty++;
@@ -1139,7 +1075,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StoptDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp,1);
 				CcsGunQty++;
@@ -1162,7 +1098,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StopDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StoptDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].ConnectorTemp,1);
 				GbGunQty++;
@@ -1185,7 +1121,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StopDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StoptDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].ConnectorTemp,1);
 				CHAdeMOGunQty++;
@@ -1208,7 +1144,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].CardNumber);
 				StartUserId[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartUserId);
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartDateTime);
-				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StopDateTime);
+				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StoptDateTime);
 				StartMethod[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartMethod,1);
 				ConnectorTemp[1] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].ConnectorTemp,1);
 				AcGunQty++;
@@ -1233,7 +1169,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StoptDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp,1);
 				CcsGunQty++;
@@ -1256,7 +1192,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StopDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StoptDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[GbGunQty].ConnectorTemp,1);
 				GbGunQty++;
@@ -1279,7 +1215,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StopDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StoptDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CHAdeMOGunQty].ConnectorTemp,1);
 				CHAdeMOGunQty++;
@@ -1302,7 +1238,7 @@ int main(int argc, char *argv[]) {
 				CardNumber[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].CardNumber);
 				StartUserId[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartUserId);
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartDateTime);
-				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StopDateTime);
+				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StoptDateTime);
 				StartMethod[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].StartMethod,1);
 				ConnectorTemp[2] = json_object_new_string_len((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[AcGunQty].ConnectorTemp,1);
 				AcGunQty++;