Skip to content

Commit 4284080

Browse files
committed
Merge branch 'master' into HEAD
2 parents 749c517 + 932b850 commit 4284080

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

avr/cores/arduino/Stream.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void Stream::setTimeout(unsigned long timeout) // sets the maximum number of mi
7575
// find returns true if the target string is found
7676
bool Stream::find(char *target)
7777
{
78-
return findUntil(target, NULL);
78+
return findUntil(target, "");
7979
}
8080

8181
// reads data from the stream until the target string of given length is found

avr/cores/arduino/USBAPI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ struct ring_buffer;
3636
class Serial_ : public Stream
3737
{
3838
private:
39-
int peek_buffer;
39+
int peek_buffer = -1;
4040
public:
4141
void begin(unsigned long);
4242
void begin(unsigned long, uint8_t);

0 commit comments

Comments
 (0)