[Improve][AX80 / Modularization][main / OcppBackend / OcppBackendPH / OcppBackend20]

2022.05.03 / Folus Wen

Actions:
1. AX80 enable authorize by EVCCID.
2. wget retry change from 3 to 1.

Files:
1. As follow commit history

Image version: D0.01.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Modularization/ocpp20/MessageHandler.c

@@ -19123,13 +19123,13 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 		system(rmFileCmd);
 	}
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
+	sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
 	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		DEBUG_INFO("http DownLoad error!\n");
+		DEBUG_INFO("HTTP/HTTPS download fail!\n");
 		result = FALSE;
 	}
 	system("pkill ping");
@@ -19157,19 +19157,19 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
 
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
+	sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120",filename, url);
 	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
+		sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
 		DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 		systemresult = system(ftpbuf);
 		if(systemresult != 0)
 		{
-			DEBUG_WARN("wget error!\n");
+			DEBUG_WARN("FTP download fail!\n");
 			result = FALSE;
 		}
 	}

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -20129,13 +20129,13 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 		system(rmFileCmd);
 	}
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
+	sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
 	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		DEBUG_INFO("http DownLoad error!\n");
+		DEBUG_INFO("HTTP/HTTPS downLoad fail!\n");
 		result = FALSE;
 	}
 	system("pkill ping");
@@ -20163,19 +20163,19 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
 
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
+	sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120",filename, url);
 	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
+		sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
 		DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 		systemresult = system(ftpbuf);
 		if(systemresult != 0)
 		{
-			DEBUG_WARN("wget error!\n");
+			DEBUG_WARN("FTP download fail!\n");
 			result = FALSE;
 		}
 	}

EVSE/Modularization/ocppph/MessageHandler.c

@@ -19408,13 +19408,13 @@ int httpDownLoadFile(char *location, char *path, char *filename,char *url)
 		system(rmFileCmd);
 	}
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
+	sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120 --no-check-certificate",filename, url);
 	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		DEBUG_INFO("http DownLoad error!\n");
+		DEBUG_INFO("HTTP/HTTPS downLoad fail!\n");
 		result = FALSE;
 	}
 	system("pkill ping");
@@ -19442,19 +19442,19 @@ int ftpDownLoadFile(char *location, char *user, char *password, int port, char *
 
 	memset(ftpbuf, 0, ARRAY_SIZE(ftpbuf));
 
-	sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120",filename, url);
+	sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120",filename, url);
 	DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 	systemresult = system(ftpbuf);
 	if(systemresult != 0)
 	{
-		sprintf(ftpbuf, "wget --tries=3 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
+		sprintf(ftpbuf, "wget --tries=1 -O /mnt/%s -c %s -T 120 --no-passive-ftp",filename, url);
 		DEBUG_INFO("Download command: %s\n",ftpbuf);
 
 		systemresult = system(ftpbuf);
 		if(systemresult != 0)
 		{
-			DEBUG_WARN("wget error!\n");
+			DEBUG_WARN("FTP download fail!\n");
 			result = FALSE;
 		}
 	}

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

@@ -2859,6 +2859,7 @@ int CsuCommAC_SHM_Rx_Update()
    ShmCharger->gun_info[gun_index].acCcsInfo.PresentMsgFlowStatus=Check_V2G_Flow_Status();
    ShmCharger->gun_info[gun_index].acCcsInfo.EVChargeProgress = ShmCcsData->V2GMessage_ISO15118_2014.PowerDeliveryRequest.ChargeProgress;
    ShmCharger->gun_info[gun_index].acCcsInfo.CpSetPWMDuty=ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].CpDuty;
+   memcpy(ShmDispenser->gun_info.acCcsInfo.EVCCID, EVCOMM_SYS_INFO.EVCCID, sizeof(ShmDispenser->gun_info.acCcsInfo.EVCCID));
     //----------[1] Permission --------
    // ShmInternalComm->ChargingPermission_new = (unsigned char) CSUCOMMAC_SHM.ChargingPermission;
     ShmInternalComm->ChargingPermission_new=ShmCharger->gun_info[gun_index].acCcsInfo.ChargingPermission;

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

@@ -286,6 +286,7 @@ int main(void)
 			printf("\n  modelname: EVSE model name.");
 			printf("\n  serialnumber: EVSE serial number.");
 			printf("\n  authentication: Authentication function.");
+			printf("\n  authbyevccid: Authorize by EVCCID.");
 			printf("\n  rfidendian: RFID read endian.");
 			printf("\n **************************************************");
 			printf("\n  Please input operation item: ");
@@ -350,6 +351,23 @@ int main(void)
 				else
 					DEBUG_INFO("Authentication: Enable\n");
 			}
