diff options
| author | Perry Hung <iperry@gmail.com> | 2011-02-27 03:07:31 -0500 |
|---|---|---|
| committer | Perry Hung <iperry@gmail.com> | 2011-02-27 04:58:43 -0500 |
| commit | def4173e683c3538388aabceeb08e5336c2bdadf (patch) | |
| tree | 54e2571fb12b31d6730eb1a1b33d09fc53e003a8 /wirish/wirish_analog.c | |
| parent | c8ca7a2eb7528462677c80497854b940931eab16 (diff) | |
| download | librambutan-def4173e683c3538388aabceeb08e5336c2bdadf.tar.gz librambutan-def4173e683c3538388aabceeb08e5336c2bdadf.zip | |
libmaple: Refactor ADC routines
ADC routines rewritten, support for ADC2, 3, added.
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
Diffstat (limited to 'wirish/wirish_analog.c')
| -rw-r--r-- | wirish/wirish_analog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wirish/wirish_analog.c b/wirish/wirish_analog.c index 3c63342..ba1290d 100644 --- a/wirish/wirish_analog.c +++ b/wirish/wirish_analog.c @@ -33,9 +33,9 @@ /* Assumes that the ADC has been initialized and that the pin is set * to ANALOG_INPUT */ uint32 analogRead(uint8 pin) { - if(PIN_MAP[pin].adc == ADC_INVALID) { + if(PIN_MAP[pin].adc_channel == ADC_INVALID) { return 0; } - return adc_read(PIN_MAP[pin].adc); + return adc_read(ADC1->regs, PIN_MAP[pin].adc_channel); } |