Merge pull request #696 from LeeLeahy2/no-wifi-ethernet

Fix compiles with and without COMPILE_ETHERNET and COMPILE_WIFI

Author: nseidle

Firmware/RTK_Surveyor/Developer.ino

@@ -73,6 +73,32 @@ void ntripServerStop(bool clientAllocated) {online.ntripServer = false;}
 void ntripServerUpdate() {}
 void ntripServerValidateTables() {}
 
+//----------------------------------------
+// OTA client
+//----------------------------------------
+
+void otaVerifyTables() {}
+
+//----------------------------------------
+// PVT client
+//----------------------------------------
+
+int32_t pvtClientSendData(uint16_t dataHead) {return 0;}
+void pvtClientUpdate() {}
+void pvtClientValidateTables() {}
+void pvtClientZeroTail() {}
+void discardPvtClientBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
+
+//----------------------------------------
+// PVT UDP server
+//----------------------------------------
+
+int32_t pvtUdpServerSendData(uint16_t dataHead) {return 0;}
+void pvtUdpServerStop() {}
+void pvtUdpServerUpdate() {}
+void pvtUdpServerZeroTail() {}
+void discardPvtUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
+
 #endif // COMPILE_NETWORK
 
 //----------------------------------------
@@ -92,35 +118,16 @@ bool parseIncomingSettings() {return false;}
 #endif  // COMPILE_AP
 #ifndef COMPILE_WIFI
 
-//----------------------------------------
-// PVT client
-//----------------------------------------
-
-uint16_t pvtClientSendData(uint16_t dataHead) {return 0;};
-void pvtClientUpdate() {}
-void pvtClientValidateTables() {}
-void pvtClientZeroTail() {}
-void discardPvtClientBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
-
-
 //----------------------------------------
 // PVT server
 //----------------------------------------
 
-int pvtServerSendData(uint16_t dataHead) {return 0;}
+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) {}
-void discardPvtUdpServerBytes(RING_BUFFER_OFFSET previousTail, RING_BUFFER_OFFSET newTail) {}
-
-//----------------------------------------
-// PVT UDP server
-//----------------------------------------
-
-int pvtUdpServerSendData(uint16_t dataHead) {return 0;}
-void pvtUdpServerUpdate() {}
-void pvtUdpServerZeroTail() {}
 
 //----------------------------------------
 // WiFi

Firmware/RTK_Surveyor/Network.ino

@@ -378,6 +378,38 @@ void menuNetwork()
     }
 }
 
+//----------------------------------------
+// Allocate a network client
+//----------------------------------------
+NetworkClient * networkClient(uint8_t user, bool useSSL)
+{
+    NetworkClient * client;
+    int type;
+
+    type = networkGetType(user);
+#if defined(COMPILE_ETHERNET)
+    if (type == NETWORK_TYPE_ETHERNET)
+    {
+        if (useSSL)
+            client = new NetworkEthernetSslClient();
+        else
+            client = new NetworkEthernetClient;
+    }
+    else
+#endif // COMPILE_ETHERNET
+    {
+#if defined(COMPILE_WIFI)
+        if (useSSL)
+            client = new NetworkWiFiSslClient();
+        else
+            client = new NetworkWiFiClient();
+#else   // COMPILE_WIFI
+        client = nullptr;
+#endif  // COMPILE_WIFI
+    }
+    return client;
+}
+
 //----------------------------------------
 // Display the IP address
 //----------------------------------------

Firmware/RTK_Surveyor/PvtClient.ino

@@ -116,7 +116,7 @@ PvtClient.ino
     * private SNIP NTRIP caster
 */
 
-#ifdef COMPILE_WIFI
+#if COMPILE_NETWORK
 
 //----------------------------------------
 // Constants
@@ -520,4 +520,4 @@ void pvtClientZeroTail()
     pvtClientTail = 0;
 }
 
-#endif  // COMPILE_WIFI
+#endif  // COMPILE_NETWORK

Firmware/RTK_Surveyor/PvtUdpServer.ino

@@ -33,9 +33,9 @@ pvtUdpServer.ino
 
      RTK Express(+) with WiFi enabled, PvtUdpServer enabled, PvtUdpPort setup,
      Smartphone with QField:
-        
+
         Network Setup:
-            Connect the Smartphone and the RTK Express to the same Network (e.g. the Smartphones HotSpot). 
+            Connect the Smartphone and the RTK Express to the same Network (e.g. the Smartphones HotSpot).
 
         QField Setup:
             * Open a project
@@ -53,13 +53,13 @@ pvtUdpServer.ino
             * Exit the menus
 
         1. Long press on the location icon in the lower right corner
-        
+
         2. Enable Show Position Information
 
-        3. Verify that the displayed coordinates, fix tpe etc. are valid   
+        3. Verify that the displayed coordinates, fix tpe etc. are valid
 */
 
-#ifdef COMPILE_WIFI
+#if COMPILE_NETWORK
 
 //----------------------------------------
 // Constants
@@ -121,7 +121,7 @@ int32_t pvtUdpServerSendDataBroadcast(uint8_t *data, uint16_t length)
             PERIODIC_CLEAR(PD_PVT_UDP_SERVER_BROADCAST_DATA);
             systemPrintf("PVT UDP Server failed to write %d bytes as broadcast\r\n", length);
             length = 0;
-        }       
+        }
     }
     return length;
 }
@@ -148,7 +148,7 @@ int32_t pvtUdpServerSendData(uint16_t dataHead)
         if ((tail + bytesToSend) > settings.gnssHandlerBufferSize)
             bytesToSend = settings.gnssHandlerBufferSize - tail;
 
-        // Send the data 
+        // Send the data
         bytesToSend = pvtUdpServerSendDataBroadcast(&ringBuffer[tail], bytesToSend);
 
         // Assume all data was sent, wrap the buffer pointer
@@ -369,4 +369,4 @@ void pvtUdpServerZeroTail()
     pvtUdpServerTail = 0;
 }
 
-#endif // COMPILE_WIFI
+#endif // COMPILE_NETWORK

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -201,8 +201,11 @@ char logFileName[sizeof("SFE_Reference_Station_230101_120101.ubx_plusExtraSpace"
 // Over-the-Air (OTA) update support
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
+#if COMPILE_NETWORK
 #include <SSLClientESP32.h> // http://librarymanager/All#SSLClientESP32
 #include "X509_Certificate_Bundle.h" // Root certificates
+#endif // COMPILE_NETWORK
+#include <ArduinoJson.h>  //http://librarymanager/All#Arduino_JSON_messagepack v6.19.4
 
 #include "esp_ota_ops.h" //Needed for partition counting and updateFromSD
 
@@ -229,7 +232,6 @@ unsigned int binBytesSent = 0;         // Tracks firmware bytes sent over WiFi O
 // Connection settings to NTRIP Caster
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 #ifdef COMPILE_WIFI
-#include <ArduinoJson.h>  //http://librarymanager/All#Arduino_JSON_messagepack v6.19.4
 #include <ESPmDNS.h>      //Built-in.
 #include <HTTPClient.h>   //Built-in. Needed for ThingStream API for ZTP
 #include <PubSubClient.h> //http://librarymanager/All#PubSubClient_MQTT_Lightweight by Nick O'Leary v2.8.0 Used for MQTT obtaining of keys