+			else if(strcmp(cmd, "authbyevccid") == 0)
+                        {
+                                memset(cmd, 0x00, ARRAY_SIZE(cmd));
+                                printf("\n ***** authbyevccid *******************************");
+                                printf("\n  Current mode: %d", ShmSysConfigAndInfo->SysConfig.isAuthrizeByEVCCID);
+                                printf("\n  0: Disable.");
+                                printf("\n  1: Enable.");
+                                printf("\n **************************************************");
+                                printf("\n  Please input authorize by EVCCID configuration value: ");
+                                scanf("%s", &cmd[0]);
+
+                                ShmSysConfigAndInfo->SysConfig.isAuthrizeByEVCCID = ((0<=atoi(cmd))&&(atoi(cmd)<=1)?atoi(cmd):0);
+                                if(!ShmSysConfigAndInfo->SysConfig.isAuthrizeByEVCCID)
+                                        DEBUG_INFO("Authotize by EVCCID: Disable\n");
+                                else
+                                        DEBUG_INFO("Authorize by EVCCID: Enable\n");
+                        }
 			else if(strcmp(cmd, "rfidendian") == 0)
 			{
 				memset(cmd, 0x00, ARRAY_SIZE(cmd));

EVSE/Projects/AX80/Apps/CCS/CsuComm.c

@@ -2859,6 +2859,7 @@ int CsuCommAC_SHM_Rx_Update()
    ShmDispenser->gun_info.acCcsInfo.PresentMsgFlowStatus=Check_V2G_Flow_Status();
    ShmDispenser->gun_info.acCcsInfo.EVChargeProgress = ShmCcsData->V2GMessage_ISO15118_2014.PowerDeliveryRequest.ChargeProgress;
    ShmDispenser->gun_info.acCcsInfo.CpSetPWMDuty=ShmSysConfigAndInfo->SysInfo.CcsChargingData[0].CpDuty;
+   memcpy(ShmDispenser->gun_info.acCcsInfo.EVCCID, EVCOMM_SYS_INFO.EVCCID, sizeof(ShmDispenser->gun_info.acCcsInfo.EVCCID));
     //----------[1] Permission --------
    // ShmInternalComm->ChargingPermission_new = (unsigned char) CSUCOMMAC_SHM.ChargingPermission;
     ShmInternalComm->ChargingPermission_new=ShmDispenser->gun_info.acCcsInfo.ChargingPermission;

EVSE/Projects/AX80/Apps/Module_ConfigTools.c

@@ -286,6 +286,7 @@ int main(void)
 			printf("\n  modelname: EVSE model name.");
 			printf("\n  serialnumber: EVSE serial number.");
 			printf("\n  authentication: Authentication function.");
+			printf("\n  authbyevccid: Authorize by EVCCID.");
 			printf("\n  rfidendian: RFID read endian.");
 			printf("\n **************************************************");
 			printf("\n  Please input operation item: ");
@@ -350,6 +351,23 @@ int main(void)
 				else
 					DEBUG_INFO("Authentication: Enable\n");
 			}
