Add compile guards for disabling WiFi/Bluetooth

This is handy for debugging other aspects of the system. Firmware is normally 1,501,618 bytes. With BT off: 888,850. With both BT and WiFi off: 454950. This helps reduce compile and upload times.

Author: nseidle

Firmware/RTK_Surveyor/Base.ino

@@ -196,10 +196,12 @@ void SFE_UBLOX_GNSS::processRTCM(uint8_t incoming)
     if (rtcmPacketsSent > 9999) rtcmPacketsSent = 1;
   }
 
+#ifdef COMPILE_WIFI
   if (caster.connected() == true)
   {
     caster.write(incoming); //Send this byte to socket
     casterBytesSent++;
     lastServerSent_ms = millis();
   }
+#endif
 }

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -118,10 +118,15 @@ const TickType_t fatSemaphore_longWait_ms = 200 / portTICK_PERIOD_MS;
 
 //Connection settings to NTRIP Caster
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
+
+//#define COMPILE_WIFI 1 //Comment out to remove all WiFi functionality
+
+#ifdef COMPILE_WIFI
 #include <WiFi.h>
 #include "esp_wifi.h" //Needed for init/deinit of resources to free up RAM
 
 WiFiClient caster;
+#endif
 const char * ntrip_server_name = "SparkFun_RTK_Surveyor";
 
 unsigned long lastServerSent_ms = 0; //Time of last data pushed to caster
@@ -184,10 +189,15 @@ float battChangeRate = 0.0;
 //Hardware serial and BT buffers
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 //We use a local copy of the BluetoothSerial library so that we can increase the RX buffer. See issue: https://github.com/sparkfun/SparkFun_RTK_Surveyor/issues/18
+
+//#define COMPILE_BT 1 //Comment out to disable all Bluetooth
+
+#ifdef COMPILE_BT
 #include "src/BluetoothSerial/BluetoothSerial.h"
 BluetoothSerial SerialBT;
 #include "esp_bt.h" //Core access is needed for BT stop. See customBTstop() for more info.
 #include "esp_gap_bt_api.h" //Needed for setting of pin. See issue: https://github.com/sparkfun/SparkFun_RTK_Surveyor/issues/5
+#endif
 
 char platformPrefix[40] = "Surveyor"; //Sets the prefix for broadcast names
 

Firmware/RTK_Surveyor/States.ino

@@ -225,6 +225,7 @@ void updateSystemState()
       //Check to see if we have connected over WiFi
       case (STATE_BASE_TEMP_WIFI_STARTED):
         {
+#ifdef COMPILE_WIFI
           byte wifiStatus = WiFi.status();
           if (wifiStatus == WL_CONNECTED)
           {
@@ -249,6 +250,7 @@ void updateSystemState()
             }
             delay(1000);
           }
+#endif          
         }
         break;
 
@@ -264,6 +266,7 @@ void updateSystemState()
           if (settings.enableNtripServer == true)
           {
             //Open connection to caster service
+#ifdef COMPILE_WIFI
             if (caster.connect(settings.casterHost, settings.casterPort) == true) //Attempt connection
             {
               changeState(STATE_BASE_TEMP_CASTER_STARTED);
@@ -281,13 +284,15 @@ void updateSystemState()
 
               casterResponseWaitStartTime = millis();
             }
+#endif
           }
         }
         break;
 
       //Wait for response for caster service and make sure it's valid
       case (STATE_BASE_TEMP_CASTER_STARTED):
         {
+#ifdef COMPILE_WIFI
           //Check if caster service responded
           if (caster.available() == 0)
           {
@@ -335,6 +340,7 @@ void updateSystemState()
               changeState(STATE_BASE_TEMP_CASTER_CONNECTED);
             }
           }
+#endif
         }
         break;
 
@@ -343,11 +349,13 @@ void updateSystemState()
         {
           cyclePositionLEDs();
 
+#ifdef COMPILE_WIFI
           if (caster.connected() == false)
           {
             Serial.println(F("Caster no longer connected. Reconnecting..."));
             changeState(STATE_BASE_TEMP_WIFI_CONNECTED); //Return to 2 earlier states to try to reconnect
           }
+#endif
         }
         break;
 
@@ -392,6 +400,7 @@ void updateSystemState()
       //Check to see if we have connected over WiFi
       case (STATE_BASE_FIXED_WIFI_STARTED):
         {
+#ifdef COMPILE_WIFI
           byte wifiStatus = WiFi.status();
           if (wifiStatus == WL_CONNECTED)
           {
@@ -416,6 +425,7 @@ void updateSystemState()
             }
             delay(1000);
           }
+#endif          
         }
         break;
 
@@ -429,6 +439,7 @@ void updateSystemState()
           }
           if (settings.enableNtripServer == true)
           {
+#ifdef COMPILE_WIFI
             //Open connection to caster service
             if (caster.connect(settings.casterHost, settings.casterPort) == true) //Attempt connection
             {
@@ -447,13 +458,15 @@ void updateSystemState()
 
               casterResponseWaitStartTime = millis();
             }
+#endif
           }
         }
         break;
 
       //Wait for response for caster service and make sure it's valid
       case (STATE_BASE_FIXED_CASTER_STARTED):
         {
+#ifdef COMPILE_WIFI
           //Check if caster service responded
           if (caster.available() < 10)
           {
@@ -502,6 +515,7 @@ void updateSystemState()
               changeState(STATE_BASE_FIXED_CASTER_CONNECTED);
             }
           }
