Merge pull request #1202 from vdorr/lib-1.5

cmaglie · cmaglie · commit 2007a626dd12 · 2013-01-06T08:42:00.000-08:00
modified analogWrite to wait for end of conversion
diff --git a/hardware/arduino/sam/cores/arduino/wiring_analog.c b/hardware/arduino/sam/cores/arduino/wiring_analog.c
@@ -243,8 +243,8 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {
 
 			// Write user value
 			ulValue = mapResolution(ulValue, _writeResolution, DACC_RESOLUTION);
-			while ((dacc_get_interrupt_status(DACC_INTERFACE) & DACC_ISR_TXRDY) == 0);
 			dacc_write_conversion_data(DACC_INTERFACE, ulValue);
+			while ((dacc_get_interrupt_status(DACC_INTERFACE) & DACC_ISR_EOC) == 0);
 			return;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -243,8 +243,8 @@ void analogWrite(uint32_t ulPin, uint32_t ulValue) {`
`243`	`243`
`244`	`244`	`// Write user value`
`245`	`245`	`ulValue = mapResolution(ulValue, _writeResolution, DACC_RESOLUTION);`
`246`		`- while ((dacc_get_interrupt_status(DACC_INTERFACE) & DACC_ISR_TXRDY) == 0);`
`247`	`246`	`dacc_write_conversion_data(DACC_INTERFACE, ulValue);`
	`247`	`+ while ((dacc_get_interrupt_status(DACC_INTERFACE) & DACC_ISR_EOC) == 0);`
`248`	`248`	`return;`
`249`	`249`	`}`
`250`	`250`	`}`