aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/wiring_analog.c
diff options
context:
space:
mode:
authorCristian Maglie <c.maglie@bug.st>2012-05-21 01:56:06 +0200
committerCristian Maglie <c.maglie@bug.st>2012-05-22 11:23:47 +0200
commit3786e337e0211ca1ef94b37b03e891adfb3b5f9a (patch)
treedd7f8f6fd396243460ec22da89bfbd71d552f484 /cores/arduino/wiring_analog.c
parent324023a67afd1691f12ead4388d7cdf1a9d1a6ef (diff)
parent9a8976ce56bcdb70815dd58c1764d9e5c3b6fe95 (diff)
Pre-merge upstream Arduino
Diffstat (limited to 'cores/arduino/wiring_analog.c')
-rw-r--r--cores/arduino/wiring_analog.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 902b153..a8bc817 100644
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -45,6 +45,8 @@ 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_ATmega1284__)
+ if (pin >= 24) pin -= 24; // allow for channel or pin numbers
#else
if (pin >= 14) pin -= 14; // allow for channel or pin numbers
#endif