2021-06-29 / ct_chen

Actions:
1. Webservice add ChillTemp
2. fix bugs for "DO" series

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

EVSE/Modularization/WebService.c

@@ -1479,6 +1479,7 @@ int main(int argc, char *argv[]) {
 		struct json_object *StopDateTime[3];
 		struct json_object *StartMethod[3];
 		struct json_object *ConnectorTemp[3];
+		struct json_object *ChillerTemp[3];
 		struct json_object *PresentChargingVoltage[3];
 		struct json_object *PresentChargingCurrent[3];
 		struct json_object *PresentChargingPower[3];
@@ -1501,6 +1502,7 @@ int main(int argc, char *argv[]) {
 		struct json_object *DDStopDateTime[4];
 		struct json_object *DDStartMethod[4];
 		struct json_object *DDConnectorTemp[4];
+		struct json_object *DDChillerTemp[4];
 		struct json_object *DDPresentChargingVoltage[4];
 		struct json_object *DDPresentChargingCurrent[4];
 		struct json_object *DDPresentChargingPower[4];
@@ -1765,6 +1767,12 @@ int main(int argc, char *argv[]) {
 				else{
 					ConnectorTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp == 255){
+					ChillerTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[0] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].PowerConsumption);
 				CcsGunQty++;
 			}
@@ -1784,13 +1792,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StartDateTime);
 				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StopDateTime);
 				StartMethod[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StartMethod);
-				ConnectorTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp == 255){
 					ConnectorTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp == 255){
+					ChillerTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[0] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].PowerConsumption);
 				GbGunQty++;
 			}
@@ -1810,13 +1823,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StartDateTime);
 				StopDateTime[0] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StopDateTime);
 				StartMethod[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StartMethod);
-				ConnectorTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp == 255){
 					ConnectorTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp == 255){
+					ChillerTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[0] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[0] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].PowerConsumption);
 				CHAdeMOGunQty++;
 			}
@@ -1858,13 +1876,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
 				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
 				StartMethod[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod);
-				ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp == 255){
 					ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp == 255){
+					ChillerTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[1] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].PowerConsumption);
 				CcsGunQty++;
 			}
@@ -1884,13 +1907,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StartDateTime);
 				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StopDateTime);
 				StartMethod[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StartMethod);
-				ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp == 255){
 					ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp == 255){
+					ChillerTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[1] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].PowerConsumption);
 				GbGunQty++;
 			}
@@ -1910,13 +1938,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StartDateTime);
 				StopDateTime[1] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StopDateTime);
 				StartMethod[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StartMethod);
-				ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp == 255){
 					ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp == 255){
+					ChillerTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[1] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[1] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].PowerConsumption);
 				CHAdeMOGunQty++;
 			}
@@ -1958,13 +1991,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartDateTime);
 				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StopDateTime);
 				StartMethod[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].StartMethod);
-				ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp == 0 ||ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp == 255){
 					ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp == 0 ||ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp == 255){
+					ChillerTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[2] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.CcsChargingData[CcsGunQty].PowerConsumption);
 				CcsGunQty++;
 			}
@@ -1984,13 +2022,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StartDateTime);
 				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StopDateTime);
 				StartMethod[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].StartMethod);
-				ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp == 255){
 					ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp == 255){
+					ChillerTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[2] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.GbChargingData[GbGunQty].PowerConsumption);
 				GbGunQty++;
 			}
@@ -2010,13 +2053,18 @@ int main(int argc, char *argv[]) {
 				StartDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StartDateTime);
 				StopDateTime[2] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StopDateTime);
 				StartMethod[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].StartMethod);
-				ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp == 255){
 					ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp == 255){
+					ChillerTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp);
+				}
+				else{
+					ChillerTemp[2] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].ChillerTemp-60);
+				}
 				PowerConsumption[2] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.ChademoChargingData[CHAdeMOGunQty].PowerConsumption);
 				CHAdeMOGunQty++;
 			}
@@ -2060,13 +2108,18 @@ int main(int argc, char *argv[]) {
 				DDStartDateTime[i] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.StartDateTime);
 				DDStopDateTime[i] = json_object_new_string((char *)&ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.StopDateTime);
 				DDStartMethod[i] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.StartMethod);
