arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-10-15 11:26:40 +03:00
Code Activity

Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery

Browse Source
This commit is contained in:
Federico Fissore
2013-05-13 16:58:10 +02:00
parent 219d1462fc 76fd163a5f
commit 2d6af8264b
36 changed files with 171 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ readBytesBetween( pre_string, terminator, buffer, length)
class Stream : public Print
{
private:
protected:
unsigned long _timeout; // number of milliseconds to wait for the next char before aborting timed read
unsigned long _startMillis; // used for timeout measurement
int timedRead(); // private method to read stream with timeout

1
hardware/arduino/sam/cores/arduino/WString.h
View File

@@ -146,6 +146,7 @@ public:
void getBytes(unsigned char *buf, unsigned int bufsize, unsigned int index=0) const;
void toCharArray(char *buf, unsigned int bufsize, unsigned int index=0) const
{getBytes((unsigned char *)buf, bufsize, index);}
const char * c_str() const { return buffer; }
// search
int indexOf( char ch ) const;