Move file content printing to main menu

Author: nseidle

Firmware/RTK_Surveyor/menuMain.ino

@@ -25,6 +25,11 @@ void menuMain()
 
     Serial.println(F("5) Configure Logging"));
 
+    if (settings.enableSD == true && online.microSD == true)
+    {
+      Serial.println(F("6) Display microSD contents"));
+    }
+
     if (online.accelerometer == true)
       Serial.println(F("b) Bubble Level"));
 
@@ -35,7 +40,7 @@ void menuMain()
     if (binCount > 0)
       Serial.println(F("f) Firmware upgrade"));
 
-    Serial.println(F("t) Test menu"));
+    //Serial.println(F("t) Test menu"));
 
     Serial.println(F("x) Exit"));
 
@@ -51,6 +56,11 @@ void menuMain()
       menuPorts();
     else if (incoming == '5')
       menuLog();
+    else if (incoming == '6' && settings.enableSD == true && online.microSD == true)
+    {
+      Serial.println(F("Files found (date time size name):\n\r"));
+      sd.ls(LS_R | LS_DATE | LS_SIZE);
+    }
     else if (incoming == 'd')
       menuDebug();
     else if (incoming == 'r')

Firmware/RTK_Surveyor/menuMessages.ino

@@ -38,27 +38,18 @@ void menuLog()
     {
       settings.enableLogging ^= 1;
     }
-    else if (settings.enableLogging == true)
+    else if (incoming == '2' && settings.enableLogging == true)
     {
-      if (incoming == '2')
+      Serial.print(F("Enter max minutes to log data: "));
+      int maxMinutes = getNumber(menuTimeout); //Timeout after x seconds
+      if (maxMinutes < 0 || maxMinutes > 60 * 48) //Arbitrary 48 hour limit
       {
-        Serial.print(F("Enter max minutes to log data: "));
-        int maxMinutes = getNumber(menuTimeout); //Timeout after x seconds
-        if (maxMinutes < 0 || maxMinutes > 60 * 48) //Arbitrary 48 hour limit
-        {
-          Serial.println(F("Error: max minutes out of range"));
-        }
-        else
-        {
-          settings.maxLogTime_minutes = maxMinutes; //Recorded to NVM and file at main menu exit
-        }
+        Serial.println(F("Error: max minutes out of range"));
       }
-      else if (incoming == 'x')
-        break;
-      else if (incoming == STATUS_GETBYTE_TIMEOUT)
-        break;
       else
-        printUnknown(incoming);
+      {
+        settings.maxLogTime_minutes = maxMinutes; //Recorded to NVM and file at main menu exit
+      }
     }
     else if (incoming == 'x')
       break;
@@ -724,7 +715,7 @@ bool configureGNSSMessageRates()
   response &= configureMessageRate(COM_PORT_UART1, settings.message.mon_rxbuf);
   response &= configureMessageRate(COM_PORT_UART1, settings.message.mon_rxr);
   response &= configureMessageRate(COM_PORT_UART1, settings.message.mon_txbuf);
-  
+
   //TIM
   response &= configureMessageRate(COM_PORT_UART1, settings.message.tim_tm2);
   response &= configureMessageRate(COM_PORT_UART1, settings.message.tim_tp);