Backported SD library from 1.5.x

Author: cmaglie

libraries/SD/SD.cpp

@@ -550,9 +550,9 @@ boolean SDClass::mkdir(char *filepath) {
 boolean SDClass::rmdir(char *filepath) {
   /*
   
-    Makes a single directory or a heirarchy of directories.
+    Remove a single directory or a heirarchy of directories.
 
-    A rough equivalent to `mkdir -p`.
+    A rough equivalent to `rm -rf`.
   
    */
   return walkPath(filepath, root, callback_rmdir);

libraries/SD/examples/CardInfo/CardInfo.ino

@@ -1,25 +1,26 @@
 /*
-  SD card test 
-   
+  SD card test
+
  This example shows how use the utility libraries on which the'
  SD library is based in order to get info about your SD card.
  Very useful for testing a card when you're not sure whether its working or not.
- 	
+
  The circuit:
   * SD card attached to SPI bus as follows:
  ** MOSI - pin 11 on Arduino Uno/Duemilanove/Diecimila
  ** MISO - pin 12 on Arduino Uno/Duemilanove/Diecimila
  ** CLK - pin 13 on Arduino Uno/Duemilanove/Diecimila
- ** CS - depends on your SD card shield or module. 
+ ** CS - depends on your SD card shield or module.
  		Pin 4 used here for consistency with other Arduino examples
 
- 
+
  created  28 Mar 2011
- by Limor Fried 
+ by Limor Fried
  modified 9 Apr 2012
  by Tom Igoe
  */
- // include the SD library:
+// include the SD library:
+#include <SPI.h>
 #include <SD.h>
 
 // set up variables using the SD utility library functions:
@@ -31,22 +32,22 @@ SdFile root;
 // Arduino Ethernet shield: pin 4
 // Adafruit SD shields and modules: pin 10
 // Sparkfun SD shield: pin 8
-const int chipSelect = 4;    
+const int chipSelect = 4;
 
 void setup()
 {
- // Open serial communications and wait for port to open:
+  // Open serial communications and wait for port to open:
   Serial.begin(9600);
-   while (!Serial) {
+  while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
 
 
   Serial.print("\nInitializing SD card...");
   // On the Ethernet Shield, CS is pin 4. It's set as an output by default.
-  // Note that even if it's not used as the CS pin, the hardware SS pin 
-  // (10 on most Arduino boards, 53 on the Mega) must be left as an output 
-  // or the SD library functions will not work. 
+  // Note that even if it's not used as the CS pin, the hardware SS pin
+  // (10 on most Arduino boards, 53 on the Mega) must be left as an output
+  // or the SD library functions will not work.
   pinMode(10, OUTPUT);     // change this to 53 on a mega
 
 
@@ -59,12 +60,12 @@ void setup()
     Serial.println("* did you change the chipSelect pin to match your shield or module?");
     return;
   } else {
-   Serial.println("Wiring is correct and a card is present."); 
+    Serial.println("Wiring is correct and a card is present.");
   }
 
   // print the type of card
   Serial.print("\nCard type: ");
-  switch(card.type()) {
+  switch (card.type()) {
     case SD_CARD_TYPE_SD1:
       Serial.println("SD1");
       break;
@@ -90,7 +91,7 @@ void setup()
   Serial.print("\nVolume type is FAT");
   Serial.println(volume.fatType(), DEC);
   Serial.println();
-  
+
   volumesize = volume.blocksPerCluster();    // clusters are collections of blocks
   volumesize *= volume.clusterCount();       // we'll have a lot of clusters
   volumesize *= 512;                            // SD card blocks are always 512 bytes
@@ -103,15 +104,15 @@ void setup()
   volumesize /= 1024;
   Serial.println(volumesize);
 
-  
+
   Serial.println("\nFiles found on the card (name, date and size in bytes): ");
   root.openRoot(volume);
-  
+
   // list all files in the card with date and size
   root.ls(LS_R | LS_DATE | LS_SIZE);
 }
 
 
 void loop(void) {
-  
+
 }

libraries/SD/examples/Datalogger/Datalogger.ino

@@ -1,25 +1,26 @@
 /*
   SD card datalogger
- 
- This example shows how to log data from three analog sensors 
+
+ This example shows how to log data from three analog sensors
  to an SD card using the SD library.
- 	
+
  The circuit:
  * analog sensors on analog ins 0, 1, and 2
  * SD card attached to SPI bus as follows:
  ** MOSI - pin 11
  ** MISO - pin 12
  ** CLK - pin 13
  ** CS - pin 4
- 
+
  created  24 Nov 2010
  modified 9 Apr 2012
  by Tom Igoe
- 
+
  This example code is in the public domain.
- 	 
+
  */
 
+#include <SPI.h>
 #include <SD.h>
 
 // On the Ethernet Shield, CS is pin 4. Note that even if it's not
@@ -30,9 +31,9 @@ const int chipSelect = 4;
 
 void setup()
 {
- // Open serial communications and wait for port to open:
+  // Open serial communications and wait for port to open:
   Serial.begin(9600);
-   while (!Serial) {
+  while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
 
@@ -41,7 +42,7 @@ void setup()
   // make sure that the default chip select pin is set to
   // output, even if you don't use it:
   pinMode(10, OUTPUT);
-  
+
   // see if the card is present and can be initialized:
   if (!SD.begin(chipSelect)) {
     Serial.println("Card failed, or not present");
@@ -61,7 +62,7 @@ void loop()
     int sensor = analogRead(analogPin);
     dataString += String(sensor);
     if (analogPin < 2) {
-      dataString += ","; 
+      dataString += ",";
     }
   }
 
@@ -75,11 +76,11 @@ void loop()
     dataFile.close();
     // print to the serial port too:
     Serial.println(dataString);
-  }  
+  }
   // if the file isn't open, pop up an error:
   else {
     Serial.println("error opening datalog.txt");
-  } 
+  }
 }
 
 

libraries/SD/examples/DumpFile/DumpFile.ino

@@ -1,25 +1,26 @@
 /*
   SD card file dump
- 
+
  This example shows how to read a file from the SD card using the
  SD library and send it over the serial port.
- 	
+
  The circuit:
  * SD card attached to SPI bus as follows:
  ** MOSI - pin 11
  ** MISO - pin 12
  ** CLK - pin 13
  ** CS - pin 4
- 
+
  created  22 December 2010
  by Limor Fried
  modified 9 Apr 2012
  by Tom Igoe
- 
+
  This example code is in the public domain.
- 	 
+
  */
 
+#include <SPI.h>
 #include <SD.h>
 
 // On the Ethernet Shield, CS is pin 4. Note that even if it's not
@@ -30,9 +31,9 @@ const int chipSelect = 4;
 
 void setup()
 {
- // Open serial communications and wait for port to open:
+  // Open serial communications and wait for port to open:
   Serial.begin(9600);
-   while (!Serial) {
+  while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
 
@@ -41,15 +42,15 @@ void setup()
   // make sure that the default chip select pin is set to
   // output, even if you don't use it:
   pinMode(10, OUTPUT);
-  
+
   // see if the card is present and can be initialized:
   if (!SD.begin(chipSelect)) {
     Serial.println("Card failed, or not present");
     // don't do anything more:
     return;
   }
   Serial.println("card initialized.");
-  
+
   // open the file. note that only one file can be open at a time,
   // so you have to close this one before opening another.
   File dataFile = SD.open("datalog.txt");
@@ -60,11 +61,11 @@ void setup()
       Serial.write(dataFile.read());
     }
     dataFile.close();
-  }  
+  }
   // if the file isn't open, pop up an error:
   else {
     Serial.println("error opening datalog.txt");
-  } 
+  }
 }
 
 void loop()

