Browse Source

Merge branch 'master' into AW-Regular

8009 4 years ago
parent
commit
a03a157f5d
2 changed files with 8 additions and 6 deletions
  1. 4 3
      EVSE/Modularization/Module_Wifi.c
  2. 4 3
      EVSE/Projects/define.h

+ 4 - 3
EVSE/Modularization/Module_Wifi.c

@@ -4,7 +4,7 @@
  *  Created on: 2020-01-14
  *  Update on: 2020-05-27
  *  Author: Jerry Wang, Eason Yang, Folus Wen
- *  Version: D0.02
+ *  Version: D0.03
  */
 
 #include 	<sys/time.h>
@@ -558,7 +558,7 @@ int isConnectAP()
 	char buf[512];
 
 	// Get IP address & net mask
-	strcpy(cmd, "/root/iwconfig ");
+	strcpy(cmd, "iwconfig ");
 	strcat(cmd, Wifi.currentInterface);
 	fp = popen(cmd, "r");
 	if(fp == NULL)
@@ -663,7 +663,7 @@ int getLinkQuality()
 	char buf[512];
 	char tmp[512];
 
-	strcpy(cmd, "/root/iwconfig ");
+	strcpy(cmd, "iwconfig ");
 	strcat(cmd, Wifi.currentInterface);
 	fp = popen(cmd, "r");
 	if(fp == NULL)
@@ -3650,6 +3650,7 @@ void proc_ap()
 			}
 			break;
 		case AP_STATE_DEVICE_DETECT:
+			dispReq.isShowed_IP_info = false;
 			if(!isSetWPA_OK && (setWPAconf() == PASS))
 			{
 				isSetWPA_OK = true;

+ 4 - 3
EVSE/Projects/define.h

@@ -439,7 +439,8 @@ struct ChargingInfoData
 	float 				PresentChargingVoltageL2;	//0~6553.5 volt
 	float 				PresentChargingVoltageL3;	//0~6553.5 volt
 	float 				PresentChargingCurrentL2;		//0~6553.5 amp	
-	float 				PresentChargingCurrentL3;		//0~6553.5 amp	
+	float 				PresentChargingCurrentL3;		//0~6553.5 amp
+	char 				RemoteStartFlag;
 };
 
 struct SysInfoData
@@ -800,7 +801,7 @@ char AlarmStatusCode[128][6]=
 	"012290",	// GBT output UVP
 	"012291",	// Self test Failed due to communication of GBTboard failure
 	"012292",	// Self test Failed due to communication of AC failure
-	"012293",	// Reserved
+	"012293",	// Self test Failed due to communication of Ledboard failure
 	"012294",	// Ac input OVP
 	"012295",	// Ac input UVP
 	"012296",	// CHAdeMO groundfault detection - warning
@@ -925,7 +926,7 @@ struct AlarmCodeData
 			unsigned char GbtOutputUVPFail :1;					//bit 2
 			unsigned char GbtboardStestFail :1;					//bit 3
 			unsigned char AcConnectorStestFail:1;				//bit 4
-			unsigned char :1;									//bit 5
+			unsigned char LedboardStestFail:1;									//bit 5
 			unsigned char AcSystemInputOVP:1;									//bit 6
 			unsigned char AcSystemInputUVP:1;									//bit 7
 			//AlarmVal[12]