Compiling

Author: nseidle

Firmware/RTK_Everywhere/Begin.ino

@@ -77,7 +77,6 @@ void identifyBoard()
     // First, test for devices that do not have ID resistors
     if (productVariant == RTK_UNKNOWN)
     {
-        // Torch
         // Check if unique ICs are on the I2C bus
         if (i2c_0 == nullptr)
             i2c_0 = new TwoWire(0);
@@ -95,30 +94,26 @@ void identifyBoard()
         // 0x08 - HUSB238 - USB C PD Sink Controller
         bool husb238Present = i2cIsDevicePresent(i2c_0, 0x08);
 
-        // Flex has everything a Torch does and a display
-        // 0x3C - SSD1306 OLED Driver
-        // If a display is present, it's not a Torch
-        // bool displayPresent = i2cIsDevicePresent(i2c_0, 0x3C);
-        bool displayPresent = i2cIsDevicePresent(i2c_0, 0x10);
+        // 0x10 -MFI343S00177 Authentication Coprocessor
+        bool mfiPresent = i2cIsDevicePresent(i2c_0, 0x10);
 
         i2c_0->end();
 
-        // Proceed with Torch ID only if display is absent
-        if (displayPresent == false)
+        // Proceed with Torch ID only if MFi is absent (Torch X2 has MFi, and ID resistors)
+        if (mfiPresent == false)
         {
             if (bq40z50Present || mp2762aPresent || husb238Present)
             {
                 productVariant = RTK_TORCH;
-            }
-
-            if (productVariant == RTK_TORCH && bq40z50Present == false)
-                systemPrintln("Error: Torch ID'd with no BQ40Z50 present");
+                if (bq40z50Present == false)
+                    systemPrintln("Error: Torch ID'd with no BQ40Z50 present");
 
-            if (productVariant == RTK_TORCH && mp2762aPresent == false)
-                systemPrintln("Error: Torch ID'd with no MP2762A present");
+                if (mp2762aPresent == false)
+                    systemPrintln("Error: Torch ID'd with no MP2762A present");
 
-            if (productVariant == RTK_TORCH && husb238Present == false)
-                systemPrintln("Error: Torch ID'd with no HUSB238 present");
+                if (husb238Present == false)
+                    systemPrintln("Error: Torch ID'd with no HUSB238 present");
+            }
         }
     }
 
@@ -159,11 +154,20 @@ void identifyBoard()
         // Postcard: 3.3/10  -->  2371mV < 2481mV < 2582mV (8.5% tolerance)
         else if (idWithAdc(idValue, 3.3, 10, 8.5))
             productVariant = RTK_POSTCARD;
-  
+
+        // 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;
+
 #ifndef NOT_FACET_FLEX
         systemPrintln("<<<<<<<<<< !!!!!!!!!! FLEX FORCED !!!!!!!!!! >>>>>>>>>>");
         productVariant = RTK_FLEX; // TODO remove once v1.1 Flex has ID resistors
 #endif
+
+#ifndef NOT_TORCH_X2
+        systemPrintln("<<<<<<<<<< !!!!!!!!!! TORCH X2 FORCED !!!!!!!!!! >>>>>>>>>>");
+        productVariant = RTK_TORCH_X2; // TODO remove once v1.1 Torch X2 has ID resistors
+#endif
     }
 
     if (ENABLE_DEVELOPER)
@@ -722,7 +726,7 @@ void beginBoard()
         present.fuelgauge_max17048 = true;
         present.display_i2c0 = true;
         present.i2c0BusSpeed_400 = true; // Run display bus at higher speed
-        present.i2c1 = true; // Qwiic bus
+        present.i2c1 = true;             // Qwiic bus
         present.display_type = DISPLAY_128x64;
         present.microSd = true;
         present.gpioExpanderButtons = true;
@@ -849,6 +853,91 @@ void beginBoard()
 
         // GNSS receiver type is determined later in gnssDetectReceiverType()
     }
