[Improve][Modularization][Webservice]

2021.07.23 / Folus Wen

Actions:
1. Before download log from web page input how many months log need to download.

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/WebService.c

@@ -1060,169 +1060,155 @@ int main(int argc, char *argv[]) {
 			DEBUG_INFO("WebServiceConfig update OK");
 		#endif
 	}
-	if (argc == 2) {	//init share memory for test
-		if (strcmp(argv[1], "aaa") == 0) {
-			//struct SysConfigData 	SysConfig;
-		//system
-		ShmSysConfigAndInfo->SysInfo.DispenserInfo.DispenserQuantity=1;
-		ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity=1;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ModelName, "DO0E362001D1P0D");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SerialNumber, "SerialNumber");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SystemId, "1234567890");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SystemDateTime, "2019-12-31 23:59:59");
-		ShmSysConfigAndInfo->SysConfig.AcPhaseCount=1;
-		ShmSysConfigAndInfo->SysConfig.PhaseLossPolicy=0;
-		ShmSysConfigAndInfo->SysInfo.FactoryConfiguration=0;
-		ShmSysConfigAndInfo->SysConfig.AuthorisationMode=0;
-		ShmSysConfigAndInfo->SysConfig.DefaultLanguage=0;
-		ShmSysConfigAndInfo->SysInfo.InputVoltageR=0;
-		ShmSysConfigAndInfo->SysInfo.InputVoltageS=0;
-		ShmSysConfigAndInfo->SysInfo.InputVoltageT=0;
-		ShmSysConfigAndInfo->SysInfo.SystemFanRotaSpeed=0;
-		ShmSysConfigAndInfo->SysInfo.PsuFanRotaSpeed=0;
-		ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian=0;
-		ShmSysConfigAndInfo->SysConfig.RatingCurrent=100;
-		ShmSysConfigAndInfo->SysConfig.PsuAcInputType=0;
-		ShmSysConfigAndInfo->SysInfo.AuxPower5V=0;
-		ShmSysConfigAndInfo->SysInfo.AuxPower12V=0;
-		ShmSysConfigAndInfo->SysInfo.AuxPower24V=0;
-		ShmSysConfigAndInfo->SysInfo.AuxPower48V=0;
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuHwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuBootLoadFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuKernelFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.LcmHwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.LcmFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.PsuHwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.PsuPrimFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.PsuSecFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.AuxPwrHwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.AuxPwrFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.FanModuleHwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.FanModuleFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.RelayModuleHwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.RelayModuleFwRev, "");
-		strcpy((char *)&ShmSysConfigAndInfo->SysInfo.TelcomModemFwRev, "");
-		ShmSysConfigAndInfo->SysInfo.SystemAmbientTemp=0;
-		ShmSysConfigAndInfo->SysInfo.SystemCriticalTemp=0;
-		ShmSysConfigAndInfo->SysInfo.CcsConnectorTemp=0;
-		ShmSysConfigAndInfo->SysInfo.PsuAmbientTemp=0;
-		ShmSysConfigAndInfo->SysConfig.AcPlugInTimes=0;
-		ShmSysConfigAndInfo->SysConfig.GbPlugInTimes=0;
-		ShmSysConfigAndInfo->SysConfig.Ccs1PlugInTime=0;
-		ShmSysConfigAndInfo->SysConfig.Ccs2PlugInTimes=0;
-		ShmSysConfigAndInfo->SysConfig.ChademoPlugInTimes=0;
-		// strcpy((char *)&ShmPsuData->PsuVersion[0].FwPrimaryVersion, "DC 9.01");
-		// strcpy((char *)&ShmPsuData->PsuVersion[1].FwPrimaryVersion, "DC 9.02");
-		// strcpy((char *)&ShmPsuData->PsuVersion[0].FwSecondVersion, "PFC 9.02");
-		// strcpy((char *)&ShmPsuData->PsuVersion[1].FwSecondVersion, "PFC 9.03");
 
