Make logFileName global and print in menuLog().

Author: nseidle

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -167,6 +167,7 @@ const uint8_t sdSizeCheckTaskPriority = 0; //3 being the highest, and 0 being th
 const int sdSizeCheckStackSize = 2000;
 bool sdSizeCheckTaskComplete = false;
 
+char logFileName[sizeof("SFE_Facet_L-Band_230101_120101.ubx_plusExtraSpace")] = "";
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 //Connection settings to NTRIP Caster

Firmware/RTK_Surveyor/menuMessages.ino

@@ -22,11 +22,16 @@ void menuLog()
                sdFreeSpaceChar
               );
       systemPrintln(myString);
+
+      if (online.logging)
+      {
+        systemPrintf("Current log file name: %s\r\n", logFileName);
+      }
     }
     else
       systemPrintln("No microSD card is detected");
 
-    if(bufferOverruns) 
+    if (bufferOverruns)
       systemPrintf("Buffer overruns: %d\r\n", bufferOverruns);
 
     systemPrint("1) Log to microSD: ");
@@ -94,8 +99,8 @@ void menuLog()
     }
     else if (incoming == 4 && settings.enableLogging == true && online.logging == true)
     {
-      endSD(false, true); //Close down file. A new one will be created at the next calling of updateLogs().
-      beginLogging();
+      endLogging(false, true); //(gotSemaphore, releaseSemaphore) Close file. Reset parser stats.
+      beginLogging(); //Create new file based on current RTC.
       setLoggingType(); //Determine if we are standard, PPP, or custom. Changes logging icon accordingly.
     }
     else if (incoming == 5)
@@ -329,22 +334,27 @@ void beginLogging(const char *customFileName)
   {
     if (online.microSD == true && settings.enableLogging == true && online.rtc == true) //We can't create a file until we have date/time
     {
-      char fileName[66 + 6 + 40] = "";
-
       if (strlen(customFileName) == 0)
       {
         //Generate a standard log file name
         if (reuseLastLog == true) //attempt to use previous log
         {
-          if (findLastLog(fileName) == false)
+          reuseLastLog = false;
+
+          if (findLastLog(logFileName) == false)
             log_d("Failed to find last log. Making new one.");
           else
             log_d("Using last log file.");
         }
+        else
+        {
+          //We are not reusing the last log, so erase the global/original filename
+          strcpy(logFileName, "");
+        }
 
-        if (strlen(fileName) == 0)
+        if (strlen(logFileName) == 0)
         {
-          sprintf(fileName, "%s_%02d%02d%02d_%02d%02d%02d.ubx", //SdFat library
+          sprintf(logFileName, "%s_%02d%02d%02d_%02d%02d%02d.ubx", //SdFat library
                   platformFilePrefix,
                   rtc.getYear() - 2000, rtc.getMonth() + 1, rtc.getDay(), //ESP32Time returns month:0-11
                   rtc.getHour(true), rtc.getMinute(), rtc.getSecond() //ESP32Time getHour(true) returns hour:0-23
@@ -353,7 +363,7 @@ void beginLogging(const char *customFileName)
       }
       else
       {
-        strcpy(fileName, customFileName);
+        strcpy(logFileName, customFileName);
       }
 
       //Attempt to write to file system. This avoids collisions with file writing in F9PSerialReadTask()
@@ -364,9 +374,9 @@ void beginLogging(const char *customFileName)
         // O_CREAT - create the file if it does not exist
         // O_APPEND - seek to the end of the file prior to each write
         // O_WRITE - open for write
-        if (ubxFile->open(fileName, O_CREAT | O_APPEND | O_WRITE) == false)
+        if (ubxFile->open(logFileName, O_CREAT | O_APPEND | O_WRITE) == false)
         {
-          systemPrintf("Failed to create GNSS UBX data file: %s\r\n", fileName);
+          systemPrintf("Failed to create GNSS UBX data file: %s\r\n", logFileName);
           online.logging = false;
           xSemaphoreGive(sdCardSemaphore);
           return;
@@ -439,7 +449,7 @@ void beginLogging(const char *customFileName)
         return;
       }
 
-      systemPrintf("Log file name: %s\r\n", fileName);
+      systemPrintf("Log file name: %s\r\n", logFileName);
       online.logging = true;
     } //online.sd, enable.logging, online.rtc
   } //online.logging
@@ -521,15 +531,15 @@ bool findLastLog(char *lastLogName)
         const char* LOG_EXTENSION = "ubx";
         const char* LOG_PREFIX = platformFilePrefix;
         char fname[50]; //Handle long file names
-  
+
         dir.open("/"); //Open root
-  
+
         while (tempFile.openNext(&dir, O_READ))
         {
           if (tempFile.isFile())
           {
             tempFile.getName(fname, sizeof(fname));
-  
+
             //Check for matching file name prefix and extension
             if (strcmp(LOG_EXTENSION, &fname[strlen(fname) - strlen(LOG_EXTENSION)]) == 0)
             {
@@ -551,7 +561,7 @@ bool findLastLog(char *lastLogName)
         const char* LOG_EXTENSION = "ubx";
         const char* LOG_PREFIX = platformFilePrefix;
         char fname[50]; //Handle long file names
-  
+
         dir = SD_MMC.open("/"); //Open root
 
         if (dir && dir.isDirectory())
@@ -562,7 +572,7 @@ bool findLastLog(char *lastLogName)
             if (!tempFile.isDirectory())
             {
               snprintf(fname, sizeof(fname), "%s", tempFile.name());
-    
+
               //Check for matching file name prefix and extension
               if (strcmp(LOG_EXTENSION, &fname[strlen(fname) - strlen(LOG_EXTENSION)]) == 0)
               {