From ed42d9541213a5e37fe0151dee89868d5c502305 Mon Sep 17 00:00:00 2001 From: Kristian Sloth Lauszus Date: Thu, 4 Apr 2013 20:55:15 +0200 Subject: Added support for all variants of Sanguino --- cores/arduino/Arduino.h | 2 +- cores/arduino/wiring_analog.c | 2 +- cores/arduino/wiring_private.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'cores') diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h index b265825..3b9ccca 100755 --- a/cores/arduino/Arduino.h +++ b/cores/arduino/Arduino.h @@ -46,7 +46,7 @@ extern "C"{ #define EXTERNAL 1 #define INTERNAL 2 #else -#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__) +#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) #define INTERNAL1V1 2 #define INTERNAL2V56 3 #else diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c index 3f19c7f..7ed0e4e 100644 --- a/cores/arduino/wiring_analog.c +++ b/cores/arduino/wiring_analog.c @@ -45,7 +45,7 @@ int analogRead(uint8_t pin) if (pin >= 54) pin -= 54; // allow for channel or pin numbers #elif defined(__AVR_ATmega32U4__) if (pin >= 18) pin -= 18; // allow for channel or pin numbers -#elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__) +#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) if (pin >= 24) pin -= 24; // allow for channel or pin numbers #elif defined(analogPinToChannel) && (defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)) pin = analogPinToChannel(pin); diff --git a/cores/arduino/wiring_private.h b/cores/arduino/wiring_private.h index f678265..90dbf2c 100755 --- a/cores/arduino/wiring_private.h +++ b/cores/arduino/wiring_private.h @@ -54,7 +54,7 @@ extern "C"{ #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #define EXTERNAL_NUM_INTERRUPTS 8 -#elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__) +#elif defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644__) || defined(__AVR_ATmega644A__) || defined(__AVR_ATmega644P__) || defined(__AVR_ATmega644PA__) #define EXTERNAL_NUM_INTERRUPTS 3 #elif defined(__AVR_ATmega32U4__) #define EXTERNAL_NUM_INTERRUPTS 4 -- cgit v1.2.3-18-g5258 From ccf7eb9a56345e150fc8141a7c6f7905f7b11940 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 6 May 2013 08:52:31 +0200 Subject: 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. --- cores/arduino/Stream.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cores') diff --git a/cores/arduino/Stream.h b/cores/arduino/Stream.h index 58bbf75..007b4bc 100644 --- a/cores/arduino/Stream.h +++ b/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 -- cgit v1.2.3-18-g5258 From 8673113e43fa38c936baca717c8670c54abad6bc Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 6 May 2013 08:57:06 +0200 Subject: Added c_str() method to String class. --- cores/arduino/WString.h | 1 + 1 file changed, 1 insertion(+) (limited to 'cores') diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h index 947325e..b3e280a 100644 --- a/cores/arduino/WString.h +++ b/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; -- cgit v1.2.3-18-g5258 From eb40f35b2d95b2701d92e3b8baf53832a3bd2993 Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Mon, 6 May 2013 18:10:29 +0200 Subject: Added const modifier to String.c_str() --- cores/arduino/WString.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cores') diff --git a/cores/arduino/WString.h b/cores/arduino/WString.h index b3e280a..642b016 100644 --- a/cores/arduino/WString.h +++ b/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; -- cgit v1.2.3-18-g5258