-				DDConnectorTemp[i] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ConnectorTemp);
 				if(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ConnectorTemp == 0 || ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ConnectorTemp == 255){
 					ConnectorTemp[i] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ConnectorTemp);
 				}
 				else{
 					ConnectorTemp[i] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ConnectorTemp-60);
 				}
+				if(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ChillerTemp == 0 || ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ChillerTemp == 255){
+					ChillerTemp[i] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ChillerTemp);
+				}
+				else{
+					ChillerTemp[i] = json_object_new_int(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.ChillerTemp-60);
+				}
 				DDPowerConsumption[i] = json_object_new_double(ShmSysConfigAndInfo->SysInfo.ConnectorInfo[i].GeneralChargingData.PowerConsumption);
 			}
 		}
@@ -2267,6 +2320,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo1,"StopDateTime",StopDateTime[0]);
 			json_object_object_add(ChargingInfo1,"StartMethod",StartMethod[0]);
 			json_object_object_add(ChargingInfo1,"ConnectorTemp",ConnectorTemp[0]);
+			json_object_object_add(ChargingInfo1,"ChillerTemp",ChillerTemp[0]);
 			json_object_object_add(ChargingInfo1,"PresentChargingVoltage",PresentChargingVoltage[0]);
 			json_object_object_add(ChargingInfo1,"PresentChargingCurrent",PresentChargingCurrent[0]);
 			json_object_object_add(ChargingInfo1,"PresentChargingPower",PresentChargingPower[0]);
@@ -2287,6 +2341,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo2,"StopDateTime",StopDateTime[1]);
 			json_object_object_add(ChargingInfo2,"StartMethod",StartMethod[1]);
 			json_object_object_add(ChargingInfo2,"ConnectorTemp",ConnectorTemp[1]);
+			json_object_object_add(ChargingInfo2,"ChillerTemp",ChillerTemp[1]);
 			json_object_object_add(ChargingInfo2,"PresentChargingVoltage",PresentChargingVoltage[1]);
 			json_object_object_add(ChargingInfo2,"PresentChargingCurrent",PresentChargingCurrent[1]);
 			json_object_object_add(ChargingInfo2,"PresentChargingPower",PresentChargingPower[1]);