+
+    else if (productVariant == RTK_TORCH_X2)
+    {
+        // Specify the GNSS radio
+#ifdef COMPILE_LG290P
+        gnss = (GNSS *)new GNSS_LG290P();
+#else  // COMPILE_UM980
+        gnss = (GNSS *)new GNSS_None();
+        systemPrintln("<<<<<<<<<< !!!!!!!!!! LG290P NOT COMPILED !!!!!!!!!! >>>>>>>>>>");
+#endif // COMPILE_UM980
+
+        present.brand = BRAND_SPARKPNT;
+        present.psram_2mb = true;
+        present.gnss_lg290p = true;
+        present.antennaPhaseCenter_mm = 116.5; // Default to Torch helical APC, average of L1/L2
+        present.fuelgauge_bq40z50 = true;
+        present.charger_mp2762a = true;
+        present.button_powerHigh = true; // Button is pressed when high
+        present.beeper = true;
+        present.gnss_to_uart = true;
+        present.needsExternalPpl = true; // Uses the PointPerfect Library
+
+        // We can't enable GNSS features here because we don't know if lg290pFirmwareVersion is >= v05
+        // present.minElevation = true;
+        // present.minCno = true;
+
+        pin_I2C0_SDA = 15;
+        pin_I2C0_SCL = 4;
+
+        pin_GnssUart_RX = 14; //Torch X2 uses UART2 of ESP32 to communicate with LG290P
+        pin_GnssUart_TX = 17;
+        pin_GNSS_DR_Reset = 22; // Push low to reset GNSS/DR.
+
+        pin_GNSS_TimePulse = 39; // PPS on UM980
+
+        pin_muxB = 12;
+        pin_usbSelect = 12;          // Controls U18 switch between ESP UART0 to USB or GNSS UART1
+        pin_powerAdapterDetect = 36; // Goes low when USB cable is plugged in
+
+        pin_batteryStatusLED = 0;
+        pin_bluetoothStatusLED = 32;
+        pin_gnssStatusLED = 13;
+
+        pin_beeper = 33;
+
+        pin_powerButton = 34;
+        pin_powerSenseAndControl = 18; // PWRKILL
+
+        pin_loraRadio_power = 19; // LoRa_EN
+        // pin_loraRadio_boot = 23;  // LoRa_BOOT0
+        // pin_loraRadio_reset = 5;  // LoRa_NRST
+
+        DMW_if systemPrintf("pin_bluetoothStatusLED: %d\r\n", pin_bluetoothStatusLED);
+        pinMode(pin_bluetoothStatusLED, OUTPUT);
+
+        DMW_if systemPrintf("pin_gnssStatusLED: %d\r\n", pin_gnssStatusLED);
+        pinMode(pin_gnssStatusLED, OUTPUT);
+
+        DMW_if systemPrintf("pin_batteryStatusLED: %d\r\n", pin_batteryStatusLED);
+        pinMode(pin_batteryStatusLED, OUTPUT);
+
+        // Turn on Bluetooth, GNSS, and Battery LEDs to indicate power on
+        bluetoothLedOn();
+        gnssStatusLedOn();
+        batteryStatusLedOn();
+
+        pinMode(pin_beeper, OUTPUT);
+        beepOff();
+
+        pinMode(pin_powerButton, INPUT);
+
+        pinMode(pin_GNSS_TimePulse, INPUT);
+
+        pinMode(pin_GNSS_DR_Reset, OUTPUT);
+        gnssBoot(); // Tell GNSS to boot
+
+        pinMode(pin_powerAdapterDetect, INPUT); // Has 10k pullup
+
+        pinMode(pin_usbSelect, OUTPUT);
+        digitalWrite(pin_usbSelect, LOW); // Keep ESP32 connected to CH342 (not GNSS UART1)
+
+        // LoRa not mounted in X2, but power down to be sure
+        pinMode(pin_loraRadio_power, OUTPUT);
+        loraPowerOff(); // Keep LoRa powered down for now
+    }
 }
 
 void beginVersion()
@@ -1137,7 +1226,7 @@ void forceGnssCommunicationRate(uint32_t &platformGnssCommunicationRate)
         // Override user setting. Required because beginGnssUart() is called before beginBoard().
         platformGnssCommunicationRate = 115200;
     }
