Get Errorstate from FatFS

Signed-off-by: AnHardt <[email protected]>

Author: AnHardt

src/SD.cpp

@@ -149,10 +149,12 @@ File SDClass::open(const char *filepath, uint8_t mode /* = FA_READ */)
     mode = mode | FA_CREATE_ALWAYS;
   }
 
-  if (f_open(file._fil, filepath, mode) != FR_OK) {
+  file._res = f_open(file._fil, filepath, mode);
+  if ( file._res != FR_OK) {
     free(file._fil);
     file._fil = NULL;
-    if (f_opendir(&file._dir, filepath) != FR_OK) {
+    file._res = f_opendir(&file._dir, filepath);
+    if (file._res != FR_OK) {
       free(file._name);
       file._name = NULL;
     }
@@ -179,10 +181,11 @@ File SDClass::openRoot(void)
   return open(_fatFs.getRoot());
 }
 
-File::File()
+File::File(FRESULT result /* = FR_OK */)
 {
   _name = NULL;
   _fil = NULL;
+  _res = result;
 }
 
 /** List directory contents to Serial.
@@ -595,7 +598,7 @@ File File::openNextFile(uint8_t mode)
   while (1) {
     res = f_readdir(&_dir, &fno);
     if (res != FR_OK || fno.fname[0] == 0) {
-      return File();
+      return File(res);
     }
     if (fno.fname[0] == '.') {
       continue;
@@ -618,7 +621,7 @@ File File::openNextFile(uint8_t mode)
       free(fullPath);
       return filtmp;
     } else {
-      return File();
+      return File(FR_NOT_ENOUGH_CORE);
     }
   }
 }

src/STM32SD.h

@@ -32,7 +32,7 @@ uint8_t const LS_R = 4;
 
 class File {
   public:
-    File(void);
+    File(FRESULT res = FR_OK);
     virtual size_t write(uint8_t);
     virtual size_t write(const uint8_t *buf, size_t size);
     virtual size_t write(const char *buf, size_t size);
@@ -72,6 +72,9 @@ class File {
     char *_name = NULL; //file or dir name
     FIL *_fil = NULL; // underlying file object structure pointer
     DIR _dir = {}; // init all fields to 0
+    FRESULT _res = FR_OK;
+
+    FRESULT getErrorstate(void) {return _res;}
 
 };