[Add][All][define.h]

2021.11.19 / Folus Wen

Actions:
1. Add MaintainServerURL to SysConfig struct.
2. Add MaintainServerConnStatus to SysInfo struct.

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/ocppph/MessageHandler.c

@@ -4012,7 +4012,7 @@ void CheckSystemValue(void)
 			sendStartTransactionRequest(gun_index);
 			refreshStartTimer(&clientTime.StartTransaction);
 			refreshStartTimer(&clientTime.MeterValues[gun_index]);
-			storeTempStopTransaction(gun_index);
+			//storeTempStopTransaction(gun_index);
 		}
 
 		//==============================================
@@ -4566,7 +4566,7 @@ void CheckSystemValue(void)
 				if(atoi((const char *)ShmOCPP16DataPH->ConfigurationTable.CoreProfile[MeterValueSampleInterval].ItemData)>0)
 					sendMeterValuesRequest(gun_index, ReadingContext_Sample_Periodic);
 
-				storeTempStopTransaction(gun_index);
+				//storeTempStopTransaction(gun_index);
 			}
 
 			refreshStartTimer(&clientTime.MeterValues[gun_index]);
@@ -18353,15 +18353,14 @@ int GetOcppServerURL()
 	char urlStr[512];
 
 	// OCPPPH only
-	sprintf((char*)ShmOCPP16DataPH->OcppServerURL, "wss://ocpp.phihong.com.tw:2013/");
 	sprintf((char*)ShmOCPP16DataPH->ChargeBoxId, "%s%s", ShmSysConfigAndInfo->SysConfig.ModelName, ShmSysConfigAndInfo->SysConfig.SerialNumber);
-	if((ShmOCPP16DataPH->OcppServerURL != NULL) && (strcmp((const char *)ShmOCPP16DataPH->OcppServerURL,"") != 0))
+	if((ShmSysConfigAndInfo->SysConfig.MaintainServerURL != NULL) && (strcmp((const char *)ShmSysConfigAndInfo->SysConfig.MaintainServerURL,"") != 0) )
 	{
 		/*sscanf((const char *)ShmOCPP16DataPH->OcppServerURL,
 								"%[^:]:%*2[/]%[^:]:%i/%[a-zA-Z0-9._/-]",
 								OcppProtocol, OcppHost, &OcppPort, OcppTempPath);*/
 
-		memcpy(urlStr, ShmOCPP16DataPH->OcppServerURL, ARRAY_SIZE(ShmOCPP16DataPH->OcppServerURL));
+		memcpy(urlStr, ShmSysConfigAndInfo->SysConfig.MaintainServerURL, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.MaintainServerURL));
 		if(yuarel_parse(&url, urlStr) != -1)
 		{
 			sprintf(OcppProtocol, "%s", url.scheme);
@@ -18424,12 +18423,12 @@ int GetOcppPort()
 
 int GetOcppConnStatus(void)
 {
-	return ShmOCPP16DataPH->OcppConnStatus;
+	return ShmSysConfigAndInfo->SysInfo.MaintainServerConnStatus;
 }
 
 void SetOcppConnStatus(uint8_t status)
 {
-	ShmOCPP16DataPH->OcppConnStatus = status;
+	ShmSysConfigAndInfo->SysInfo.MaintainServerConnStatus = status;
 }
 
 int GetHeartBeatWithNOResponse(void)

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

@@ -373,6 +373,7 @@ int main(void)
 			memset(cmd, 0x00, ARRAY_SIZE(cmd));
 			printf("\n ***** ocpp ***************************************");
 			printf("\n  ocppurl: OCPP backend server url.");
+			printf("\n  mtserverurl: Maintain backend server url.");
 			printf("\n  cboxid: Charger box id.");
 			printf("\n  vender: Charger point vender.");
 			printf("\n  offlinepolicy: Charger off line policy.");
@@ -402,6 +403,27 @@ int main(void)
 					DEBUG_INFO("Input ocpp url: %s\n", ShmSysConfigAndInfo->SysConfig.OcppServerURL);
 				}
 			}
