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

cmaglie · cmaglie · commit b53074260343 · 2013-12-18T15:46:42.000+01:00
See #1740 #1634 http://forum.arduino.cc/index.php?topic=203322.msg1509907#msg1509907
diff --git a/build/shared/revisions.txt b/build/shared/revisions.txt
@@ -10,7 +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)
+* sam: Fixed regression in analogRead() (fails to read multiple channels) (Mark Tillotson)
 
 ARDUINO 1.5.5 BETA 2013.11.28
 
diff --git a/hardware/arduino/sam/cores/arduino/wiring_analog.c b/hardware/arduino/sam/cores/arduino/wiring_analog.c
@@ -149,9 +149,9 @@ uint32_t analogRead(uint32_t ulPin)
 
 			// Enable the corresponding channel
 			if (ulChannel != latestSelectedChannel) {
+				adc_enable_channel( ADC, ulChannel );
 				if ( latestSelectedChannel != -1 )
 					adc_disable_channel( ADC, latestSelectedChannel );
-				adc_enable_channel( ADC, ulChannel );
 				latestSelectedChannel = ulChannel;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -149,9 +149,9 @@ uint32_t analogRead(uint32_t ulPin)`
`149`	`149`
`150`	`150`	`// Enable the corresponding channel`
`151`	`151`	`if (ulChannel != latestSelectedChannel) {`
	`152`	`+ adc_enable_channel( ADC, ulChannel );`
`152`	`153`	`if ( latestSelectedChannel != -1 )`
`153`	`154`	`adc_disable_channel( ADC, latestSelectedChannel );`
`154`		`- adc_enable_channel( ADC, ulChannel );`
`155`	`155`	`latestSelectedChannel = ulChannel;`
`156`	`156`	`}`
`157`	`157`