[Improve][Modularization][Module_Wifi]

2021.09.02 / Folus Wen

Actions:
1. Wifi connect restart condition improve.

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

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.19","2021-07-06"};
+char *Version_And_Date[2]		= {"V0.20","2021-09-02"};
 int protocol_Version [] 		= {0,7,0};
 
 int StoreLogMsg(const char *fmt, ...)
@@ -4540,33 +4540,37 @@ void proc_sta()
 				sleep(5);
 			}
 
-			if((cnt_pingDNS_Fail >= 3) && !ShmSysConfigAndInfo->SysInfo.OcppConnStatus && !(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging && (isConnectAP() == PASS)))
+			if(cnt_pingDNS_Fail >= 3)
 			{
 				ShmStatusCodeData->InfoCode.InfoEvents.bits.InternetDisconnectViaWiFi=1;
-				ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn=0;
-				cnt_pingDNS_Fail = 0;
-
-				DEBUG_INFO("Ping DNS failed...\n");
-				memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress);
-				memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress);
-				memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress);
 
-				resetModule();
-				if(isFindInterface() == PASS)
-				{
-					DEBUG_INFO("Wifi interface: %s\n", Wifi.currentInterface);
-					getParameters();
-					isSetWPA_OK = false;
-					ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi = 0;
-					Wifi_module_sts = STA_STATE_DEVICE_DETECT;
-					DEBUG_INFO("=================[State 1]===================\n");
-				}
-				else
+				if((!ShmSysConfigAndInfo->SysInfo.OcppConnStatus && (strcmp((char *)&ShmSysConfigAndInfo->SysConfig.OcppServerURL,"") != 0)) && !(ShmSysConfigAndInfo->SysConfig.isEnableLocalPowerSharging && (isConnectAP() == PASS)))
 				{
-					DEBUG_INFO("Wifi support interface valid result: Fail\n");
-					ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi = 0;
-					Wifi_module_sts = STA_STATE_INIT;
-					DEBUG_INFO("=================[State 0]===================\n");
+					ShmSysConfigAndInfo->SysConfig.AthInterface.WifiNetworkConn=0;
+					cnt_pingDNS_Fail = 0;
+
+					DEBUG_INFO("Ping DNS failed...\n");
+					memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiSubmaskAddress);
+					memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiGatewayAddress);
+					memset(ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress, 0, sizeof ShmSysConfigAndInfo->SysConfig.AthInterface.WifiMacAddress);
+
+					resetModule();
+					if(isFindInterface() == PASS)
+					{
+						DEBUG_INFO("Wifi interface: %s\n", Wifi.currentInterface);
+						getParameters();
+						isSetWPA_OK = false;
+						ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi = 0;
+						Wifi_module_sts = STA_STATE_DEVICE_DETECT;
+						DEBUG_INFO("=================[State 1]===================\n");
+					}
+					else
+					{
+						DEBUG_INFO("Wifi support interface valid result: Fail\n");
+						ShmSysConfigAndInfo->SysConfig.AthInterface.WifiRssi = 0;
+						Wifi_module_sts = STA_STATE_INIT;
+						DEBUG_INFO("=================[State 0]===================\n");
+					}
 				}
 			}
 			break;