Merge pull request #345 from LeeLeahy2/no-network-type-client

Change NetworkEthernetClient & NetworkWiFiClient to RTKNetworkClientType

Author: nseidle

Firmware/RTK_Everywhere/Network.ino

@@ -358,18 +358,7 @@ RTKNetworkClient *networkClient(uint8_t user, bool useSSL)
     int type;
 
     type = networkGetType(user);
-#if defined(COMPILE_ETHERNET)
-    if (type == NETWORK_TYPE_ETHERNET)
-        client = new NetworkEthernetClient;
-    else
-#endif // COMPILE_ETHERNET
-    {
-#if defined(COMPILE_WIFI)
-        client = new NetworkWiFiClient();
-#else  // COMPILE_WIFI
-        client = nullptr;
-#endif // COMPILE_WIFI
-    }
+    client = new RTKNetworkClientType(type);
     return client;
 }
 

Firmware/RTK_Everywhere/RTKNetworkClient.h

@@ -233,56 +233,33 @@ class RTKNetworkClient : public NetworkClient
     // Declare the friend classes
     //------------------------------
 
-    friend class NetworkEthernetClient;
     friend class NetworkEthernetSslClient;
     friend class NetworkWiFiClient;
     friend class NetworkWiFiSslClient;
 };
 
-#ifdef COMPILE_ETHERNET
-class NetworkEthernetClient : public RTKNetworkClient
+class RTKNetworkClientType : public RTKNetworkClient
 {
   private:
-    NetworkClient _ethernetClient;
-
-  public:
-    NetworkEthernetClient() : RTKNetworkClient(&_ethernetClient, NETWORK_TYPE_ETHERNET)
-    {
-    }
-
-    NetworkEthernetClient(NetworkClient &client)
-        : _ethernetClient{client}, RTKNetworkClient(&_ethernetClient, NETWORK_TYPE_ETHERNET)
-    {
-    }
-
-    ~NetworkEthernetClient()
-    {
-        this->~RTKNetworkClient();
-    }
-};
-#endif // COMPILE_ETHERNET
-
-#ifdef COMPILE_WIFI
-class NetworkWiFiClient : public RTKNetworkClient
-{
-  protected:
     NetworkClient _client;
 
   public:
-    NetworkWiFiClient() : RTKNetworkClient(&_client, NETWORK_TYPE_WIFI)
+    RTKNetworkClientType(uint8_t type) : RTKNetworkClient(&_client, type)
     {
     }
 
-    NetworkWiFiClient(WiFiClient &client) : _client{client}, RTKNetworkClient(&_client, NETWORK_TYPE_WIFI)
+    RTKNetworkClientType(NetworkClient &client, uint8_t type)
+        : _client{client}, RTKNetworkClient(&_client, type)
     {
     }
 
-    ~NetworkWiFiClient()
+    ~RTKNetworkClientType()
     {
         this->~RTKNetworkClient();
     }
 };
 
+#ifdef COMPILE_WIFI
 class NetworkSecureWiFiClient : public RTKNetworkClient
 {
   protected:

Firmware/RTK_Everywhere/TcpServer.ino

@@ -449,7 +449,7 @@ void tcpServerUpdate()
             // Determine if the client data structure is in use
             if (!(tcpServerClientConnected & (1 << index)))
             {
-                WiFiClient client;
+                NetworkClient client;
 
                 // Data structure not in use
                 // Check for another TCP server client
@@ -460,7 +460,7 @@ void tcpServerUpdate()
                     break;
 
                 // Start processing the new TCP server client connection
-                tcpServerClient[index] = new NetworkWiFiClient(client);
+                tcpServerClient[index] = new RTKNetworkClientType(client, NETWORK_TYPE_WIFI);
                 tcpServerClientIpAddress[index] = tcpServerClient[index]->remoteIP();
                 tcpServerClientConnected = tcpServerClientConnected | (1 << index);
                 tcpServerClientDataSent = tcpServerClientDataSent | (1 << index);