From 99f2a2755349784835130147e46cb61659b85893 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 6 May 2013 08:52:31 +0200 Subject: [PATCH 1/3] Stream "_timeout" field and related methods are now protected instead of private. This allows better optimization on classes that extends Stream without losing timeout capabilities. --- hardware/arduino/cores/arduino/Stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/arduino/cores/arduino/Stream.h b/hardware/arduino/cores/arduino/Stream.h index 58bbf752f..007b4bc66 100644 --- a/hardware/arduino/cores/arduino/Stream.h +++ b/hardware/arduino/cores/arduino/Stream.h @@ -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 From 19e4d387258eb4dcd323fe10c9cceb0671ef8e03 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 6 May 2013 08:57:06 +0200 Subject: [PATCH 2/3] Added c_str() method to String class. --- hardware/arduino/cores/arduino/WString.h | 1 + 1 file changed, 1 insertion(+) diff --git a/hardware/arduino/cores/arduino/WString.h b/hardware/arduino/cores/arduino/WString.h index 947325e5f..b3e280a06 100644 --- a/hardware/arduino/cores/arduino/WString.h +++ b/hardware/arduino/cores/arduino/WString.h @@ -147,6 +147,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);} + char* c_str() const { return buffer; } // search int indexOf( char ch ) const; From 444ede099dc740ac99b4b280c5a0fe635cdb286d Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 6 May 2013 18:10:29 +0200 Subject: [PATCH 3/3] Added const modifier to String.c_str() --- hardware/arduino/cores/arduino/WString.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hardware/arduino/cores/arduino/WString.h b/hardware/arduino/cores/arduino/WString.h index b3e280a06..642b016c5 100644 --- a/hardware/arduino/cores/arduino/WString.h +++ b/hardware/arduino/cores/arduino/WString.h @@ -147,7 +147,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);} - char* c_str() const { return buffer; } + const char * c_str() const { return buffer; } // search int indexOf( char ch ) const;