diff options
| author | bnewbold <bnewbold@robocracy.org> | 2010-08-31 17:39:46 -0400 |
|---|---|---|
| committer | bnewbold <bnewbold@robocracy.org> | 2010-08-31 17:39:46 -0400 |
| commit | 02d7b08f0497096f21e41922e0efb54c4ef33bab (patch) | |
| tree | a7e04293efcba70f37cffcd03c0fcc4c0be7858a /wirish/wirish_analog.c | |
| parent | b2dd49c3141d8a21a4e7c7ef51dee7329f847c30 (diff) | |
| parent | e03d58f4dab4176514924baa3a1ff430bf5819b8 (diff) | |
| download | librambutan-02d7b08f0497096f21e41922e0efb54c4ef33bab.tar.gz librambutan-02d7b08f0497096f21e41922e0efb54c4ef33bab.zip | |
Merge maple-native changes into portable
This compiles for both maple and maple_native but is untested.
Diffstat (limited to 'wirish/wirish_analog.c')
| -rw-r--r-- | wirish/wirish_analog.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/wirish/wirish_analog.c b/wirish/wirish_analog.c index f4c1204..1b911bc 100644 --- a/wirish/wirish_analog.c +++ b/wirish/wirish_analog.c @@ -30,13 +30,12 @@ #include "wirish.h" #include "io.h" -extern const PinMapping PIN_MAP[NR_MAPLE_PINS]; - /* Assumes that the ADC has been initialized and * that the pin is set to ANALOG_INPUT */ uint32 analogRead(uint8 pin) { - if (pin >= NR_ANALOG_PINS) + if(PIN_MAP[pin].adc == ADC_INVALID) { return 0; + } return adc_read(PIN_MAP[pin].adc); } |