+#endif
         }
         break;
 
@@ -510,10 +524,12 @@ void updateSystemState()
         {
           cyclePositionLEDs();
 
+#ifdef COMPILE_WIFI
           if (caster.connected() == false)
           {
             changeState(STATE_BASE_FIXED_WIFI_CONNECTED);
           }
+#endif          
         }
         break;
 

Firmware/RTK_Surveyor/System.ino

@@ -3,6 +3,8 @@
 //This allows multiple units to be on at same time
 bool startBluetooth()
 {
+#ifdef COMPILE_BT
+
   //Get unit MAC address
   esp_read_mac(unitMACAddress, ESP_MAC_WIFI_STA);
   unitMACAddress[5] += 2; //Convert MAC address to Bluetooth MAC (add 2): https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-reference/system/system.html#mac-address
@@ -78,6 +80,7 @@ bool startBluetooth()
   //Start task for controlling Bluetooth pair LED
   if (productVariant == RTK_SURVEYOR)
     btLEDTask.attach(btLEDTaskPace, updateBTled); //Rate in seconds, callback
+#endif
 
   return (true);
 }
@@ -98,9 +101,11 @@ void endBluetooth()
     F9PSerialWriteTaskHandle = NULL;
   }
 
+#ifdef COMPILE_BT
   SerialBT.flush(); //Complete any transfers
   SerialBT.disconnect(); //Drop any clients
   SerialBT.end(); //SerialBT.end() will release significant RAM (~100k!) but a SerialBT.start will crash.
+#endif
 
   //The following code releases the BT hardware so that it can be restarted with a SerialBT.begin
   customBTstop();
@@ -113,7 +118,7 @@ void endBluetooth()
 //To work around the bug without modifying the core we create our own btStop() function with
 //the patch from github
 bool customBTstop() {
-
+#ifdef COMPILE_BT
   if (esp_bt_controller_get_status() == ESP_BT_CONTROLLER_STATUS_IDLE) {
     return true;
   }
@@ -137,18 +142,21 @@ bool customBTstop() {
     return true;
   }
   log_e("BT Stop failed");
+#endif
   return false;
 }
 
 //Start WiFi assuming it was previously fully released
 //See WiFiBluetoothSwitch sketch for more info
 void startWiFi()
 {
+#ifdef COMPILE_WIFI
   wifi_init_config_t wifi_init_config = WIFI_INIT_CONFIG_DEFAULT();
   esp_wifi_init(&wifi_init_config); //Restart WiFi resources
 
   Serial.printf("Connecting to local WiFi: %s\n\r", settings.wifiSSID);
   WiFi.begin(settings.wifiSSID, settings.wifiPW);
+#endif
 
   radioState = WIFI_ON_NOCONNECTION;
 }
@@ -157,9 +165,12 @@ void startWiFi()
 //See WiFiBluetoothSwitch sketch for more info
 void stopWiFi()
 {
+#ifdef COMPILE_WIFI
   caster.stop();
   WiFi.mode(WIFI_OFF);
   esp_wifi_deinit(); //Free all resources
+#endif
+
   Serial.println("WiFi Stopped");
 
   radioState = RADIO_OFF;
@@ -506,6 +517,7 @@ void danceLEDs()
 
 //Call back for when BT connection event happens (connected/disconnect)
 //Used for updating the radioState state machine
+#ifdef COMPILE_BT
 void btCallback(esp_spp_cb_event_t event, esp_spp_cb_param_t *param) {
   if (event == ESP_SPP_SRV_OPEN_EVT) {
     Serial.println(F("Client Connected"));
@@ -521,6 +533,7 @@ void btCallback(esp_spp_cb_event_t event, esp_spp_cb_param_t *param) {
       digitalWrite(pin_bluetoothStatusLED, LOW);
   }
 }
+#endif
 
 //Update Battery level LEDs every 5s
 void updateBattLEDs()

Firmware/RTK_Surveyor/Tasks.ino

@@ -7,6 +7,7 @@ void F9PSerialWriteTask(void *e)
 {
   while (true)
   {
+#ifdef COMPILE_BT
     //Receive RTCM corrections or UBX config messages over bluetooth and pass along to ZED
     while (SerialBT.available())
     {
@@ -27,6 +28,7 @@ void F9PSerialWriteTask(void *e)
         incomingBTTest = incoming; //Displayed during system test
       }
     }
+#endif 
 
     taskYIELD();
   }
@@ -48,6 +50,7 @@ void F9PSerialReadTask(void *e)
         //Do nothing
         taskYIELD();
       }
+#ifdef COMPILE_BT
       else if (SerialBT.connected())
       {
         if (SerialBT.isCongested() == false)
@@ -64,6 +67,7 @@ void F9PSerialReadTask(void *e)
           log_d("Dropped SPP Bytes: %d", s);
         }
       }
+#endif
 
       if (settings.enableTaskReports == true)
         Serial.printf("SerialReadTask High watermark: %d\n\r",  uxTaskGetStackHighWaterMark(NULL));