noisymime
/
Arduino
mirror of https://github.com/noisymime/Arduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[sam] Fixed regression in analogRead() (fails to read multiple channels) 

Fixes #1740
This commit is contained in:
Cristian Maglie 2013-12-16 11:06:34 +01:00
parent 2e7b645571
commit a1c4809105
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/shared/revisions.txt
View File

@ -10,6 +10,7 @@ ARDUINO 1.5.6 BETA
[core]
* sam: Fixed wrap-around bug in delay() (Mark Tillotson)
* sam: Fixed regression in analogRead() (fails to read multiple channels)
ARDUINO 1.5.5 BETA 2013.11.28

9
hardware/arduino/sam/cores/arduino/wiring_analog.c
View File

@ -149,8 +149,10 @@ uint32_t analogRead(uint32_t ulPin)
// Enable the corresponding channel
if (ulChannel != latestSelectedChannel) {
adc_enable_channel( ADC, ulChannel );
latestSelectedChannel = ulChannel;
if ( latestSelectedChannel != -1 )
adc_disable_channel( ADC, latestSelectedChannel );
adc_enable_channel( ADC, ulChannel );
latestSelectedChannel = ulChannel;
}
// Start the ADC
@ -164,9 +166,6 @@ uint32_t analogRead(uint32_t ulPin)
ulValue = adc_get_latest_value(ADC);
ulValue = mapResolution(ulValue, ADC_RESOLUTION, _readResolution);
// Disable the corresponding channel
//adc_disable_channel(ADC, ulChannel);
break;
// Compiler could yell because we don't handle DAC pins