Remove single WiFi.begin()

If an area has multiple APs with identical SSIDs (common in office environments) WiFi.begin() will connect to the first it detects, not necessarily the strongest AP with that SSID. Using multiWifi is slower, but ensures that the network with the strongest RSSI is used.

Author: nseidle

Firmware/RTK_Everywhere/WiFi.ino

@@ -530,39 +530,18 @@ bool wifiConnect(unsigned long timeout)
 
     int wifiResponse = WL_DISCONNECTED;
 
-    // WiFi.begin() is much faster than wifiMulti (requires scan time)
-    // Use wifiMulti only if multiple credentials exist
-    if (wifiNetworkCount() == 1)
-    {
-        systemPrint("Connecting WiFi");
+    systemPrint("Connecting WiFi... ");
+    WiFiMulti wifiMulti;
 
-        // Load SSID - may not be in spot 0
-        for (int x = 0; x < MAX_WIFI_NETWORKS; x++)
-        {
-            if (strlen(settings.wifiNetworks[x].ssid) > 0)
-            {
-                WiFi.begin(settings.wifiNetworks[x].ssid, settings.wifiNetworks[x].password);
-                break;
-            }
-        }
-
-        wifiResponse = WiFi.waitForConnectResult();
-    }
-    else
+    // Load SSIDs
+    for (int x = 0; x < MAX_WIFI_NETWORKS; x++)
     {
-        systemPrint("Connecting WiFi... ");
-        WiFiMulti wifiMulti;
-
-        // Load SSIDs
-        for (int x = 0; x < MAX_WIFI_NETWORKS; x++)
-        {
-            if (strlen(settings.wifiNetworks[x].ssid) > 0)
-                wifiMulti.addAP(settings.wifiNetworks[x].ssid, settings.wifiNetworks[x].password);
-        }
-
-        wifiResponse = wifiMulti.run(timeout);
+        if (strlen(settings.wifiNetworks[x].ssid) > 0)
+            wifiMulti.addAP(settings.wifiNetworks[x].ssid, settings.wifiNetworks[x].password);
     }
 
+    wifiResponse = wifiMulti.run(timeout);
+
     if (wifiResponse == WL_CONNECTED)
     {
         if (settings.enableTcpClient == true || settings.enableTcpServer == true || settings.enableUdpServer == true)