Merge branch 'release_candidate' into PointPerfectRTCM

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -211,16 +211,19 @@ void wifiDisplaySoftApStatus()                  {}
 bool wifiEspNowOff(const char * fileName, uint32_t lineNumber) {return true;}
 bool wifiEspNowOn(const char * fileName, uint32_t lineNumber) {return false;}
 void wifiEspNowSetChannel(WIFI_CHANNEL_t channel) {}
-uint32_t wifiGetStartTimeout()                  {return 0;}
 int wifiNetworkCount()                          {return 0;}
-void wifiResetThrottleTimeout()                 {}
 void wifiResetTimeout()                         {}
+IPAddress wifiSoftApGetIpAddress()              {return IPAddress((uint32_t)0);}
 const char * wifiSoftApGetSsid()                {return "";}
 bool wifiSoftApOff(const char * fileName, uint32_t lineNumber) {return true;}
 bool wifiSoftApOn(const char * fileName, uint32_t lineNumber) {return false;}
+void wifiStationDisplayData()                   {}
 bool wifiStationOff(const char * fileName, uint32_t lineNumber) {return true;}
 bool wifiStationOn(const char * fileName, uint32_t lineNumber) {return false;}
+void wifiStationUpdate()                        {}
 void wifiStopAll()                              {}
+void wifiUpdateSettings()                       {}
+void wifiVerifyTables()                         {}
 
 #endif // COMPILE_WIFI
 

Firmware/RTK_Everywhere/Network.ino

@@ -201,7 +201,10 @@ void menuTcpUdp()
             systemPrintf("7) UDP Server Port: %ld\r\n", settings.udpServerPort);
 
         if (settings.enableTcpServer)
+        {
             systemPrintf("8) Enable NTRIP Caster: %s\r\n", settings.enableNtripCaster ? "Enabled" : "Disabled");
+            systemPrintf("9) Enable base Caster override: %s\r\n", settings.baseCasterOverride ? "Enabled" : "Disabled");
+        }
 
         //------------------------------
         // Display the mDNS server menu items
@@ -286,6 +289,9 @@ void menuTcpUdp()
         else if (incoming == 8 && settings.enableTcpServer)
             settings.enableNtripCaster ^= 1;
 
+        else if (incoming == 9 && settings.enableTcpServer)
+            settings.baseCasterOverride ^= 1;
+
         //------------------------------
         // Get the mDNS server parameters
         //------------------------------
@@ -485,10 +491,18 @@ NETCONSUMER_MASK_t networkConsumerBits(NetIndex_t index)
     return networkConsumersAny | netIfConsumers[index];
 }
 
+//----------------------------------------
+// Count the number of network consumers
+//----------------------------------------
+int networkConsumerCount(NetIndex_t index)
+{
+    return networkConsumerCountBits(networkConsumerBits(index));
+}
+
 //----------------------------------------
 // Count the network consumer bits
 //----------------------------------------
-int networkConsumerCount(NETCONSUMER_MASK_t bits)
+int networkConsumerCountBits(NETCONSUMER_MASK_t bits)
 {
     int bitCount;
     NETCONSUMER_MASK_t bitMask;
@@ -527,7 +541,7 @@ void networkConsumerDisplay()
         bits |= netIfConsumers[index];
         users = netIfUsers[index];
     }
-    systemPrintf("Network Consumers: %d", networkConsumerCount(bits));
+    systemPrintf("Network Consumers: %d", networkConsumerCountBits(bits));
     networkConsumerPrint(bits, users, ", ");
     systemPrintln();
 
