Add Flex v1.1 support for LG290P

Author: nseidle

Firmware/RTK_Everywhere/Begin.ino

@@ -158,11 +158,6 @@ void identifyBoard()
         // Torch X2: 8.2/3.3  -->  836mV < 947mV < 1067mV (8.5% tolerance)
         else if (idWithAdc(idValue, 8.2, 3.3, 8.5))
             productVariant = RTK_TORCH_X2;
-
-#ifdef FLEX_OVERRIDE
-        systemPrintln("<<<<<<<<<< !!!!!!!!!! FLEX OVERRIDE !!!!!!!!!! >>>>>>>>>>");
-        productVariant = RTK_FLEX; // TODO remove once v1.1 Flex has ID resistors
-#endif
     }
 
     if (ENABLE_DEVELOPER)
@@ -777,7 +772,6 @@ void beginBoard()
         present.antennaPhaseCenter_mm = 62.0; // APC from drawings
         present.radio_lora = true;
         present.fuelgauge_bq40z50 = true;
-        present.charger_mp2762a = true;
 
         present.button_powerLow = true; // Button is pressed when high
         present.button_mode = true;
@@ -1526,6 +1520,12 @@ void beginButtons()
         buttonCount++;
     if (present.gpioExpanderButtons == true)
         buttonCount++;
+    if (productVariant == RTK_FLEX)
+    {
+        Serial.println("<<<<<<<<<<<<<<<<<<<< Deal with Flex buttons >>>>>>>>>>>>>>");
+        buttonCount = 1;
+    }
+
     if (buttonCount > 1)
         reportFatalError("Illegal button assignment.");
 

Firmware/RTK_Everywhere/GNSS.ino

@@ -558,14 +558,6 @@ void gnssDetectReceiverType()
 
     gnssBoot(); // Tell GNSS to run
 
-    // 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
-#ifdef FLEX_OVERRIDE
-    systemPrintln("<<<<<<<<<< !!!!!!!!!! FLEX FORCED !!!!!!!!!! >>>>>>>>>>");
-    // settings.detectedGnssReceiver = GNSS_RECEIVER_UNKNOWN; // This may be causing weirdness on the LG290P.
-    // Commenting for now
-#endif
-
     // Start auto-detect if NVM is not yet set
     if (settings.detectedGnssReceiver == GNSS_RECEIVER_UNKNOWN)
     {
@@ -574,7 +566,8 @@ void gnssDetectReceiverType()
         do
         {
 #ifdef COMPILE_LG290P
-            if (lg290pIsPresent() == true)
+            systemPrintln("Testing for LG290P");
+            if (lg290pIsPresentOnFlex() == true)
             {
                 systemPrintln("Auto-detected GNSS receiver: LG290P");
                 settings.detectedGnssReceiver = GNSS_RECEIVER_LG290P;
@@ -586,6 +579,7 @@ void gnssDetectReceiverType()
 #endif // COMPILE_LGP290P
 
 #ifdef COMPILE_MOSAICX5
+            systemPrintln("Testing for mosaic-X5");
             if (mosaicIsPresentOnFlex() == true) // Note: this changes the COM1 baud from 115200 to 460800
             {
                 systemPrintln("Auto-detected GNSS receiver: mosaic-X5");

Firmware/RTK_Everywhere/GNSS_LG290P.ino

@@ -668,16 +668,21 @@ uint32_t GNSS_LG290P::getDataBaudRate()
         // This is nicknamed the DATA port
         dataUart = 1;
     }
+    else if (productVariant == RTK_FLEX)
+    {
+        // On the Flex, the DATA connector is not connected to the GNSS
+        // Return 0.
+        return (0);
+    }
     else if (productVariant == RTK_TORCH_X2)
     {
         // UART3 of the LG290P is connected to USB CH342 (Port A)
         // This is nicknamed the DATA port
         dataUart = 3;
     }
     else
-    {
         systemPrintln("getDataBaudRate: Uncaught platform");
-    }
+
     return (getBaudRate(dataUart));
 }
 
@@ -700,20 +705,20 @@ bool GNSS_LG290P::setBaudRateData(uint32_t baud)
                 // This is nicknamed the DATA port
                 return (setBaudRate(1, baud));
             }
-            else if (productVariant == RTK_TORCH_X2)
+            else if (productVariant == RTK_FLEX)
             {
-                if (getDataBaudRate() != baud)
-                {
-                    // UART3 of the LG290P is connected to USB CH342 (Port A)
-                    // This is nicknamed the DATA port
-                    return (setBaudRate(3, baud));
-                }
+                // On the Flex, the DATA connector is not connected to the GNSS
+                // Return true so that configuration can proceed.
+                return (true);
             }
-            else
+            else if (productVariant == RTK_TORCH_X2)
             {
-                // On products that don't have a DATA port (Flex), act as if we have set the baud successfully
-                return (true);
+                // UART3 of the LG290P is connected to USB CH342 (Port A)
+                // This is nicknamed the DATA port
+                return (setBaudRate(3, baud));
             }
+            else
+                systemPrintln("setDataBaudRate: Uncaught platform");
         }
     }
     return (false);
@@ -741,6 +746,9 @@ uint32_t GNSS_LG290P::getRadioBaudRate()
         // Not really used at this time but available for configuration
         radioUart = 1;
     }
+    else
+        systemPrintln("getDataBaudRate: Uncaught platform");
+
     return (getBaudRate(radioUart));
 }
 
@@ -774,6 +782,9 @@ bool GNSS_LG290P::setBaudRateRadio(uint32_t baud)
                 // Not really used at this time but available for configuration
                 radioUart = 1;
             }
+            else
+                systemPrintln("setBaudRateRadio: Uncaught platform");
+
             return (setBaudRate(radioUart, baud));
         }
     }
@@ -1781,6 +1792,9 @@ bool GNSS_LG290P::setBaudRateComm(uint32_t baud)
                 // UART1 of the LG290P is connected to the ESP32 for the main config/comm
                 commUart = 1;
             }
+            else
+                systemPrintln("setBaudRateComm: Uncaught platform");
+
             return (setBaudRate(commUart, baud));
         }
     }
@@ -1803,6 +1817,9 @@ uint32_t GNSS_LG290P::getCommBaudRate()
         // On the Flex, the ESP32 UART1 is connected to LG290P UART1
         commUart = 1;
     }
+    else
+        systemPrintln("getCommBaudRate: Uncaught platform");
+
     return (getBaudRate(commUart));
 }
 
@@ -2630,7 +2647,7 @@ bool lg290pMessageEnabled(char *nmeaSentence, int sentenceLength)
 }
 
 // Return true if we detect this receiver type
-bool lg290pIsPresent()
+bool lg290pIsPresentOnFlex()
 {
     // Locally instantiate the hardware and library so it will release on exit
 

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -78,9 +78,6 @@
 
 */
 
-// While we wait for the next hardware revisions, Flex and Torch can be manually enabled:
-//#define FLEX_OVERRIDE // Uncomment to force support for 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