Merged master

8 files changed, 76 insertions, 38 deletions

diff --git a/libraries/SD/examples/CardInfo/CardInfo.ino b/libraries/SD/examples/CardInfo/CardInfo.ino
index fb2f6c3..0c2dfc5 100644
--- a/libraries/SD/examples/CardInfo/CardInfo.ino
+++ b/libraries/SD/examples/CardInfo/CardInfo.ino
@@ -16,7 +16,7 @@
  
  created  28 Mar 2011
  by Limor Fried 
- modified 16 Mar 2011
+ modified 9 Apr 2012
  by Tom Igoe
  */
  // include the SD library:
@@ -35,7 +35,13 @@ const int chipSelect = 4;
 
 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
+  }
+
+
   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 
diff --git a/libraries/SD/examples/Datalogger/Datalogger.ino b/libraries/SD/examples/Datalogger/Datalogger.ino
index 73d81af..a7f85ee 100644
--- a/libraries/SD/examples/Datalogger/Datalogger.ino
+++ b/libraries/SD/examples/Datalogger/Datalogger.ino
@@ -13,7 +13,7 @@
  ** CS - pin 4
  
  created  24 Nov 2010
- updated 2 Dec 2010
+ modified 9 Apr 2012
  by Tom Igoe
  
  This example code is in the public domain.
@@ -30,7 +30,13 @@ const int chipSelect = 4;
 
 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
+  }
+
+
   Serial.print("Initializing SD card...");
   // make sure that the default chip select pin is set to
   // output, even if you don't use it:
diff --git a/libraries/SD/examples/DumpFile/DumpFile.ino b/libraries/SD/examples/DumpFile/DumpFile.ino
index 961717f..d83089a 100644
--- a/libraries/SD/examples/DumpFile/DumpFile.ino
+++ b/libraries/SD/examples/DumpFile/DumpFile.ino
@@ -12,6 +12,9 @@
  ** 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.
  	 
@@ -27,7 +30,13 @@ const int chipSelect = 4;
 
 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
+  }
+
+
   Serial.print("Initializing SD card...");
   // make sure that the default chip select pin is set to
   // output, even if you don't use it:
diff --git a/libraries/SD/examples/Files/Files.ino b/libraries/SD/examples/Files/Files.ino
index 5ed9fea..a15b862 100644
--- a/libraries/SD/examples/Files/Files.ino
+++ b/libraries/SD/examples/Files/Files.ino
@@ -11,7 +11,7 @@
  
  created   Nov 2010
  by David A. Mellis
- updated 2 Dec 2010
+ modified 9 Apr 2012
  by Tom Igoe
  
  This example code is in the public domain.
@@ -23,7 +23,13 @@ File myFile;
 
 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
+  }
+
+
   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 
diff --git a/libraries/SD/examples/ReadWrite/ReadWrite.ino b/libraries/SD/examples/ReadWrite/ReadWrite.ino
index 9957218..5805fc8 100644
--- a/libraries/SD/examples/ReadWrite/ReadWrite.ino
+++ b/libraries/SD/examples/ReadWrite/ReadWrite.ino
@@ -11,7 +11,7 @@
  
  created   Nov 2010
  by David A. Mellis
- updated 2 Dec 2010
+ modified 9 Apr 2012
  by Tom Igoe
  
  This example code is in the public domain.
@@ -24,7 +24,13 @@ File myFile;
 
 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
+  }
+
+
   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 
diff --git a/libraries/SD/examples/listfiles/listfiles.ino b/libraries/SD/examples/listfiles/listfiles.ino
index b2435a2..876c3f8 100644
--- a/libraries/SD/examples/listfiles/listfiles.ino
+++ b/libraries/SD/examples/listfiles/listfiles.ino
@@ -11,7 +11,7 @@
  
  created   Nov 2010
  by David A. Mellis
- updated 2 Dec 2010
+ modified 9 Apr 2012
  by Tom Igoe
  
  This example code is in the public domain.
@@ -23,7 +23,13 @@ File root;
 
 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
+  }
+
+
   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 
diff --git a/libraries/SD/utility/Sd2PinMap.h b/libraries/SD/utility/Sd2PinMap.h
index 4bd75a3..1c76dd3 100644
--- a/libraries/SD/utility/Sd2PinMap.h
+++ b/libraries/SD/utility/Sd2PinMap.h
@@ -166,44 +166,43 @@ static const pin_map_t digitalPinMap[] = {
 };

 //------------------------------------------------------------------------------

 #elif defined(__AVR_ATmega32U4__)

-// Teensy 2.0

+// Leonardo

 

 // Two Wire (aka I2C) ports

-uint8_t const SDA_PIN = 6;

-uint8_t const SCL_PIN = 5;

+uint8_t const SDA_PIN = 2;

+uint8_t const SCL_PIN = 3;

 

 // SPI port

-uint8_t const SS_PIN = 0;

