Tweak the gpioExpander function names

Author: PaulZC

Firmware/RTK_Everywhere/LoRa.ino

@@ -377,7 +377,7 @@ void loraEnterBootloader()
     if (productVariant == RTK_TORCH)
         digitalWrite(pin_loraRadio_boot, HIGH); // Enter bootload mode
     else if (productVariant == RTK_FLEX)
-        gpioExpanderEnableLoraBoot();
+        gpioExpanderLoraBootEnable();
 
     loraReset();
 }
@@ -387,7 +387,7 @@ void loraExitBootloader()
     if (productVariant == RTK_TORCH)
         digitalWrite(pin_loraRadio_boot, LOW); // Exit bootload mode
     else if (productVariant == RTK_FLEX)
-        gpioExpanderDisableLoraBoot();
+        gpioExpanderLoraBootDisable();
 
     loraReset();
 }
@@ -403,9 +403,9 @@ void loraReset()
     }
     else if (productVariant == RTK_FLEX)
     {
-        gpioExpanderDisableLora();
+        gpioExpanderLoraDisable();
         delay(15);
-        gpioExpanderEnableLora();
+        gpioExpanderLoraEnable();
         delay(15);
     }
 }
@@ -415,15 +415,15 @@ void loraPowerOn()
     if (productVariant == RTK_TORCH)
         digitalWrite(pin_loraRadio_power, HIGH); // Power STM32/radio
     else if (productVariant == RTK_FLEX)
-        gpioExpanderEnableLora();
+        gpioExpanderLoraEnable();
 }
 
 void loraPowerOff()
 {
     if (productVariant == RTK_TORCH)
         digitalWrite(pin_loraRadio_power, LOW); // Power off STM32/radio
     else if (productVariant == RTK_FLEX)
-        gpioExpanderDisableLora();
+        gpioExpanderLoraDisable();
 }
 
 bool loraIsOn()
@@ -802,15 +802,15 @@ void loraWrite(uint8_t *data, uint16_t dataLength)
     if (productVariant == RTK_TORCH)
         Serial.write(data, dataLength);
     else if (productVariant == RTK_FLEX)
-        SerialForLoRa.write(data, dataLength);
+        SerialForLoRa->write(data, dataLength);
 }
 
 void loraPrint(const char *data)
 {
     if (productVariant == RTK_TORCH)
         Serial.print(data);
     else if (productVariant == RTK_FLEX)
-        SerialForLoRa.print(data);
+        SerialForLoRa->print(data);
 }
 
 void loraPrintf(const char *format, ...)
@@ -827,7 +827,7 @@ void loraPrintf(const char *format, ...)
     if (productVariant == RTK_TORCH)
         Serial.printf(buf);
     else if (productVariant == RTK_FLEX)
-        SerialForLoRa.printf(buf);
+        SerialForLoRa->printf(buf);
 
     va_end(args);
     va_end(args2);
@@ -838,13 +838,19 @@ uint16_t loraAvailable()
     if (productVariant == RTK_TORCH)
         return (Serial.available());
     else if (productVariant == RTK_FLEX)
-        return (SerialForLoRa.available());
+        return (SerialForLoRa->available());
+    
+    systemPrintln("loraAvailable - invalid ProductVariant");
+    return 0;
 }
 
 uint16_t loraRead()
 {
     if (productVariant == RTK_TORCH)
         return (Serial.read());
     else if (productVariant == RTK_FLEX)
-        return (SerialForLoRa.read());
+        return (SerialForLoRa->read());
+
+    systemPrintln("loraRead - invalid ProductVariant");
+    return 0;
 }

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -79,14 +79,14 @@
 */
 
 // While we wait for the next hardware revision, Facet Flex needs to be manually forced:
-#define NOT_FACET_FLEX // Comment to force support for Facet Flex
+//#define NOT_FACET_FLEX // Comment to force support for Facet Flex
 
 // To reduce compile times, various parts of the firmware can be disabled/removed if they are not
 // needed during development
-#define COMPILE_BT       // Comment out to remove Bluetooth functionality
-#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_BT       // Comment out to remove Bluetooth functionality
+//#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
 
 #ifdef COMPILE_BT
 #define COMPILE_AUTHENTICATION // Comment out to disable MFi authentication
@@ -98,9 +98,9 @@
 #endif                 // COMPILE_WIFI
 
 #define COMPILE_LG290P   // Comment out to remove LG290P functionality
-#define COMPILE_MOSAICX5 // Comment out to remove mosaic-X5 functionality
-#define COMPILE_UM980 // Comment out to remove UM980 functionality
-#define COMPILE_ZED      // Comment out to remove ZED-F9x functionality
+//#define COMPILE_MOSAICX5 // Comment out to remove mosaic-X5 functionality
+//#define COMPILE_UM980 // Comment out to remove UM980 functionality
+//#define COMPILE_ZED      // Comment out to remove ZED-F9x functionality
 
 #ifdef  COMPILE_ZED
 #define COMPILE_L_BAND   // Comment out to remove L-Band functionality
@@ -285,14 +285,15 @@ int gpioExpander_left = 3;
 int gpioExpander_center = 4;
 int gpioExpander_cardDetect = 5;
 
