2022-01-17 / ct_chen

Actions:
1. Webservice add AC version in DC+AC case

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

EVSE/Modularization/WebService.c

@@ -1482,6 +1482,8 @@ int main(int argc, char *argv[]) {
 		struct json_object *TelcomModemFwRev;
 		struct json_object *Connector1FwRev;
 		struct json_object *Connector2FwRev;
+		/* for DC+AC*/
+		struct json_object *Connector3FwRev;
 		struct json_object *LedModuleFwRev;
 		struct json_object *SystemAmbientTemp;
 		struct json_object *SystemCriticalTemp;
@@ -1742,6 +1744,10 @@ int main(int argc, char *argv[]) {
 		TelcomModemFwRev = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.TelcomModemFwRev);
 		Connector1FwRev = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.Connector1FwRev);
 		Connector2FwRev = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.Connector2FwRev);
+		/* for DC+AC*/
+		if(connectorType3==4){
+			Connector3FwRev = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.AcChargingData[0].version);
+		}
 		LedModuleFwRev = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.LedModuleFwRev);
 		SystemAmbientTemp = json_object_new_int(ShmSysConfigAndInfo->SysInfo.SystemAmbientTemp);
 		SystemCriticalTemp = json_object_new_int(ShmSysConfigAndInfo->SysInfo.SystemCriticalTemp);
@@ -2421,6 +2427,10 @@ int main(int argc, char *argv[]) {
 		json_object_object_add(jobj1,"TelcomModemFwRev",TelcomModemFwRev);
 		json_object_object_add(jobj1,"Connector1FwRev",Connector1FwRev);
 		json_object_object_add(jobj1,"Connector2FwRev",Connector2FwRev);
+		/* for DC+AC*/
+		if(connectorType3==4){
+			json_object_object_add(jobj1,"Connector3FwRev",Connector3FwRev);
+		}
 		json_object_object_add(jobj1,"LedModuleFwRev",LedModuleFwRev);
 		json_object_object_add(jobj1,"SystemAmbientTemp",SystemAmbientTemp);
 		json_object_object_add(jobj1,"SystemCriticalTemp",SystemCriticalTemp);

EVSE/rootfs/var/www/head.php

@@ -27,7 +27,7 @@
 	$display2="block";
 	$lang = new Lang;
 	$lang->getLang();
-	$acgun=array('1','2','3','4','5','6');
+	$acgun=array('1','2','3','4','5','6','7','8');
 	//chdir("/home/phihong/Module_WebService");
 	chdir("/root");
 	exec("'./WebService' 'query'",$output,$return_var);

EVSE/rootfs/var/www/set_system.php

@@ -313,6 +313,13 @@ img {
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'Connector2FwRev'};?>">
 											<input type="hidden" name="Connector2FwRev" id="Connector2FwRev" value="<?php echo $obj->{'Connector2FwRev'};?>">
 										</div>
+<?php if($connectorType3=="AC"){?>
+										<div class="form-group" id="Connector3FwRevDiv">
+											<label>Connector3(<?php echo $connectorType3;?>) Fw Rev</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'Connector3FwRev'};?>">
+											<input type="hidden" name="Connector3FwRev" id="Connector3FwRev" value="<?php echo $obj->{'Connector3FwRev'};?>">
+										</div>
+<?php } ?>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Led Module Fw Rev</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'LedModuleFwRev'};?>">