diff options
| author | Kristian Sloth Lauszus <lauszus@gmail.com> | 2013-04-17 19:49:40 +0200 |
|---|---|---|
| committer | Kristian Sloth Lauszus <lauszus@gmail.com> | 2013-04-17 19:49:40 +0200 |
| commit | b9717187fd9b11c77d75a289050cb0a58512d2b9 (patch) | |
| tree | c9d0d56b19894f50732e5a2a2d0e4164104057f0 /cores/arduino/wiring_analog.c | |
| parent | f50c307be280dc6ece9e70c43b301c1db36291a0 (diff) | |
Use analogPinToChannel if it's defined
Diffstat (limited to 'cores/arduino/wiring_analog.c')
| -rw-r--r-- | cores/arduino/wiring_analog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cores/arduino/wiring_analog.c b/cores/arduino/wiring_analog.c index 3f19c7f..bd148cc 100644 --- a/cores/arduino/wiring_analog.c +++ b/cores/arduino/wiring_analog.c @@ -41,14 +41,14 @@ int analogRead(uint8_t pin) { uint8_t low, high; -#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) +#if defined(analogPinToChannel) + pin = analogPinToChannel(pin); +#elif defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) if (pin >= 54) pin -= 54; // allow for channel or pin numbers #elif defined(__AVR_ATmega32U4__) if (pin >= 18) pin -= 18; // allow for channel or pin numbers #elif defined(__AVR_ATmega1284P__) || defined(__AVR_ATmega644P__) if (pin >= 24) pin -= 24; // allow for channel or pin numbers -#elif defined(analogPinToChannel) && (defined(__AVR_ATtiny25__) || defined(__AVR_ATtiny45__) || defined(__AVR_ATtiny85__)) - pin = analogPinToChannel(pin); #else if (pin >= 14) pin -= 14; // allow for channel or pin numbers #endif |