Merge branch 'master' into AW-Regular

EVSE/Modularization/Module_Wifi.c

@@ -260,7 +260,7 @@ int isValidCheckSum(uint8_t *message);
 char *Support_InterfaceSTA[2]	= {"mlan0", "wlan0"};
 char *Support_InterfaceAP[1]	= {"uap0"};
 char *valid_Internet[2]			= {"8.8.8.8", "180.76.76.76"};
-char *Version_And_Date[2]		= {"V0.20","2021-09-02"};
+char *Version_And_Date[2]		= {"V0.21","2021-10-14"};
 int protocol_Version [] 		= {0,7,0};
 
 int StoreLogMsg(const char *fmt, ...)
@@ -646,16 +646,23 @@ int isConnectAP()
 		result = FAIL;
 	else
 	{
-		while(fgets(buf, sizeof(buf), fp) != NULL)
+		if(fgets(buf, sizeof(buf), fp) == NULL)
 		{
-			if(strstr(buf, "Not-Associated") > 0)
+			result = FAIL;
+		}
+		else
+		{
+			while(fgets(buf, sizeof(buf), fp) != NULL)
 			{
-				result = FAIL;
-			}
+				if(strstr(buf, "Access Point") > 0)
+				{
+					DEBUG_INFO("Link AP info: %s", &buf[strcspn(buf, "Mode")]);
+				}
 
-			if(strstr(buf, "Access Point") > 0)
-			{
-				DEBUG_INFO("Link AP info: %s", &buf[strcspn(buf, "Mode")]);
+				if(strstr(buf, "Not-Associated") > 0)
+				{
+					result = FAIL;
+				}
 			}
 		}
 	}