andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-06 15:59:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix input pullup and counter on gpio 25/26, #2201

Browse Source
This commit is contained in:
MichaelDvP
2024-11-14 17:15:17 +01:00
parent b6d2ab6adb
commit f8c279edb0
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/analogsensor.cpp
View File

@@ -138,14 +138,10 @@ void AnalogSensor::reload(bool get_nvs) {
continue; // skip this loop pass continue; // skip this loop pass
} }
if (sensor.type() == AnalogType::ADC) { if ((sensor.gpio() == 25 || sensor.gpio() == 26)
LOG_DEBUG("ADC Sensor on GPIO %02d", sensor.gpio()); && (sensor.type() == AnalogType::COUNTER || sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::RATE
// analogSetPinAttenuation does not work with analogReadMilliVolts || sensor.type() == AnalogType::TIMER)) {
sensor.analog_ = 0; // initialize // pullup is mapped to DAC, so set to 3.3V
sensor.last_reading_ = 0;
} else if (sensor.type() == AnalogType::COUNTER) {
LOG_DEBUG("I/O Counter on GPIO %02d", sensor.gpio());
pinMode(sensor.gpio(), INPUT_PULLUP);
#if CONFIG_IDF_TARGET_ESP32 #if CONFIG_IDF_TARGET_ESP32
if (sensor.gpio() == 25 || sensor.gpio() == 26) { if (sensor.gpio() == 25 || sensor.gpio() == 26) {
dacWrite(sensor.gpio(), 255); dacWrite(sensor.gpio(), 255);
@@ -155,6 +151,15 @@ void AnalogSensor::reload(bool get_nvs) {
dacWrite(sensor.gpio(), 255); dacWrite(sensor.gpio(), 255);
} }
#endif #endif
}
if (sensor.type() == AnalogType::ADC) {
LOG_DEBUG("ADC Sensor on GPIO %02d", sensor.gpio());
// analogSetPinAttenuation does not work with analogReadMilliVolts
sensor.analog_ = 0; // initialize
sensor.last_reading_ = 0;
} else if (sensor.type() == AnalogType::COUNTER) {
LOG_DEBUG("I/O Counter on GPIO %02d", sensor.gpio());
pinMode(sensor.gpio(), INPUT_PULLUP);
sensor.polltime_ = 0; sensor.polltime_ = 0;
sensor.poll_ = digitalRead(sensor.gpio()); sensor.poll_ = digitalRead(sensor.gpio());
if (double_t val = EMSESP::nvs_.getDouble(sensor.name().c_str(), 0)) { if (double_t val = EMSESP::nvs_.getDouble(sensor.name().c_str(), 0)) {