Merge pull request #389 from LeeLeahy2/no-network

Compile successfully when commenting out COMPILE_NETWORK

Author: nseidle

Firmware/RTK_Everywhere/menuPP.ino

@@ -1,4 +1,5 @@
 #include "mbedtls/ssl.h" //Needed for certificate validation
+#include "mbedtls/ctr_drbg.h"
 
 //----------------------------------------
 // Locals - compiled out
@@ -806,11 +807,11 @@ void erasePointperfectCredentials()
 // Subscribe to MQTT channel, grab keys, then stop
 bool pointperfectUpdateKeys()
 {
-#ifdef COMPILE_WIFI
+    bool gotKeys = false;
+#ifdef COMPILE_NETWORK
     char *certificateContents = nullptr; // Holds the contents of the keys prior to MQTT connection
     char *keyContents = nullptr;
     NetworkClientSecure secureClient;
-    bool gotKeys = false;
     menuppMqttClient = nullptr;
 
     do
@@ -940,16 +941,14 @@ bool pointperfectUpdateKeys()
         free(certificateContents);
 
     // Return the key status
+#endif  // COMPILE_NETWORK
     return (gotKeys);
-#else  // COMPILE_WIFI
-    return (false);
-#endif // COMPILE_WIFI
 }
 
 // Called when a subscribed to message arrives
 void mqttCallback(int messageSize)
 {
-#ifdef COMPILE_WIFI
+#ifdef  COMPILE_NETWORK
     static uint32_t messageLength = 0;
     static byte *message = nullptr;
 
@@ -1040,7 +1039,7 @@ void mqttCallback(int messageSize)
 
         mqttMessageReceived = true;
     } while (0);
-#endif // COMPILE_WIFI
+#endif  // COMPILE_NETWORK
 }
 
 // Get a date from a user
@@ -1494,6 +1493,7 @@ void menuPointPerfect()
 
         if (pointPerfectIsEnabled())
         {
+#ifdef  COMPILE_NETWORK
             systemPrint("2) Toggle Auto Key Renewal: ");
             if (settings.autoKeyRenewal == true)
                 systemPrintln("Enabled");
@@ -1504,6 +1504,7 @@ void menuPointPerfect()
                 systemPrintln("3) Provision Device");
             else
                 systemPrintln("3) Update Keys");
+#endif  // COMPILE_NETWORK
 
             systemPrintln("4) Show device ID");
 
@@ -1525,6 +1526,7 @@ void menuPointPerfect()
             restartRover = true; // Require a rover restart to enable / disable RTCM for PPL
         }
 
+#ifdef  COMPILE_NETWORK
         else if (incoming == 2 && pointPerfectIsEnabled())
         {
             settings.autoKeyRenewal ^= 1;
@@ -1581,6 +1583,7 @@ void menuPointPerfect()
 
             WIFI_STOP();
         }
+#endif  // COMPILE_NETWORK
         else if (incoming == 4 && pointPerfectIsEnabled())
         {
             char hardwareID[15];

Firmware/RTK_Everywhere/settings.h

@@ -316,6 +316,8 @@ enum WiFiState
 };
 volatile byte wifiState = WIFI_STATE_OFF;
 
+#ifdef  COMPILE_NETWORK
+
 #include "RTKNetworkClient.h" // Built-in - Supports both WiFiClient and EthernetClient
 #include "RTKNetworkUDP.h"    //Built-in - Supports both WiFiUdp and EthernetUdp
 
@@ -349,6 +351,8 @@ typedef struct _NTRIP_SERVER_DATA
     uint32_t previousMilliseconds;
 } NTRIP_SERVER_DATA;
 
+#endif  // COMPILE_NETWORK
+
 typedef enum
 {
     ESPNOW_OFF,