-uint8_t const MOSI_PIN = 2;

-uint8_t const MISO_PIN = 3;

-uint8_t const SCK_PIN = 1;

+uint8_t const SS_PIN = 17;

+uint8_t const MOSI_PIN = 16;

+uint8_t const MISO_PIN = 14;

+uint8_t const SCK_PIN = 15;

 

 static const pin_map_t digitalPinMap[] = {

-  {&DDRB, &PINB, &PORTB, 0},  // B0  0

-  {&DDRB, &PINB, &PORTB, 1},  // B1  1

-  {&DDRB, &PINB, &PORTB, 2},  // B2  2

-  {&DDRB, &PINB, &PORTB, 3},  // B3  3

-  {&DDRB, &PINB, &PORTB, 7},  // B7  4

-  {&DDRD, &PIND, &PORTD, 0},  // D0  5

-  {&DDRD, &PIND, &PORTD, 1},  // D1  6

-  {&DDRD, &PIND, &PORTD, 2},  // D2  7

-  {&DDRD, &PIND, &PORTD, 3},  // D3  8

-  {&DDRC, &PINC, &PORTC, 6},  // C6  9

-  {&DDRC, &PINC, &PORTC, 7},  // C7 10

-  {&DDRD, &PIND, &PORTD, 6},  // D6 11

-  {&DDRD, &PIND, &PORTD, 7},  // D7 12

-  {&DDRB, &PINB, &PORTB, 4},  // B4 13

-  {&DDRB, &PINB, &PORTB, 5},  // B5 14

-  {&DDRB, &PINB, &PORTB, 6},  // B6 15

-  {&DDRF, &PINF, &PORTF, 7},  // F7 16

-  {&DDRF, &PINF, &PORTF, 6},  // F6 17

-  {&DDRF, &PINF, &PORTF, 5},  // F5 18

-  {&DDRF, &PINF, &PORTF, 4},  // F4 19

-  {&DDRF, &PINF, &PORTF, 1},  // F1 20

-  {&DDRF, &PINF, &PORTF, 0},  // F0 21

-  {&DDRD, &PIND, &PORTD, 4},  // D4 22

-  {&DDRD, &PIND, &PORTD, 5},  // D5 23

-  {&DDRE, &PINE, &PORTE, 6}   // E6 24

+  {&DDRD, &PIND, &PORTD, 2},  // D2  0

+  {&DDRD, &PIND, &PORTD, 3},  // D3  1

+  {&DDRD, &PIND, &PORTD, 1},  // D1  2

+  {&DDRD, &PIND, &PORTD, 0},  // D0  3

+  {&DDRD, &PIND, &PORTD, 4},  // D4  4

+  {&DDRC, &PINC, &PORTC, 6},  // C6  5

+  {&DDRD, &PIND, &PORTD, 7},  // D7  6

+  {&DDRE, &PINE, &PORTE, 6},  // E6  7

+  {&DDRB, &PINB, &PORTB, 4},  // B4  8

+  {&DDRB, &PINB, &PORTB, 5},  // B5  9

+  {&DDRB, &PINB, &PORTB, 6},  // B6 10

+  {&DDRB, &PINB, &PORTB, 7},  // B7 11

+  {&DDRD, &PIND, &PORTD, 6},  // D6 12

+  {&DDRC, &PINC, &PORTC, 7},  // C7 13

+  {&DDRB, &PINB, &PORTB, 3},  // B3 14

+  {&DDRB, &PINB, &PORTB, 1},  // B1 15

+  {&DDRB, &PINB, &PORTB, 2},  // B2 16

+  {&DDRB, &PINB, &PORTB, 0},  // B0 17

+  {&DDRF, &PINF, &PORTF, 7},  // F7 18

+  {&DDRF, &PINF, &PORTF, 6},  // F6 19

+  {&DDRF, &PINF, &PORTF, 5},  // F5 20

+  {&DDRF, &PINF, &PORTF, 4},  // F4 21

+  {&DDRF, &PINF, &PORTF, 1},  // F1 22

+  {&DDRF, &PINF, &PORTF, 0},  // F0 23

 };

 //------------------------------------------------------------------------------

 #elif defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB1286__)

diff --git a/libraries/SD/utility/SdFatUtil.h b/libraries/SD/utility/SdFatUtil.h
index 283fcb2..7d6b410 100644
--- a/libraries/SD/utility/SdFatUtil.h
+++ b/libraries/SD/utility/SdFatUtil.h
@@ -56,7 +56,7 @@ static UNUSEDOK int FreeRam(void) {
  * \param[in] str Pointer to string stored in flash memory.

  */

 static NOINLINE void SerialPrint_P(PGM_P str) {

-  for (uint8_t c; (c = pgm_read_byte(str)); str++) Serial.print(c);

+  for (uint8_t c; (c = pgm_read_byte(str)); str++) Serial.write(c);

 }

 //------------------------------------------------------------------------------

 /**