Where possible, write residual serial data to file before closing

Author: PaulZC

Firmware/OpenLog_Artemis/OpenLog_Artemis.ino

@@ -166,6 +166,7 @@
 
   v2.10
     Restructure the serial logging code in loop()
+    Where possible, write residual serial data to file before closing
 */
 
 const int FIRMWARE_VERSION_MAJOR = 2;
@@ -812,6 +813,18 @@ void loop() {
         }
         if (online.serialLogging == true)
         {
+          if (incomingBufferSpot > 0)
+          {
+            //Write the remainder of the buffer
+            digitalWrite(PIN_STAT_LED, HIGH); //Toggle stat LED to indicating log recording
+            serialDataFile.write(incomingBuffer, incomingBufferSpot); //Record the buffer to the card
+            digitalWrite(PIN_STAT_LED, LOW);
+
+            incomingBufferSpot = 0;
+
+            lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
+          }
+
           serialDataFile.sync();
           updateDataFileAccess(&serialDataFile); // Update the file access time & date
           serialDataFile.close();

Firmware/OpenLog_Artemis/lowerPower.ino

@@ -183,6 +183,18 @@ void resetArtemis(void)
   }
   if (online.serialLogging == true)
   {
+    if (incomingBufferSpot > 0)
+    {
+      //Write the remainder of the buffer
+      digitalWrite(PIN_STAT_LED, HIGH); //Toggle stat LED to indicating log recording
+      serialDataFile.write(incomingBuffer, incomingBufferSpot); //Record the buffer to the card
+      digitalWrite(PIN_STAT_LED, LOW);
+
+      incomingBufferSpot = 0;
+
+      lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
+    }
+
     serialDataFile.sync();
     updateDataFileAccess(&serialDataFile); // Update the file access time & date
     serialDataFile.close();
@@ -281,6 +293,18 @@ void goToSleep(uint32_t sysTicksToSleep)
   }
   if (online.serialLogging == true)
   {
+    if (incomingBufferSpot > 0)
+    {
+      //Write the remainder of the buffer
+      digitalWrite(PIN_STAT_LED, HIGH); //Toggle stat LED to indicating log recording
+      serialDataFile.write(incomingBuffer, incomingBufferSpot); //Record the buffer to the card
+      digitalWrite(PIN_STAT_LED, LOW);
+
+      incomingBufferSpot = 0;
+
+      lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
+    }
+
     serialDataFile.sync();
     updateDataFileAccess(&serialDataFile); // Update the file access time & date
     serialDataFile.close();
@@ -589,6 +613,18 @@ void stopLogging(void)
   }
   if (online.serialLogging == true)
   {
+    if (incomingBufferSpot > 0)
+    {
+      //Write the remainder of the buffer
+      digitalWrite(PIN_STAT_LED, HIGH); //Toggle stat LED to indicating log recording
+      serialDataFile.write(incomingBuffer, incomingBufferSpot); //Record the buffer to the card
+      digitalWrite(PIN_STAT_LED, LOW);
+
+      incomingBufferSpot = 0;
+
+      lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
+    }
+
     serialDataFile.sync();
     updateDataFileAccess(&serialDataFile); // Update the file access time & date
     serialDataFile.close();

Firmware/OpenLog_Artemis/menuMain.ino

@@ -98,6 +98,18 @@ void menuMain(bool alwaysOpen)
         }
         if (online.serialLogging == true)
         {
+          if (incomingBufferSpot > 0)
+          {
+            //Write the remainder of the buffer
+            digitalWrite(PIN_STAT_LED, HIGH); //Toggle stat LED to indicating log recording
+            serialDataFile.write(incomingBuffer, incomingBufferSpot); //Record the buffer to the card
+            digitalWrite(PIN_STAT_LED, LOW);
+
+            incomingBufferSpot = 0;
+
+            lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
+          }
+
           serialDataFile.sync();
           updateDataFileAccess(&serialDataFile); // Update the file access time & date
           serialDataFile.close();
@@ -164,6 +176,18 @@ void menuMain(bool alwaysOpen)
         }
         if (online.serialLogging == true)
         {
+          if (incomingBufferSpot > 0)
+          {
+            //Write the remainder of the buffer
+            digitalWrite(PIN_STAT_LED, HIGH); //Toggle stat LED to indicating log recording
+            serialDataFile.write(incomingBuffer, incomingBufferSpot); //Record the buffer to the card
+            digitalWrite(PIN_STAT_LED, LOW);
+
+            incomingBufferSpot = 0;
+
+            lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
+          }
+
           serialDataFile.sync();
           updateDataFileAccess(&serialDataFile); // Update the file access time & date
           serialDataFile.close();

Firmware/OpenLog_Artemis/menuSerialLogging.ino

@@ -81,6 +81,18 @@ void menuSerialLogging()
       {
         if (online.serialLogging)
         {
+          if (incomingBufferSpot > 0)
+          {
+            //Write the remainder of the buffer
+            digitalWrite(PIN_STAT_LED, HIGH); //Toggle stat LED to indicating log recording
+            serialDataFile.write(incomingBuffer, incomingBufferSpot); //Record the buffer to the card
+            digitalWrite(PIN_STAT_LED, LOW);
+
+            incomingBufferSpot = 0;
+
+            lastSeriaLogSyncTime = rtcMillis(); //Reset the last sync time to now
+          }
+
           //Shut it all down
           updateDataFileAccess(&serialDataFile); // Update the file access time & date
           serialDataFile.close();