Add FileSdFatMMC

Firmware/RTK_Surveyor/Begin.ino

@@ -403,79 +403,28 @@ void beginSD()
     sdCardSize = 0;
     outOfSDSpace = true;
 
-    if (USE_SPI_MICROSD)
+    //Allocate the ubxFile
+    if (!ubxFile)
     {
-      //Allocate the ubxFile
+      ubxFile = new FileSdFatMMC();
       if (!ubxFile)
       {
-        ubxFile = new SdFile();
-        if (!ubxFile)
-        {
-          systemPrintln("Failed to allocate ubxFile!");
-          break;
-        }
-      }
-
-      //Allocate the managerTempFile
-      if (!managerTempFile)
-      {
-        managerTempFile = new SdFile();
-        if (!managerTempFile)
-        {
-          systemPrintln("Failed to allocate managerTempFile!");
-          break;
-        }
-      }
-
-      //Allocate the marksFile
-      if (!marksFile)
-      {
-        marksFile = new SdFile();
-        if (!marksFile)
-        {
-          systemPrintln("Failed to allocate marksFile!");
-          break;
-        }
+        systemPrintln("Failed to allocate ubxFile!");
+        break;
       }
     }
-#ifdef COMPILE_SD_MMC
-    else
+
+    //Allocate the managerTempFile
+    if (!managerTempFile)
     {
-      //Allocate the ubxFile
-      if (!ubxFile_SD_MMC)
-      {
-        ubxFile_SD_MMC = new File();
-        if (!ubxFile_SD_MMC)
-        {
-          systemPrintln("Failed to allocate ubxFile!");
-          break;
-        }
-      }
-
-      //Allocate the managerTempFile
-      if (!managerTempFile_SD_MMC)
-      {
-        managerTempFile_SD_MMC = new File();
-        if (!managerTempFile_SD_MMC)
-        {
-          systemPrintln("Failed to allocate managerTempFile!");
-          break;
-        }
-      }
-
-      //Allocate the marksFile
-      if (!marksFile_SD_MMC)
+      managerTempFile = new FileSdFatMMC();
+      if (!managerTempFile)
       {
-        marksFile_SD_MMC = new File();
-        if (!marksFile_SD_MMC)
-        {
-          systemPrintln("Failed to allocate marksFile!");
-          break;
-        }
+        systemPrintln("Failed to allocate managerTempFile!");
+        break;
       }
     }
-#endif
-
+
     systemPrintln("microSD: Online");
     online.microSD = true;
     break;
@@ -516,7 +465,7 @@ void endSD(bool alreadyHaveSemaphore, bool releaseSemaphore)
     xSemaphoreGive(sdCardSemaphore);
 }
 
