[gnoduino: 235/237] Small changes for the ATmega1284.
- From: Lucian Langa <lucilanga src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnoduino: 235/237] Small changes for the ATmega1284.
- Date: Sat, 31 Mar 2012 20:34:35 +0000 (UTC)
commit e1387667b37d2becdb99d2f0690c290ed3d0ab0b
Author: David A. Mellis <d mellis arduino cc>
Date: Fri Mar 2 18:58:53 2012 -0500
Small changes for the ATmega1284.
http://code.google.com/p/arduino/issues/detail?id=736
arduino/cores/arduino/WInterrupts.c | 2 --
arduino/cores/arduino/wiring_analog.c | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/arduino/cores/arduino/WInterrupts.c b/arduino/cores/arduino/WInterrupts.c
index 4f035eb..3b9fe08 100755
--- a/arduino/cores/arduino/WInterrupts.c
+++ b/arduino/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/arduino/cores/arduino/wiring_analog.c b/arduino/cores/arduino/wiring_analog.c
index 902b153..a8bc817 100644
--- a/arduino/cores/arduino/wiring_analog.c
+++ b/arduino/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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]