Format ifdefs

Author: nseidle

Firmware/RTK_Surveyor/Bluetooth.ino

@@ -27,7 +27,7 @@ Bluetooth States:
 // Locals - compiled out
 //----------------------------------------
 
-#ifdef  COMPILE_BT
+#ifdef COMPILE_BT
 BTSerialInterface *bluetoothSerial;
 static volatile byte bluetoothState = BT_OFF;
 

Firmware/RTK_Surveyor/Display.ino

@@ -2510,7 +2510,7 @@ const uint8_t * getMacAddress()
 {
   static const uint8_t zero[6] = {0, 0, 0, 0, 0, 0};
 
-#ifdef  COMPILE_BT
+#ifdef COMPILE_BT
   if (bluetoothState != BT_OFF)
     return btMACAddress;
 #ifdef COMPILE_WIFI

Firmware/RTK_Surveyor/NtripClient.ino

@@ -35,7 +35,7 @@
 // Constants - compiled out
 //----------------------------------------
 
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
 
 //Size of the credentials buffer in bytes
 static const int CREDENTIALS_BUFFER_SIZE = 512;
@@ -246,7 +246,7 @@ void ntripClientSetState(byte newState)
 
 void ntripClientStart()
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   //Stop NTRIP client and WiFi
   ntripClientStop(true); //Do not allocate new wifiClient
 
@@ -274,7 +274,7 @@ void ntripClientStart()
 //Stop the NTRIP client
 void ntripClientStop(bool done)
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   if (ntripClient)
   {
     //Break the NTRIP client connection if necessary
@@ -309,7 +309,7 @@ void ntripClientStop(bool done)
 //Stop task if the connection has dropped or if we receive no data for maxTimeBeforeHangup_ms
 void ntripClientUpdate()
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   //Periodically display the NTRIP client state
   if (settings.enablePrintNtripClientState && ((millis() - lastNtripClientState) > 15000))
   {
@@ -514,7 +514,7 @@ void ntripClientUpdate()
 
 void pushGPGGA(NMEA_GGA_data_t *nmeaData)
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   //Provide the caster with our current position as needed
   if (ntripClient->connected() == true && settings.ntripClient_TransmitGGA == true)
   {

Firmware/RTK_Surveyor/NtripServer.ino

@@ -50,7 +50,7 @@
 // Constants - compiled out
 //----------------------------------------
 
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
 
 //Give up connecting after this number of attempts
 //Connection attempts are throttled to increase the time between attempts
@@ -221,7 +221,7 @@ void ntripServerSetState(byte newState)
 //This function gets called as each RTCM byte comes in
 void ntripServerProcessRTCM(uint8_t incoming)
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
 
   if (ntripServerState == NTRIP_SERVER_CASTING)
   {
@@ -277,7 +277,7 @@ void ntripServerProcessRTCM(uint8_t incoming)
 //Start the NTRIP server
 void ntripServerStart()
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   //Stop NTRIP server and WiFi
   ntripServerStop(true); //Don't allocate new wifiClient
 
@@ -303,7 +303,7 @@ void ntripServerStart()
 //Stop the NTRIP server
 void ntripServerStop(bool wifiClientAllocated)
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   if (ntripServer)
   {
     //Break the NTRIP server connection if necessary
@@ -338,7 +338,7 @@ void ntripServerStop(bool wifiClientAllocated)
 //Update the NTRIP server state machine
 void ntripServerUpdate()
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   //Periodically display the NTRIP server state
   if (settings.enablePrintNtripServerState && ((millis() - ntripServerStateLastDisplayed) > 15000))
   {

Firmware/RTK_Surveyor/States.ino

@@ -653,7 +653,7 @@ void updateSystemState()
         }
         break;
 
-#ifdef  COMPILE_L_BAND
+#ifdef COMPILE_L_BAND
       case (STATE_KEYS_STARTED):
         {
           if (rtcWaitTime == 0) rtcWaitTime = millis();
@@ -1036,7 +1036,7 @@ void changeState(SystemState newState)
       case (STATE_PROFILE):
         Serial.print("State: Profile");
         break;
-#ifdef  COMPILE_L_BAND
+#ifdef COMPILE_L_BAND
       case (STATE_KEYS_STARTED):
         Serial.print("State: Keys Started ");
         break;

Firmware/RTK_Surveyor/WiFi.ino

@@ -57,7 +57,7 @@ static const int WIFI_IP_ADDRESS_DISPLAY_INTERVAL = 12 * 1000;  //Milliseconds
 // Locals - compiled out
 //----------------------------------------
 
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
 
 //WiFi Timer usage:
 //  * Measure connection time to access point
@@ -148,7 +148,7 @@ void wifiStartAP()
 {
   //When testing, operate on local WiFi instead of AP
   //#define LOCAL_WIFI_TESTING 1
-#ifdef  LOCAL_WIFI_TESTING
+#ifdef LOCAL_WIFI_TESTING
   //Connect to local router
 #define WIFI_SSID "TRex"
 #define WIFI_PASSWORD "parachutes"
@@ -203,7 +203,7 @@ void wifiStartAP()
 //Determine if the WiFi connection has timed out
 bool wifiConnectionTimeout()
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   if ((millis() - wifiTimer) <= WIFI_CONNECTION_TIMEOUT)
     return false;
   Serial.println("WiFi connection timeout!");
@@ -214,7 +214,7 @@ bool wifiConnectionTimeout()
 //Send NMEA data to the NMEA clients
 void wifiNmeaData(uint8_t * data, uint16_t length)
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   static IPAddress ipAddress[WIFI_MAX_NMEA_CLIENTS];
   int index;
   static uint32_t lastNmeaConnectAttempt;
@@ -377,7 +377,7 @@ void wifiStart(char* ssid, char* pw)
 //If ESP NOW is active, leave WiFi on enough for ESP NOW
 void wifiStop()
 {
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   stopWebServer();
 
   if (wifiState == WIFI_OFF)
@@ -441,7 +441,7 @@ void wifiStop()
 void wifiUpdate()
 {
 
-#ifdef  COMPILE_WIFI
+#ifdef COMPILE_WIFI
   //Periodically display the WiFi state
   if (settings.enablePrintWifiState && ((millis() - lastWifiState) > 15000))
   {

Firmware/RTK_Surveyor/menuPP.ino

@@ -1,4 +1,4 @@
-#ifdef  COMPILE_L_BAND
+#ifdef COMPILE_L_BAND
 
 //----------------------------------------
 // Locals - compiled out
@@ -934,7 +934,7 @@ void beginLBand()
 //Download keys
 void menuPointPerfect()
 {
-#ifdef  COMPILE_L_BAND
+#ifdef COMPILE_L_BAND
   int menuTimeoutExtended = 30; //Increase time needed for complex data entry (mount point ID, caster credentials, etc).
 
   while (1)
@@ -1078,7 +1078,7 @@ void menuPointPerfect()
 //If a certain amount of time has elapsed between last decryption, turn off L-Band icon
 void updateLBand()
 {
-#ifdef  COMPILE_L_BAND
+#ifdef COMPILE_L_BAND
   if (online.lbandCorrections == true)
   {
     i2cLBand.checkUblox(); // Check for the arrival of new PMP data and process it.