diff options
| author | David A. Mellis <d.mellis@arduino.cc> | 2012-03-02 18:58:53 -0500 |
|---|---|---|
| committer | David A. Mellis <d.mellis@arduino.cc> | 2012-03-02 18:58:53 -0500 |
| commit | 4fade7007fbe2049f4f7a3867c9f9a76f8c06db1 (patch) | |
| tree | 4d1fafa6fdd61c1b7806cdea38b2a9990713011c | |
| parent | 0c00db7809760aae21678615b153d4a09709d018 (diff) | |
Small changes for the ATmega1284.
http://code.google.com/p/arduino/issues/detail?id=736
| -rwxr-xr-x | cores/arduino/WInterrupts.c | 2 | ||||
| -rw-r--r-- | cores/arduino/wiring_analog.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cores/arduino/WInterrupts.c b/cores/arduino/WInterrupts.c index 4f035eb..3b9fe08 100755 --- a/cores/arduino/WInterrupts.c +++ b/cores/arduino/WInterrupts.c @@ -121,8 +121,6 @@ void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode) { #elif defined(MCUCR) && defined(ISC20) && defined(GIMSK) && defined(GIMSK) MCUCR = (MCUCR & ~((1 << ISC20) | (1 << ISC21))) | (mode << ISC20); GIMSK |= (1 << INT2); - #else - #warning attachInterrupt may need some more work for this cpu (case 1) #endif break; #endif 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 |