arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Merge remote-tracking branch 'arduino/master' into wifishield-bugfix

Browse Source
This commit is contained in:
Cristian Maglie
2013-03-10 23:22:48 +01:00
parent deb309b831 ebc35019be
commit 15727e9a2d
21 changed files with 137 additions and 1176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/arduino/cores/arduino/wiring_analog.c
View File

@ -47,6 +47,8 @@ int analogRead(uint8_t pin)
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