Merge pull request #387 from LeeLeahy2/rtk-network-secure-client

Rename NetworkSecureWifiClient to RTKNetworkSecureClient

Author: nseidle

Firmware/RTK_Everywhere/MQTT_Client.ino

@@ -123,7 +123,7 @@ static volatile uint32_t mqttClientLastDataReceived; // Last time data was recei
 
 static char *mqttClientPrivateKeyBuffer; // Buffer for client private key
 
-static NetworkSecureWiFiClient *mqttSecureClient;
+static RTKNetworkSecureClient *mqttSecureClient;
 
 static volatile uint8_t mqttClientState = MQTT_CLIENT_OFF;
 
@@ -555,7 +555,7 @@ void mqttClientUpdate()
         }
 
         // Allocate the mqttSecureClient structure
-        mqttSecureClient = new NetworkSecureWiFiClient();
+        mqttSecureClient = new RTKNetworkSecureClient();
         if (!mqttSecureClient)
         {
             systemPrintln("ERROR: Failed to allocate the mqttSecureClient structure!");

Firmware/RTK_Everywhere/RTKNetworkClient.h

@@ -259,22 +259,21 @@ class RTKNetworkClientType : public RTKNetworkClient
     }
 };
 
-#ifdef COMPILE_WIFI
-class NetworkSecureWiFiClient : public RTKNetworkClient
+class RTKNetworkSecureClient : public RTKNetworkClient
 {
   protected:
     NetworkClientSecure _client;
 
   public:
-    NetworkSecureWiFiClient() : _client{WiFiClientSecure()}, RTKNetworkClient(&_client, NETWORK_TYPE_WIFI)
+    RTKNetworkSecureClient() : _client{NetworkClientSecure()}, RTKNetworkClient(&_client, NETWORK_TYPE_WIFI)
     {
     }
 
-    NetworkSecureWiFiClient(WiFiClient &client) : _client{client}, RTKNetworkClient(&_client, NETWORK_TYPE_WIFI)
+    RTKNetworkSecureClient(NetworkClientSecure &client) : _client{client}, RTKNetworkClient(&_client, NETWORK_TYPE_WIFI)
     {
     }
 
-    ~NetworkSecureWiFiClient()
+    ~RTKNetworkSecureClient()
     {
         this->~RTKNetworkClient();
     }
@@ -372,6 +371,4 @@ class NetworkSecureWiFiClient : public RTKNetworkClient
     }
 };
 
-#endif // COMPILE_WIFI
-
 #endif // __NETWORK_CLIENT_H__