1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-05-06 18:19:16 +03:00

Merge branch 'master' into master

This commit is contained in:
reiyawea 2016-03-16 19:47:37 +08:00
commit 5bb3427c64

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