Explorar el Código

2021-11-12 / ct_chen

Actions:
1. Webservice add InputVoltageDc for "DB" series

Files:
1. EVSE/Modularization/WebService.c
   EVSE/rootfs/var/www/set_system.php
ct_chen hace 3 años
padre
commit
0a25b6adcf
Se han modificado 2 ficheros con 10 adiciones y 0 borrados
  1. 3 0
      EVSE/Modularization/WebService.c
  2. 7 0
      EVSE/rootfs/var/www/set_system.php

+ 3 - 0
EVSE/Modularization/WebService.c

@@ -1429,6 +1429,7 @@ int main(int argc, char *argv[]) {
 		struct json_object *InputVoltageR;
 		struct json_object *InputVoltageS;
 		struct json_object *InputVoltageT;
+		struct json_object *InputVoltageDc;
 		struct json_object *SystemFanRotaSpeed;
 		struct json_object *PsuFanRotaSpeed;
 		struct json_object *RfidCardNumEndian;
@@ -1684,6 +1685,7 @@ int main(int argc, char *argv[]) {
 		InputVoltageR = json_object_new_double(ShmSysConfigAndInfo->SysInfo.InputVoltageR);
 		InputVoltageS = json_object_new_double(ShmSysConfigAndInfo->SysInfo.InputVoltageS);
 		InputVoltageT = json_object_new_double(ShmSysConfigAndInfo->SysInfo.InputVoltageT);
+		InputVoltageDc = json_object_new_double(ShmSysConfigAndInfo->SysInfo.InputVoltageDc);
 		SystemFanRotaSpeed = json_object_new_int(ShmSysConfigAndInfo->SysInfo.SystemFanRotaSpeed);
 		PsuFanRotaSpeed = json_object_new_int(ShmSysConfigAndInfo->SysInfo.PsuFanRotaSpeed);
 		RfidCardNumEndian = json_object_new_int(ShmSysConfigAndInfo->SysConfig.RfidCardNumEndian);
@@ -2358,6 +2360,7 @@ int main(int argc, char *argv[]) {
 		json_object_object_add(jobj1,"InputVoltageR",InputVoltageR);
 		json_object_object_add(jobj1,"InputVoltageS",InputVoltageS);
 		json_object_object_add(jobj1,"InputVoltageT",InputVoltageT);
+		json_object_object_add(jobj1,"InputVoltageDc",InputVoltageDc);
 		json_object_object_add(jobj1,"SystemFanRotaSpeed",SystemFanRotaSpeed);
 		json_object_object_add(jobj1,"PsuFanRotaSpeed",PsuFanRotaSpeed);
 		json_object_object_add(jobj1,"RfidCardNumEndian",RfidCardNumEndian);

+ 7 - 0
EVSE/rootfs/var/www/set_system.php

@@ -164,6 +164,13 @@ img {
 											<input type="text" readonly class="form-control" placeholder="<?php echo round($obj->{'InputVoltageT'},2);?> volt">
 											<input type="hidden" name="InputVoltageT" id="InputVoltageT" value="<?php echo $obj->{'InputVoltageT'};?>">
 										</div>
+<?php if(substr($ModelName,0,2)=="DB"){?>
+										<div class="form-group">
+											<label>Input Voltage DC</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo round($obj->{'InputVoltageDc'},2);?> volt">
+											<input type="hidden" name="InputVoltageDc" id="InputVoltageDc" value="<?php echo $obj->{'InputVoltageDc'};?>">
+										</div>
+<?php } ?>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>System Fan Speed</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'SystemFanRotaSpeed'};?> RPM">