Defining LG290P UARTs for Torch X2

Author: nseidle

Firmware/RTK_Everywhere/Begin.ino

@@ -888,7 +888,6 @@ void beginBoard()
 
         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
 

Firmware/RTK_Everywhere/GNSS_LG290P.ino

@@ -67,7 +67,6 @@ 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)
@@ -1184,6 +1183,12 @@ uint32_t GNSS_LG290P::getDataBaudRate()
         // This is nicknamed the DATA port
         dataUart = 1;
     }
+    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;
+    }
     return (getBaudRate(dataUart));
 }
 
@@ -1203,6 +1208,15 @@ bool GNSS_LG290P::setDataBaudRate(uint32_t baud)
                 return (setBaudRate(1, baud));
             }
         }
+        else if (productVariant == RTK_TORCH_X2)
+        {
+            if (getDataBaudRate() != baud)
+            {
+                // UART3 of the LG290P is connected to USB CH342 (Port A)
+                // This is nicknamed the DATA port
+                return (setBaudRate(3, baud));
+            }
+        }
         else
         {
             // On products that don't have a DATA port (Flex), act as if we have set the baud successfully
@@ -1228,6 +1242,12 @@ uint32_t GNSS_LG290P::getRadioBaudRate()
         // UART2 of the LG290P is connected to SW4, which is connected to LoRa UART0
         radioUart = 2;
     }
+    else if (productVariant == RTK_TORCH_X2)
+    {
+        // UART1 of the LG290P is connected to SW, which is connected to ESP32 UART0
+        // Not really used at this time but available for configuration
+        radioUart = 1;
+    }
     return (getBaudRate(radioUart));
 }
 
@@ -1255,6 +1275,12 @@ bool GNSS_LG290P::setRadioBaudRate(uint32_t baud)
                 // UART2 of the LG290P is connected to SW4, which is connected to LoRa UART0
                 radioUart = 2;
             }
+            else if (productVariant == RTK_TORCH_X2)
+            {
+                // UART1 of the LG290P is connected to SW, which is connected to ESP32 UART0
+                // Not really used at this time but available for configuration
+                radioUart = 1;
+            }
             return (setBaudRate(radioUart, baud));
         }
     }

Firmware/RTK_Everywhere/TcpServer.ino

@@ -461,7 +461,7 @@ void tcpServerClientUpdate(uint8_t index)
             if(tcpServerClient[index] == nullptr)
             {
                 if (settings.debugTcpServer)
-                    Serial.printf("ERROR: Failed to allocate %s client!\r\n", tcpServerName);
+                    systemPrintf("ERROR: Failed to allocate %s client!\r\n", tcpServerName);
                 break;
             }
         }

Firmware/RTK_Everywhere/WebServer.ino

@@ -37,7 +37,7 @@ static const char *const webServerStateNames[] = {
     webServer->on(page, HTTP_GET, []() {                                                                               \
         String length;                                                                                                 \
         if (settings.debugWebServer == true)                                                                           \
-            Serial.printf("WebServer: Sending %s (%p, %d bytes)\r\n", page, (void *)data, sizeof(data));               \
+            systemPrintf("WebServer: Sending %s (%p, %d bytes)\r\n", page, (void *)data, sizeof(data));               \
         webServer->sendHeader("Content-Encoding", "gzip");                                                             \
         length = String(sizeof(data));                                                                                 \
         webServer->sendHeader("Content-Length", length.c_str());                                                       \