Эх сурвалжийг харах

2022-04-18 / ct_chen

Actions:
1. Webservice add WebApiTrigger flag for forcing charging

Files:
1. EVSE/Modularization/WebService.c
ct_chen 2 жил өмнө
parent
commit
ee8a9c71ad

+ 10 - 0
EVSE/Modularization/WebService.c

@@ -1463,6 +1463,7 @@ int main(int argc, char *argv[]) {
 						}
 						ShmChargerInfo->Control.FCharging[Gun].FCtrl.bits.EnableForceCharging=1;
 						ShmChargerInfo->Control.FCharging[Gun].FCtrl.bits.StartForceCharging=1;
+						ShmChargerInfo->Control.FCharging[Gun].FCtrl.bits.WebApiTrigger=1;
 					}
 				}
 				printf("%s\n", json_object_to_json_string(jobj2));
@@ -1487,46 +1488,55 @@ int main(int argc, char *argv[]) {
 				struct json_object *FTargetCurrent;
 				struct json_object *EnableForceCharging;
 				struct json_object *StartForceCharging;
+				struct json_object *WebApiTrigger;
 				struct json_object *ManualStop;
 				FTargetVoltage = json_object_new_int(ShmChargerInfo->Control.FCharging[0].FTargetVoltage);
 				FTargetCurrent = json_object_new_int(ShmChargerInfo->Control.FCharging[0].FTargetCurrent);
 				EnableForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[0].FCtrl.bits.EnableForceCharging);
 				StartForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[0].FCtrl.bits.StartForceCharging);
+				WebApiTrigger = json_object_new_int(ShmChargerInfo->Control.FCharging[0].FCtrl.bits.WebApiTrigger);
 				ManualStop = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[0].GeneralChargingData.ChargingStopFlag.bits.ManualStop);
 				json_object_object_add(jobj,"FTargetVoltage0",FTargetVoltage);
 				json_object_object_add(jobj,"FTargetCurrent0",FTargetCurrent);
 				json_object_object_add(jobj,"EnableForceCharging0",EnableForceCharging);
 				json_object_object_add(jobj,"StartForceCharging0",StartForceCharging);
+				json_object_object_add(jobj,"WebApiTrigger0",WebApiTrigger);
 				json_object_object_add(jobj,"ManualStop0",ManualStop);
 				FTargetVoltage = json_object_new_int(ShmChargerInfo->Control.FCharging[1].FTargetVoltage);
 				FTargetCurrent = json_object_new_int(ShmChargerInfo->Control.FCharging[1].FTargetCurrent);
 				EnableForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[1].FCtrl.bits.EnableForceCharging);
 				StartForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[1].FCtrl.bits.StartForceCharging);
+				WebApiTrigger = json_object_new_int(ShmChargerInfo->Control.FCharging[1].FCtrl.bits.WebApiTrigger);
 				ManualStop = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[1].GeneralChargingData.ChargingStopFlag.bits.ManualStop);
 				json_object_object_add(jobj,"FTargetVoltage1",FTargetVoltage);
 				json_object_object_add(jobj,"FTargetCurrent1",FTargetCurrent);
 				json_object_object_add(jobj,"EnableForceCharging1",EnableForceCharging);
 				json_object_object_add(jobj,"StartForceCharging1",StartForceCharging);
+				json_object_object_add(jobj,"WebApiTrigger1",WebApiTrigger);
 				json_object_object_add(jobj,"ManualStop1",ManualStop);
 				FTargetVoltage = json_object_new_int(ShmChargerInfo->Control.FCharging[2].FTargetVoltage);
 				FTargetCurrent = json_object_new_int(ShmChargerInfo->Control.FCharging[2].FTargetCurrent);
 				EnableForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[2].FCtrl.bits.EnableForceCharging);
 				StartForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[2].FCtrl.bits.StartForceCharging);
+				WebApiTrigger = json_object_new_int(ShmChargerInfo->Control.FCharging[2].FCtrl.bits.WebApiTrigger);
 				ManualStop = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[2].GeneralChargingData.ChargingStopFlag.bits.ManualStop);
 				json_object_object_add(jobj,"FTargetVoltage2",FTargetVoltage);
 				json_object_object_add(jobj,"FTargetCurrent2",FTargetCurrent);
 				json_object_object_add(jobj,"EnableForceCharging2",EnableForceCharging);
 				json_object_object_add(jobj,"StartForceCharging2",StartForceCharging);
+				json_object_object_add(jobj,"WebApiTrigger2",WebApiTrigger);
 				json_object_object_add(jobj,"ManualStop2",ManualStop);
 				FTargetVoltage = json_object_new_int(ShmChargerInfo->Control.FCharging[3].FTargetVoltage);
 				FTargetCurrent = json_object_new_int(ShmChargerInfo->Control.FCharging[3].FTargetCurrent);
 				EnableForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[3].FCtrl.bits.EnableForceCharging);
 				StartForceCharging = json_object_new_int(ShmChargerInfo->Control.FCharging[3].FCtrl.bits.StartForceCharging);
+				WebApiTrigger = json_object_new_int(ShmChargerInfo->Control.FCharging[3].FCtrl.bits.WebApiTrigger);
 				ManualStop = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[3].GeneralChargingData.ChargingStopFlag.bits.ManualStop);
 				json_object_object_add(jobj,"FTargetVoltage3",FTargetVoltage);
 				json_object_object_add(jobj,"FTargetCurrent3",FTargetCurrent);
 				json_object_object_add(jobj,"EnableForceCharging3",EnableForceCharging);
 				json_object_object_add(jobj,"StartForceCharging3",StartForceCharging);
+				json_object_object_add(jobj,"WebApiTrigger3",WebApiTrigger);
 				json_object_object_add(jobj,"ManualStop3",ManualStop);
 				printf("%s\n", json_object_to_json_string(jobj));
 				json_object_put(jobj);

+ 0 - 6
board-support/linux-4.9.59+gitAUTOINC+a75d8e9305-ga75d8e9305/lib/.gitignore

@@ -1,6 +0,0 @@
-#
-# Generated files
-#
-gen_crc32table
-crc32table.h
-oid_registry_data.c

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

@@ -1 +0,0 @@
-cmd_lib/lib.a := rm -f lib/lib.a; /opt/ti-processor-sdk-linux-am335x-evm-04.02.00.09/linux-devkit/sysroots/x86_64-arago-linux/usr/bin/arm-linux-gnueabihf-ar rcsD lib/lib.a lib/argv_split.o lib/bug.o lib/chacha20.o lib/cmdline.o lib/ctype.o lib/dec_and_lock.o lib/decompress.o lib/decompress_inflate.o lib/dma-noop.o lib/dump_stack.o lib/earlycpio.o lib/extable.o lib/fdt.o lib/fdt_empty_tree.o lib/fdt_ro.o lib/fdt_rw.o lib/fdt_strerror.o lib/fdt_sw.o lib/fdt_wip.o lib/flex_proportions.o lib/idr.o lib/int_sqrt.o lib/ioremap.o lib/irq_regs.o lib/is_single_threaded.o lib/klist.o lib/kobject.o lib/kobject_uevent.o lib/md5.o lib/nmi_backtrace.o lib/nodemask.o lib/plist.o lib/radix-tree.o lib/ratelimit.o lib/rbtree.o lib/seq_buf.o lib/sha1.o lib/show_mem.o lib/string.o lib/timerqueue.o lib/vsprintf.o lib/win_minmax.o