2020-12-11 / ct_chen

Actions:
1. add "Relay2ModuleFwRev" for "DO" model

Files:
1. as list

EVSE/Modularization/WebService.c

@@ -1446,6 +1446,7 @@ int main(int argc, char *argv[]) {
 		struct json_object *DDConnector2FwRevArr= json_object_new_array();
 		struct json_object *DDIntensity[4];
 		struct json_object *DDIntensityArr= json_object_new_array();
+		struct json_object *Relay2ModuleFwRev;
 
 		//charging
 		struct json_object *MaxChargingEnergy;
@@ -1674,6 +1675,7 @@ int main(int argc, char *argv[]) {
 				json_object_array_add(DDConnector2FwRevArr,DDConnector2FwRev[i]);
 				json_object_array_add(DDIntensityArr,DDIntensity[i]);
 			}
+			Relay2ModuleFwRev = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.Relay2ModuleFwRev);
 		}
 
 		//charging
@@ -2118,6 +2120,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(jobj1,"DDConnector1FwRev",DDConnector1FwRevArr);
 			json_object_object_add(jobj1,"DDConnector2FwRev",DDConnector2FwRevArr);
 			json_object_object_add(jobj1,"DDIntensity",DDIntensityArr);
+			json_object_object_add(jobj1,"Relay2ModuleFwRev",Relay2ModuleFwRev);
 		}
 
 		printf("%s\n", json_object_to_json_string(jobj1));

EVSE/rootfs/var/www/set_system.php

@@ -283,6 +283,13 @@ img {
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'RelayModuleFwRev'};?>">
 											<input type="hidden" name="RelayModuleFwRev" id="RelayModuleFwRev" value="<?php echo $obj->{'RelayModuleFwRev'};?>">
 										</div>
+<?php if(substr($ModelName,0,2)=="DO"){?>
+										<div class="form-group" style="display:<?php echo $am001;?>">
+											<label>Relay2 Module Fw Rev</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'Relay2ModuleFwRev'};?>">
+											<input type="hidden" name="Relay2ModuleFwRev" id="Relay2ModuleFwRev" value="<?php echo $obj->{'Relay2ModuleFwRev'};?>">
+										</div>
+<?php } ?>
 										<div class="form-group" style="display:<?php echo $showTelcom;?>">
 											<label>Telcom Modem Fw Rev</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'TelcomModemFwRev'};?>">