diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2013-03-10 23:22:48 +0100 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2013-03-10 23:22:48 +0100 |
| commit | 477257b34532239e20acab70412b3ebdaedca62f (patch) | |
| tree | b9939fcbe25cfc0be764751184790f1d8c5cf0ad /cores | |
| parent | 399d9c58a2777aef3b53fb4860cb8bf4252a1598 (diff) | |
| parent | aa218e803a8fd1bffd79fbcbe7ca2fef56a2fe37 (diff) | |
Merge remote-tracking branch 'arduino/master' into wifishield-bugfix
Diffstat (limited to 'cores')
| -rw-r--r-- | cores/arduino/wiring_analog.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c index 23b01c6..3f19c7f 100644 --- a/cores/arduino/wiring_analog.c +++ b/cores/arduino/wiring_analog.c @@ -47,6 +47,8 @@ int analogRead(uint8_t pin) if (pin >= 18) pin -= 18; // allow for channel or pin numbers #elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__) 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); #else if (pin >= 14) pin -= 14; // allow for channel or pin numbers #endif |