Merge pull request #778 from LeeLeahy2/no-lora

Build with COMPILE_LORA commented out

Author: nseidle

Firmware/RTK_Everywhere/Developer.ino

@@ -225,6 +225,22 @@ void espNowUpdate()                     {}
 
 #endif   // COMPILE_ESPNOW
 
+//----------------------------------------
+// LoRa
+//----------------------------------------
+
+#ifndef COMPILE_LORA
+void beginLoraFirmwareUpdate() {}
+bool checkUpdateLoraFirmware() {return false;}
+bool createLoRaPassthrough() {return false;}
+void loraGetVersion() {}
+void loraPowerOff() {}
+void loraProcessRTCM(uint8_t *rtcmData, uint16_t dataLength) {}
+void muxSelectUm980() {}
+void muxSelectUsb() {}
+void updateLora() {}
+#endif  // COMPILE_LORA
+
 //----------------------------------------
 // WiFi
 //----------------------------------------

Firmware/RTK_Everywhere/LoRa.ino

@@ -36,7 +36,7 @@ LoRa.ino
     ESP32 (UART2) <-> Switch 3 B1 <-> STM32 LoRa (UART2)
 
     UART0 on the STM32 is used for pushing data across the link.
-    UART2 on the STM32 is used for configuration. 
+    UART2 on the STM32 is used for configuration.
 
   Printing:
     On Torch, Serial must be used to send and receive data from the radio. At times, this requires disconnecting from the USB interface.
@@ -54,6 +54,8 @@ LoRa.ino
 
 ------------------------------------------------------------------------------*/
 
+#ifdef  COMPILE_LORA
+
 // See menuRadio() to get LoRa Settings
 
 // Define the NTRIP client states
@@ -73,7 +75,6 @@ enum LoraState
 
 static volatile uint8_t loraState = LORA_OFF;
 
-char loraFirmwareVersion[25] = {'\0'};
 int loraBytesSent = 0;
 
 HardwareSerial *SerialForLoRa; // Don't instantiate until we know the platform. May compete with SerialForTilt
@@ -877,7 +878,7 @@ uint16_t loraAvailable()
         return (Serial.available());
     else if (productVariant == RTK_FLEX)
         return (SerialForLoRa->available());
-    
+
     systemPrintln("loraAvailable - invalid ProductVariant");
     return 0;
 }
@@ -891,4 +892,6 @@ uint16_t loraRead()
 
     systemPrintln("loraRead - invalid ProductVariant");
     return 0;
-}
+}
+
+#endif  // COMPILE_LORA

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -88,6 +88,7 @@
 #define COMPILE_WIFI     // Comment out to remove WiFi functionality
 #define COMPILE_ETHERNET // Comment out to remove Ethernet (W5500) support
 #define COMPILE_CELLULAR // Comment out to remove cellular modem support
+#define COMPILE_LORA     // COmment out to remove LoRa functionality
 
 #ifdef COMPILE_BT
 #define COMPILE_AUTHENTICATION // Comment out to disable MFi authentication
@@ -982,6 +983,7 @@ int16_t *commandIndex;
 
 bool usbSerialIsSelected = true;      // Goes false when switch U18 is moved from CH34x to LoRa
 unsigned long loraLastIncomingSerial; // Last time a user sent a serial command. Used in LoRa timeouts.
+char loraFirmwareVersion[25] = {'\0'};
 
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

Firmware/RTK_Everywhere/check.sh

@@ -40,6 +40,11 @@ sed -i 's|#define COMPILE_ETHERNET|//#define COMPILE_ETHERNET|' RTK_Everywhere.i
 make
 git reset --hard --quiet  HEAD
 
+# LoRa
+sed -i 's|#define COMPILE_LORA|//#define COMPILE_LORA|' RTK_Everywhere.ino
+make
+git reset --hard --quiet HEAD
+
 # WiFi
 sed -i 's|#define COMPILE_WIFI|//#define COMPILE_WIFI|' RTK_Everywhere.ino
 make