-int gpioExpanderSwitch_S1 = 0; // Controls U16 switch 1: connect ESP UART0 to CH342 or SW2
-int gpioExpanderSwitch_S2 = 1; // Controls U17 switch 2: connect SW1 to RS232 Output or GNSS UART4
-int gpioExpanderSwitch_S3 = 2; // Controls U18 switch 3: connect ESP UART2 to GNSS UART3 or LoRa UART2
-int gpioExpanderSwitch_S4 = 3; // Controls U19 switch 4: connect GNSS UART2 to 4-pin JST TTL Serial or LoRa UART0
-int gpioExpanderSwitch_LoraEnable = 4;   // LoRa_EN
-int gpioExpanderSwitch_GNSS_Reset = 5;   // RST_GNSS
-int gpioExpanderSwitch_LoraBoot = 6;     // LoRa_BOOT0 - Used for bootloading the STM32 radio IC
-int gpioExpanderSwitch_PowerFastOff = 7; // PWRKILL
+const int gpioExpanderSwitch_S1 = 0; // Controls U16 switch 1: connect ESP UART0 to CH342 or SW2
+const int gpioExpanderSwitch_S2 = 1; // Controls U17 switch 2: connect SW1 to RS232 Output or GNSS UART4
+const int gpioExpanderSwitch_S3 = 2; // Controls U18 switch 3: connect ESP UART2 to GNSS UART3 or LoRa UART2
+const int gpioExpanderSwitch_S4 = 3; // Controls U19 switch 4: connect GNSS UART2 to 4-pin JST TTL Serial or LoRa UART0
+const int gpioExpanderSwitch_LoraEnable = 4;   // LoRa_EN
+const int gpioExpanderSwitch_GNSS_Reset = 5;   // RST_GNSS
+const int gpioExpanderSwitch_LoraBoot = 6;     // LoRa_BOOT0 - Used for bootloading the STM32 radio IC
+const int gpioExpanderSwitch_PowerFastOff = 7; // PWRKILL
+const int gpioExpanderNumSwitches = gpioExpanderSwitch_PowerFastOff;
 
 //=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 

Firmware/RTK_Everywhere/System.ino

@@ -906,10 +906,10 @@ void beginGpioExpanderSwitches()
         // SW1 is on pin 0. Driving it high will disconnect the ESP32 from USB
         // GNSS_RST is on pin 5. Driving it low when an LG290P is connected will kill the I2C bus.
         // PWRKILL is on pin 7. Driving it low will turn off the system
-        for (int i = 0; i < 8; i++)
+        for (int i = 0; i <= gpioExpanderNumSwitches; i++)
         {
             // Set all pins to low except GNSS RESET and PWRKILL
-            if (i == 5 || i == 7)
+            if (i == gpioExpanderSwitch_GNSS_Reset || i == gpioExpanderSwitch_PowerFastOff)
                 gpioExpanderSwitches->digitalWrite(i, HIGH);
             else
                 gpioExpanderSwitches->digitalWrite(i, LOW);
@@ -965,13 +965,20 @@ void gpioExpanderSelectLoraCommunication()
         gpioExpanderSwitches->digitalWrite(gpioExpanderSwitch_S4, HIGH);
 }
 
+// Connect Flex GNSS UART2 to 4-pin JST RADIO port
+void gpioExpanderSelectRadioPort()
+{
+    if (online.gpioExpanderSwitches == true)
+        gpioExpanderSwitches->digitalWrite(gpioExpanderSwitch_S4, LOW);
+}
+
 // Drive GPIO pin high to enable LoRa Radio
-void gpioExpanderEnableLora()
+void gpioExpanderLoraEnable()
 {
     if (online.gpioExpanderSwitches == true)
         gpioExpanderSwitches->digitalWrite(gpioExpanderSwitch_LoraEnable, HIGH);
 }
-void gpioExpanderDisableLora()
+void gpioExpanderLoraDisable()
 {
     if (online.gpioExpanderSwitches == true)
         gpioExpanderSwitches->digitalWrite(gpioExpanderSwitch_LoraEnable, LOW);
@@ -985,12 +992,12 @@ bool gpioExpanderLoraIsOn()
     }
     return(false);
 }
-void gpioExpanderEnableLoraBoot()
+void gpioExpanderLoraBootEnable()
 {
     if (online.gpioExpanderSwitches == true)
         gpioExpanderSwitches->digitalWrite(gpioExpanderSwitch_LoraBoot, HIGH);
 }
-void gpioExpanderDisableLoraBoot()
+void gpioExpanderLoraBootDisable()
 {
     if (online.gpioExpanderSwitches == true)
         gpioExpanderSwitches->digitalWrite(gpioExpanderSwitch_LoraBoot, LOW);

Firmware/RTK_Everywhere/menuMessages.ino

@@ -3,8 +3,10 @@ void menuLogSelection()
 {
     if (present.microSd && !present.mosaicMicroSd)
         menuLog();
+#ifdef COMPILE_MOSAICX5
     if (!present.microSd && present.mosaicMicroSd)
         menuLogMosaic();
+#endif
     if (present.microSd && present.mosaicMicroSd)
     {
         while (1)