@@ -672,7 +686,10 @@ void networkConsumerRemove(NETCONSUMER_t consumer, NetIndex_t network, const cha
         {
             // Display the consumer
             if (settings.debugNetworkLayer)
+            {
+                networkDisplayStatus();
                 systemPrintf("Network: Stopping the networks\r\n");
+            }
 
             // Walk the networks in increasing priority
             // Turn off the lower priority networks first to eliminate failover
@@ -758,6 +775,10 @@ void networkDisplayInterface(NetIndex_t index)
     networkValidateIndex(index);
     entry = &networkInterfaceTable[index];
     networkDisplayNetworkData(entry->name, entry->netif);
+
+    // Display additional WiFi data
+    if (index == NETWORK_WIFI_STATION)
+        wifiStationDisplayData();
 }
 
 //----------------------------------------
@@ -1363,7 +1384,7 @@ void networkInterfaceInternetConnectionLost(NetIndex_t index)
 bool networkIsHighestPriority(NetIndex_t index)
 {
     NetPriority_t priority;
-    bool higherPriority;
+    bool highestPriority;
 
     // Validate the index
     networkValidateIndex(index);
@@ -1372,10 +1393,10 @@ bool networkIsHighestPriority(NetIndex_t index)
     priority = networkPriority;
 
     // Determine if the specified interface has higher priority
-    higherPriority = (priority == NETWORK_OFFLINE);
-    if (!higherPriority)
-        higherPriority = (priority > networkPriorityTable[index]);
-    return higherPriority;
+    highestPriority = (priority == NETWORK_OFFLINE);
+    if (highestPriority == false)
+        highestPriority = (priority >= networkPriorityTable[index]);
+    return highestPriority;
 }
 
 //----------------------------------------
@@ -1536,7 +1557,7 @@ void networkPrintStatus(uint8_t priority)
 {
     NetMask_t bitMask;
     NETCONSUMER_MASK_t consumerMask;
-    NETCONSUMER_t consumers;
+    NETCONSUMER_MASK_t consumers;
     bool highestPriority;
     int index;
     const char *name;
@@ -2020,7 +2041,7 @@ NETCONSUMER_MASK_t networkSoftApConsumerBits()
 //----------------------------------------
 void networkSoftApConsumerDisplay()
 {
-    systemPrintf("WiFi Soft AP Consumers: %d", networkConsumerCount(networkSoftApConsumer));
+    systemPrintf("WiFi Soft AP Consumers: %d", networkConsumerCountBits(networkSoftApConsumer));
     networkConsumerPrint(networkSoftApConsumer, 0, ", ");
     systemPrintln();
 }
@@ -2279,10 +2300,7 @@ void networkStartDelayed(NetIndex_t index, uintptr_t parameter, bool debug)
 //----------------------------------------
 void networkUpdate()
 {
-    bool displayIpAddress;
     NetIndex_t index;
-    IPAddress ipAddress;
-    bool ipAddressDisplayed;
     uint8_t networkType;
     NETWORK_POLL_ROUTINE pollRoutine;
     uint8_t priority;
@@ -2295,18 +2313,8 @@ void networkUpdate()
 
         // Handle the network lost internet event
         if (networkEventInternetLost[index])
-        {
             networkInterfaceInternetConnectionLost(index);
 
-            // Attempt to restart WiFi
-            if ((index == NETWORK_WIFI_STATION) && (networkIsHighestPriority(index)))
-            {
-                if (networkIsStarted(index))
-                    networkStop(index, settings.debugWifiState, __FILE__, __LINE__);
-                networkStart(index, settings.debugWifiState, __FILE__, __LINE__);
-            }
-        }
-
         // Handle the network stop event
         if (networkEventStop[index])
             networkStop(index, settings.debugNetworkLayer, __FILE__, __LINE__);
@@ -2341,6 +2349,9 @@ void networkUpdate()
         }
     }
 
+    // Update the WiFi state
+    wifiStationUpdate();
+
     // Update the network services
     // Start or stop mDNS
     if (networkMdnsRequests != networkMdnsRunning)
@@ -2367,44 +2378,62 @@ void networkUpdate()
     webServerUpdate(); // Start webServer for web config as needed
 
     // Periodically display the network interface state
-    displayIpAddress = PERIODIC_DISPLAY(PD_IP_ADDRESS);
-    for (int index = 0; index < NETWORK_OFFLINE; index++)
+    if (PERIODIC_DISPLAY(PD_NETWORK_STATE))
     {
-        // Display the current state
-        ipAddressDisplayed = displayIpAddress && (index == networkPriority);
-        if (PERIODIC_DISPLAY(networkInterfaceTable[index].pdState) || PERIODIC_DISPLAY(PD_NETWORK_STATE) ||
-            ipAddressDisplayed)
-        {
+        PERIODIC_CLEAR(PD_NETWORK_STATE);
+        PERIODIC_CLEAR(PD_IP_ADDRESS);
+        for (int index = 0; index < NETWORK_OFFLINE; index++)
             PERIODIC_CLEAR(networkInterfaceTable[index].pdState);
-            if (networkInterfaceTable[index].netif->hasIP())
-            {
-                ipAddress = networkInterfaceTable[index].netif->localIP();
-                systemPrintf("%s: %s%s\r\n", networkInterfaceTable[index].name, ipAddress.toString().c_str(),
-                             networkInterfaceTable[index].netif->isDefault() ? " (default)" : "");
-            }
-            else if (networkInterfaceTable[index].netif->linkUp())
-                systemPrintf("%s: Link Up\r\n", networkInterfaceTable[index].name);
-            else if (networkInterfaceTable[index].netif->started())
-                systemPrintf("%s: Started\r\n", networkInterfaceTable[index].name);
 
-            else if (index == NETWORK_WIFI_STATION && (WiFi.getMode() == WIFI_AP || WiFi.getMode() == WIFI_AP_STA))
-            {
-                // NETIF doesn't capture the IP address of a soft AP
-                ipAddress = WiFi.softAPIP();
-                systemPrintf("%s: %s%s\r\n", networkInterfaceTable[index].name, ipAddress.toString().c_str(),
-                             networkInterfaceTable[index].netif->isDefault() ? " (default)" : "");
-            }
-            else
-                systemPrintf("%s: Stopped\r\n", networkInterfaceTable[index].name);
-        }
+        // Display the network state
+        networkDisplayStatus();
     }
-    if (PERIODIC_DISPLAY(PD_NETWORK_STATE))
-        PERIODIC_CLEAR(PD_NETWORK_STATE);
-    if (displayIpAddress)
+
+    // Periodically display the IP address
+    else if (PERIODIC_DISPLAY(PD_IP_ADDRESS))
     {
-        if (!ipAddressDisplayed)
-            systemPrintln("Network: Offline");
+        int index;
+        IPAddress ipAddress;
+
         PERIODIC_CLEAR(PD_IP_ADDRESS);
+
+        // Display the IP address of the highest priority network
+        index = networkPriorityTable[networkPriority];
+        if ((index < NETWORK_OFFLINE)
+            && networkInterfaceHasInternet(index)
+            && networkInterfaceTable[index].netif->hasIP())
+        {
+            ipAddress = networkInterfaceTable[index].netif->localIP();
+            systemPrintf("%s: %s%s\r\n",
+                         networkInterfaceTable[index].name,
+                         ipAddress.toString().c_str(),
+                         networkInterfaceTable[index].netif->isDefault() ? " (default)" : "");
+        }
+        else
+            systemPrintf("Network: Offline\r\n");
+
+        // Display the soft AP IP address
+        if (wifiSoftApOnline)
+        {
+            ipAddress = wifiSoftApGetIpAddress();
+            systemPrintf("WiFi Soft AP: %s\r\n", ipAddress.toString().c_str());
+        }
+        else
+            systemPrintf("WiFi Soft AP: Offline\r\n");
+    }
+
+    // Periodically display an interface state
+    else
+    {
+        for (int index = 0; index < NETWORK_OFFLINE; index++)
+            if (PERIODIC_DISPLAY(networkInterfaceTable[index].pdState))
+            {
+                PERIODIC_CLEAR(networkInterfaceTable[index].pdState);
+
+                // Display the state for an interface
+                networkPrintStatus(index);
+                networkDisplayInterface(index);
+            }
     }
 }
 
@@ -2437,6 +2466,26 @@ void networkUserAdd(NETCONSUMER_t consumer, const char *fileName, uint32_t lineN
     networkConsumerIndexLast[consumer] = index;
 }
 
+//----------------------------------------
+// Get the network user bit mask
+//----------------------------------------
+NETCONSUMER_MASK_t networkUserBits(NetIndex_t index)
+{
+    // Validate the index
+    networkValidateIndex(index);
+
+    // Return the consumer bits
+    return netIfUsers[index];
+}
+
+//----------------------------------------
+// Count the number of network users
+//----------------------------------------
+int networkUserCount(NetIndex_t index)
+{
+    return networkConsumerCountBits(networkUserBits(index));
+}
+
 //----------------------------------------
 // Display the network interface users
 //----------------------------------------
@@ -2449,7 +2498,7 @@ void networkUserDisplay(NetIndex_t index)
 
     // Determine if there are any users
     bits = netIfUsers[index];
-    systemPrintf("%s Users: %d", networkInterfaceTable[index].name, networkConsumerCount(bits));
+    systemPrintf("%s Users: %d", networkInterfaceTable[index].name, networkConsumerCountBits(bits));
     networkConsumerPrint(bits, 0, ", ");
     systemPrintln();
 }