Move GNSS to Serial output to Ports menu

Author: nseidle

Firmware/RTK_Everywhere/menuMain.ino

@@ -155,8 +155,7 @@ void menuMain()
 
             systemPrintln("3) Configure Base");
 
-            if (productVariant != RTK_TORCH) // Torch does not have external ports
-                systemPrintln("4) Configure Ports");
+            systemPrintln("4) Configure Ports");
 
             if (productVariant != RTK_TORCH) // Torch does not have logging
                 systemPrintln("5) Configure Logging");
@@ -217,7 +216,7 @@ void menuMain()
                 gnssMenuMessages();
             else if (incoming == 3)
                 menuBase();
-            else if (incoming == 4 && productVariant != RTK_TORCH) // Torch does not have external ports
+            else if (incoming == 4)
                 menuPorts();
             else if (incoming == 5 && productVariant != RTK_TORCH) // Torch does not have logging
                 menuLog();

Firmware/RTK_Everywhere/menuPorts.ino

@@ -1,9 +1,50 @@
 void menuPorts()
 {
     if (present.portDataMux == true)
+    {
+        //RTK Facet mosaic, Facet v2
         menuPortsMultiplexed();
+    }
+    else if (productVariant == RTK_TORCH)
+    {
+        //RTK Torch
+        menuPortsUsb();
+    }
     else
+    {
+        //RTK EVK
         menuPortsNoMux();
+    }
+}
+
+// Configure a single port interface (USB only)
+void menuPortsUsb()
+{
+    while (1)
+    {
+        systemPrintln();
+        systemPrintln("Menu: Ports");
+
+        systemPrintf("1) Output GNSS data to USB serial: %s\r\n", settings.enableGnssToUsbSerial ? "Enabled" : "Disabled");
+
+        systemPrintln("x) Exit");
+
+        int incoming = getUserInputNumber(); // Returns EXIT, TIMEOUT, or long
+
+        if (incoming == 1)
+            settings.enableGnssToUsbSerial ^= 1;
+
+        else if (incoming == 'x')
+            break;
+        else if (incoming == INPUT_RESPONSE_GETNUMBER_EXIT)
+            break;
+        else if (incoming == INPUT_RESPONSE_GETNUMBER_TIMEOUT)
+            break;
+        else
+            printUnknown(incoming);
+    }
+
+    clearBuffer(); // Empty buffer of any newline chars
 }
 
 // Set the baud rates for the radio and data ports

Firmware/RTK_Everywhere/menuSystem.ino

@@ -156,9 +156,6 @@ void menuSystem()
         systemPrintf("Filtered by parser: %d NMEA / %d RTCM / %d UBX\r\n", failedParserMessages_NMEA,
                      failedParserMessages_RTCM, failedParserMessages_UBX);
 
-        // Display the USB serial output status
-        menuSystemDisplayUsbSerialOutput(settings.enableGnssToUsbSerial);
-
         //---------------------------
         // Start of menu
         //---------------------------
@@ -949,9 +946,6 @@ void menuOperation()
         if(present.gnss_zedf9p)
             systemPrintln("10) Mirror ZED-F9x's UART1 settings to USB");
 
-        // USB Serial
-        systemPrintln("11) Output GNSS data to USB serial");
-
         systemPrintln("----  Interrupts  ----");
         systemPrint("30) Bluetooth Interrupts Core: ");
         systemPrintln(settings.bluetoothInterruptsCore);
@@ -1053,12 +1047,6 @@ void menuOperation()
                 systemPrintln(F("USB messages successfully enabled"));
         }
 
-        else if (incoming == 11)
-        {
-            settings.enableGnssToUsbSerial ^= 1;
-            menuSystemDisplayUsbSerialOutput(settings.enableGnssToUsbSerial);
-        }
-
         else if (incoming == 30)
         {
             getNewSetting("Not yet implemented! - Enter Core used for Bluetooth Interrupts", 0, 1,
@@ -1111,15 +1099,6 @@ void menuOperation()
     clearBuffer(); // Empty buffer of any newline chars
 }
 
-// Display the USB serial output
-void menuSystemDisplayUsbSerialOutput(bool gnssData)
-{
-    if (gnssData)
-        systemPrintln("USB Serial output is GNSS data");
-    else
-        systemPrintln("USB Serial output is status and debug messages");
-}
-
 // Toggle periodic print message enables
 void menuPeriodicPrint()
 {