aboutsummaryrefslogtreecommitdiff
path: root/cores/arduino/wiring_analog.c
diff options
context:
space:
mode:
authorDavid A. Mellis <d.mellis@arduino.cc>2009-08-15 14:48:42 +0000
committerDavid A. Mellis <d.mellis@arduino.cc>2009-08-15 14:48:42 +0000
commit50f77c7210a490d8fee28348fcda811ca0bdf615 (patch)
treec5ed76441bcdd7c51b6bf07d7b0ba16444dbaee6 /cores/arduino/wiring_analog.c
parent159051b8f814edb7474912ad6d04058d34f2d173 (diff)
parent79b7ecdd92973f4aa67a6bcaa8bd12a10e5b5133 (diff)
Moving the processing-5503 branch (used for Arduino 0017) into the trunk.
Diffstat (limited to 'cores/arduino/wiring_analog.c')
-rwxr-xr-xcores/arduino/wiring_analog.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c
index 529ad52..782a0bd 100755
--- a/cores/arduino/wiring_analog.c
+++ b/cores/arduino/wiring_analog.c
@@ -42,7 +42,7 @@ int analogRead(uint8_t pin)
// set the analog reference (high two bits of ADMUX) and select the
// channel (low 4 bits). this also sets ADLAR (left-adjust result)
// to 0 (the default).
- ADMUX = (analog_reference << 6) | (pin & 0x07);
+ ADMUX = (analog_reference << 6) | (pin & 0x0f);
#if defined(__AVR_ATmega1280__)
// the MUX5 bit of ADCSRB selects whether we're reading from channels