Merge pull request #2202 from MichaelDvP/dev

fix analog input pullup and counter on gpio 25/26, dac values on web #2201
emsesp · Nov 14, 2024 · fdc3b19 · fdc3b19
2 parents bf21097 + e15f9de
commit fdc3b19
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
@@ -23,5 +23,6 @@ For more details go to [www.emsesp.org](https://www.emsesp.org/).
 - lastCode character check [#2189](https://github.com/emsesp/EMS-ESP32/issues/2189)
 - reading too many telegram parts
 - heatpump cost UOMs [#2188](https://github.com/emsesp/EMS-ESP32/issues/2188)
+- analog dac output and inputs on dac pins [#2201](https://github.com/emsesp/EMS-ESP32/discussions/2201)
 
 ## Changed
diff --git a/interface/src/app/main/Sensors.tsx b/interface/src/app/main/Sensors.tsx
@@ -438,7 +438,8 @@ const Sensors = () => {
                 <Cell stiff>{a.g}</Cell>
                 <Cell>{a.n}</Cell>
                 <Cell stiff>{AnalogTypeNames[a.t]} </Cell>
-                {a.t === AnalogType.DIGITAL_OUT || a.t === AnalogType.DIGITAL_IN ? (
+                {(a.t === AnalogType.DIGITAL_OUT && a.g !== 25 && a.g !== 26) ||
+                a.t === AnalogType.DIGITAL_IN ? (
                   <Cell stiff>{a.v ? LL.ON() : LL.OFF()}</Cell>
                 ) : (
                   <Cell stiff>{a.t ? formatValue(a.v, a.u) : ''}</Cell>

diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
@@ -138,23 +138,28 @@ void AnalogSensor::reload(bool get_nvs) {
             continue;                             // skip this loop pass
         }
 
-        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);
+        if ((sensor.gpio() == 25 || sensor.gpio() == 26)
+            && (sensor.type() == AnalogType::COUNTER || sensor.type() == AnalogType::DIGITAL_IN || sensor.type() == AnalogType::RATE
+                || sensor.type() == AnalogType::TIMER)) {
+            // pullup is mapped to DAC, so set to 3.3V
 #if CONFIG_IDF_TARGET_ESP32
             if (sensor.gpio() == 25 || sensor.gpio() == 26) {
                 dacWrite(sensor.gpio(), 255);
             }
 #elif CONFIG_IDF_TARGET_ESP32S2
-            if (sensor.gpio() == 23 || sensor.gpio() == 24) {
+            if (sensor.gpio() == 17 || sensor.gpio() == 18) {
                 dacWrite(sensor.gpio(), 255);
             }
 #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.poll_     = digitalRead(sensor.gpio());
             if (double_t val = EMSESP::nvs_.getDouble(sensor.name().c_str(), 0)) {
@@ -192,7 +197,7 @@ void AnalogSensor::reload(bool get_nvs) {
                 sensor.set_value(sensor.offset());
             } else
 #elif CONFIG_IDF_TARGET_ESP32S2
-            if (sensor.gpio() == 23 || sensor.gpio() == 24) {
+            if (sensor.gpio() == 17 || sensor.gpio() == 18) {
                 if (sensor.offset() > 255) {
                     sensor.set_offset(255);
                 } else if (sensor.offset() < 0) {
@@ -745,7 +750,7 @@ bool AnalogSensor::command_setvalue(const char * value, const int8_t gpio) {
                     dacWrite(sensor.gpio(), sensor.offset());
                 } else
 #elif CONFIG_IDF_TARGET_ESP32S2
-                if ((sensor.gpio() == 23 || sensor.gpio() == 24) && v <= 255) {
+                if ((sensor.gpio() == 17 || sensor.gpio() == 18) && v <= 255) {
                     sensor.set_offset(v);
                     sensor.set_value(v);
                     pinMode(sensor.gpio(), OUTPUT);

diff --git a/src/version.h b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.7.1-dev.6"
+#define EMSESP_APP_VERSION "3.7.1-dev.7"
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
@@ -415,7 +415,16 @@ void WebDataService::dashboard_data(AsyncWebServerRequest * request) {
 
                 JsonObject dv = node["dv"].to<JsonObject>();
                 dv["id"]      = "00" + sensor.name();
-                if (sensor.type() == AnalogSensor::AnalogType::DIGITAL_OUT || sensor.type() == AnalogSensor::AnalogType::DIGITAL_IN) {
+#if CONFIG_IDF_TARGET_ESP32
+                if (sensor.type() == AnalogSensor::AnalogType::DIGITAL_OUT && (sensor.gpio() == 25 || sensor.gpio() == 26)) {
+                    obj["v"] = Helpers::transformNumFloat(sensor.value(), 0);
+                } else
+#elif CONFIG_IDF_TARGET_ESP32S2
+                if (sensor.type() == AnalogSensor::AnalogType::DIGITAL_OUT && (sensor.gpio() == 17 || sensor.gpio() == 18)) {
+                    obj["v"] = Helpers::transformNumFloat(sensor.value(), 0);
+                } else
+#endif
+                    if (sensor.type() == AnalogSensor::AnalogType::DIGITAL_OUT || sensor.type() == AnalogSensor::AnalogType::DIGITAL_IN) {
                     char s[12];
                     dv["v"]     = Helpers::render_boolean(s, sensor.value() != 0, true);
                     JsonArray l = dv["l"].to<JsonArray>();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define EMSESP_APP_VERSION "3.7.1-dev.6"
		#define EMSESP_APP_VERSION "3.7.1-dev.7"