Rename Facet Flex to Flex

Author: nseidle

Firmware/RTK_Everywhere/Begin.ino

@@ -147,7 +147,7 @@ void identifyBoard()
         else if (idWithAdc(idValue, 12.1, 1.5, 8.5))
             productVariant = RTK_FACET_V2_LBAND;
 
-        // Facet Flex: 10.0/20.0  -->  2071mV < 2200mV < 2322mV (8.5% tolerance)
+        // Flex: 10.0/20.0  -->  2071mV < 2200mV < 2322mV (8.5% tolerance)
         else if (idWithAdc(idValue, 10.0, 20.0, 8.5))
             productVariant = RTK_FLEX;
 
@@ -159,13 +159,13 @@ void identifyBoard()
         else if (idWithAdc(idValue, 8.2, 3.3, 8.5))
             productVariant = RTK_TORCH_X2;
 
-#ifndef NOT_FACET_FLEX
-        systemPrintln("<<<<<<<<<< !!!!!!!!!! FLEX FORCED !!!!!!!!!! >>>>>>>>>>");
+#ifndef FLEX_OVERRIDE
+        systemPrintln("<<<<<<<<<< !!!!!!!!!! FLEX OVERRIDE !!!!!!!!!! >>>>>>>>>>");
         productVariant = RTK_FLEX; // TODO remove once v1.1 Flex has ID resistors
 #endif
 
-#ifndef NOT_TORCH_X2
-        systemPrintln("<<<<<<<<<< !!!!!!!!!! TORCH X2 FORCED !!!!!!!!!! >>>>>>>>>>");
+#ifndef TORCH_X2_OVERRIDE
+        systemPrintln("<<<<<<<<<< !!!!!!!!!! TORCH X2 OVERRIDE !!!!!!!!!! >>>>>>>>>>");
         productVariant = RTK_TORCH_X2; // TODO remove once v1.1 Torch X2 has ID resistors
 #endif
     }
@@ -631,7 +631,7 @@ void beginBoard()
         // mosaic COM3 is connected to the Data connector - via the multiplexer
         // mosaic COM3 is available as a generic COM port. The firmware configures the baud. Nothing else.
 
-        // NOTE: Facet Flex with mosaic-X5 is VERY different!
+        // NOTE: Flex with mosaic-X5 is VERY different!
 
         // Specify the GNSS radio
 #ifdef COMPILE_MOSAICX5

Firmware/RTK_Everywhere/GNSS.ino

@@ -142,7 +142,7 @@ void gnssDetectReceiverType()
 
     // TODO remove after testing, force retest on each boot
     // Note: with this in place, the X5 detection will take a lot longer due to the baud rate change
-#ifndef NOT_FACET_FLEX
+#ifndef FLEX_OVERRIDE
     systemPrintln("<<<<<<<<<< !!!!!!!!!! FLEX FORCED !!!!!!!!!! >>>>>>>>>>");
     // settings.detectedGnssReceiver = GNSS_RECEIVER_UNKNOWN; // This may be causing weirdness on the LG290P. Commenting for now
 #endif

Firmware/RTK_Everywhere/GNSS_Mosaic.ino

@@ -41,7 +41,7 @@ void printMosaicCardSpace()
         freeSpace.toCharArray(sdFreeSpaceChar, sizeof(sdFreeSpaceChar));
 
         // On Facet mosaic, the SD is connected directly to the X5 and is accessible
-        // On Facet Flex X5, the internal mosaic SD card is not accessible
+        // On Flex mosaic-X5, the internal mosaic SD card is not accessible
         char myString[70];
         snprintf(myString, sizeof(myString), "SD card size: %s / Free space: %s", sdCardSizeChar, sdFreeSpaceChar);
         systemPrintln(myString);
@@ -228,7 +228,7 @@ void GNSS_MOSAIC::begin()
     //   COM4 is connected to the ESP32 for config
     //   (The comments on the schematic are out of date)
 
-    // On Facet Flex (with Ethernet):
+    // On Flex (with Ethernet):
     //   COM1 is connected to the ESP32 UART1 for: Encapsulated RTCMv3 + SBF + NMEA
     //   COM2 is connected to LoRa or 4-pin JST (switched by SW4)
     //   COM3 can be connected to ESP32 UART2 (switched by SW3)
@@ -237,7 +237,7 @@ void GNSS_MOSAIC::begin()
     // We need to Encapsulate RTCMv3 and NMEA in SBF format. Both SBF and NMEA messages start with "$".
     // The alternative would be to add a 'hybrid' parser to the SEMP which can disambiguate SBF and NMEA
 