-		//charging
-		ShmSysConfigAndInfo->SysConfig.MaxChargingEnergy=0;
-		ShmSysConfigAndInfo->SysConfig.MaxChargingPower=0;
-		ShmSysConfigAndInfo->SysConfig.MaxChargingCurrent= 0;
-		ShmSysConfigAndInfo->SysConfig.AcMaxChargingCurrent= 0;
-		ShmSysConfigAndInfo->SysConfig.MaxChargingDuration=0;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[0], "111");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[1], "222");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[2], "333");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[3], "444");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[4], "555");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[5], "666");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[6], "777");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[7], "888");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[8], "999");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[9], "aaa");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.UserId, "UserId");
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargingVoltage=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargingCurrent=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargingPower=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargedEnergy=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargedDuration=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].RemainChargingDuration=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatteryMaxVoltage=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatterytargetVoltage=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatterySoc=0;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].SystemStatus=1;
-		ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatterytargetCurrent=1;
-		//network
-		ShmSysConfigAndInfo->SysInfo.InternetConn=0;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.FtpServer,"");
-		ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthDhcpClient=1;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthMacAddress,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthIpAddress,"192.168.1.10");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthSubmaskAddress,"255.255.255.0");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthGatewayAddress,"192.168.1.1");
-		ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthDhcpClient=1;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthMacAddress,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthIpAddress,"192.168.0.10");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthSubmaskAddress,"255.255.255.0");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthGatewayAddress,"192.168.0.1");
-		ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode=1;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSsid,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiPassword,"");
-		ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi=0;
-		ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpServer=0;
-		ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpClient=0;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiIpAddress,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress,"");
-		ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn=1;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomApn,"");
-		ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomRssi=0;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomChapPapId,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomChapPapPwd,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomModemImei,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomSimImsi,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomSimIccid,"");
-		ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomSimStatus=0;
-		ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomModemMode=0;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress,"");
-		//backend
-		ShmSysConfigAndInfo->SysConfig.BackendConnTimeout=300;
-		ShmSysConfigAndInfo->SysConfig.OfflinePolicy=0;
-		ShmSysConfigAndInfo->SysConfig.OfflineMaxChargeEnergy=0;
-		ShmSysConfigAndInfo->SysConfig.OfflineMaxChargeDuration=0;
-		ShmSysConfigAndInfo->SysInfo.OcppConnStatus=0;
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ChargeBoxId,"");
-		strcpy((char *)&ShmSysConfigAndInfo->SysConfig.chargePointVendor,"Phihong");
-
-		ShmSysConfigAndInfo->SysInfo.FirmwareUpdate=0;
-		struct SysConfigData 	SysConfig;
-		memcpy(&SysConfig, &ShmSysConfigAndInfo->SysConfig, sizeof(struct SysConfigData));
-		StoreUsrConfigData(&SysConfig);
-		
-		// struct PsuModuleVer 	PsuData;
-		// memcpy(&PsuData, &ShmPsuData->PsuVersion, sizeof(struct PsuModuleVer));
-		// StoreUsrConfigData(&PsuData);
+	if (argc == 2)
+	{	//init share memory for test
+		if (strcmp(argv[1], "aaa") == 0)
+		{
+			//struct SysConfigData 	SysConfig;
+			//system
+			ShmSysConfigAndInfo->SysInfo.DispenserInfo.DispenserQuantity=1;
+			ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity=1;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ModelName, "DO0E362001D1P0D");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SerialNumber, "SerialNumber");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SystemId, "1234567890");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.SystemDateTime, "2019-12-31 23:59:59");
+			ShmSysConfigAndInfo->SysConfig.AcPhaseCount=1;
+			ShmSysConfigAndInfo->SysConfig.PhaseLossPolicy=0;
+			ShmSysConfigAndInfo->SysInfo.FactoryConfiguration=0;
+			ShmSysConfigAndInfo->SysConfig.AuthorisationMode=0;
+			ShmSysConfigAndInfo->SysConfig.DefaultLanguage=0;
+			ShmSysConfigAndInfo->SysInfo.InputVoltageR=0;
+			ShmSysConfigAndInfo->SysInfo.InputVoltageS=0;
+			ShmSysConfigAndInfo->SysInfo.InputVoltageT=0;
+			ShmSysConfigAndInfo->SysInfo.SystemFanRotaSpeed=0;
+			ShmSysConfigAndInfo->SysInfo.PsuFanRotaSpeed=0;
+			ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian=0;
+			ShmSysConfigAndInfo->SysConfig.RatingCurrent=100;
+			ShmSysConfigAndInfo->SysConfig.PsuAcInputType=0;
+			ShmSysConfigAndInfo->SysInfo.AuxPower5V=0;
+			ShmSysConfigAndInfo->SysInfo.AuxPower12V=0;
+			ShmSysConfigAndInfo->SysInfo.AuxPower24V=0;
+			ShmSysConfigAndInfo->SysInfo.AuxPower48V=0;
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuHwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuBootLoadFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuKernelFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuRootFsFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.CsuPrimFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.LcmHwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.LcmFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.PsuHwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.PsuPrimFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.PsuSecFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.AuxPwrHwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.AuxPwrFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.FanModuleHwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.FanModuleFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.RelayModuleHwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.RelayModuleFwRev, "");
+			strcpy((char *)&ShmSysConfigAndInfo->SysInfo.TelcomModemFwRev, "");
+			ShmSysConfigAndInfo->SysInfo.SystemAmbientTemp=0;
+			ShmSysConfigAndInfo->SysInfo.SystemCriticalTemp=0;
+			ShmSysConfigAndInfo->SysInfo.CcsConnectorTemp=0;
+			ShmSysConfigAndInfo->SysInfo.PsuAmbientTemp=0;
+			ShmSysConfigAndInfo->SysConfig.AcPlugInTimes=0;
+			ShmSysConfigAndInfo->SysConfig.GbPlugInTimes=0;
+			ShmSysConfigAndInfo->SysConfig.Ccs1PlugInTime=0;
+			ShmSysConfigAndInfo->SysConfig.Ccs2PlugInTimes=0;
+			ShmSysConfigAndInfo->SysConfig.ChademoPlugInTimes=0;
+			// strcpy((char *)&ShmPsuData->PsuVersion[0].FwPrimaryVersion, "DC 9.01");
+			// strcpy((char *)&ShmPsuData->PsuVersion[1].FwPrimaryVersion, "DC 9.02");
+			// strcpy((char *)&ShmPsuData->PsuVersion[0].FwSecondVersion, "PFC 9.02");
+			// strcpy((char *)&ShmPsuData->PsuVersion[1].FwSecondVersion, "PFC 9.03");
+
+			//charging
+			ShmSysConfigAndInfo->SysConfig.MaxChargingEnergy=0;
+			ShmSysConfigAndInfo->SysConfig.MaxChargingPower=0;
+			ShmSysConfigAndInfo->SysConfig.MaxChargingCurrent= 0;
+			ShmSysConfigAndInfo->SysConfig.AcMaxChargingCurrent= 0;
+			ShmSysConfigAndInfo->SysConfig.MaxChargingDuration=0;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[0], "111");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[1], "222");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[2], "333");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[3], "444");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[4], "555");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[5], "666");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[6], "777");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[7], "888");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[8], "999");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.LocalWhiteCard[9], "aaa");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.UserId, "UserId");
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargingVoltage=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargingCurrent=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargingPower=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargedEnergy=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].PresentChargedDuration=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].RemainChargingDuration=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatteryMaxVoltage=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatterytargetVoltage=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatterySoc=0;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].SystemStatus=1;
+			ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].EvBatterytargetCurrent=1;
+			//network
+			ShmSysConfigAndInfo->SysInfo.InternetConn=0;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.FtpServer,"");
+			ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthDhcpClient=1;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthMacAddress,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthIpAddress,"192.168.1.10");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthSubmaskAddress,"255.255.255.0");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth0Interface.EthGatewayAddress,"192.168.1.1");
+			ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthDhcpClient=1;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthMacAddress,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthIpAddress,"192.168.0.10");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthSubmaskAddress,"255.255.255.0");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.Eth1Interface.EthGatewayAddress,"192.168.0.1");
+			ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMode=1;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSsid,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiPassword,"");
+			ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi=0;
+			ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpServer=0;
+			ShmSysConfigAndInfo->SysConfig.AthInterface.WifiDhcpClient=0;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiIpAddress,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress,"");
+			ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn=1;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomApn,"");
+			ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomRssi=0;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomChapPapId,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomChapPapPwd,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomModemImei,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomSimImsi,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomSimIccid,"");
+			ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomSimStatus=0;
+			ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomModemMode=0;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.TelecomInterface.TelcomIpAddress,"");
+			//backend
+			ShmSysConfigAndInfo->SysConfig.BackendConnTimeout=300;
+			ShmSysConfigAndInfo->SysConfig.OfflinePolicy=0;
+			ShmSysConfigAndInfo->SysConfig.OfflineMaxChargeEnergy=0;
+			ShmSysConfigAndInfo->SysConfig.OfflineMaxChargeDuration=0;
+			ShmSysConfigAndInfo->SysInfo.OcppConnStatus=0;
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.ChargeBoxId,"");
+			strcpy((char *)&ShmSysConfigAndInfo->SysConfig.chargePointVendor,"Phihong");
+
+			ShmSysConfigAndInfo->SysInfo.FirmwareUpdate=0;
+			struct SysConfigData 	SysConfig;
+			memcpy(&SysConfig, &ShmSysConfigAndInfo->SysConfig, sizeof(struct SysConfigData));
+			StoreUsrConfigData(&SysConfig);
+
+			// struct PsuModuleVer 	PsuData;
+			// memcpy(&PsuData, &ShmPsuData->PsuVersion, sizeof(struct PsuModuleVer));
+			// StoreUsrConfigData(&PsuData);
 
