Merge branch 'master' into HEAD
This commit is contained in:
commit
fca64de387
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue