SD code cleanup

Author: alfran

libraries/SD/examples/Full/Full.ino

@@ -3,19 +3,8 @@
 #define BUFFERSIZE                       (COUNTOF(wtext) -1)
   uint32_t file_size = 0, seek_val = FALSE, peek_val = FALSE;
   uint32_t byteswritten, bytesread = 0;
-  uint8_t wtext[] =  "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"
-                     "This is STM32 working with FatFs. It is to test Arduino based on STM32 HAL. \n"; /* File write buffer */
+  /* File write buffer */
+  uint8_t wtext[] =  "This is the OTTO SD Test working with FatFs. \n";
 
   uint8_t rtext[BUFFERSIZE];
   uint32_t i = 0;
@@ -29,16 +18,23 @@ void setup()
   {
     delay(10);
   }
+  Serial.begin(9600);
+  while (!Serial);
 
   /* Test mkdir() method */
+  Serial.println("Creating 'STM32F4' directory");
   SD.mkdir("STM32F4");
+  Serial.println("Creating 'ARDUINO' directory");
   SD.mkdir("ARDUINO");
+  Serial.println("Creating 'ARDUINO/OTTO' directory");
   SD.mkdir("ARDUINO/OTTO");
   /* Test open() method */
+  Serial.println("opening 'STM32F4/Toremove.txt' file");
   SD.open("STM32F4/Toremove.txt", FILE_WRITE);
   MyFile = SD.open("ARDUINO/OTTO/ARDUINO_OTTO_TEXT.txt", FILE_WRITE);
 
   /* Test print() method */
+  Serial.println("writing \"This is the OTTO SD Test working with FatFs.\" into Toremove.txt file");
   byteswritten = MyFile.print((const char*)wtext);
   MyFile.close();
 
@@ -47,13 +43,18 @@ void setup()
   for(i = 0; i<10; i++)
   {
     peek_val = MyFile.peek();
+    Serial.print("TEXT.txt peek: ");
+    Serial.println(peek_val);
   }
 
   /* Test size() method */
   file_size = MyFile.size();
-
+  Serial.print("TEXT.txt size: ");
+  Serial.println(file_size);
   /* Test seek method */
   seek_val = MyFile.seek(100);
+  Serial.print("TEXT.txt seek value: ");
+  Serial.println(seek_val);
 
   for(i = 0; i<10; i++)
   {
@@ -62,9 +63,11 @@ void setup()
   i = 0;
 
    /* Test available() and read() methods */
+   Serial.print("TEXT.txt content: ");
     while(MyFile.available())
     {
       rtext[i] = (uint8)MyFile.read();
+      Serial.println(rtext[i]);
       i++;
      }
 
@@ -107,7 +110,7 @@ void setup()
   MyFile = SD.open("ARDUINO/OTTO/WRITE.txt");
   file_size = MyFile.size();
   bytesread = MyFile.read(rtext, file_size);
-  MyFile.close();  
+  MyFile.close();
 }
 
 void loop()

libraries/SD/src/SD.cpp

@@ -49,6 +49,7 @@
   level (e.g. open).
 
  */
+
 extern "C" {
   #include <stdlib.h>
   #include <string.h>
@@ -458,4 +459,3 @@ uint8_t File::isDirectory()
        return FALSE;
     }
 }
-

libraries/SD/src/SD.h

@@ -16,7 +16,7 @@
 #define __SD_H__
 
 #include <Arduino.h>
-/* DISCOVERY includes component */
+/* otto includes component */
 #include "BSP/OTTO/otto_sd.h"
 
 /* FatFs includes component */
@@ -31,40 +31,49 @@
 
 class File {
 public:
+
   virtual size_t write(uint8_t);
   virtual size_t write(const uint8_t *buf, size_t size);
-  virtual size_t print(const char* data);
-  virtual size_t println();
-  virtual size_t println(const char* data);
   virtual int read();
-  int read(void* buf, size_t len);
   virtual int peek();
   virtual int available();
   virtual void flush();
+  int read(void* buf, size_t len);
   uint8_t seek(uint32_t pos);
   uint32_t position();
   uint32_t size();
   void close();
+  // alfran ----- begin -----
+  operator bool();
+  // alfran ----- end -----
+  char *name;
   uint8_t isDirectory();
 
-FIL Fil;
-char *name;
+
+  virtual size_t print(const char* data);
+  virtual size_t println();
+  virtual size_t println(const char* data);
+
+  FIL Fil;
+
 };
 
 class SDClass {
+
 public:
 
   /* Initialize the SD peripheral */
   static uint8_t begin();
   static uint8_t begin(uint8_t cspin);
+  static File open(const char *filepath, uint8_t mode);
+  static File open(const char *filepath);
   static uint8_t exists(const char *filepath);
   static uint8_t mkdir(const char *filepath);
-  static uint8_t rmdir(const char *filepath);
-  static File open(const char *filepath);
-  static File open(const char *filepath, uint8_t mode);
   static uint8_t remove(const char *filepath);
+  static uint8_t rmdir(const char *filepath);
 
   friend class File;
+
 };
 
 extern SDClass SD;