diff options
| author | Federico Fissore <f.fissore@arduino.cc> | 2013-05-13 16:58:10 +0200 |
|---|---|---|
| committer | Federico Fissore <f.fissore@arduino.cc> | 2013-05-13 16:58:10 +0200 |
| commit | b70954ea256f94afdd941e2c89a086887b496c13 (patch) | |
| tree | bd9fb74f61b1351a32b8b48cef8f04863d9d6df8 /cores/arduino | |
| parent | c48c0f9e2cebe0e3ebda7aa5c4f9096b9586ed9e (diff) | |
| parent | 7207108255a772474b322151cb0fd113e8030afe (diff) | |
Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x-discovery
Diffstat (limited to 'cores/arduino')
| -rw-r--r-- | cores/arduino/Arduino.h | 2 | ||||
| -rw-r--r-- | cores/arduino/Stream.h | 2 | ||||
| -rw-r--r-- | cores/arduino/wiring_analog.c | 2 | ||||
| -rw-r--r-- | cores/arduino/wiring_private.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h index 02c2a8f..5596c14 100644 --- a/cores/arduino/Arduino.h +++ b/cores/arduino/Arduino.h @@ -48,7 +48,7 @@ void yield(void); #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/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 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 100644 --- 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 |