-		#ifdef SystemLogMessage
-		DEBUG_INFO("WebService initial OK");
-		#endif
-		}
-		if (strcmp(argv[1], "log") == 0) {
-			unsigned char			ModelName[64];;
-			unsigned char			SerialNo[64];;
-			memcpy(ModelName,ShmSysConfigAndInfo->SysConfig.ModelName,ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.ModelName));
-			printf("%s", ModelName);
-			memcpy(SerialNo,ShmSysConfigAndInfo->SysConfig.SerialNumber,ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.SerialNumber));
-			printf("%s", SerialNo);
-			time_t tt = time(0); //獲取當前時間
-			int year,month;
-			char cmd[512];
-			struct tm *pst = localtime(&tt); //把time_t類型轉換為struct tm類型
-			year = pst->tm_year + 1900;
-			month = pst->tm_mon + 1;
-//			sprintf(cmd,"cp /mnt/*%s*%s*.zip /var/www/log.zip",ModelName,SerialNo);
-			if(system("exec /root/logPackTools 'log'")==0){
-				system(cmd);
-			}
+			#ifdef SystemLogMessage
+			DEBUG_INFO("WebService initial OK");
+			#endif
 		}
 
-		if (strcmp(argv[1], "button") == 0) {
+		if (strcmp(argv[1], "button") == 0)
+		{
 			unsigned char			Button1;
 			unsigned char			Button2;
 			unsigned char			EmergencyButton;
@@ -1243,12 +1229,38 @@ int main(int argc, char *argv[]) {
 			printf("%s\n", json_object_to_json_string(jobj));
 		}
 
-		if (strcmp(argv[1], "restart") == 0) {
+		if (strcmp(argv[1], "restart") == 0)
+		{
 			system("exec /usr/bin/run_evse_restart.sh");
 		}
 	}
+
+	if(strcmp(argv[1], "log") == 0)
+	{
+		char cmd[512];
+
+		if((argc == 3) && isdigit(*argv[2]))
+		{
+			sprintf(cmd, "exec /root/logPackTools 'log' %s", argv[2]);
+		}
+		else
+		{
+			sprintf(cmd, "exec /root/logPackTools 'log'");
+		}
+
+		if(system(cmd) == 0)
+		{
+			DEBUG_INFO("Log pack success.\n");
+		}
+		else
+		{
+			DEBUG_INFO("Log pack fail.\n");
+		}
+	}
+
 	//upgrade firmware
-	if ((argc == 3) & (strcmp(argv[1], "upgrade") == 0)) {
+	if ((argc == 3) & (strcmp(argv[1], "upgrade") == 0))
+	{
 		struct json_object *jobj;
 		struct json_object *Result;
 		struct json_object *Message;

EVSE/rootfs/var/www/log_download.php

@@ -65,6 +65,12 @@ img {
 	}
 
 	function getInfo() {
+		var logCnt;
+
+                do{
+                        logCnt = prompt("<?php echo $lang->showWord("logPackPrompt");?>", 2);
+		}while(isNaN(logCnt) || (logCnt > 6) || (logCnt < 1));
+
 		document.getElementById("loading").style.display="block";
 		// 發送 Ajax 查詢請求並處理
 		var request = new XMLHttpRequest();
@@ -72,7 +78,7 @@ img {
 		var d=new Date();
 		var now=d.getFullYear() + ("00" + (d.getMonth() + 1)).slice(-2) + ("00" + d.getDate()).slice(-2) + ("00" + d.getHours()).slice(-2) + ("00" + d.getMinutes()).slice(-2) + ("00" + d.getSeconds()).slice(-2);
 		// POST 參數須使用 send() 發送
-		var data = "name=";
+		var data = "logCnt=" + logCnt;
 
 		// POST 請求必須設置表頭在 open() 下面，send() 上面
 		request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");

EVSE/rootfs/var/www/log_download_action.php

@@ -18,26 +18,12 @@
 		
 		$message = $lang->showWord("message_download_log");
 		chdir('/var/www');
-		//shell_exec('sudo cp /root/charger_buffer_log.db /var/www'.'> /dev/null 2>/dev/null ');	
-//		$output =shell_exec('./run_pack_log.sh ');
 		ob_start();
-		// while (@ ob_end_flush()); // end all output buffers if any
-		// $proc = popen('sudo /var/www/html/run_pack_log.sh', 'r');
-//		echo '<pre>';
-		// while (!feof($proc))
-		// {
-			// echo fread($proc, 512);
-		   // @ flush();
-		// }
-//		echo '</pre>';
-	chdir("/root");
-	exec("'./WebService' 'log'",$output,$return_var);
-//	$SerialNumber=json_decode(trim($output[0]))->{'SerialNumber'};
-//echo date('Ym').$SerialNumber;exit;
-//		shell_exec('zip --password "'.date('Ym').$SerialNumber.'" -r /var/www/log.zip /Storage/');
+		chdir("/root");
+		exec("'./WebService' 'log' ".$_POST['logCnt'], $output, $return_var);
 		ob_end_clean();	
 		
 		echo "<font color=#000fff>".$message."</font>";
 	}
 
-?>
+?>