arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-11 04:01:30 +03:00
Code

Merge branch 'master' into master

Browse Source
This commit is contained in:
reiyawea 2016-03-16 19:47:37 +08:00
commit 5bb3427c64
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cores/esp8266/core_esp8266_wiring_analog.c
View File

@ -26,11 +26,13 @@
#include "pins_arduino.h" #include "pins_arduino.h"
extern int __analogRead(uint8_t pin) { extern int __analogRead(uint8_t pin)
if(pin == 17){ {
return system_adc_read(); // accept both A0 constant and ADC channel number
} if(pin == 17 || pin == 0) {
return digitalRead(pin) * 1023; return system_adc_read();
}
return digitalRead(pin) * 1023;
} }
extern int analogRead(uint8_t pin) __attribute__ ((weak, alias("__analogRead"))); extern int analogRead(uint8_t pin) __attribute__ ((weak, alias("__analogRead")));