Merge remote-tracking branch 'origin/release_candidate' into captive-portal

Author: dberschauer

Firmware/RTK_Surveyor/Begin.ino

@@ -554,6 +554,8 @@ void beginUART2()
 {
     ringBuffer = (uint8_t *)malloc(settings.gnssHandlerBufferSize);
     if (!ringBuffer)
+        systemPrintln("ERROR: Failed to allocate the ring buffer!");
+    else
     {
         if (pinUART2TaskHandle == nullptr)
             xTaskCreatePinnedToCore(

Firmware/RTK_Surveyor/Developer.ino

@@ -100,7 +100,6 @@ void pvtClientZeroTail() {}
 // PVT server
 //----------------------------------------
 
-bool pvtServerActive() {return false;}
 int pvtServerSendData(uint16_t dataHead) {return 0;}
 void pvtServerUpdate() {}
 void pvtServerZeroTail() {}

Firmware/RTK_Surveyor/Network.ino

@@ -181,10 +181,11 @@ const int networkStateEntries = sizeof(networkState) / sizeof(networkState[0]);
 // List of network users
 const char * const networkUser[] =
 {
+    "NTP Server",
     "NTRIP Client",
     "NTRIP Server",
     "PVT Client",
-    "NTP Server",
+    "PVT Server",
 };
 const int networkUserEntries = sizeof(networkUser) / sizeof(networkUser[0]);
 
@@ -302,20 +303,9 @@ void menuNetwork()
         //------------------------------
 
         else if (incoming == 4)
-        {
             // Toggle WiFi NEMA server
             settings.enablePvtServer ^= 1;
-            if ((!settings.enablePvtServer) && online.pvtServer)
-            {
-                // Tell the UART2 tasks that the TCP server is shutting down
-                online.pvtServer = false;
 
-                // Wait for the UART2 tasks to close the TCP client connections
-                while (pvtServerActive())
-                    delay(5);
-                systemPrintln("TCP Server offline");
-            }
-        }
         else if (incoming == 5)
         {
             systemPrint("Enter the TCP port to use (0 to 65535): ");
@@ -849,6 +839,12 @@ void networkStop(uint8_t networkType)
                         systemPrintln("Network layer stopping PVT client");
                     pvtClientStop();
                     break;
+
+                case NETWORK_USER_PVT_SERVER:
+                    if (settings.debugNetworkLayer)
+                        systemPrintln("Network layer stopping PVT server");
+                    pvtServerStop();
+                    break;
                 }
             }
         }

Firmware/RTK_Surveyor/NetworkClient.h

@@ -8,15 +8,24 @@ class NetworkClient : public Client
   protected:
 
     Client * _client; // Ethernet or WiFi client
+    bool _friendClass;
     uint8_t _networkType;
 
   public:
 
     //------------------------------
     // Create the network client
     //------------------------------
+    NetworkClient(Client * client, uint8_t networkType)
+    {
+        _friendClass = true;
+        _networkType = networkType;
+        _client = client;
+    }
+
     NetworkClient(uint8_t user)
     {
+        _friendClass = false;
         _networkType = networkGetType(user);
 #if defined(COMPILE_ETHERNET)
         if (_networkType == NETWORK_TYPE_ETHERNET)
@@ -38,7 +47,8 @@ class NetworkClient : public Client
         if (_client)
         {
             _client->stop();
-            delete _client;
+            if (!_friendClass)
+                delete _client;
             _client = nullptr;
         }
     };
@@ -221,6 +231,57 @@ class NetworkClient : public Client
     {
         return Client::rawIPAddress(addr);
     }
+
+    //------------------------------
+    // Declare the friend classes
+    //------------------------------
+
+    friend class NetworkEthernetClient;
+    friend class NetworkWiFiClient;
+};
+
+#ifdef  COMPILE_ETHERNET
+class NetworkEthernetClient : public NetworkClient
+{
+  private:
+
+    EthernetClient _client;
+
+  public:
+
+    NetworkEthernetClient(EthernetClient& client) :
+        _client{client},
+        NetworkClient(&_client, NETWORK_TYPE_ETHERNET)
+    {
+    }
+
+    ~NetworkEthernetClient()
+    {
+        this->~NetworkClient();
+    }
+};
+#endif  // COMPILE_ETHERNET
+
+#ifdef  COMPILE_WIFI
+class NetworkWiFiClient : public NetworkClient
+{
+  private:
+
+    WiFiClient _client;
+
+  public:
+
+    NetworkWiFiClient(WiFiClient& client) :
+        _client{client},
+        NetworkClient(&_client, NETWORK_TYPE_WIFI)
+    {
+    }
+
+    ~NetworkWiFiClient()
+    {
+        this->~NetworkClient();
+    }
 };
+#endif  // COMPILE_WIFI
 
 #endif  // __NETWORK_CLIENT_H__

Firmware/RTK_Surveyor/PvtClient.ino

@@ -153,11 +153,11 @@ const int pvtClientStateNameEntries = sizeof(pvtClientStateName) / sizeof(pvtCli
 static NetworkClient * pvtClient;
 static IPAddress pvtClientIpAddress;
 static uint8_t pvtClientState;
-static volatile uint16_t pvtClientTail;
+static volatile RING_BUFFER_OFFSET pvtClientTail;
 static volatile bool pvtClientWriteError;
 
 //----------------------------------------
-// PVT Client Routines
+// PVT Client handleGnssDataTask Support Routines
 //----------------------------------------
 
 // Send PVT data to the NMEA server
@@ -250,6 +250,10 @@ void pvtClientSetState(uint8_t newState)
     }
 }
 
+//----------------------------------------
+// PVT Client Routines
+//----------------------------------------
+
 // Start the PVT client
 bool pvtClientStart()
 {