-    else if (productVariant == RTK_POSTCARD)
+    else if (productVariant == RTK_POSTCARD || productVariant == RTK_TORCH_X2)
     {
         // LG290P communicates at 460800bps.
         platformGnssCommunicationRate = 115200 * 4;
@@ -1553,6 +1642,14 @@ void beginSystemState()
         if (systemState == STATE_BASE_NOT_STARTED)
             firstRoverStart = false;
     }
+    else if (productVariant == RTK_TORCH_X2)
+    {
+        // Do not allow user to enter test screen during first rover start because there is no screen
+        firstRoverStart = false;
+
+        // Return to either Base or Rover Not Started. The last state previous to power down.
+        systemState = settings.lastState;
+    }
     else
     {
         systemPrintf("beginSystemState: Unknown product variant: %d\r\n", productVariant);
@@ -1736,13 +1833,15 @@ bool i2cBusInitialization(TwoWire *i2cBus, int sda, int scl, int clockKHz)
                 break;
             }
 
-            case 0x10: {
+            case 0x10:
+            {
                 systemPrintf("  0x%02X - MFI343S00177 Authentication Coprocessor\r\n", addr);
                 i2cAuthCoPro = i2cBus; // Record the bus
                 break;
             }
 
-            case 0x18: {
+            case 0x18:
+            {
                 systemPrintf("  0x%02X - PCA9557 GPIO Expander with Reset\r\n", addr);
                 break;
             }

Firmware/RTK_Everywhere/GNSS.ino

@@ -88,7 +88,7 @@ static void pushGPGGA(char *ggaData)
 {
     static char storedGPGGA[100];
 
-    static SemaphoreHandle_t reentrant = xSemaphoreCreateMutex();  // Create the mutex
+    static SemaphoreHandle_t reentrant = xSemaphoreCreateMutex(); // Create the mutex
 
     if (xSemaphoreTake(reentrant, 10 / portTICK_PERIOD_MS) == pdPASS)
     {
@@ -144,15 +144,16 @@ void gnssDetectReceiverType()
     // Note: with this in place, the X5 detection will take a lot longer due to the baud rate change
 #ifndef NOT_FACET_FLEX
     systemPrintln("<<<<<<<<<< !!!!!!!!!! FLEX FORCED !!!!!!!!!! >>>>>>>>>>");
-    //settings.detectedGnssReceiver = GNSS_RECEIVER_UNKNOWN; // This may be causing weirdness on the LG290P. Commenting for now
+    // 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)
     {
         // The COMPILE guards prevent else if
         // Use a do while (0) so we can break when GNSS is detected
-        do {
+        do
+        {
 #ifdef COMPILE_LG290P
             if (lg290pIsPresent() == true)
             {
@@ -174,7 +175,7 @@ void gnssDetectReceiverType()
                 break;
             }
 #else  // COMPILE_MOSAICX5
-                systemPrintln("<<<<<<<<<< !!!!!!!!!! MOSAICX5 NOT COMPILED !!!!!!!!!! >>>>>>>>>>");
+            systemPrintln("<<<<<<<<<< !!!!!!!!!! MOSAICX5 NOT COMPILED !!!!!!!!!! >>>>>>>>>>");
 #endif // COMPILE_MOSAICX5
         } while (0);
     }
@@ -221,6 +222,10 @@ void gnssBoot()
     {
         digitalWrite(pin_GNSS_DR_Reset, HIGH); // Tell UM980 and DR to boot
     }
+    else if (productVariant == RTK_TORCH_X2)
+    {
+        digitalWrite(pin_GNSS_DR_Reset, HIGH); // Tell LG290P to boot
+    }
     else if (productVariant == RTK_FLEX)
     {
         gpioExpanderGnssBoot(); // Drive the GNSS reset pin high
@@ -238,6 +243,10 @@ void gnssReset()
     {
         digitalWrite(pin_GNSS_DR_Reset, LOW); // Tell UM980 and DR to reset
     }
+    else if (productVariant == RTK_TORCH_X2)
+    {
+        digitalWrite(pin_GNSS_Reset, LOW); // Tell LG290P to reset
+    }
     else if (productVariant == RTK_FLEX)
     {
         gpioExpanderGnssReset(); // Drive the GNSS reset pin low
@@ -315,9 +324,10 @@ void gnssFirmwareBeginUpdate()
 
     systemPrintln();
     systemPrintf("Entering GNSS direct connect for firmware update and configuration. Disconnect this terminal "
-                  "connection. Use the GNSS manufacturer software "
-                  "to update the firmware. Baudrate: %dbps. Press the %s button to return "
-                  "to normal operation.\r\n", serialBaud, present.button_mode ? "mode" : "power");
+                 "connection. Use the GNSS manufacturer software "
+                 "to update the firmware. Baudrate: %dbps. Press the %s button to return "
+                 "to normal operation.\r\n",
+                 serialBaud, present.button_mode ? "mode" : "power");
     systemFlush();
 
     Serial.end(); // We must end before we begin otherwise the UART settings are corrupted
@@ -347,25 +357,25 @@ void gnssFirmwareBeginUpdate()
             Serial.write(serialGNSS->read());
 
         // Button task will gnssFirmwareRemoveUpdate and restart
-        
+
         // Temporary fix for buttonless Flex. TODO - remove
         if ((productVariant == RTK_FLEX) && (millis() > (lastSerial + 30000)))
         {
-                // Beep to indicate exit
-                beepOn();
-                delay(300);
-                beepOff();
-                delay(100);
-                beepOn();
-                delay(300);
-                beepOff();
+            // Beep to indicate exit
+            beepOn();
+            delay(300);
+            beepOff();
+            delay(100);
+            beepOn();
+            delay(300);
+            beepOff();
 
-                gnssFirmwareRemoveUpdate();
+            gnssFirmwareRemoveUpdate();
 
-                systemPrintln("Exiting direct connection (passthrough) mode");
-                systemFlush(); // Complete prints
+            systemPrintln("Exiting direct connection (passthrough) mode");
+            systemFlush(); // Complete prints
 
-                ESP.restart();
+            ESP.restart();
         }
     }
 }

Firmware/RTK_Everywhere/GNSS_LG290P.ino

@@ -67,6 +67,7 @@ const char *GNSS_LG290P::getRtcmLowDataRateString()
 void GNSS_LG290P::begin()
 {
     // During identifyBoard(), the GNSS UART and DR pins are set
+    Serial.println("LG begin");
 
     // The GNSS UART is already started. We can now pass it to the library.
     if (serialGNSS == nullptr)
@@ -85,13 +86,13 @@ void GNSS_LG290P::begin()
     if (_lg290p->begin(*serialGNSS) == false) // Give the serial port over to the library
     {
         if (settings.debugGnss)
-            systemPrintln("GNSS Failed to begin. Trying again.");
+            systemPrintln("GNSS LG290P failed to begin. Trying again.");
 
         // Try again with power on delay
         delay(1000);
         if (_lg290p->begin(*serialGNSS) == false)
         {
-            systemPrintln("GNSS offline");
+            systemPrintln("GNSS LG290P offline");
             displayGNSSFail(1000);
             return;
         }

Firmware/RTK_Everywhere/GNSS_UM980.ino

@@ -86,13 +86,13 @@ void GNSS_UM980::begin()
     if (_um980->begin(*serialGNSS) == false) // Give the serial port over to the library
     {
         if (settings.debugGnss)
-            systemPrintln("GNSS Failed to begin. Trying again.");
+            systemPrintln("GNSS UM980 failed to begin. Trying again.");
 
         // Try again with power on delay
         delay(1000);
         if (_um980->begin(*serialGNSS) == false)
         {
-            systemPrintln("GNSS offline");
+            systemPrintln("GNSS UM980 offline");
             displayGNSSFail(1000);
             return;
         }

Firmware/RTK_Everywhere/GNSS_ZED.ino

@@ -137,7 +137,7 @@ void GNSS_ZED::begin()
 
     if (_zed->begin(*i2c_0) == false)
     {
-        systemPrintln("GNSS Failed to begin. Trying again.");
+        systemPrintln("GNSS ZED failed to begin. Trying again.");
 
         // Try again with power on delay
         delay(1000); // Wait for ZED-F9P to power up before it can respond to ACK