From 52e0e1a9994cc2e0a7a8a0f4396b27dc0d93c70c Mon Sep 17 00:00:00 2001 From: "David A. Mellis" Date: Sat, 10 Jul 2010 21:07:51 +0000 Subject: [PATCH] INTERNAL -> INTERNAL1V1 AND INTERNAL2V56 on the Mega (issue #194). --- build/shared/lib/keywords.txt | 4 +++- build/shared/revisions.txt | 5 +++++ hardware/arduino/cores/arduino/wiring.h | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt index 770acfbd8..62da3eb43 100644 --- a/build/shared/lib/keywords.txt +++ b/build/shared/lib/keywords.txt @@ -19,7 +19,9 @@ FALLING LITERAL1 AttachInterrupt RISING LITERAL1 AttachInterrupt DEFAULT LITERAL1 AnalogReference EXTERNAL LITERAL1 AnalogReference -INTERAL LITERAL1 AnalogReference +INTERNAL LITERAL1 AnalogReference +INTERNAL1V1 LITERAL1 AnalogReference +INTERNAL2V56 LITERAL1 AnalogReference # KEYWORD1 specifies datatypes and C/C++ keywords diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt index e7496bc56..f5bb63ba5 100644 --- a/build/shared/revisions.txt +++ b/build/shared/revisions.txt @@ -20,6 +20,9 @@ ARDUINO 0019 * Disabling interrupts while digitalWrite() and pinMode() write to pins. http://code.google.com/p/arduino/issues/detail?id=146 + +* Replacing INTERNAL analog reference with INTERNAL1V1 AND INTERNAL2V56 on + the Arduino Mega. http://code.google.com/p/arduino/issues/detail?id=194 [environment] @@ -30,6 +33,8 @@ ARDUINO 0019 * Synchronized with the Processing 1.1 code base, bringing various changes. +* Modified the parsing of avr-gcc / avr-g++ output and error messages. + * Adding control over scrolling in serial monitor. http://code.google.com/p/arduino/issues/detail?id=97 diff --git a/hardware/arduino/cores/arduino/wiring.h b/hardware/arduino/cores/arduino/wiring.h index edc9704ba..d0ce1c314 100755 --- a/hardware/arduino/cores/arduino/wiring.h +++ b/hardware/arduino/cores/arduino/wiring.h @@ -57,7 +57,12 @@ extern "C"{ #define FALLING 2 #define RISING 3 +#if defined(__AVR_ATmega1280__) +#define INTERNAL1V1 2 +#define INTERNAL2V56 3 +#else #define INTERNAL 3 +#endif #define DEFAULT 1 #define EXTERNAL 0