libraries/SD/examples/Files/Files.ino

@@ -1,40 +1,41 @@
 /*
   SD card basic file example
- 
- This example shows how to create and destroy an SD card file 	
+
+ This example shows how to create and destroy an SD card file
  The circuit:
  * SD card attached to SPI bus as follows:
  ** MOSI - pin 11
  ** MISO - pin 12
  ** CLK - pin 13
  ** CS - pin 4
- 
+
  created   Nov 2010
  by David A. Mellis
  modified 9 Apr 2012
  by Tom Igoe
- 
+
  This example code is in the public domain.
- 	 
+
  */
+#include <SPI.h>
 #include <SD.h>
 
 File myFile;
 
 void setup()
 {
- // Open serial communications and wait for port to open:
+  // Open serial communications and wait for port to open:
   Serial.begin(9600);
-   while (!Serial) {
+  while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
 
 
   Serial.print("Initializing SD card...");
   // On the Ethernet Shield, CS is pin 4. It's set as an output by default.
-  // Note that even if it's not used as the CS pin, the hardware SS pin 
-  // (10 on most Arduino boards, 53 on the Mega) must be left as an output 
-  // or the SD library functions will not work. 
+  // Note that even if it's not used as the CS pin, the hardware SS pin
+  // (10 on most Arduino boards, 53 on the Mega) must be left as an output
+  // or the SD library functions will not work.
   pinMode(10, OUTPUT);
 
   if (!SD.begin(4)) {
@@ -55,23 +56,23 @@ void setup()
   myFile = SD.open("example.txt", FILE_WRITE);
   myFile.close();
 
-  // Check to see if the file exists: 
+  // Check to see if the file exists:
   if (SD.exists("example.txt")) {
     Serial.println("example.txt exists.");
   }
   else {
-    Serial.println("example.txt doesn't exist.");  
+    Serial.println("example.txt doesn't exist.");
   }
 
   // delete the file:
   Serial.println("Removing example.txt...");
   SD.remove("example.txt");
 
-  if (SD.exists("example.txt")){ 
+  if (SD.exists("example.txt")) {
     Serial.println("example.txt exists.");
   }
   else {
-    Serial.println("example.txt doesn't exist.");  
+    Serial.println("example.txt doesn't exist.");
   }
 }