2021-05-17 / ct_chen

Actions:
1. Webservice add "DK" following "DO" model

Files:
1.

EVSE/Modularization/WebService.c

@@ -1333,7 +1333,7 @@ int main(int argc, char *argv[]) {
 				PsuQuantity = RatedPower/30;
 			}
 		}
-		if(strcmp(IsDO, "DO") == 0){
+		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0){
 		}
 		
 		struct json_object *jobj1;
@@ -1632,7 +1632,7 @@ int main(int argc, char *argv[]) {
 				json_object_array_add(FwSecondVersionArr,FwSecondVersion[i]);
 			}
 		}
-		if(strcmp(IsDO, "DO") == 0){
+		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0){
 			if(ShmSysConfigAndInfo->SysInfo.DispenserInfo.DispenserQuantity>4 || ShmSysConfigAndInfo->SysInfo.DispenserInfo.DispenserQuantity<0)ShmSysConfigAndInfo->SysInfo.DispenserInfo.DispenserQuantity=0;
 			DispenserQuantity = json_object_new_int(ShmSysConfigAndInfo->SysInfo.DispenserInfo.DispenserQuantity);
 			TotalConnectorQuantity = json_object_new_int(ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity);
@@ -2041,7 +2041,7 @@ int main(int argc, char *argv[]) {
 				AcGunQty++;
 			}
 		}
-		if(strcmp(IsDO, "DO") == 0){
+		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0){
 			if(ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity>4 || ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity<0)ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity=0;
 			int DDTotalConnectorQuantity = ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity;
 			for(int i=0;i<DDTotalConnectorQuantity;i++){
@@ -2182,7 +2182,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(jobj1,"FwPrimaryVersion",FwPrimaryVersionArr);
 			json_object_object_add(jobj1,"FwSecondVersion",FwSecondVersionArr);
 		}
-		if(strcmp(IsDO, "DO") == 0){
+		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0){
 			json_object_object_add(jobj1,"DispenserQuantity",DispenserQuantity);
 			json_object_object_add(jobj1,"TotalConnectorQuantity",TotalConnectorQuantity);
 			json_object_object_add(jobj1,"DDModelName",DDModelNameArr);
@@ -2321,7 +2321,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo3,"PowerConsumption",PowerConsumption[2]);
 			json_object_object_add(jobj2,"ChargingInfo3",ChargingInfo3);
 		}
