Merge branch 'master' into HEAD

Author: cmaglie

hardware/arduino/avr/cores/arduino/Stream.cpp

@@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout)  // sets the maximum number of mi
  // find returns true if the target string is found
 bool  Stream::find(char *target)
 {
-  return findUntil(target, NULL);
+  return findUntil(target, "");
 }
 
 // reads data from the stream until the target string of given length is found

hardware/arduino/avr/cores/arduino/USBAPI.h

@@ -36,7 +36,7 @@ struct ring_buffer;
 class Serial_ : public Stream
 {
 private:
-	int peek_buffer;
+	int peek_buffer = -1;
 public:
 	void begin(unsigned long);
 	void begin(unsigned long, uint8_t);

hardware/arduino/sam/cores/arduino/Stream.cpp

@@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout)  // sets the maximum number of mi
  // find returns true if the target string is found
 bool  Stream::find(char *target)
 {
-  return findUntil(target, NULL);
+  return findUntil(target, "");
 }
 
 // reads data from the stream until the target string of given length is found

libraries/Robot_Control/src/Melody.cpp

@@ -40,7 +40,7 @@ void RobotControl::playMelody(char* script){
       case 'C': playNote(202, time, modifier); break; // Play a  C#
       case 'd': playNote(190, time, modifier); break; // Play a  D
       case 'D': playNote(180, time, modifier); break; // Play a  D#
-      case 'e': playNote(170, time, modifier); break; // Play an F
+      case 'e': playNote(170, time, modifier); break; // Play an E
       case 'f': playNote(160, time, modifier); break; // Play an F
       case 'F': playNote(151, time, modifier); break; // Play an F#
       case 'g': playNote(143, time, modifier); break; // Play a  G
@@ -97,4 +97,4 @@ void RobotControl::playFile(char* filename){
 
 void RobotControl::stopPlayFile(){
   melody.close();
-}
+}