+			if(strcmp(cmd, "mtserverurl") == 0)
+			{
+				memset(cmd, 0x00, ARRAY_SIZE(cmd));
+				printf("\n ***** mtserverurl *********************************");
+				printf("\n  Current maintain server url: %s", ShmSysConfigAndInfo->SysConfig.MaintainServerURL);
+				printf("\n  0: Keep current config.");
+				printf("\n  1: Input new ocpp url.");
+				printf("\n **************************************************");
+				printf("\n  Please input operation item: ");
+				scanf("%s", &cmd[0]);
+
+				if(atoi(cmd) == 1)
+				{
+					printf("\n Please input maintain server url: ");
+					scanf("%s", &cmd[0]);
+
+					memset(&ShmSysConfigAndInfo->SysConfig.MaintainServerURL[0], 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.MaintainServerURL));
+					strcpy((char*)&ShmSysConfigAndInfo->SysConfig.MaintainServerURL[0], (char*)&cmd[0]);
+					DEBUG_INFO("Input maintain server url: %s\n", ShmSysConfigAndInfo->SysConfig.MaintainServerURL);
+				}
+			}
 			else if(strcmp(cmd, "cboxid") == 0)
 			{
 				memset(cmd, 0x00, ARRAY_SIZE(cmd));

EVSE/Projects/AX80/Apps/Module_ConfigTools.c

@@ -373,6 +373,7 @@ int main(void)
 			memset(cmd, 0x00, ARRAY_SIZE(cmd));
 			printf("\n ***** ocpp ***************************************");
 			printf("\n  ocppurl: OCPP backend server url.");
+			printf("\n  mtserverurl: Maintain backend server url.");
 			printf("\n  cboxid: Charger box id.");
 			printf("\n  vender: Charger point vender.");
 			printf("\n  offlinepolicy: Charger off line policy.");
@@ -402,6 +403,27 @@ int main(void)
 					DEBUG_INFO("Input ocpp url: %s\n", ShmSysConfigAndInfo->SysConfig.OcppServerURL);
 				}
 			}
+			if(strcmp(cmd, "mtserverurl") == 0)
+			{
+				memset(cmd, 0x00, ARRAY_SIZE(cmd));
+				printf("\n ***** mtserverurl *********************************");
+				printf("\n  Current maintain server url: %s", ShmSysConfigAndInfo->SysConfig.MaintainServerURL);
+				printf("\n  0: Keep current config.");
+				printf("\n  1: Input new ocpp url.");
+				printf("\n **************************************************");
+				printf("\n  Please input operation item: ");
+				scanf("%s", &cmd[0]);
+
+				if(atoi(cmd) == 1)
+				{
+					printf("\n Please input maintain server url: ");
+					scanf("%s", &cmd[0]);
+
+					memset(&ShmSysConfigAndInfo->SysConfig.MaintainServerURL[0], 0x00, ARRAY_SIZE(ShmSysConfigAndInfo->SysConfig.MaintainServerURL));
+					strcpy((char*)&ShmSysConfigAndInfo->SysConfig.MaintainServerURL[0], (char*)&cmd[0]);
+					DEBUG_INFO("Input maintain server url: %s\n", ShmSysConfigAndInfo->SysConfig.MaintainServerURL);
+				}
+			}
 			else if(strcmp(cmd, "cboxid") == 0)
 			{
 				memset(cmd, 0x00, ARRAY_SIZE(cmd));

EVSE/Projects/define.h

@@ -534,7 +534,7 @@ struct SysConfigData
 	unsigned char   		OfflinePolicy;				//0: local list, 1: Phihong RFID tag, 2: free charging, 3: no charging
 	unsigned short	   		OfflineMaxChargeEnergy;		//0: same as MaxChargingEnergy, 1 ~ 65535 kWh
 	unsigned short	   		OfflineMaxChargeDuration;	//0: same as MaxChargeDuration, 1 ~ 65535 minutes
-	unsigned char 			OcppServerURL[512];			//http: non-secure OCPP 1.5-S, https: secure OCPP 1.5-S, ws: non-secure OCPP 1.6-J, wss: secure OCPP 1.6-J"
+	unsigned char 			OcppServerURL[512];			//ws: non-secure OCPP 1.6-J, wss: secure OCPP 1.6-J"
 	unsigned char 			ChargeBoxId[128];
 	unsigned char			chargePointVendor[20];		//the Vendor of the ChargePoint
     unsigned char           OcppSecurityProfile;        //OCPP security profile 0~3
@@ -553,6 +553,7 @@ struct SysConfigData
 
     unsigned char           OcppReceiptrURL[512];       // Charging receipt display URL
     unsigned char           isAuthrizeByEVCCID;         // is Authorize by EVCCID (CCS)
+    unsigned char 			MaintainServerURL[512];		//ws: non-secure OCPP 1.6-J, wss: secure OCPP 1.6-J"
 };
 
 struct ChargingInfoData
@@ -942,6 +943,7 @@ struct SysInfoData
 	unsigned char 		InternetConn;					//0: disconnected, 1: connected
 	/**************Backend***************/
 	unsigned char 		OcppConnStatus;					//0: disconnected, 1: connected
+	unsigned char 		MaintainServerConnStatus;		//0: disconnected, 1: connected
 	char 				OrderCharging;
     float               MaxChargingProfilePower;        // unit: 1W
 	/**************Alston***************/