+			else if(strcmp(cmd, "authbyevccid") == 0)
+			{
+                                memset(cmd, 0x00, ARRAY_SIZE(cmd));
+                                printf("\n ***** authbyevccid *******************************");
+                                printf("\n  Current mode: %d", ShmSysConfigAndInfo->SysConfig.isAuthrizeByEVCCID);
+                                printf("\n  0: Disable.");
+                                printf("\n  1: Enable.");
+                                printf("\n **************************************************");
+                                printf("\n  Please input authorize by EVCCID configuration value: ");
+                                scanf("%s", &cmd[0]);
+
+                                ShmSysConfigAndInfo->SysConfig.isAuthrizeByEVCCID = ((0<=atoi(cmd))&&(atoi(cmd)<=1)?atoi(cmd):0);
+                                if(!ShmSysConfigAndInfo->SysConfig.isAuthrizeByEVCCID)
+                                        DEBUG_INFO("Authotize by EVCCID: Disable\n");
+                                else
+                                        DEBUG_INFO("Authorize by EVCCID: Enable\n");
+			}
 			else if(strcmp(cmd, "rfidendian") == 0)
 			{
 				memset(cmd, 0x00, ARRAY_SIZE(cmd));

EVSE/Projects/AX80/Apps/main.c

@@ -5668,8 +5668,13 @@ int main(void)
 							}
 						}
 
-						// Try to get EVCCID if plug first
-						if(ShmCharger->isCcsEnable && (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B))
+						/*
+						 *	TODO:
+						 *	1. Try to get EVCCID if plug first
+						 */
+						if(ShmSysConfigAndInfo->SysConfig.isAuthrizeByEVCCID &&
+						   ShmCharger->isCcsEnable &&
+						  (ShmSysConfigAndInfo->SysInfo.AcChargingData[gun_index].PilotState == CP_STATE_B))
 						{
 							if(!getRequest(gun_index))
 							{
@@ -5681,12 +5686,26 @@ int main(void)
 							{
 								if((16 < ShmCharger->gun_info[gun_index].acCcsInfo.PresentMsgFlowStatus) && (ShmCharger->gun_info[gun_index].acCcsInfo.PresentMsgFlowStatus < 254))
 								{
-									sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X", ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[0],
-																													  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[1],
-																													  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[2],
-																													  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[3],
-																													  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[4],
-																													  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[5]);
+									if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_16)
+									{
+										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%s%02X%02X%02X%02X%02X%02X", ShmOCPP16Data->ConfigurationTable.CoreProfile[EVCCID_PREFIX].ItemData,
+																															ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[0],
+																															ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[1],
+																															ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[2],
+																															ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[3],
+																															ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[4],
+																															ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[5]);
+									}
+									else if(ShmSysConfigAndInfo->SysInfo.OcppRunningVer == OCPP_RUNNING_VERSION_20)
+									{
+										sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "%02X%02X%02X%02X%02X%02X", ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[0],
+																														  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[1],
+																														  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[2],
+																														  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[3],
+																														  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[4],
+																														  ShmCharger->gun_info[gun_index].acCcsInfo.EVCCID[5]);
+									}
+
 									//sprintf((char*)ShmSysConfigAndInfo->SysConfig.UserId, "F5902677");
 									ShmCharger->gun_info[gun_index].isGetEvCCID = ON;
 

EVSE/rootfs/var/www/set_system.php

@@ -516,7 +516,7 @@ img {
 				document.getElementById("isQRCode").checked=true;
 				document.getElementById("isRFID").checked=true;
 			}
-			if(document.getElementById("ModelName").value.substr(0,1) == "D"){
+			if((document.getElementById("ModelName").value.substr(0,1) == "D") || (document.getElementById("ModelName").value.substr(0,2) == "AX")){
 				document.getElementById("isAuthrizeByEVCCIDDiv").style.display="block";
 			}
 			else{