-    // On Facet Flex (with IMU):
+    // On Flex (with IMU):
     //   COM1 is connected to the ESP32 UART1 for: Encapsulated RTCMv3 + SBF + NMEA
     //   COM2 is connected to LoRa or 4-pin JST (switched by SW4)
     //   COM3 is N/C (ESP32 UART2 is connected to the IMU)
@@ -1587,7 +1587,7 @@ bool GNSS_MOSAIC::isAntennaOpen()
 bool GNSS_MOSAIC::isBlocking()
 {
     // Facet mosaic is non-blocking. It has exclusive access to COM4
-    // Facet Flex (mosaic) is blocking. Suspend the GNSS read task only if needed
+    // Flex (mosaic) is blocking. Suspend the GNSS read task only if needed
     return _isBlocking && (productVariant == RTK_FLEX);
 }
 

Firmware/RTK_Everywhere/NVM.ino

@@ -228,7 +228,7 @@ void recordSystemSettingsToFile(File *settingsFile)
     {
         // Do not record this setting if it is not supported by the current platform
         // But oh what a tangled web we weave...
-        // Thanks to Facet Flex, initially we should be saving all possible settings.
+        // Thanks to Flex, initially we should be saving all possible settings.
         // Later, once we know what Flex GNSS is present, we save only the available
         // settings for that platform. Passing usePossibleSettings in as a parameter
         // would be messy. So, we'll use a global flag which is updated by commandIndexFill

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -78,9 +78,9 @@
 
 */
 
-// While we wait for the next hardware revision, Facet Flex needs to be manually forced:
-#define NOT_FACET_FLEX // Comment out to force support for Facet Flex
-//#define NOT_TORCH_X2 // Comment out to force support for Torch X2
+// While we wait for the next hardware revisions, Flex and Torch can be manually enabled:
+//#define FLEX_OVERRIDE // Uncomment to force support for Flex
+#define TORCH_X2_OVERRIDE // Uncomment to force support for Torch X2
 
 // To reduce compile times, various parts of the firmware can be disabled/removed if they are not
 // needed during development

Firmware/RTK_Everywhere/SD.ino

@@ -84,14 +84,14 @@ void sdUpdate()
 // On Postcard:     on the Portability Shield, SD DET (SD_CD) is connected to
 //                  IO5 of a PCA9554 I2C GPIO expander (address 0x20)
 //                  IO5 is high when the card is present
-// On Facet Flex:   SD_#CD is connected to ESP32 GPIO39
+// On Flex:         SD_#CD is connected to ESP32 GPIO39
 // Torch:           has no SD card
 // On Facet mosaic: the SD card is connected directly to the X5 but
 //                  SD_!DET is connected to ESP32 GPIO15
 //
 // More generally:
 // The GPIO expander on Postcard is known as gpioExpanderButtons (0x20)
-// Facet Flex also has a GPIO expander, known as gpioExpanderSwitches (0x21)
+// Flex also has a GPIO expander, known as gpioExpanderSwitches (0x21)
 bool sdCardPresent(void)
 {
     if (present.microSdCardDetectLow == true)

Firmware/RTK_Everywhere/Tasks.ino

@@ -480,7 +480,7 @@ void gnssReadTask(void *e)
         // to add extra checks, above and beyond the invalidDataCallback, to make sure that doesn't happen.
         // Here we check that the SBF ID and length are expected / valid too.
         //
-        // For Facet Flex mosaic, we need the SBF parser but not the SPARTN parser
+        // For Flex mosaic, we need the SBF parser but not the SPARTN parser
 
         if (gnss->isBlocking() == false)
         {

Firmware/RTK_Everywhere/settings.h

@@ -1250,8 +1250,8 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
     // Detected GNSS Receiver - for Flex. Save / load first so settingAvailableOnPlatform is correct on Flex
     { 0, 0, 0, 0, 0, 0, 0, 0, 0, ALL, 0, tGnssReceiver,     0, & settings.detectedGnssReceiver, "detectedGnssReceiver",  },
 
-    // Common settings which use the same name on multiple Facet Flex platforms
-    // We need these - for Facet Flex - because:
+    // Common settings which use the same name on multiple Flex platforms
+    // We need these - for Flex - because:
     //   During setup, the settings are loaded before we know which GNSS is present
     //   Previously, the setting would be applied to whichever GNSS is matched first alphabetically
     //   We need to apply these settings to all GNSS initially so that when we