Merge pull request #261 from sparkfun/BrowserConfig

Allow entry into browser config if WiFi is on

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -152,6 +152,7 @@ bool wifiConnect(unsigned long timeout) {return false;}
 IPAddress wifiGetGatewayIpAddress() {return IPAddress((uint32_t)0);}
 IPAddress wifiGetIpAddress() {return IPAddress((uint32_t)0);}
 int wifiGetRssi() {return -999;}
+String wifiGetSsid() {return "**WiFi Not compiled**";}
 bool wifiIsConnected() {return false;}
 bool wifiIsNeeded() {return false;}
 int wifiNetworkCount() {return 0;}

Firmware/RTK_Everywhere/Network.ino

@@ -389,7 +389,7 @@ void networkDisplayIpAddress(uint8_t networkType)
         {
             strcpy(ipAddress, networkGetIpAddress(networkType).toString().c_str());
             if (network->type == NETWORK_TYPE_WIFI)
-                systemPrintf("%s IP address: %s, RSSI: %d\r\n", networkName[network->type], ipAddress, wifiGetRssi());
+                systemPrintf("%s '%s' IP address: %s, RSSI: %d\r\n", networkName[network->type], ipAddress, wifiGetSsid(), wifiGetRssi());
             else
                 systemPrintf("%s IP address: %s\r\n", networkName[network->type], ipAddress);
 
@@ -1037,6 +1037,13 @@ const char * networkTypeToString(uint8_t type)
 //----------------------------------------
 void networkTypeUpdate(uint8_t networkType)
 {
+    if(inWiFiConfigMode())
+    {
+        //Avoid the full network layer while in Browser Config Mode
+        wifiUpdate();
+        return; 
+    }
+
     char errorMsg[64];
     NETWORK_DATA *network;
 

Firmware/RTK_Everywhere/States.ino

@@ -421,6 +421,7 @@ void stateUpdate()
 
             displayWiFiConfigNotStarted(); // Display immediately during SD cluster pause
 
+            WIFI_STOP(); //Notify the network layer that it should stop so we can take over control of WiFi
             bluetoothStop();
             espnowStop();
 

Firmware/RTK_Everywhere/WiFi.ino

@@ -171,7 +171,7 @@ void menuWiFi()
 // Display the WiFi IP address
 void wifiDisplayIpAddress()
 {
-    systemPrintf("WiFi %s IP address: ", WiFi.SSID());
+    systemPrintf("WiFi '%s' IP address: ", WiFi.SSID());
     systemPrint(WiFi.localIP());
     systemPrintf(" RSSI: %d\r\n", WiFi.RSSI());
 
@@ -253,12 +253,14 @@ bool wifiStartAP(bool forceAP)
         IPAddress subnet(255, 255, 255, 0);
 
         WiFi.softAPConfig(local_IP, gateway, subnet);
-        if (WiFi.softAP("RTK Config") == false) // Must be short enough to fit OLED Width
+
+        const char *softApSsid = "RTK Config";
+        if (WiFi.softAP(softApSsid) == false) // Must be short enough to fit OLED Width
         {
             systemPrintln("WiFi AP failed to start");
             return (false);
         }
-        systemPrint("WiFi AP Started with IP: ");
+        systemPrintf("WiFi AP '%s' started with IP: ", softApSsid);
         systemPrintln(WiFi.softAPIP());
 
         // Start DNS Server
@@ -527,39 +529,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)
@@ -708,4 +689,9 @@ int wifiGetRssi()
     return WiFi.RSSI();
 }
 
+String wifiGetSsid()
+{
+    return WiFi.SSID();
+}
+
 #endif // COMPILE_WIFI