diff --git a/tasmota/settings.ino b/tasmota/settings.ino index c1f3cb4de..767cc9ed8 100644 --- a/tasmota/settings.ino +++ b/tasmota/settings.ino @@ -1259,7 +1259,7 @@ void SettingsDelta(void) Settings.ledmask = APP_LEDMASK; } if (Settings.version < 0x0605000A) { -// Settings.my_adc0 = ADC0_NONE; + Settings.my_adc0 = GPIO_NONE; } if (Settings.version < 0x0605000D) { Settings.param[P_IR_UNKNOW_THRESHOLD] = IR_RCV_MIN_UNKNOWN_SIZE; diff --git a/tasmota/support.ino b/tasmota/support.ino index e94170759..892bedd0f 100644 --- a/tasmota/support.ino +++ b/tasmota/support.ino @@ -1390,7 +1390,7 @@ bool ValidGPIO(uint32_t pin, uint32_t gpio) { #ifdef ESP8266 #ifdef USE_ADC_VCC - if (17 == pin) { return false; } // ADC0 = GPIO17 + if (ADC0_PIN == pin) { return false; } // ADC0 = GPIO17 #endif #endif return (GPIO_USER == ValidPin(pin, BGPIO(gpio))); // Only allow GPIO_USER pins diff --git a/tasmota/xdrv_01_webserver.ino b/tasmota/xdrv_01_webserver.ino index b73a264e5..1258d10d8 100644 --- a/tasmota/xdrv_01_webserver.ino +++ b/tasmota/xdrv_01_webserver.ino @@ -1804,7 +1804,7 @@ void HandleTemplateConfiguration(void) //#ifdef ESP8266 // WSContentSend_P(PSTR("%s%d"), // ((9==i)||(10==i)) ? WebColor(COL_TEXT_WARNING) : WebColor(COL_TEXT), -// (17==i) ? PSTR(D_ADC) : PSTR(D_GPIO), (17==i) ? 0 : i, +// (ADC0_PIN==i) ? PSTR(D_ADC) : PSTR(D_GPIO), (ADC0_PIN==i) ? 0 : i, // (0==i) ? " style='width:150px'" : "", i, i); //#else // ESP32 WSContentSend_P(PSTR("" D_GPIO "%d"), @@ -1989,7 +1989,7 @@ void HandleModuleConfiguration(void) //#ifdef ESP8266 // WSContentSend_P(PSTR("%s %s%d"), // (WEMOS==my_module_type)?stemp:"", -// (17==i) ? PSTR(D_ADC) : PSTR(D_GPIO), (17==i) ? 0 : i, +// (ADC0_PIN==i) ? PSTR(D_ADC) : PSTR(D_GPIO), (ADC0_PIN==i) ? 0 : i, // i, i); //#else // ESP32 WSContentSend_P(PSTR("%s " D_GPIO "%d"), diff --git a/tasmota/xsns_02_analog.ino b/tasmota/xsns_02_analog.ino index f476a98d7..8da803115 100644 --- a/tasmota/xsns_02_analog.ino +++ b/tasmota/xsns_02_analog.ino @@ -95,11 +95,9 @@ struct { } Adc[MAX_ADCS]; #ifdef ESP8266 - bool adcAttachPin(uint8_t pin) { - return true; + return (ADC0_PIN == pin); } - #endif void AdcSaveSettings(uint32_t idx) {