Add menuLogSelection - interim solution for Facet Flex mosaic-X5

TODO: rework settings.enableLogging to properly support the Facet Flex mosaic-X5.
It needs its a separate enable for internal NMEA logging.
But that means reworking everything...

Author: PaulZC

Firmware/RTK_Everywhere/GNSS_Mosaic.ino

@@ -26,22 +26,11 @@ GNSS_Mosaic.ino
 //   File type "1" is NMEA
 //==============================================================================
 
-//----------------------------------------
-// Control the messages that get logged to SD
-//----------------------------------------
-void menuLogMosaic()
+void printMosaicCardSpace()
 {
-    if (!present.mosaicMicroSd) // This may be needed for the G5 P3 ?
-        return;
-
-    bool applyChanges = false;
-
-    while (1)
+    // mosaicSdCardSize and mosaicSdFreeSpace are updated via the SBF 4059 (storeBlock4059)
+    if (present.mosaicMicroSd)
     {
-        systemPrintln();
-        systemPrintln("Menu: Logging");
-        systemPrintln();
-
         char sdCardSizeChar[20];
         String cardSize;
         stringHumanReadableSize(cardSize, mosaicSdCardSize);
@@ -54,31 +43,29 @@ void menuLogMosaic()
         // 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
         char myString[70];
-        snprintf(myString, sizeof(myString), "Mosaic SD card size: %s / Free space: %s", sdCardSizeChar, sdFreeSpaceChar);
+        snprintf(myString, sizeof(myString), "SD card size: %s / Free space: %s", sdCardSizeChar, sdFreeSpaceChar);
         systemPrintln(myString);
+    }
+}
+
+//----------------------------------------
+// Control the messages that get logged to SD
+//----------------------------------------
+void menuLogMosaic()
+{
+    if (!present.mosaicMicroSd) // This may be needed for the G5 P3 ?
+        return;
+
+    bool applyChanges = false;
+
+    while (1)
+    {
+        systemPrintln();
+        systemPrintln("Menu: Mosaic Logging");
         systemPrintln();
 
-        if (settings.enableSD && online.microSD)
-        {
-            char sdCardSizeChar[20];
-            String cardSize;
-            stringHumanReadableSize(cardSize, sdCardSize);
-            cardSize.toCharArray(sdCardSizeChar, sizeof(sdCardSizeChar));
-            char sdFreeSpaceChar[20];
-            String freeSpace;
-            stringHumanReadableSize(freeSpace, sdFreeSpace);
-            freeSpace.toCharArray(sdFreeSpaceChar, sizeof(sdFreeSpaceChar));
-
-            char myString[70];
-            snprintf(myString, sizeof(myString), "Accessible SD card size: %s / Free space: %s", sdCardSizeChar, sdFreeSpaceChar);
-            systemPrintln(myString);
-
-            if (online.logging)
-            {
-                systemPrintf("Accessible SD current log file name: %s\r\n", logFileName);
-            }
-            systemPrintln();
-        }
+        printMosaicCardSpace();
+        systemPrintln();
 
         systemPrint("1) Log NMEA to microSD: ");
         if (settings.enableLogging == true)

Firmware/RTK_Everywhere/menuMain.ino

@@ -234,12 +234,8 @@ void menuMain()
             menuBase();
         else if (incoming == 4)
             menuPorts();
-#ifdef COMPILE_MOSAICX5
-        else if (incoming == 5 && present.gnss_mosaicX5)
-            menuLogMosaic();
-#endif                                                         // COMPILE_MOSAICX5
         else if (incoming == 5 && productVariant != RTK_TORCH) // Torch does not have logging
-            menuLog();
+            menuLogSelection();
         else if (incoming == 6)
             menuWiFi();
         else if (incoming == 7)

Firmware/RTK_Everywhere/menuMessages.ino

@@ -1,3 +1,82 @@
+// Menu of Logging Menus
+void menuLogSelection()
+{
+    if (present.microSd && !present.mosaicMicroSd)
+        menuLog();
+    if (!present.microSd && present.mosaicMicroSd)
+        menuLogMosaic();
+    if (present.microSd && present.mosaicMicroSd)
+    {
+        while (1)
+        {
+            systemPrintln();
+            systemPrintln("Menu: Logging");
+            systemPrintln();
+
+            systemPrintln("Accessible microSD:");
+            printMicroSdInfo();
+            systemPrintln();
+#ifdef COMPILE_MOSAICX5
+            systemPrintln("Internal mosaic microSD:");
+            printMosaicCardSpace();
+            systemPrintln();
+#endif
+            systemPrintln("1) Accessible microSD logging");
+            systemPrintln("2) Internal mosaic microSD logging");
+
+            systemPrintln("x) Exit");
+
+            int incoming = getUserInputNumber(); // Returns EXIT, TIMEOUT, or long
+
+            if (incoming == 1)
+                menuLog();
+#ifdef COMPILE_MOSAICX5
+            else if (incoming == 2)
+                menuLogMosaic();
+#endif
+            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
+    }
+}
+
+// Print accessible microSd size and free space
+void printMicroSdInfo()
+{
+    if (settings.enableSD && online.microSD)
+    {
+        char sdCardSizeChar[20];
+        String cardSize;
+        stringHumanReadableSize(cardSize, sdCardSize);
+        cardSize.toCharArray(sdCardSizeChar, sizeof(sdCardSizeChar));
+        char sdFreeSpaceChar[20];
+        String freeSpace;
+        stringHumanReadableSize(freeSpace, sdFreeSpace);
+        freeSpace.toCharArray(sdFreeSpaceChar, sizeof(sdFreeSpaceChar));
+
+        char myString[70];
+        snprintf(myString, sizeof(myString), "SD card size: %s / Free space: %s", sdCardSizeChar, sdFreeSpaceChar);
+        systemPrintln(myString);
+
+        if (online.logging)
+        {
+            systemPrintf("Current log file name: %s\r\n", logFileName);
+        }
+    }
+    else
+        systemPrintln("No microSD card is detected");
+
+    if (bufferOverruns)
+        systemPrintf("Buffer overruns: %d\r\n", bufferOverruns);
+}
+
 // Control the messages that get logged to SD
 // Control max logging time (limit to a certain number of minutes)
 // The main use case is the setup for a base station to log RAW sentences that then get post processed
@@ -7,32 +86,10 @@ void menuLog()
     {
         systemPrintln();
         systemPrintln("Menu: Logging");
+        systemPrintln();
 
-        if (settings.enableSD && online.microSD)
-        {
-            char sdCardSizeChar[20];
-            String cardSize;
-            stringHumanReadableSize(cardSize, sdCardSize);
-            cardSize.toCharArray(sdCardSizeChar, sizeof(sdCardSizeChar));
-            char sdFreeSpaceChar[20];
-            String freeSpace;
-            stringHumanReadableSize(freeSpace, sdFreeSpace);
-            freeSpace.toCharArray(sdFreeSpaceChar, sizeof(sdFreeSpaceChar));
-
-            char myString[70];
-            snprintf(myString, sizeof(myString), "SD card size: %s / Free space: %s", sdCardSizeChar, sdFreeSpaceChar);
-            systemPrintln(myString);
-
-            if (online.logging)
-            {
-                systemPrintf("Current log file name: %s\r\n", logFileName);
-            }
-        }
-        else
-            systemPrintln("No microSD card is detected");
-
-        if (bufferOverruns)
-            systemPrintf("Buffer overruns: %d\r\n", bufferOverruns);
+        printMicroSdInfo();
+        systemPrintln();
 
         systemPrint("1) Log to microSD: ");
         if (settings.enableLogging == true)