-//Attempt to de-init the SD card
+//Attempt to de-init the SD card - SPI only
 //https://github.com/greiman/SdFat/issues/351
 void resetSPI()
 {

Firmware/RTK_Surveyor/FileSdFatMMC.h

@@ -0,0 +1,187 @@
+// Define a hybrid class which can support both SdFat SdFile and SD_MMC File
+
+#ifdef COMPILE_SD_MMC
+
+#include "FS.h"
+#include "SD_MMC.h"
+
+class FileSdFatMMC : public SdFile, public File
+
+#else
+
+class FileSdFatMMC : public SdFile
+
+#endif
+
+{
+public:
+
+  FileSdFatMMC()
+  {
+    if (USE_SPI_MICROSD)
+      sdFile = new SdFile;
+#ifdef COMPILE_SD_MMC
+    else
+      file = new File;
+#endif
+  };
+
+  ~FileSdFatMMC()
+  {
+    if (USE_SPI_MICROSD)
+      if (*sdFile) // operator bool
+        delete sdFile;
+#ifdef COMPILE_SD_MMC
+    else
+      if (*file) // operator bool
+        delete file;
+#endif
+  };
+
+  operator bool()
+  {
+    if (USE_SPI_MICROSD)
+      return *sdFile;
+#ifdef COMPILE_SD_MMC
+    else
+      return *file;
+#endif
+  };
+
+  size_t println(const char printMe[])
+  {
+    if (USE_SPI_MICROSD)
+      return sdFile->println(printMe);
+#ifdef COMPILE_SD_MMC
+    else
+      return file->println(printMe);
+#endif
+  };
+
+  bool open(const char *filepath, uint8_t mode)
+  {
+    if (USE_SPI_MICROSD)
+      return sdFile->open(filepath, mode);
+#ifdef COMPILE_SD_MMC
+    else
+    {
+      if (mode | O_APPEND)
+        *file = SD_MMC.open(filepath, FILE_APPEND);
+      else if (mode | O_WRITE)
+        *file = SD_MMC.open(filepath, FILE_WRITE);
+      else // if (mode | O_READ)
+        *file = SD_MMC.open(filepath, FILE_READ);
+      return (*file); // operator bool
+    }
+#endif    
+  };
+
+  uint32_t size()
+  {
+    if (USE_SPI_MICROSD)
+      return sdFile->size();
+#ifdef COMPILE_SD_MMC
+    else
+      return file->size();
+#endif    
+  };
+
+  uint32_t position()
+  {
+    if (USE_SPI_MICROSD)
+      return sdFile->position();
+#ifdef COMPILE_SD_MMC
+    else
+      return file->position();
+#endif    
+  };
+
+  int available()
+  {
+    if (USE_SPI_MICROSD)
+      return sdFile->available();
+#ifdef COMPILE_SD_MMC
+    else
+      return file->available();
+#endif    
+  };
+
+  int read(uint8_t *buf, uint16_t nbyte)
+  {
+    if (USE_SPI_MICROSD)
+      return sdFile->read(buf, nbyte);
+#ifdef COMPILE_SD_MMC
+    else
+      return file->read(buf, nbyte);
+#endif    
+  };
+
+  size_t write(const uint8_t *buf, size_t size)
+  {
+    if (USE_SPI_MICROSD)
+      return sdFile->write(buf, size);
+#ifdef COMPILE_SD_MMC
+    else
+      return file->write(buf, size);
+#endif    
+  };
+
+  void close()
+  {
+    if (USE_SPI_MICROSD)
+      sdFile->close();
+#ifdef COMPILE_SD_MMC
+    else
+      file->close();
+#endif    
+  };
+
+  void updateFileAccessTimestamp()
+  {
+    if (USE_SPI_MICROSD)
+      if (online.rtc == true)
+      {
+        //ESP32Time returns month:0-11
+        sdFile->timestamp(T_ACCESS, rtc.getYear(), rtc.getMonth() + 1, rtc.getDay(), rtc.getHour(true), rtc.getMinute(), rtc.getSecond());
+        sdFile->timestamp(T_WRITE, rtc.getYear(), rtc.getMonth() + 1, rtc.getDay(), rtc.getHour(true), rtc.getMinute(), rtc.getSecond());
+      }
+  };
+
+  void updateFileCreateTimestamp()
+  {
+    if (USE_SPI_MICROSD)
+      if (online.rtc == true)
+        sdFile->timestamp(T_CREATE, rtc.getYear(), rtc.getMonth() + 1, rtc.getDay(), rtc.getHour(true), rtc.getMinute(), rtc.getSecond()); //ESP32Time returns month:0-11
+  };
+
+  void sync()
+  {
+    if (USE_SPI_MICROSD)
+      sdFile->sync();
+  };
+
+protected:
+  SdFile * sdFile;
+#ifdef COMPILE_SD_MMC
+  File * file;
+#endif
+};
+
+//Update the file access and write time with date and time obtained from GNSS
+// These are SdFile-specific. SD_MMC does this automatically
+void updateDataFileAccess(SdFile *dataFile)
+{
+  if (online.rtc == true)
+  {
+    //ESP32Time returns month:0-11
+    dataFile->timestamp(T_ACCESS, rtc.getYear(), rtc.getMonth() + 1, rtc.getDay(), rtc.getHour(true), rtc.getMinute(), rtc.getSecond());
+    dataFile->timestamp(T_WRITE, rtc.getYear(), rtc.getMonth() + 1, rtc.getDay(), rtc.getHour(true), rtc.getMinute(), rtc.getSecond());
+  }
+}
+
+//Update the file create time with date and time obtained from GNSS
+void updateDataFileCreate(SdFile *dataFile)
+{
+  if (online.rtc == true)
+    dataFile->timestamp(T_CREATE, rtc.getYear(), rtc.getMonth() + 1, rtc.getDay(), rtc.getHour(true), rtc.getMinute(), rtc.getSecond()); //ESP32Time returns month:0-11
+}