Add semaphore check to file size. Add short time for semaphore.

Author: nseidle

Firmware/RTK_Surveyor/NVM.ino

@@ -67,7 +67,7 @@ void recordSystemSettingsToFile()
   if (online.microSD == true)
   {
     //Attempt to write to file system. This avoids collisions with file writing from other functions like updateLogs()
-    if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+    if (xSemaphoreTake(xFATSemaphore, fatSemaphore_longWait_ms) == pdPASS)
     {
       //Assemble settings file name
       char settingsFileName[40]; //SFE_Surveyor_Settings.txt
@@ -240,7 +240,7 @@ bool loadSystemSettingsFromFile()
   if (online.microSD == true)
   {
     //Attempt to access file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile() and F9PSerialReadTask()
-    if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+    if (xSemaphoreTake(xFATSemaphore, fatSemaphore_longWait_ms) == pdPASS)
     {
       //Assemble settings file name
       char settingsFileName[40]; //SFE_Surveyor_Settings.txt

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -113,7 +113,8 @@ int startLogTime_minutes = 0; //Mark when we start logging so we can stop loggin
 //System crashes if two tasks access a file at the same time
 //So we use a semaphore to see if file system is available
 SemaphoreHandle_t xFATSemaphore;
-const TickType_t fatSemaphore_maxWait_ms = 200 / portTICK_PERIOD_MS;
+const TickType_t fatSemaphore_shortWait_ms = 10 / portTICK_PERIOD_MS;
+const TickType_t fatSemaphore_longWait_ms = 200 / portTICK_PERIOD_MS;
 
 #define sdWriteSize 512 // Write data to the SD card in blocks of 512 bytes
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
@@ -375,42 +376,59 @@ void updateLogs()
   else if (online.logging == true && settings.enableLogging == false)
   {
     //Close down file
-    ubxFile.sync();
-    ubxFile.close();
-    online.logging = false;
+    if (xSemaphoreTake(xFATSemaphore, fatSemaphore_longWait_ms) == pdPASS)
+    {
+      ubxFile.sync();
+      ubxFile.close();
+      online.logging = false;
+      //xSemaphoreGive(xFATSemaphore); //Do not release semaphore
+    }
   }
 
   //Report file sizes to show recording is working
   if (online.logging == true)
   {
     if (millis() - lastFileReport > 5000)
     {
-      lastFileReport = millis();
-      Serial.printf("UBX file size: %d", ubxFile.fileSize());
+      long fileSize = 0;
 
-      if ((systemTime_minutes - startLogTime_minutes) < settings.maxLogTime_minutes)
-      {
-        //Calculate generation and write speeds every 5 seconds
-        uint32_t delta = ubxFile.fileSize() - lastLogSize;
-        Serial.printf(" - Generation rate: %0.1fkB/s", delta / 5.0 / 1000.0);
-        Serial.printf(" - Write speed: %0.1fkB/s", delta / (totalWriteTime / 1000000.0) / 1000.0);
-      }
-      else
+      //Attempt to access file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile() and F9PSerialReadTask()
+      if (xSemaphoreTake(xFATSemaphore, fatSemaphore_shortWait_ms) == pdPASS)
       {
-        Serial.printf(" reached max log time %d", settings.maxLogTime_minutes);
-      }
-
-      Serial.println();
+        fileSize = ubxFile.fileSize();
 
-      totalWriteTime = 0; //Reset write time every 5s
+        xSemaphoreGive(xFATSemaphore);
+      }
 
-      if (ubxFile.fileSize() > lastLogSize)
+      if (fileSize > 0)
       {
-        lastLogSize = ubxFile.fileSize();
-        logIncreasing = true;
+        lastFileReport = millis();
+        Serial.printf("UBX file size: %ld", fileSize);
+
+        if ((systemTime_minutes - startLogTime_minutes) < settings.maxLogTime_minutes)
+        {
+          //Calculate generation and write speeds every 5 seconds
+          uint32_t delta = fileSize - lastLogSize;
+          Serial.printf(" - Generation rate: %0.1fkB/s", delta / 5.0 / 1000.0);
+          Serial.printf(" - Write speed: %0.1fkB/s", delta / (totalWriteTime / 1000000.0) / 1000.0);
+        }
+        else
+        {
+          Serial.printf(" reached max log time %d", settings.maxLogTime_minutes);
+        }
+
+        Serial.println();
+
+        totalWriteTime = 0; //Reset write time every 5s
+
+        if (fileSize > lastLogSize)
+        {
+          lastLogSize = fileSize;
+          logIncreasing = true;
+        }
+        else
+          logIncreasing = false;
       }
-      else
-        logIncreasing = false;
     }
   }
 }

Firmware/RTK_Surveyor/System.ino

@@ -624,7 +624,7 @@ bool createTestFile()
   char testFileName[40] = "testfile.txt";
 
   //Attempt to write to file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile() and F9PSerialReadTask()
-  if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+  if (xSemaphoreTake(xFATSemaphore, fatSemaphore_shortWait_ms) == pdPASS)
   {
     if (testFile.open(testFileName, O_CREAT | O_APPEND | O_WRITE) == true)
     {

Firmware/RTK_Surveyor/Tasks.ino

@@ -67,7 +67,7 @@ void F9PSerialReadTask(void *e)
         if ((systemTime_minutes - startLogTime_minutes) < settings.maxLogTime_minutes)
         {
           //Attempt to write to file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile()
-          if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+          if (xSemaphoreTake(xFATSemaphore, fatSemaphore_shortWait_ms) == pdPASS)
           {
             ubxFile.write(rBuffer, s);
 

Firmware/RTK_Surveyor/menuMain.ino

@@ -59,7 +59,7 @@ void menuMain()
     else if (incoming == '6' && settings.enableSD == true && online.microSD == true)
     {
       //Attempt to write to file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile() and F9PSerialReadTask()
-      if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+      if (xSemaphoreTake(xFATSemaphore, fatSemaphore_longWait_ms) == pdPASS)
       {
         Serial.println(F("Files found (date time size name):\n\r"));
         sd.ls(LS_R | LS_DATE | LS_SIZE);
@@ -83,7 +83,7 @@ void menuMain()
         strcat(settingsFileName, "_Settings.txt");
 
         //Attempt to write to file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile() and F9PSerialReadTask()
-        if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+        if (xSemaphoreTake(xFATSemaphore, fatSemaphore_longWait_ms) == pdPASS)
         {
           if (sd.exists(settingsFileName))
             sd.remove(settingsFileName);

Firmware/RTK_Surveyor/menuMessages.ino

@@ -823,7 +823,7 @@ void beginLogging()
       }
 
       //Attempt to write to file system. This avoids collisions with file writing in F9PSerialReadTask()
-      if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+      if (xSemaphoreTake(xFATSemaphore, fatSemaphore_longWait_ms) == pdPASS)
       {
         // O_CREAT - create the file if it does not exist
         // O_APPEND - seek to the end of the file prior to each write

Firmware/RTK_Surveyor/menuTest.ino

@@ -50,7 +50,7 @@ void menuTest()
       if (settings.enableSD && online.microSD)
       {
         //Attempt to access file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile() and F9PSerialReadTask()
-        if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait_ms) == pdPASS)
+        if (xSemaphoreTake(xFATSemaphore, fatSemaphore_longWait_ms) == pdPASS)
         {
           Serial.println(F("Files found (date time size name):\n\r"));
           sd.ls(LS_R | LS_DATE | LS_SIZE);