@@ -2307,6 +2362,7 @@ int main(int argc, char *argv[]) {
 			json_object_object_add(ChargingInfo3,"StopDateTime",StopDateTime[2]);
 			json_object_object_add(ChargingInfo3,"StartMethod",StartMethod[2]);
 			json_object_object_add(ChargingInfo3,"ConnectorTemp",ConnectorTemp[2]);
+			json_object_object_add(ChargingInfo3,"ChillerTemp",ChillerTemp[2]);
 			json_object_object_add(ChargingInfo3,"PresentChargingVoltage",PresentChargingVoltage[2]);
 			json_object_object_add(ChargingInfo3,"PresentChargingCurrent",PresentChargingCurrent[2]);
 			json_object_object_add(ChargingInfo3,"PresentChargingPower",PresentChargingPower[2]);
@@ -2334,6 +2390,7 @@ int main(int argc, char *argv[]) {
 				json_object_object_add(DDChargingInfo1,"StopDateTime",DDStopDateTime[0]);
 				json_object_object_add(DDChargingInfo1,"StartMethod",DDStartMethod[0]);
 				json_object_object_add(DDChargingInfo1,"ConnectorTemp",DDConnectorTemp[0]);
+				json_object_object_add(DDChargingInfo1,"ChillerTemp",DDChillerTemp[0]);
 				json_object_object_add(DDChargingInfo1,"PresentChargingVoltage",DDPresentChargingVoltage[0]);
 				json_object_object_add(DDChargingInfo1,"PresentChargingCurrent",DDPresentChargingCurrent[0]);
 				json_object_object_add(DDChargingInfo1,"PresentChargingPower",DDPresentChargingPower[0]);
@@ -2354,6 +2411,7 @@ int main(int argc, char *argv[]) {
 				json_object_object_add(DDChargingInfo2,"StopDateTime",DDStopDateTime[1]);
 				json_object_object_add(DDChargingInfo2,"StartMethod",DDStartMethod[1]);
 				json_object_object_add(DDChargingInfo2,"ConnectorTemp",DDConnectorTemp[1]);
+				json_object_object_add(DDChargingInfo2,"ChillerTemp",DDChillerTemp[1]);
 				json_object_object_add(DDChargingInfo2,"PresentChargingVoltage",DDPresentChargingVoltage[1]);
 				json_object_object_add(DDChargingInfo2,"PresentChargingCurrent",DDPresentChargingCurrent[1]);
 				json_object_object_add(DDChargingInfo2,"PresentChargingPower",DDPresentChargingPower[1]);
@@ -2374,6 +2432,7 @@ int main(int argc, char *argv[]) {
 				json_object_object_add(DDChargingInfo3,"StopDateTime",DDStopDateTime[2]);
 				json_object_object_add(DDChargingInfo3,"StartMethod",DDStartMethod[2]);
 				json_object_object_add(DDChargingInfo3,"ConnectorTemp",DDConnectorTemp[2]);
+				json_object_object_add(DDChargingInfo3,"ChillerTemp",DDChillerTemp[2]);
 				json_object_object_add(DDChargingInfo3,"PresentChargingVoltage",DDPresentChargingVoltage[2]);
 				json_object_object_add(DDChargingInfo3,"PresentChargingCurrent",DDPresentChargingCurrent[2]);
 				json_object_object_add(DDChargingInfo3,"PresentChargingPower",DDPresentChargingPower[2]);
@@ -2394,6 +2453,7 @@ int main(int argc, char *argv[]) {
 				json_object_object_add(DDChargingInfo4,"StopDateTime",DDStopDateTime[3]);
 				json_object_object_add(DDChargingInfo4,"StartMethod",DDStartMethod[3]);
 				json_object_object_add(DDChargingInfo4,"ConnectorTemp",DDConnectorTemp[3]);
+				json_object_object_add(DDChargingInfo4,"ChillerTemp",DDChillerTemp[3]);
 				json_object_object_add(DDChargingInfo4,"PresentChargingVoltage",DDPresentChargingVoltage[3]);
 				json_object_object_add(DDChargingInfo4,"PresentChargingCurrent",DDPresentChargingCurrent[3]);
 				json_object_object_add(DDChargingInfo4,"PresentChargingPower",DDPresentChargingPower[3]);

EVSE/rootfs/var/www/set_charging.php

@@ -834,7 +834,11 @@ img {
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Connector Temperature</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo1']['ConnectorTemp']!=255?$obj['DDChargingInfo1']['ConnectorTemp']:"not supported";?> ℃">
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo1']['ConnectorTemp']!=255?$obj['DDChargingInfo1']['ConnectorTemp']." ℃":"not supported";?>">
+										</div>
+										<div class="form-group ChillerTemp">
+											<label>Chiller Temperature</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo1']['ChillerrTemp']!=255?$obj['DDChargingInfo1']['ChillerTemp']." ℃":"not supported";?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Present Charging Voltage</label>
@@ -906,7 +910,11 @@ img {
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Connector Temperature</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo2']['ConnectorTemp']!=255?$obj['DDChargingInfo2']['ConnectorTemp']:"not supported";?> ℃">
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo2']['ConnectorTemp']!=255?$obj['DDChargingInfo2']['ConnectorTemp']." ℃":"not supported";?>">
+										</div>
+										<div class="form-group ChillerTemp">
+											<label>Chiller Temperature</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo2']['ChillerTemp']!=255?$obj['DDChargingInfo2']['ChillerTemp']." ℃":"not supported";?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Present Charging Voltage</label>
@@ -978,7 +986,11 @@ img {
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Connector Temperature</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo3']['ConnectorTemp']!=255?$obj['DDChargingInfo3']['ConnectorTemp']:"not supported";?> ℃">
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo3']['ConnectorTemp']!=255?$obj['DDChargingInfo3']['ConnectorTemp']." ℃":"not supported";?>">
+										</div>
+										<div class="form-group ChillerTemp">
+											<label>Chiller Temperature</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo3']['ChillerTemp']!=255?$obj['DDChargingInfo3']['ChillerTemp']." ℃":"not supported";?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Present Charging Voltage</label>
@@ -1050,7 +1062,11 @@ img {
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Connector Temperature</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo4']['ConnectorTemp']!=255?$obj['DDChargingInfo4']['ConnectorTemp']:"not supported";?> ℃">
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo4']['ConnectorTemp']!=255?$obj['DDChargingInfo4']['ConnectorTemp']." ℃":"not supported";?>">
+										</div>
+										<div class="form-group ChillerTemp">
+											<label>Chiller Temperature</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['DDChargingInfo4']['ChilleTemp']!=255?$obj['DDChargingInfo4']['ChillerTemp']." ℃":"not supported";?>">
 										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Present Charging Voltage</label>
@@ -1128,9 +1144,14 @@ img {
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Connector Temperature</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['ConnectorTemp']!=255?$obj['ChargingInfo1']['ConnectorTemp']:"not supported";?> ℃">
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['ConnectorTemp']!=255?$obj['ChargingInfo1']['ConnectorTemp']." ℃":"not supported";?>">
 											<input type="hidden" name="ConnectorTemp1" id="ConnectorTemp1" value="<?php echo $obj['ChargingInfo1']['ConnectorTemp'];?>">
 										</div>
+										<div class="form-group ChillerTemp1">
+											<label>Chiller Temperature</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo1']['ChillerTemp']!=255?$obj['ChargingInfo1']['ChillerTemp']." ℃":"not supported";?>">
+											<input type="hidden" name="ChillerTemp" id="ChillerTemp" value="<?php echo $obj['ChargingInfo1']['ChillerTemp'];?>">
+										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Present Charging Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo round($obj['ChargingInfo1']['PresentChargingVoltage'],2);?> volt">
@@ -1215,9 +1236,14 @@ img {
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Connector Temperature</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['ConnectorTemp']!=255?$obj['ChargingInfo2']['ConnectorTemp']:"not supported";?> ℃">
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['ConnectorTemp']!=255?$obj['ChargingInfo2']['ConnectorTemp']." ℃":"not supported";?>">
 											<input type="hidden" name="ConnectorTemp2" id="ConnectorTemp2" value="<?php echo $obj['ChargingInfo2']['ConnectorTemp'];?>">
 										</div>
+										<div class="form-group ChillerTemp2">
+											<label>Chiller Temperature</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo2']['ChillerTemp']!=255?$obj['ChargingInfo2']['ChillerTemp']." ℃":"not supported";?>">
+											<input type="hidden" name="ChillerTemp2" id="ChillerTemp2" value="<?php echo $obj['ChargingInfo2']['ChillerTemp'];?>">
+										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Present Charging Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo round($obj['ChargingInfo2']['PresentChargingVoltage'],2);?> volt">
@@ -1302,9 +1328,14 @@ img {
 										</div>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Connector Temperature</label>
-											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['ConnectorTemp']!=255?$obj['ChargingInfo3']['ConnectorTemp']:"not supported";?> ℃">
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['ConnectorTemp']!=255?$obj['ChargingInfo3']['ConnectorTemp']." ℃":"not supported";?>">
 											<input type="hidden" name="ConnectorTemp3" id="ConnectorTemp3" value="<?php echo $obj['ChargingInfo3']['ConnectorTemp'];?>">
 										</div>
+										<div class="form-group ChillerTemp3">
+											<label>Chiller Temperature</label>
+											<input type="text" readonly class="form-control" placeholder="<?php echo $obj['ChargingInfo3']['ChillerTemp']!=255?$obj['ChargingInfo3']['ChillerTemp']." ℃":"not supported";?>">
+											<input type="hidden" name="ChillerTemp3" id="ChillerTemp3" value="<?php echo $obj['ChargingInfo3']['ChillerTemp'];?>">
+										</div>
 										<div class="form-group" style="display:<?php echo $am001;?>">
 											<label>Present Charging Voltage</label>
 											<input type="text" readonly class="form-control" placeholder="<?php echo round($obj['ChargingInfo3']['PresentChargingVoltage'],2);?> volt">
@@ -1441,6 +1472,31 @@ img {
 				document.getElementById(this.id+"Text").style.display="none";
 			}
 		});
+		if(document.getElementById("ModelName").value.substr(0,2) == "DO" || document.getElementById("ModelName").value.substr(0,2) == "DK"){
+			document.getElementsByClassName("ChillerTemp").style.display="block";
+		}
+		else{
+			document.getElementsByClassName("ChillerTemp").style.display="none";
+		}
+		if(document.getElementById("ModelName").value.substr(7,1) == "V" || document.getElementById("ModelName").value.substr(7,1) == "F" || document.getElementById("ModelName").value.substr(7,1) == "P" || document.getElementById("ModelName").value.substr(7,1) == "R"){
+			document.getElementsByClassName("ChillerTemp1").style.display="block";
+		}
+		else{
+			document.getElementsByClassName("ChillerTemp1").style.display="none";
+		}
+		if(document.getElementById("ModelName").value.substr(9,1) == "V" || document.getElementById("ModelName").value.substr(9,1) == "F" || document.getElementById("ModelName").value.substr(9,1) == "P" || document.getElementById("ModelName").value.substr(9,1) == "R"){
+			document.getElementsByClassName("ChillerTemp2").style.display="block";
+		}
+		else{
+			document.getElementsByClassName("ChillerTemp2").style.display="none";
+		}
+		if(document.getElementById("ModelName").value.substr(8,1) == "V" || document.getElementById("ModelName").value.substr(8,1) == "F" || document.getElementById("ModelName").value.substr(8,1) == "P" || document.getElementById("ModelName").value.substr(8,1) == "R"){
+			document.getElementsByClassName("ChillerTemp3").style.display="block";
+		}
+		else{
+			document.getElementsByClassName("ChillerTemp3").style.display="none";
+		}
+
 	});
 
 	document.getElementById("save").onclick = function() {

EVSE/rootfs/var/www/set_system.php

@@ -130,12 +130,7 @@ img {
 											<label>
 											<input type="checkbox" id="FactoryConfiguration" name="FactoryConfiguration" <?php echo $obj->{'FactoryConfiguration'}==1?"checked":"";?>>
 											Factory Default Configuration</label>
-<?php /*											<select class="form-control" id="FactoryConfiguration" name="FactoryConfiguration">
-												<option value="0" <?php echo $obj->{'FactoryConfiguration'}=="0"?"selected":""?>>Normal</option>
-												<option value="1" <?php echo $obj->{'FactoryConfiguration'}=="1"?"selected":""?>>Trigger</option>
-											</select>*/?>
 										</div>
-<?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 +138,6 @@ img {
 												<option value="1" <?php echo $obj->{'AuthorisationMode'}=="1"?"selected":""?>>disable</option>
 											</select>
 										</div>
-<?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 +158,6 @@ 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"){?>
 										<div class="form-group" style="display:<?php echo $am111;?>">
 											<label>Rfid Card Num Endian</label>
 											<select class="form-control" id="RfidCardNumEndian" name="RfidCardNumEndian">
@@ -221,7 +214,6 @@ img {
 												<option value="2" <?php echo $obj->{'Intensity'}=="2"?"selected":""?>>Brightest</option>
 											</select>
 										</div>
-<?php //} ?>
 <?php if(substr($ModelName,0,2)=="DO" || substr($ModelName,0,2)=="DK"){?>
 										<div class="form-group">
 											<label>Dispenser Quantity</label>
@@ -328,55 +320,6 @@ img {
 											<label>System ID</label>
 											<input type="text" name="DDSystemId<?php echo $idx2; ?>" id="DDSystemId<?php echo $idx2; ?>" class="form-control" value="<?php echo $obj->{'DDSystemId'}[$idx];?>">
 										</div>
-										<div class="form-group">
-											<label>
-											<input type="checkbox" id="DDFactoryConfiguration<?php echo $idx2; ?>" name="DDFactoryConfiguration<?php echo $idx2; ?>" <?php echo $obj->{'DDFactoryConfiguration'}[$idx]==1?"checked":"";?>>
-											Factory Default Configuration</label>
-										</div>
-										<div class="form-group">
-											<label>Authentication</label>
-											<select class="form-control" id="DDAuthorisationMode<?php echo $idx2; ?>" name="DDAuthorisationMode<?php echo $idx2; ?>" onchange="DDAuthorisationMode_changed(<?php echo $idx2; ?>)">
-												<option value="0" <?php echo $obj->{'DDAuthorisationMode'}[$idx]=="0"?"selected":""?>>enable</option>
-												<option value="1" <?php echo $obj->{'DDAuthorisationMode'}[$idx]=="1"?"selected":""?>>disable</option>
-											</select>
-										</div>
-										<div class="form-group">
-											<label>Rfid Card Num Endian</label>
-											<select class="form-control" id="DDRfidCardNumEndian<?php echo $idx2; ?>" name="DDRfidCardNumEndian<?php echo $idx2; ?>">
-												<option value="0" <?php echo $obj->{'DDRfidCardNumEndian'}[$idx]=="0"?"selected":""?>>little endian</option>
-												<option value="1" <?php echo $obj->{'DDRfidCardNumEndian'}[$idx]=="1"?"selected":""?>>big endian</option>
-											</select>
-										</div>
-										<div class="form-group" id="DDstartMode<?php echo $idx2; ?>">
-											<label id="DDisAPPLabel">
-											<input type="checkbox" id="DDisAPP<?php echo $idx2; ?>" name="DDisAPP<?php echo $idx2; ?>" <?php echo $obj->{'DDisAPP'}[$idx]==1?"checked":"";?> onclick="DDisAPP_clicked(<?php echo $idx2; ?>)">
-											APP</label>
-											<label id="DDisQRCodeLabel">
-											<input type="checkbox" id="DDisQRCode<?php echo $idx2; ?>" name="DDisQRCode<?php echo $idx2; ?>" <?php echo $obj->{'DDisQRCode'}[$idx]==1?"checked":"";?> onclick="DDisQRCode_clicked(<?php echo $idx2; ?>)">
-											QR Code</label>
-											<label id="DDisRFIDLabel">
-											<input type="checkbox" id="DDisRFID<?php echo $idx2; ?>" name="DDisRFID<?php echo $idx2; ?>" <?php echo $obj->{'DDisRFID'}[$idx]==1?"checked":"";?> onclick="DDisRFID_clicked(<?php echo $idx2; ?>)">
-											RFID</label>
-										</div>
-										<div class="form-group" id="DDQRCodeMadeModeDiv<?php echo $idx2; ?>">
-											<label>QR Code Made Mode</label>
-											<select class="form-control" id="DDQRCodeMadeMode<?php echo $idx2; ?>" name="DDQRCodeMadeMode<?php echo $idx2; ?>" onchange="DDQRCodeMadeMode_changed(<?php echo $idx2; ?>)">
-												<option value="0" <?php echo $obj->{'DDQRCodeMadeMode'}[$idx]=="0"?"selected":""?>>default</option>
-												<option value="1" <?php echo $obj->{'DDQRCodeMadeMode'}[$idx]=="1"?"selected":""?>>customized</option>
-											</select>
-										</div>
-										<div class="form-group" id="DDQRCodeContentDiv<?php echo $idx2; ?>">
-											<label>QR Code Content</label>
-											<input type="text" name="DDQRCodeContent<?php echo $idx2; ?>" id="DDQRCodeContent<?php echo $idx2; ?>" class="form-control" placeholder="<?php echo $obj->{'DDQRCodeContent'}[$idx];?>" value="<?php echo $obj->{'DDQRCodeContent'}[$idx];?>">
-										</div>
-										<div class="form-group">
-											<label>LED Intensity</label>
-											<select class="form-control" id="DDIntensity<?php echo $idx2; ?>" name="DDIntensity<?php echo $idx2; ?>">
-												<option value="0" <?php echo $obj->{'DDIntensity'}[$idx]=="0"?"selected":""?>>Darkest</option>
-												<option value="1" <?php echo $obj->{'DDIntensity'}[$idx]=="1"?"selected":""?>>Medium</option>
-												<option value="2" <?php echo $obj->{'DDIntensity'}[$idx]=="2"?"selected":""?>>Brightest</option>
-											</select>
-										</div>
 									</section>
 								</article>
 								<article class="envor-sorting-item css">
@@ -464,22 +407,9 @@ img {
 		else{
 			document.getElementById("AcModelNameDiv").style.display="none";
 		}
-<?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; ?>);
-		DDQRCodeMadeMode_changed(<?php echo $idx2; ?>);
-<?php }} else { ?>
-		if(document.getElementById("ModelName").value.substr(8,1) != "0"){
-//			document.getElementById("AcRatingCurrentDiv").style.display="block";
-		}
-		else{
-//			document.getElementById("AcRatingCurrentDiv").style.display="none";
-		}
 		isQRCode_clicked();
 		AuthorisationMode_changed();
 		QRCodeMadeMode_changed();
-<?php } ?>
 	});
 
 	document.getElementById("save").onclick = function() {
@@ -495,7 +425,6 @@ 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"){?>
 				data +=  "&PhaseLossPolicy=" + document.getElementById("PhaseLossPolicy").value+
 						"&AuthorisationMode=" + document.getElementById("AuthorisationMode").value+
 						"&isAPP=" + (document.getElementById("isAPP").checked?1:0)+
@@ -506,20 +435,10 @@ img {
 						"&Intensity=" + document.getElementById("Intensity").value+
 						"&RfidCardNumEndian=" + document.getElementById("RfidCardNumEndian").value+
 						"&PsuAcInputType=" + document.getElementById("PsuAcInputType").value;
-<?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)+
-						"&DDAuthorisationMode<?php echo $idx2; ?>=" + document.getElementById("DDAuthorisationMode<?php echo $idx2; ?>").value+
-						"&DDisAPP<?php echo $idx2; ?>=" + (document.getElementById("DDisAPP<?php echo $idx2; ?>").checked?1:0)+
-						"&DDisQRCode<?php echo $idx2; ?>=" + (document.getElementById("DDisQRCode<?php echo $idx2; ?>").checked?1:0)+
-						"&DDisRFID<?php echo $idx2; ?>=" + (document.getElementById("DDisRFID<?php echo $idx2; ?>").checked?1:0)+
-						"&DDQRCodeMadeMode<?php echo $idx2; ?>=" + document.getElementById("DDQRCodeMadeMode<?php echo $idx2; ?>").value+
-						"&DDQRCodeContent<?php echo $idx2; ?>=" + document.getElementById("DDQRCodeContent<?php echo $idx2; ?>").value+
-						"&DDIntensity<?php echo $idx2; ?>=" + document.getElementById("DDIntensity<?php echo $idx2; ?>").value+
-						"&DDRfidCardNumEndian<?php echo $idx2; ?>=" + document.getElementById("DDRfidCardNumEndian<?php echo $idx2; ?>").value;
-
+				data +=  "&DDSystemId<?php echo $idx2; ?>=" + document.getElementById("DDSystemId<?php echo $idx2; ?>").value;
 <?php }} ?>
 			// POST 請求必須設置表頭在 open() 下面，send() 上面
 			request.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
@@ -548,15 +467,6 @@ img {
 		var SystemDateTime = document.getElementById("SystemDateTime").value;
 		var result=true;
 
-/*
-		if(SystemId.length < 1)
-		{
-			alert("SystemId format is not correct, ID is required .");
-			document.getElementById("SystemId").focus();
-			result = false;
-		}
-
-*/
 		return result;
 	}
 
@@ -579,25 +489,6 @@ img {
 		}
 	}
 
-	function DDAuthorisationMode_changed(i){
-		if(document.getElementById("DDAuthorisationMode"+i).value == "0"){
-//			if(document.getElementById("DDModelName"+i).value.substr(0,1) == "D"){
-				document.getElementById("DDstartMode"+i).style.display="block";
-				DDisQRCode_clicked(i);
-//			}
-			if(!document.getElementById("DDisAPP"+i).checked && !document.getElementById("DDisRFID"+i).checked && !document.getElementById("DDisQRCode"+i).checked){
-				alert("Please choose one of 'APP、QR code、RFID'");
-				document.getElementById("DDisAPP"+i).checked=true;
-				document.getElementById("DDisQRCode"+i).checked=true;
-				document.getElementById("DDisRFID"+i).checked=true;
-			}
-		}
-		else{
-			document.getElementById("DDstartMode"+i).style.display="none";
-			document.getElementById("DDQRCodeMadeModeDiv"+i).style.display="none";
-		}
-	}
-
 	function isQRCode_clicked(){
 		if(document.getElementById("isQRCode").checked){
 			document.getElementById("QRCodeMadeModeDiv").style.display="block";
@@ -613,21 +504,6 @@ img {
 		}
 	}
 
-	function DDisQRCode_clicked(i){
-		if(document.getElementById("DDisQRCode"+i).checked){
-			document.getElementById("DDQRCodeMadeModeDiv"+i).style.display="block";
-			DDQRCodeMadeMode_changed(i);
-		}
-		else{
-			document.getElementById("DDQRCodeMadeModeDiv"+i).style.display="none";
-			document.getElementById("DDQRCodeContentDiv"+i).style.display="none";
-			if(document.getElementById("DDAuthorisationMode"+i).value == "0" && !document.getElementById("DDisAPP"+i).checked && !document.getElementById("DDisRFID"+i).checked){
-				alert("Please choose one of 'APP、QR code、RFID'");
-				document.getElementById("DDisQRCode"+i).checked=true;
-			}
-		}
-	}
-
 	function isAPP_clicked(){
 		if((document.getElementById("ModelName").value.substr(0,1) == "D" || document.getElementById("ModelName").value.substr(0,2) == "AX") && document.getElementById("AuthorisationMode").value == "0" && !document.getElementById("isQRCode").checked && !document.getElementById("isAPP").checked && !document.getElementById("isRFID").checked){
 			alert("Please choose one of 'APP、QR code、RFID'");
@@ -635,13 +511,6 @@ img {
 		}
 	}
 
-	function DDisAPP_clicked(i){
-		if(document.getElementById("DDAuthorisationMode"+i).value == "0" && !document.getElementById("DDisQRCode"+i).checked && !document.getElementById("DDisAPP"+i).checked && !document.getElementById("DDisRFID"+i).checked){
-			alert("Please choose one of 'APP、QR code、RFID'");
-			document.getElementById("DDisAPP"+i).checked=true;
-		}
-	}
-
 	function isRFID_clicked(){
 		if((document.getElementById("ModelName").value.substr(0,1) == "D" || document.getElementById("ModelName").value.substr(0,2) == "AX") && document.getElementById("AuthorisationMode").value == "0" && !document.getElementById("isQRCode").checked && !document.getElementById("isAPP").checked && !document.getElementById("isRFID").checked){
 			alert("Please choose one of 'APP、QR code、RFID'");
@@ -649,13 +518,6 @@ img {
 		}
 	}
 
-	function DDisRFID_clicked(i){
-		if(document.getElementById("DDAuthorisationMode"+i).value == "0" && !document.getElementById("DDisQRCode"+i).checked && !document.getElementById("DDisAPP"+i).checked && !document.getElementById("DDisRFID"+i).checked){
-			alert("Please choose one of 'APP、QR code、RFID'");
-			document.getElementById("DDisRFID"+i).checked=true;
-		}
-	}
-
 	function QRCodeMadeMode_changed(){
 		if(document.getElementById("QRCodeMadeMode").value == "1"){
 			document.getElementById("QRCodeContentDiv").style.display="block";
@@ -665,15 +527,6 @@ img {
 		}
 	}
 
-	function DDQRCodeMadeMode_changed(i){
-		if(document.getElementById("DDQRCodeMadeMode"+i).value == "1"){
-			document.getElementById("DDQRCodeContentDiv"+i).style.display="block";
-		}
-		else{
-			document.getElementById("DDQRCodeContentDiv"+i).style.display="none";
-		}
-	}
-
 	Date.prototype.Format = function (fmt) { //author: meizz
 		var o = {
 			"M+": this.getMonth() + 1, //月份
@@ -701,4 +554,3 @@ img {
 	}
 
 </script>
-