Browse Source

2022-06-22 / ct_chen

Actions:
1. Webservice add type of gun "L,Y,Z,S";modify rule of psu quantity for UU 50kW;

Files:
1. as list
ct_chen 2 years ago
parent
commit
3b525ddab0

+ 9 - 4
EVSE/Modularization/WebService.c

@@ -200,13 +200,13 @@ int ConnectorType(char* connector){
 	if(strcmp(connector, "0") == 0){
 		result= 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){
+	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 || strcmp(connector, "Y") == 0 || strcmp(connector, "Z") == 0){
 		result= 1;//CCS
 	}
 	else if(strcmp(connector, "G") == 0 || strcmp(connector, "B") == 0){
 		result= 2;//GB
 	}
-	else if(strcmp(connector, "J") == 0 || strcmp(connector, "K") == 0){
+	else if(strcmp(connector, "J") == 0 || strcmp(connector, "K") == 0 || strcmp(connector, "L") == 0 || strcmp(connector, "S") == 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 || strcmp(connector, "7") == 0 || strcmp(connector, "8") == 0){
@@ -1646,8 +1646,13 @@ int main(int argc, char *argv[]) {
 		int p3=atoi((char *)RatedPower3);
 		if(strcmp(IsAcDc, "D") == 0){
 			RatedPower=(p1*10+p2)*pow(10,p3-1);
-			if(RatedPower>=30){
-				PsuQuantity = RatedPower/30;
+			if(RatedPower==50){
+				PsuQuantity = 3;
+			}
+			else{
+//				if(RatedPower>=30){
+					PsuQuantity = RatedPower/30;
+//				}
 			}
 		}
 		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0 || strcmp(IsDO, "DB") == 0){

+ 2 - 2
EVSE/rootfs/var/www/set_charging.php

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

+ 9 - 4
EVSE/rootfs/var/www/set_system.php

@@ -32,8 +32,13 @@
 	$IsAcDc = substr($ModelName,0,1);
 	$PsuQuantity = 0;
 	if($IsAcDc == "D"){
-		if($RatingPower>=30){
-			$PsuQuantity = $RatingPower/30;
+		if($RatingPower==50){
+			$PsuQuantity = 3;
+		}
+		else{
+//			if($RatingPower>=30){
+				$PsuQuantity = $RatingPower/30;
+//			}
 		}
 	}
 	function ConnectorType($connector){
@@ -41,13 +46,13 @@
 		if($connector == "0"){
 			$result= "";
 		}
-		else if($connector == "U" || $connector == "V" || $connector == "E" || $connector == "F" || $connector == "T" || $connector == "D" || $connector == "M" || $connector == "N" || $connector == "P" || $connector == "R"){
+		else if($connector == "U" || $connector == "V" || $connector == "E" || $connector == "F" || $connector == "T" || $connector == "D" || $connector == "M" || $connector == "N" || $connector == "P" || $connector == "R" || $connector == "Y" || $connector == "Z"){
 			$result= "CCS";
 		}
 		else if($connector == "G" || $connector == "B" || $connector == "H" || $connector == "A"){
 			$result= "GB";
 		}
-		else if($connector == "J" || $connector == "K"){
+		else if($connector == "J" || $connector == "K" || $connector == "L" || $connector == "S"){
 			$result= "CHAdeMO";
 		}
 		else if($connector == "1" || $connector == "2" || $connector == "3" || $connector == "4" || $connector == "5" || $connector == "6" || $connector == "7" || $connector == "8"){

+ 0 - 1
board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/lib/.crc7.ko.cmd

@@ -1 +0,0 @@
-cmd_lib/crc7.ko := /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/linux-devkit/sysroots/x86_64-arago-linux/usr/bin/arm-linux-gnueabihf-ld -EL -r  -T ./scripts/module-common.lds --build-id  -o lib/crc7.ko lib/crc7.o lib/crc7.mod.o ;  true

+ 0 - 37
board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/lib/.gen_crc32table.cmd

@@ -1,37 +0,0 @@
-cmd_lib/gen_crc32table := gcc -Wp,-MD,lib/.gen_crc32table.d -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89     -o lib/gen_crc32table lib/gen_crc32table.c  
-
-source_lib/gen_crc32table := lib/gen_crc32table.c
-
-deps_lib/gen_crc32table := \
-  /usr/include/stdc-predef.h \
-  /usr/include/stdio.h \
-  /usr/include/features.h \
-  /usr/include/x86_64-linux-gnu/sys/cdefs.h \
-  /usr/include/x86_64-linux-gnu/bits/wordsize.h \
-  /usr/include/x86_64-linux-gnu/gnu/stubs.h \
-  /usr/include/x86_64-linux-gnu/gnu/stubs-64.h \
-  /usr/lib/gcc/x86_64-linux-gnu/5/include/stddef.h \
-  /usr/include/x86_64-linux-gnu/bits/types.h \
-  /usr/include/x86_64-linux-gnu/bits/typesizes.h \
-  /usr/include/libio.h \
-  /usr/include/_G_config.h \
-  /usr/include/wchar.h \
-  /usr/lib/gcc/x86_64-linux-gnu/5/include/stdarg.h \
-  /usr/include/x86_64-linux-gnu/bits/stdio_lim.h \
-  /usr/include/x86_64-linux-gnu/bits/sys_errlist.h \
-  /usr/include/x86_64-linux-gnu/bits/stdio.h \
-  /usr/include/x86_64-linux-gnu/bits/stdio2.h \
-  lib/crc32defs.h \
-    $(wildcard include/config/crc32/sliceby8.h) \
-    $(wildcard include/config/crc32/sliceby4.h) \
-    $(wildcard include/config/crc32/sarwate.h) \
-    $(wildcard include/config/crc32/bit.h) \
-    $(wildcard include/config/64bit.h) \
-  /usr/include/inttypes.h \
-  /usr/lib/gcc/x86_64-linux-gnu/5/include/stdint.h \
-  /usr/include/stdint.h \
-  /usr/include/x86_64-linux-gnu/bits/wchar.h \
-
-lib/gen_crc32table: $(deps_lib/gen_crc32table)
-
-$(deps_lib/gen_crc32table):