rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-01-29 18:52:13 +01:00
Code Issues Releases Activity

Merge branch 'master' into HEAD

Browse Source
This commit is contained in:
Cristian Maglie 2014-06-13 10:29:12 +02:00
commit 7f9e9b1cc2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/avr/cores/arduino/Stream.cpp
View File

@ -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

2
hardware/arduino/avr/cores/arduino/USBAPI.h
View File

@ -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);

2
hardware/arduino/sam/cores/arduino/Stream.cpp
View File

@ -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

4
libraries/Robot_Control/src/Melody.cpp
View File

@ -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();
}
}