2022-03-23 / ct_chen

Actions:
1. Webservice  add "Gun" for forcing charging and remote stop for DO series

Files:
1. EVSE/Modularization/WebService.c
   EVSE/rootfs/var/www/set_pcabinet_action.php

EVSE/Modularization/WebService.c

@@ -1430,12 +1430,14 @@ int main(int argc, char *argv[]) {
 
 #ifdef DO360
 	//set power cabinet
+	//  ./WebService "PowerCabinet" Cmd "{'FTargetVoltage': val,'FTargetCurrent': val, 'Gun': val}"
 	if ((strcmp(argv[1], "PowerCabinet") == 0)) {
 		char *IsDO[3];
 		substr((char *)IsDO,(const char *)ShmSysConfigAndInfo->SysConfig.ModelName,0,2);
 		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0 || strcmp(IsDO, "DB") == 0){
 			struct json_object *jobj2;
 			jobj2=json_object_new_object();
+			int Gun = 0;
 			//force charging
 			if (strcmp(argv[2], "1") == 0) {
 				json_object_object_add(jobj2,"Cmd",json_object_new_string("1"));
@@ -1444,48 +1446,36 @@ int main(int argc, char *argv[]) {
 				if(strlen(argv[3]) >0){
 					struct json_object *jobj = json_tokener_parse(argv[3]);
 					json_object *val_obj = NULL;
-					if( json_object_object_get_ex(jobj, "FTargetVoltage", &val_obj) ) {
-						FTargetVoltage = json_object_get_int(val_obj);
-						ShmChargerInfo->Control.FCharging[0].FTargetVoltage = FTargetVoltage * 10;
-						json_object_object_add(jobj2,"FTargetVoltage0",json_object_new_int(FTargetVoltage));
-						ShmChargerInfo->Control.FCharging[1].FTargetVoltage = FTargetVoltage * 10;
-						json_object_object_add(jobj2,"FTargetVoltage1",json_object_new_int(FTargetVoltage));
-						ShmChargerInfo->Control.FCharging[2].FTargetVoltage = FTargetVoltage * 10;
-						json_object_object_add(jobj2,"FTargetVoltage2",json_object_new_int(FTargetVoltage));
-						ShmChargerInfo->Control.FCharging[3].FTargetVoltage = FTargetVoltage * 10;
-						json_object_object_add(jobj2,"FTargetVoltage3",json_object_new_int(FTargetVoltage));
-					}
-					if( json_object_object_get_ex(jobj, "FTargetCurrent", &val_obj) ) {
-						FTargetCurrent = json_object_get_int(val_obj);
-						ShmChargerInfo->Control.FCharging[0].FTargetCurrent = FTargetCurrent * 10;
-						json_object_object_add(jobj2,"FTargetCurrent0",json_object_new_int(FTargetCurrent));
-						ShmChargerInfo->Control.FCharging[1].FTargetCurrent = FTargetCurrent * 10;
-						json_object_object_add(jobj2,"FTargetCurrent1",json_object_new_int(FTargetCurrent));
-						ShmChargerInfo->Control.FCharging[2].FTargetCurrent = FTargetCurrent * 10;
-						json_object_object_add(jobj2,"FTargetCurrent2",json_object_new_int(FTargetCurrent));
-						ShmChargerInfo->Control.FCharging[3].FTargetCurrent = FTargetCurrent * 10;
-						json_object_object_add(jobj2,"FTargetCurrent3",json_object_new_int(FTargetCurrent));
+					if( json_object_object_get_ex(jobj, "Gun", &val_obj) ) {
+						Gun = json_object_get_int(val_obj);
+						if( json_object_object_get_ex(jobj, "FTargetVoltage", &val_obj) ) {
+							FTargetVoltage = json_object_get_int(val_obj);
+							ShmChargerInfo->Control.FCharging[Gun].FTargetVoltage = FTargetVoltage * 10;
+							json_object_object_add(jobj2,"FTargetVoltage",json_object_new_int(FTargetVoltage));
+						}
+						if( json_object_object_get_ex(jobj, "FTargetCurrent", &val_obj) ) {
+							FTargetCurrent = json_object_get_int(val_obj);
+							ShmChargerInfo->Control.FCharging[Gun].FTargetCurrent = FTargetCurrent * 10;
+							json_object_object_add(jobj2,"FTargetCurrent",json_object_new_int(FTargetCurrent));
+						}
+						ShmChargerInfo->Control.FCharging[Gun].FCtrl.bits.EnableForceCharging=1;
+						ShmChargerInfo->Control.FCharging[Gun].FCtrl.bits.StartForceCharging=1;
 					}
 				}
-				ShmChargerInfo->Control.FCharging[0].FCtrl.bits.EnableForceCharging=1;
-				ShmChargerInfo->Control.FCharging[0].FCtrl.bits.StartForceCharging=1;
-				ShmChargerInfo->Control.FCharging[1].FCtrl.bits.EnableForceCharging=1;
-				ShmChargerInfo->Control.FCharging[1].FCtrl.bits.StartForceCharging=1;
-				ShmChargerInfo->Control.FCharging[2].FCtrl.bits.EnableForceCharging=1;
-				ShmChargerInfo->Control.FCharging[2].FCtrl.bits.StartForceCharging=1;
-				ShmChargerInfo->Control.FCharging[3].FCtrl.bits.EnableForceCharging=1;
-				ShmChargerInfo->Control.FCharging[3].FCtrl.bits.StartForceCharging=1;
 				printf("%s\n", json_object_to_json_string(jobj2));
 			}
 			//remote stop
 			if (strcmp(argv[2], "2") == 0) {
-				json_object_object_add(jobj2,"Cmd",json_object_new_string("2"));
-//				_chargingData[0]->ChargingStopFlag.bits.ManualStop = true;
-				ShmSysConfigAndInfo->SysInfo.ConnectorInfo[0].GeneralChargingData.ChargingStopFlag.bits.ManualStop=1;
-				ShmSysConfigAndInfo->SysInfo.ConnectorInfo[1].GeneralChargingData.ChargingStopFlag.bits.ManualStop=1;
-				ShmSysConfigAndInfo->SysInfo.ConnectorInfo[2].GeneralChargingData.ChargingStopFlag.bits.ManualStop=1;
-				ShmSysConfigAndInfo->SysInfo.ConnectorInfo[3].GeneralChargingData.ChargingStopFlag.bits.ManualStop=1;
-				printf("%s\n", json_object_to_json_string(jobj2));
+				if(strlen(argv[3]) >0){
+					struct json_object *jobj = json_tokener_parse(argv[3]);
+					json_object *val_obj = NULL;
+					if( json_object_object_get_ex(jobj, "Gun", &val_obj) ) {
+						Gun = json_object_get_int(val_obj);
+						json_object_object_add(jobj2,"Cmd",json_object_new_string("2"));
+						ShmSysConfigAndInfo->SysInfo.ConnectorInfo[Gun].GeneralChargingData.ChargingStopFlag.bits.ManualStop=1;
+						printf("%s\n", json_object_to_json_string(jobj2));
+					}
+				}
 			}
 			if (strcmp(argv[2], "0") == 0) {
 				struct json_object *jobj;

EVSE/rootfs/var/www/set_pcabinet_action.php

@@ -22,6 +22,16 @@
 		
 
 		checkValue('Cmd');
+		if(isset($_REQUEST['Gun'])){
+			isNumeric("Gun",4);
+			$json['Gun']				= (int)$_REQUEST['Gun'];
+		}
+		else{
+			$jsone['result'] = "Fail";
+			$jsone['message'] = "You should enter a value of Gun(0~3)";
+			echo json_encode($jsone);
+			exit;
+		}
 		if($_REQUEST['Cmd']==1){
 			if(isset($_REQUEST['FTargetVoltage'])){
 				isNumeric("FTargetVoltage",65535);
@@ -110,12 +120,18 @@
 					echo json_encode($jsone);
 					exit;
 			}
-			if($_REQUEST[$id]>$value){
+			if($_REQUEST[$id]>=$value){
 					$jsone['result'] = "Fail";
 					$jsone['message'] = "Value of " . $id . " should be less than ".$value;
 					echo json_encode($jsone);
 					exit;
 			}
 		}
+		else{
+			$jsone['result'] = "Fail";
+			$jsone['message'] = "You should enter a value of " . $id;
+			echo json_encode($jsone);
+			exit;
+		}
 	}
 ?>

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

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):