Firmware update via WebConfig works. Remove consumer AP_STA.

When a consumer requests NETCONSUMER_WIFI_STA, the bit field looks different from NETCONSUMER_WIFI_AP_STA, at which point the network is shut down (bad). The solution is to remove NETCONSUMER_WIFI_AP_STA and just use a combination of bits _AP and _STA.

Author: nseidle

Firmware/RTK_Everywhere/Network.ino

@@ -1409,25 +1409,14 @@ void networkUpdate()
     // then stop all networks and let the lower code restart the network accordingly
     if (consumerTypes != previousConsumerTypes)
     {
-        previousConsumerTypes = networkGetConsumerTypes(); // Update the previous consumer types
+        if (settings.debugNetworkLayer)
+            systemPrintf("Changing from consumer type 0x%02X to 0x%02X\r\n", previousConsumerTypes, consumerTypes);
 
-        // if (networkConsumersOnline() > 0 && networkShutdownRequest == false)
-        // {
-        //     // Tell consumers to shut down
-        //     networkShutdownRequest = true;
-        //     if (settings.debugNetworkLayer)
-        //         systemPrintln("Notifying consumers of impending network shutdown");
-        // }
-        // else
-        // {
-        //     // We're clear to shutdown
-        //     if (settings.debugNetworkLayer)
-        //         systemPrintln("Stopping all networks because of consumer type change");
+        previousConsumerTypes = networkGetConsumerTypes(); // Update the previous consumer types
 
         // Shutdown all networks
         for (int index = 0; index < NETWORK_OFFLINE; index++)
             networkStop(index, settings.debugNetworkLayer);
-        // }
 
     }
 
@@ -1440,8 +1429,7 @@ void networkUpdate()
         // If a consumer is requesting a particular type, it gets priority
 
         // Consumer is requesting WiFi specifically
-        if ((consumerTypes && (1 << NETCONSUMER_WIFI_STA)) || (consumerTypes && (1 << NETCONSUMER_WIFI_AP)) ||
-            (consumerTypes && (1 << NETCONSUMER_WIFI_AP_STA)))
+        if ((consumerTypes && (1 << NETCONSUMER_WIFI_STA)) || (consumerTypes && (1 << NETCONSUMER_WIFI_AP)))
         {
             if (settings.debugNetworkLayer)
                 systemPrintln("Starting WiFi Specific Network");
@@ -1640,7 +1628,7 @@ uint8_t networkConsumers(uint16_t *consumerTypes)
 
         // TODO Make web server over ethernet work here as well
         if (settings.wifiConfigOverAP == true)
-            *consumerTypes |= (1 << NETCONSUMER_WIFI_AP_STA); //WebConfig requires both AP and STA (for firmware check)
+            *consumerTypes |= ((1 << NETCONSUMER_WIFI_AP) | (1 << NETCONSUMER_WIFI_STA)); //WebConfig requires both AP and STA (for firmware check)
     }
 
     // Debug

Firmware/RTK_Everywhere/WiFi.ino

@@ -523,14 +523,7 @@ bool wifiForceStart()
             startWiFiStation = true;
         }
 
-        // The consumers need both (explicit)
-        else if (consumerTypes & (1 << NETCONSUMER_WIFI_AP_STA))
-        {
-            startWiFiStation = true;
-            startWiFiAP = true;
-        }
-
-        // The consumers need both (implicit)
+        // The consumers need both
         else if ((consumerTypes & (1 << NETCONSUMER_WIFI_AP)) && (consumerTypes & (1 << NETCONSUMER_WIFI_STA)))
         {
             startWiFiStation = true;

Firmware/RTK_Everywhere/menuFirmware.ino

@@ -857,7 +857,7 @@ void otaUpdate()
             if (!networkIsConnected(&otaPriority))
                 otaUpdateStop();
             if (settings.debugFirmwareUpdate)
-                systemPrintln("Firmware update checking SparkFun released firmware version");
+                systemPrintln("Checking for latest firmware version");
 
             // If we are using auto updates, only update to production firmware, disable release candidates
             if (settings.enableAutoFirmwareUpdate)

Firmware/RTK_Everywhere/settings.h

@@ -556,7 +556,7 @@ enum
     NETCONSUMER_NONE = 0, // No consumers
     NETCONSUMER_WIFI_STA, // The consumer needs STA
     NETCONSUMER_WIFI_AP, // The consumer needs AP
-    NETCONSUMER_WIFI_AP_STA, // The consumer needs STA and AP
+    //NETCONSUMER_WIFI_AP_STA, // The consumer needs STA and AP - Don't use. Use combination of STA and AP bits
     NETCONSUMER_CELLULAR, // The consumer needs Cellular
     NETCONSUMER_ETHERNET, // The consumer needs Ethernet
     NETCONSUMER_ANY, // The consumer doesn't care what type of network access is granted