Merge pull request #798 from sparkfun/pcUpdates

Add NetworkServer

Author: PaulZC

Firmware/RTK_Surveyor/Developer.ino

@@ -92,6 +92,17 @@ void pvtUdpServerUpdate() {}
 void pvtUdpServerZeroTail() {}
 void discardPvtUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 
+//----------------------------------------
+// PVT server
+//----------------------------------------
+
+int32_t pvtServerSendData(uint16_t dataHead) {return 0;}
+void pvtServerStop() {}
+void pvtServerUpdate() {}
+void pvtServerZeroTail() {}
+void pvtServerValidateTables() {}
+void discardPvtServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
+
 #endif // COMPILE_NETWORK
 
 //----------------------------------------
@@ -109,23 +120,12 @@ void stopWebServer() {}
 bool parseIncomingSettings() {return false;}
 
 #endif  // COMPILE_AP
-#ifndef COMPILE_WIFI
-
-//----------------------------------------
-// PVT server
-//----------------------------------------
-
-int32_t pvtServerSendData(uint16_t dataHead) {return 0;}
-void pvtServerStop() {}
-void pvtServerUpdate() {}
-void pvtServerZeroTail() {}
-void pvtServerValidateTables() {}
-void discardPvtServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
 
 //----------------------------------------
 // WiFi
 //----------------------------------------
 
+#ifndef COMPILE_WIFI
 void menuWiFi() {systemPrintln("WiFi not compiled");};
 bool wifiConnect(unsigned long timeout) {return false;}
 IPAddress wifiGetGatewayIpAddress() {return IPAddress((uint32_t)0);}

Firmware/RTK_Surveyor/Display.ino

@@ -236,6 +236,9 @@ void menuNetwork()
         if (settings.enablePvtUdpServer)
             systemPrintf("7) PVT UDP Server Port: %ld\r\n", settings.pvtUdpServerPort);
 
+        if ((settings.enablePvtServer) || (settings.enablePvtUdpServer))
+            systemPrintf("8) Display server IP address: %s\r\n", settings.displayServerIP ? "Enabled" : "Disabled");
+
         if (HAS_ETHERNET)
         {
             //------------------------------
@@ -348,7 +351,10 @@ void menuNetwork()
             }
         }
 
-        //------------------------------
+        else if (incoming == 8 && ((settings.enablePvtServer) || (settings.enablePvtUdpServer)))
+            settings.displayServerIP ^= 1;
+
+            //------------------------------
         // Get the network layer parameters
         //------------------------------
 
@@ -386,7 +392,7 @@ void menuNetwork()
 NetworkClient * networkClient(uint8_t user, bool useSSL)
 {
     NetworkClient * client;
-    int type;
+    uint8_t type;
 
     type = networkGetType(user);
 #if defined(COMPILE_ETHERNET)
@@ -395,7 +401,7 @@ NetworkClient * networkClient(uint8_t user, bool useSSL)
         if (useSSL)
             client = new NetworkEthernetSslClient();
         else
-            client = new NetworkEthernetClient;
+            client = new NetworkEthernetClient();
     }
     else
 #endif // COMPILE_ETHERNET
@@ -412,6 +418,58 @@ NetworkClient * networkClient(uint8_t user, bool useSSL)
     return client;
 }
 
+//----------------------------------------
+// Allocate a network server
+//----------------------------------------
+NetworkServer * networkServer(uint8_t user, uint16_t port)
+{
+    NetworkServer * _server;
+    uint8_t type;
+
+    type = networkGetType(user);
+#if defined(COMPILE_ETHERNET)
+    if (type == NETWORK_TYPE_ETHERNET)
+    {
+        _server = new NetworkEthernetServer(port);
+    }
+    else
+#endif // COMPILE_ETHERNET
+    {
+#if defined(COMPILE_WIFI)
+        _server = new NetworkWiFiServer(port);
+#else   // COMPILE_WIFI
+        _server = nullptr;
+#endif  // COMPILE_WIFI
+    }
+    return _server;
+}
+
+//----------------------------------------
+// Constructor for NetworkServer - header is in NetworkServer.h
+//----------------------------------------
+NetworkServer::NetworkServer(uint8_t user, uint16_t port) : 
+    _friendClass(false),
+    _networkType{networkGetType(user)},
+    _port{port}
+{
+#if defined(COMPILE_ETHERNET)
+    if (_networkType == NETWORK_TYPE_ETHERNET)
+    {
+        _server = new EthernetServer(port);
+    }
+    else
+#endif // COMPILE_ETHERNET
+#if defined(COMPILE_WIFI)
+    {
+        _server = new WiFiServer(port);
+    }
+#else   // COMPILE_WIFI
+    {
+        _server = nullptr;
+    }
+#endif  // COMPILE_WIFI
+}
+
 //----------------------------------------
 // Display the IP address
 //----------------------------------------

Firmware/RTK_Surveyor/Network.ino

@@ -37,7 +37,7 @@ class NetworkClient : public Client
 #else   // COMPILE_WIFI
             _client = nullptr;
 #endif  // COMPILE_WIFI
-    };
+    }
 
     //------------------------------
     // Delete the network client
@@ -51,7 +51,7 @@ class NetworkClient : public Client
                 delete _client;
             _client = nullptr;
         }
-    };
+    }
 
     //------------------------------
     // Determine if receive data is available
@@ -70,7 +70,17 @@ class NetworkClient : public Client
 
     operator bool()
     {
-        return _client;
+#if defined(COMPILE_ETHERNET)
+        if (_networkType == NETWORK_TYPE_ETHERNET)
+            if (_client)
+                return (*((EthernetClient *)_client));
+#endif // COMPILE_ETHERNET
+#if defined(COMPILE_WIFI)
+        if (_networkType == NETWORK_TYPE_WIFI)
+            if (_client)
+                return (*((WiFiClient *)_client));
+#endif  // COMPILE_WIFI
+        return false;
     }
 
     //------------------------------