Move log file sync into task.

If the log file was syncing, and the task fired it would not get a semaphore lock

Author: nseidle

Firmware/RTK_Surveyor/RTK_Surveyor.ino

@@ -379,41 +379,6 @@ void updateLogs()
     online.logging = false;
   }
 
-  if (online.logging == true)
-  {
-    //Check if we are inside the max time window for logging
-    if ((systemTime_minutes - startLogTime_minutes) < settings.maxLogTime_minutes)
-    {
-      //Attempt log file sync every 3000ms
-      if (millis() - lastUBXLogSyncTime > 3000)
-      {
-        //Attempt to write to file system. This avoids collisions with file writing from other functions like F9PSerialReadTask() and recordSystemSettingsToFile()
-        if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait) == pdPASS)
-        {
-          if (productVariant == RTK_SURVEYOR)
-            digitalWrite(pin_baseStatusLED, !digitalRead(pin_baseStatusLED)); //Blink LED to indicate logging activity
-
-          long startWriteTime = micros();
-          ubxFile.sync();
-          long stopWriteTime = micros();
-          totalWriteTime += stopWriteTime - startWriteTime; //Used to calculate overall write speed
-
-          if (productVariant == RTK_SURVEYOR)
-            digitalWrite(pin_baseStatusLED, !digitalRead(pin_baseStatusLED)); //Return LED to previous state
-
-          updateDataFileAccess(&ubxFile); // Update the file access time & date
-
-          xSemaphoreGive(xFATSemaphore);
-        }
-
-        lastUBXLogSyncTime = millis();
-      }
-
-      // In case the SD writing is slow or there is a lot of data to write, keep checking for the arrival of new data
-      i2cGNSS.checkUblox(); // Check for the arrival of new data and process it.
-    }
-  }
-
   //Report file sizes to show recording is working
   if (online.logging == true)
   {

Firmware/RTK_Surveyor/Tasks.ino

@@ -70,6 +70,26 @@ void F9PSerialReadTask(void *e)
           if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait) == pdPASS)
           {
             ubxFile.write(rBuffer, s);
+
+            //Force file sync every 5000ms
+            if (millis() - lastUBXLogSyncTime > 5000)
+            {
+              if (productVariant == RTK_SURVEYOR)
+                digitalWrite(pin_baseStatusLED, !digitalRead(pin_baseStatusLED)); //Blink LED to indicate logging activity
+
+              long startWriteTime = micros();
+              ubxFile.sync();
+              long stopWriteTime = micros();
+              totalWriteTime += stopWriteTime - startWriteTime; //Used to calculate overall write speed
+
+              if (productVariant == RTK_SURVEYOR)
+                digitalWrite(pin_baseStatusLED, !digitalRead(pin_baseStatusLED)); //Return LED to previous state
+
+              updateDataFileAccess(&ubxFile); // Update the file access time & date
+
+              lastUBXLogSyncTime = millis();
+            }
+
             xSemaphoreGive(xFATSemaphore);
           } //End xFATSemaphore
         } //End maxLogTime
@@ -92,7 +112,6 @@ void startUART2Task( void *pvParameters )
   vTaskDelete( NULL ); //Delete task once it has run once
 }
 
-
 //Control BT status LED according to bluetoothState
 void updateBTled()
 {

Firmware/RTK_Surveyor/menuMain.ino

@@ -58,8 +58,14 @@ void menuMain()
       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);
+      //Attempt to write to file system. This avoids collisions with file writing from other functions like recordSystemSettingsToFile() and F9PSerialReadTask()
+      if (xSemaphoreTake(xFATSemaphore, fatSemaphore_maxWait) == pdPASS)
+      {
+        Serial.println(F("Files found (date time size name):\n\r"));
+        sd.ls(LS_R | LS_DATE | LS_SIZE);
+
+        xSemaphoreGive(xFATSemaphore);
+      }
     }
     else if (incoming == 'd')
       menuDebug();