Browse Source

2020-00-00 / ct_chen

Actions:
1. fix PSU version array error
2. fix setting max charging value error

Files:
1. EVSE/Modularization/WebService.c
2. EVSE/rootfs/var/www/set_charging.php
ct_chen 5 years ago
parent
commit
78be749a42
2 changed files with 4 additions and 4 deletions
  1. 1 1
      EVSE/Modularization/WebService.c
  2. 3 3
      EVSE/rootfs/var/www/set_charging.php

+ 1 - 1
EVSE/Modularization/WebService.c

@@ -1662,7 +1662,7 @@ int main(int argc, char *argv[]) {
 		json_object_object_add(jobj1,"Ccs2PlugInTimes",Ccs2PlugInTimes);
 		json_object_object_add(jobj1,"ChademoPlugInTimes",ChademoPlugInTimes);
 		json_object_object_add(jobj1,"FirmwareUpdate",FirmwareUpdate);
-		if(IsAcDc == "D"){
+		if(strcmp(IsAcDc, "D") == 0){
 			for(int i=0;i<PsuQuantity;i++){
 				json_object_array_add(FwPrimaryVersionArr,FwPrimaryVersion[i]);
 				json_object_array_add(FwSecondVersionArr,FwSecondVersion[i]);

+ 3 - 3
EVSE/rootfs/var/www/set_charging.php

@@ -1015,7 +1015,7 @@ img {
 			return false;
 		}
 		if(RatingPower!="" && RatingPower!=0){
-			if(MaxChargingPower > RatingPower)
+			if(parseFloat(MaxChargingPower) > parseFloat(RatingPower))
 			{
 				alert("Max Charging Power must be less than RatingPower("+RatingPower+")!");
 				document.getElementById("MaxChargingPower").focus();
@@ -1037,7 +1037,7 @@ img {
 			return false;
 		}
 		if(RatingCurrent!="" && RatingCurrent!=0){
-			if(MaxChargingCurrent > RatingCurrent)
+			if(parseFloat(MaxChargingCurrent) > parseFloat(RatingCurrent))
 			{
 				alert("Max Charging Current must be less than RatingCurrent("+RatingCurrent+")!");
 				document.getElementById("MaxChargingCurrent").focus();
@@ -1053,7 +1053,7 @@ img {
 			}
 		}
 		if(AcRatingCurrent!="" && AcRatingCurrent!=0){
-			if(AcMaxChargingCurrent > AcRatingCurrent)
+			if(parseFloat(AcMaxChargingCurrent) > parseFloat(AcRatingCurrent))
 			{
 				alert("Ac Max Charging Current must be less than Ac Rating Current("+RatingCurrent+")!");
 				document.getElementById("AcMaxChargingCurrent").focus();