Merge of arduino-1.0.1. Work in progress...

2 files changed, 13 insertions, 1 deletions

diff --git a/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino b/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
index 615d2b3..69bcc01 100644
--- a/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
+++ b/libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
@@ -9,6 +9,7 @@
  * TX is digital pin 3 (connect to RX of other device)
  
  created back in the mists of time
+ modified 9 Apr 2012
  by Tom Igoe
  based on Mikal Hart's example
  
@@ -21,7 +22,13 @@ SoftwareSerial mySerial(2, 3); // RX, TX
 
 void setup()  
 {
+ // Open serial communications and wait for port to open:
   Serial.begin(57600);
+   while (!Serial) {
+    ; // wait for serial port to connect. Needed for Leonardo only
+  }
+
+  
   Serial.println("Goodnight moon!");
 
   // set the data rate for the SoftwareSerial port
diff --git a/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino b/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
index e870c6f..d9f8f45 100644
--- a/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
+++ b/libraries/SoftwareSerial/examples/TwoPortReceive/TwoPortReceive.ino
@@ -17,6 +17,7 @@
  * Second serial device's TX attached to digital pin 4, RX to pin 5
  
  created 18 Apr. 2011
+ modified 9 Apr 2012
  by Tom Igoe
  based on Mikal Hart's twoPortRXExample
  
@@ -33,8 +34,12 @@ SoftwareSerial portTwo(4, 5);
 
 void setup()
 {
-  // Start the hardware serial port
+ // Open serial communications and wait for port to open:
   Serial.begin(9600);
+   while (!Serial) {
+    ; // wait for serial port to connect. Needed for Leonardo only
+  }
+
 
   // Start each software serial port
   portOne.begin(9600);