2021-03-11 / ct_chen

Actions:
1. Webservice add gun type and network rule following model name

Files:
1. EVSE/Modularization/WebService.c
   EVSE/rootfs/var/www/head.php
   EVSE/rootfs/var/www/set_charging.php
   EVSE/rootfs/var/www/set_system.php

EVSE/Modularization/WebService.c

@@ -193,16 +193,16 @@ int ConnectorType(char* connector){
 	if(strcmp(connector, "0") == 0){
 		result= 0;
 	}
-	else if(strcmp(connector, "U") == 0 || strcmp(connector, "E") == 0){
+	else if(strcmp(connector, "U") == 0 || strcmp(connector, "V") == 0 || strcmp(connector, "E") == 0 || strcmp(connector, "F") == 0 || strcmp(connector, "T") == 0 || strcmp(connector, "D") == 0 || strcmp(connector, "M") == 0 || strcmp(connector, "N") == 0 || strcmp(connector, "P") == 0 || strcmp(connector, "R") == 0){
 		result= 1;//CCS
 	}
-	else if(strcmp(connector, "G") == 0 || strcmp(connector, "D") == 0){
+	else if(strcmp(connector, "G") == 0){
 		result= 2;//GB
 	}
-	else if(strcmp(connector, "J") == 0){
+	else if(strcmp(connector, "J") == 0 || strcmp(connector, "K") == 0){
 		result= 3;//CHAdeMO
 	}
-	else if(strcmp(connector, "1") == 0 || strcmp(connector, "2") == 0 || strcmp(connector, "3") == 0 || strcmp(connector, "4") == 0 || strcmp(connector, "5") == 0 || strcmp(connector, "6") == 0){
+	else if(strcmp(connector, "1") == 0 || strcmp(connector, "2") == 0 || strcmp(connector, "3") == 0 || strcmp(connector, "4") == 0 || strcmp(connector, "5") == 0 || strcmp(connector, "6") == 0 || strcmp(connector, "7") == 0 || strcmp(connector, "8") == 0){
 		result= 4;//AC
 	}
 	else{

EVSE/rootfs/var/www/head.php

@@ -43,7 +43,7 @@
 	}
 	$model=json_decode(trim($output[0]))->{'ModelName'};
 	if(substr($model,0,1)=="A"){
-		if(substr($model,10,1)=="E" || substr($model,10,1)=="W" || substr($model,10,1)=="T" || substr($model,10,1)=="U"){
+		if(substr($model,10,1)=="E" || substr($model,10,1)=="W" || substr($model,10,1)=="T" || substr($model,10,1)=="U" || substr($model,10,1)=="D" || substr($model,10,1)=="A" || substr($model,10,1)=="F"){
 			$ModelName='AC Net';
 		}
 		else if(substr($model,10,1)=="0" || substr($model,10,1)=="R" || substr($model,10,1)=="B"){
@@ -57,7 +57,7 @@
 			$ModelName='DC';
 		}
 	}
-	if(substr($model,10,1)=="E"){
+	if(substr($model,10,1)=="E" || substr($model,10,1)=="U"){
 		$showEthernet="block";
 		$showWifi="none";
 		$showTelcom="none";
@@ -72,11 +72,16 @@
 		$showWifi="none";
 		$showTelcom="block";
 	}
-	if(substr($model,10,1)=="D"){
+	if(substr($model,10,1)=="D" || substr($model,10,1)=="A"){
 		$showEthernet="block";
 		$showWifi="block";
 		$showTelcom="block";
 	}
+	if(substr($model,10,1)=="F"){
+		$showEthernet="none";
+		$showWifi="block";
+		$showTelcom="none";
+	}
 	
 	//$ModelName='AC Net';
 	 //$ModelName='AC Eco';

EVSE/rootfs/var/www/set_charging.php

@@ -492,16 +492,16 @@
 		if($connector == "0"){
 			$result= "";
 		}
-		else if($connector == "U" || $connector == "E"){
+		else if($connector == "U" || $connector == "V" || $connector == "E" || $connector == "F" || $connector == "T" || $connector == "D" || $connector == "M" || $connector == "N" || $connector == "P" || $connector == "R"){
 			$result= "CCS";
 		}
-		else if($connector == "G" || $connector == "D"){
+		else if($connector == "G"){
 			$result= "GB";
 		}
-		else if($connector == "J"){
+		else if($connector == "J" || $connector == "K"){
 			$result= "CHAdeMO";
 		}
-		else if($connector == "1" || $connector == "2" || $connector == "3" || $connector == "4" || $connector == "5" || $connector == "6"){
+		else if($connector == "1" || $connector == "2" || $connector == "3" || $connector == "4" || $connector == "5" || $connector == "6" || $connector == "7" || $connector == "8"){
 			$result= "AC";
 		}
 		else{

EVSE/rootfs/var/www/set_system.php

@@ -35,16 +35,16 @@
 		if($connector == "0"){
 			$result= "";
 		}
-		else if($connector == "U" || $connector == "E"){
+		else if($connector == "U" || $connector == "V" || $connector == "E" || $connector == "F" || $connector == "T" || $connector == "D" || $connector == "M" || $connector == "N" || $connector == "P" || $connector == "R"){
 			$result= "CCS";
 		}
-		else if($connector == "G" || $connector == "D"){
+		else if($connector == "G"){
 			$result= "GB";
 		}
-		else if($connector == "J"){
+		else if($connector == "J" || $connector == "K"){
 			$result= "CHAdeMO";
 		}
-		else if($connector == "1" || $connector == "2" || $connector == "3" || $connector == "4" || $connector == "5" || $connector == "6"){
+		else if($connector == "1" || $connector == "2" || $connector == "3" || $connector == "4" || $connector == "5" || $connector == "6" || $connector == "7" || $connector == "8"){
 			$result= "AC";
 		}
 		else{