ATLEDGE-393 Update SD library

bigdinotech · bigdinotech · commit 39881ec83254 · 2015-12-03T13:16:44.000-08:00
Rebase library from version 1.05 to 1.06
Fixes issue with passing String class object to SD.exists()
diff --git a/libraries/SD/examples/CardInfo/CardInfo.ino b/libraries/SD/examples/CardInfo/CardInfo.ino
@@ -34,12 +34,11 @@ SdFile root;
 // Sparkfun SD shield: pin 8
 const int chipSelect = 4;
 
-void setup()
-{
+void setup() {
   // Open serial communications and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
-    ; // wait for serial port to connect. Needed for Leonardo only
+    ; // wait for serial port to connect. Needed for native USB port only
   }
 
 
diff --git a/libraries/SD/examples/Datalogger/Datalogger.ino b/libraries/SD/examples/Datalogger/Datalogger.ino
@@ -25,12 +25,11 @@
 
 const int chipSelect = 4;
 
-void setup()
-{
+void setup() {
   // Open serial communications and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
-    ; // wait for serial port to connect. Needed for Leonardo only
+    ; // wait for serial port to connect. Needed for native USB port only
   }
 
 
@@ -45,8 +44,7 @@ void setup()
   Serial.println("card initialized.");
 }
 
-void loop()
-{
+void loop() {
   // make a string for assembling the data to log:
   String dataString = "";
 
diff --git a/libraries/SD/examples/DumpFile/DumpFile.ino b/libraries/SD/examples/DumpFile/DumpFile.ino
@@ -25,12 +25,11 @@
 
 const int chipSelect = 4;
 
-void setup()
-{
+void setup() {
   // Open serial communications and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
-    ; // wait for serial port to connect. Needed for Leonardo only
+    ; // wait for serial port to connect. Needed for native USB port only
   }
 
 
@@ -61,7 +60,6 @@ void setup()
   }
 }
 
-void loop()
-{
+void loop() {
 }
 
diff --git a/libraries/SD/examples/Files/Files.ino b/libraries/SD/examples/Files/Files.ino
@@ -22,12 +22,11 @@
 
 File myFile;
 
-void setup()
-{
+void setup() {
   // Open serial communications and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
-    ; // wait for serial port to connect. Needed for Leonardo only
+    ; // wait for serial port to connect. Needed for native USB port only
   }
 
 
@@ -41,8 +40,7 @@ void setup()
 
   if (SD.exists("example.txt")) {
     Serial.println("example.txt exists.");
-  }
-  else {
+  } else {
     Serial.println("example.txt doesn't exist.");
   }
 
@@ -54,8 +52,7 @@ void setup()
   // Check to see if the file exists:
   if (SD.exists("example.txt")) {
     Serial.println("example.txt exists.");
-  }
-  else {
+  } else {
     Serial.println("example.txt doesn't exist.");
   }
 
@@ -65,14 +62,12 @@ void setup()
 
   if (SD.exists("example.txt")) {
     Serial.println("example.txt exists.");
-  }
-  else {
+  } else {
     Serial.println("example.txt doesn't exist.");
   }
 }
 
-void loop()
-{
+void loop() {
   // nothing happens after setup finishes.
 }
 
diff --git a/libraries/SD/examples/ReadWrite/ReadWrite.ino b/libraries/SD/examples/ReadWrite/ReadWrite.ino
@@ -23,12 +23,11 @@
 
 File myFile;
 
-void setup()
-{
+void setup() {
   // Open serial communications and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
-    ; // wait for serial port to connect. Needed for Leonardo only
+    ; // wait for serial port to connect. Needed for native USB port only
   }
 
 
@@ -73,8 +72,7 @@ void setup()
   }
 }
 
-void loop()
-{
+void loop() {
   // nothing happens after setup
 }
 
diff --git a/libraries/SD/examples/listfiles/listfiles.ino b/libraries/SD/examples/listfiles/listfiles.ino
@@ -1,9 +1,9 @@
 /*
   Listfiles
- 
- This example shows how print out the files in a 
- directory on a SD card 
- 	
+
+ This example shows how print out the files in a
+ directory on a SD card
+
  The circuit:
  * SD card attached to SPI bus as follows:
  ** MOSI - pin 11
@@ -17,7 +17,7 @@
  by Tom Igoe
  modified 2 Feb 2014
  by Scott Fitzgerald
- 
+
  This example code is in the public domain.
 
  */
@@ -26,12 +26,11 @@
 
 File root;
 
-void setup()
-{
+void setup() {
   // Open serial communications and wait for port to open:
   Serial.begin(9600);
   while (!Serial) {
-    ; // wait for serial port to connect. Needed for Leonardo only
+    ; // wait for serial port to connect. Needed for native USB port only
   }
 
   Serial.print("Initializing SD card...");
@@ -49,33 +48,32 @@ void setup()
   Serial.println("done!");
 }
 
-void loop()
-{
+void loop() {
   // nothing happens after setup finishes.
 }
 
 void printDirectory(File dir, int numTabs) {
-   while(true) {
-     
-     File entry =  dir.openNextFile();
-     if (! entry) {
-       // no more files
-       break;
-     }
-     for (uint8_t i=0; i<numTabs; i++) {
-       Serial.print('\t');
-     }
-     Serial.print(entry.name());
-     if (entry.isDirectory()) {
-       Serial.println("/");
-       printDirectory(entry, numTabs+1);
-     } else {
-       // files have sizes, directories do not
-       Serial.print("\t\t");
-       Serial.println(entry.size(), DEC);
-     }
-     entry.close();
-   }
+  while (true) {
+
+    File entry =  dir.openNextFile();
+    if (! entry) {
+      // no more files
+      break;
+    }
+    for (uint8_t i = 0; i < numTabs; i++) {
+      Serial.print('\t');
+    }
+    Serial.print(entry.name());
+    if (entry.isDirectory()) {
+      Serial.println("/");
+      printDirectory(entry, numTabs + 1);
+    } else {
+      // files have sizes, directories do not
+      Serial.print("\t\t");
+      Serial.println(entry.size(), DEC);
+    }
+    entry.close();
+  }
 }
 
 
diff --git a/libraries/SD/keywords.txt b/libraries/SD/keywords.txt
@@ -8,6 +8,7 @@
 
 SD	KEYWORD1	SD
 File	KEYWORD1	SD
+SDFile	KEYWORD1	SD
 
 #######################################
 # Methods and Functions (KEYWORD2)
diff --git a/libraries/SD/library.properties b/libraries/SD/library.properties
@@ -1,5 +1,5 @@
 name=SD
-version=1.0.5
+version=1.0.6
 author=Arduino, SparkFun
 maintainer=Arduino <info@arduino.cc>
 sentence=Enables reading and writing on SD cards. For all Arduino boards.
diff --git a/libraries/SD/src/SD.cpp b/libraries/SD/src/SD.cpp
@@ -52,11 +52,13 @@
 
 #include "SD.h"
 
+namespace SDLib {
+
 // Used by `getNextPathComponent`
 #define MAX_COMPONENT_LEN 12 // What is max length?
 #define PATH_COMPONENT_BUFFER_LEN MAX_COMPONENT_LEN+1
 
-bool getNextPathComponent(char *path, unsigned int *p_offset,
+bool getNextPathComponent(const char *path, unsigned int *p_offset,
 			  char *buffer) {
   /*
 
@@ -115,9 +117,9 @@ bool getNextPathComponent(char *path, unsigned int *p_offset,
 
 
 
-boolean walkPath(char *filepath, SdFile& parentDir,
+boolean walkPath(const char *filepath, SdFile& parentDir,
 		 boolean (*callback)(SdFile& parentDir,
-				     char *filePathComponent,
+				     const char *filePathComponent,
 				     boolean isLastComponent,
 				     void *object),
 		 void *object = NULL) {
@@ -230,7 +232,7 @@ boolean walkPath(char *filepath, SdFile& parentDir,
 
  */
 
-boolean callback_pathExists(SdFile& parentDir, char *filePathComponent, 
+boolean callback_pathExists(SdFile& parentDir, const char *filePathComponent, 
 			    boolean isLastComponent, void *object) {
   /*
 
@@ -253,7 +255,7 @@ boolean callback_pathExists(SdFile& parentDir, char *filePathComponent,
 
 
 
-boolean callback_makeDirPath(SdFile& parentDir, char *filePathComponent, 
+boolean callback_makeDirPath(SdFile& parentDir, const char *filePathComponent, 
 			     boolean isLastComponent, void *object) {
   /*
 
@@ -308,15 +310,15 @@ boolean callback_openPath(SdFile& parentDir, char *filePathComponent,
 
 
 
-boolean callback_remove(SdFile& parentDir, char *filePathComponent, 
+boolean callback_remove(SdFile& parentDir, const char *filePathComponent, 
 			boolean isLastComponent, void *object) {
   if (isLastComponent) {
     return SdFile::remove(parentDir, filePathComponent);
   }
   return true;
 }
 
-boolean callback_rmdir(SdFile& parentDir, char *filePathComponent, 
+boolean callback_rmdir(SdFile& parentDir, const char *filePathComponent, 
 			boolean isLastComponent, void *object) {
   if (isLastComponent) {
     SdFile f;
@@ -515,7 +517,7 @@ File SDClass::open(char *filepath, uint8_t mode) {
 //}
 
 
-boolean SDClass::exists(char *filepath) {
+boolean SDClass::exists(const char *filepath) {
   /*
 
      Returns true if the supplied file path exists.
@@ -536,7 +538,7 @@ boolean SDClass::exists(char *filepath) {
 //}
 
 
-boolean SDClass::mkdir(char *filepath) {
+boolean SDClass::mkdir(const char *filepath) {
   /*
   
     Makes a single directory or a heirarchy of directories.
@@ -547,7 +549,7 @@ boolean SDClass::mkdir(char *filepath) {
   return walkPath(filepath, root, callback_makeDirPath);
 }
 
-boolean SDClass::rmdir(char *filepath) {
+boolean SDClass::rmdir(const char *filepath) {
   /*
   
     Remove a single directory or a heirarchy of directories.
@@ -558,7 +560,7 @@ boolean SDClass::rmdir(char *filepath) {
   return walkPath(filepath, root, callback_rmdir);
 }
 
-boolean SDClass::remove(char *filepath) {
+boolean SDClass::remove(const char *filepath) {
   return walkPath(filepath, root, callback_remove);
 }
 
@@ -614,3 +616,5 @@ void File::rewindDirectory(void) {
 }
 
 SDClass SD;
+
+};
diff --git a/libraries/SD/src/SD.h b/libraries/SD/src/SD.h

Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,11 @@`
`25`	`25`
`26`	`26`	`const int chipSelect = 4;`
`27`	`27`
`28`		`-void setup()`
`29`		`-{`
	`28`	`+void setup() {`
`30`	`29`	`// Open serial communications and wait for port to open:`
`31`	`30`	`Serial.begin(9600);`
`32`	`31`	`while (!Serial) {`
`33`		`- ; // wait for serial port to connect. Needed for Leonardo only`
	`32`	`+ ; // wait for serial port to connect. Needed for native USB port only`
`34`	`33`	`}`
`35`	`34`
`36`	`35`
`@@ -61,7 +60,6 @@ void setup()`
`61`	`60`	`}`
`62`	`61`	`}`
`63`	`62`
`64`		`-void loop()`
`65`		`-{`
	`63`	`+void loop() {`
`66`	`64`	`}`
`67`	`65`
Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,11 @@`
`23`	`23`
`24`	`24`	`File myFile;`
`25`	`25`
`26`		`-void setup()`
`27`		`-{`
	`26`	`+void setup() {`
`28`	`27`	`// Open serial communications and wait for port to open:`
`29`	`28`	`Serial.begin(9600);`
`30`	`29`	`while (!Serial) {`
`31`		`- ; // wait for serial port to connect. Needed for Leonardo only`
	`30`	`+ ; // wait for serial port to connect. Needed for native USB port only`
`32`	`31`	`}`
`33`	`32`
`34`	`33`
`@@ -73,8 +72,7 @@ void setup()`
`73`	`72`	`}`
`74`	`73`	`}`
`75`	`74`
`76`		`-void loop()`
`77`		`-{`
	`75`	`+void loop() {`
`78`	`76`	`// nothing happens after setup`
`79`	`77`	`}`
`80`	`78`