-		if(strcmp(IsDO, "DO") == 0){
+		if(strcmp(IsDO, "DO") == 0 || strcmp(IsDO, "DK") == 0){
 			if(ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity>4|| ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity<0)ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity=0;
 			int DDTotalConnectorQuantity = ShmSysConfigAndInfo->SysInfo.DispenserInfo.TotalConnectorQuantity;
 			DDChargingInfo1=json_object_new_object();

EVSE/rootfs/var/www/set_charging.php

@@ -11,7 +11,7 @@
 	$Connector1=substr($ModelName,7,1);
 	$Connector2=substr($ModelName,9,1);
 	$Connector3=substr($ModelName,8,1);
-	if(substr($ModelName,0,2)!="DO"){
+	if(substr($ModelName,0,2)!="DO" && substr($ModelName,0,2)!="DK"){
 		$connectorType1=ConnectorType($Connector1);
 		$connectorType2=ConnectorType($Connector2);
 		$connectorType3=ConnectorType($Connector3);
@@ -806,7 +806,7 @@ img {
 										</div>*/?>
 									</section>
 								</article>
-<?php if(substr($ModelName,0,2)=="DO"){?>
+<?php if(substr($ModelName,0,2)=="DO" || substr($ModelName,0,2)=="DK"){?>
 <?php if($obj['DDChargingInfo1']){ $idx++;?>
 								<!--Charging Information-->
 								<article class="envor-sorting-item css">

EVSE/rootfs/var/www/set_system.php

@@ -135,7 +135,7 @@ img {
 												<option value="1" <?php echo $obj->{'FactoryConfiguration'}=="1"?"selected":""?>>Trigger</option>
 											</select>*/?>
 										</div>
-<?php if(substr($ModelName,0,2)!="DO"){?>
+<?php //if(substr($ModelName,0,2)!="DO"){?>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Authentication</label>
 											<select class="form-control" id="AuthorisationMode" name="AuthorisationMode" onchange="AuthorisationMode_changed()">
@@ -143,7 +143,7 @@ img {
 												<option value="1" <?php echo $obj->{'AuthorisationMode'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-<?php } ?>
+<?php //} ?>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Input Voltage R</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo round($obj->{'InputVoltageR'},2);?> volt">
@@ -164,7 +164,7 @@ img {
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'SystemFanRotaSpeed'};?> RPM">
 											<input type="hidden" name="SystemFanRotaSpeed" id="SystemFanRotaSpeed" value="<?php echo $obj->{'SystemFanRotaSpeed'};?>">
 										</div>
-<?php if(substr($ModelName,0,2)!="DO"){?>
+<?php //if(substr($ModelName,0,2)!="DO"){?>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Rfid Card Num Endian</label>
 											<select class="form-control" id="RfidCardNumEndian" name="RfidCardNumEndian">
@@ -221,8 +221,8 @@ img {
 												<option value="2" <?php echo $obj->{'Intensity'}=="2"?"selected":""?>>Brightest</option>
 											</select>
 										</div>
-<?php } ?>
-<?php if(substr($ModelName,0,2)=="DO"){?>
+<?php //} ?>
+<?php if(substr($ModelName,0,2)=="DO" || substr($ModelName,0,2)=="DK"){?>
 										<div class="form-group">
 											<label>Dispenser Quantity</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo $obj->{'DispenserQuantity'};?>">
@@ -281,7 +281,7 @@ 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"){?>
+<?php if(substr($ModelName,0,2)=="DO" || substr($ModelName,0,2)=="DK"){?>
 										<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'};?>">
@@ -310,7 +310,7 @@ img {
 										</div>
 									</section>
 								</article>
-<?php if(substr($ModelName,0,2)=="DO"){?>
+<?php if(substr($ModelName,0,2)=="DO" || substr($ModelName,0,2)=="DK"){?>
 <?php for($idx=0;$idx<$obj->{'DispenserQuantity'};$idx++){ $idx2=$idx+1;?>
 								<article class="envor-sorting-item css">
 									<header><?php echo $lang->showWord("system_information"); ?> Dispenser <?php echo $idx2;?><i class="fa fa-plus"></i></header>
@@ -464,7 +464,7 @@ img {
 		else{
 			document.getElementById("AcModelNameDiv").style.display="none";
 		}
-<?php if(substr($ModelName,0,2)=="DO"){?>
+<?php if(substr($ModelName,0,2)=="DO" || substr($ModelName,0,2)=="DK"){?>
 <?php for($idx=0;$idx<$obj->{'DispenserQuantity'};$idx++){ $idx2=$idx+1;?>
 		DDisQRCode_clicked(<?php echo $idx2; ?>);
 		DDAuthorisationMode_changed(<?php echo $idx2; ?>);
@@ -495,7 +495,7 @@ img {
 			var data =  "SystemId=" + document.getElementById("SystemId").value+
 						"&SystemDateTime=" + document.getElementById("SystemDateTime").value+
 						"&FactoryConfiguration=" + (document.getElementById("FactoryConfiguration").checked?1:0);
-<?php if(substr($ModelName,0,2)!="DO"){?>
+<?php //if(substr($ModelName,0,2)!="DO"){?>
 				data +=  "&PhaseLossPolicy=" + document.getElementById("PhaseLossPolicy").value+
 						"&AuthorisationMode=" + document.getElementById("AuthorisationMode").value+
 						"&isAPP=" + (document.getElementById("isAPP").checked?1:0)+
@@ -506,8 +506,8 @@ img {
 						"&Intensity=" + document.getElementById("Intensity").value+
 						"&RfidCardNumEndian=" + document.getElementById("RfidCardNumEndian").value+
 						"&PsuAcInputType=" + document.getElementById("PsuAcInputType").value;
-<?php } ?>
-<?php if(substr($ModelName,0,2)=="DO"){?>
+<?php //} ?>
+<?php if(substr($ModelName,0,2)=="DO" || substr($ModelName,0,2)=="DK"){?>
 <?php for($idx=0;$idx<$obj->{'DispenserQuantity'};$idx++){ $idx2=$idx+1;?>
 				data +=  "&DDSystemId<?php echo $idx2; ?>=" + document.getElementById("DDSystemId<?php echo $idx2; ?>").value+
 						"&DDFactoryConfiguration<?php echo $idx2; ?>=" + (document.getElementById("DDFactoryConfiguration<?php echo $idx2; ?>").checked?1:0)+