Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev2

CHANGELOG_LATEST.md

@@ -16,11 +16,11 @@ Writeable Text entities have moved from type `sensor` to `text` in Home Assistan
 - shower_data MQTT payload contains the timestamp [#1329](https://github.com/emsesp/EMS-ESP32/issues/1329)
 - HA discovery for writeable text entities [#1337](https://github.com/emsesp/EMS-ESP32/pull/1377)
 - autodetect board_profile, store in nvs, add telnet command option, add E32V2
-- heatpump high res energy counters [#1348, #1349. #1350](https://github.com/emsesp/EMS-ESP32/issues/1348)
+- heat pump high res energy counters [#1348, #1349. #1350](https://github.com/emsesp/EMS-ESP32/issues/1348)
 - optional bssid in network settings
 - extension module EM100 [#1315](https://github.com/emsesp/EMS-ESP32/discussions/1315)
 - digital_out with new options for polarity and startup state
-- Added 'system allvalues' command that dumps all the EMS device values, plus sensors and any custom entities
+- added 'system allvalues' command that dumps all the EMS device values, plus sensors and any custom entities
 
 ## Fixed
 

lib_standalone/Preferences.h

@@ -42,7 +42,7 @@ class Preferences {
     }
 
     double getDouble(const char * key, double defaultValue = NAN) {
-        return NAN;
+        return 0;
     }
 
     size_t putString(const char * key, const char * value) {

src/devices/extension.h

@@ -43,10 +43,10 @@ class Extension : public EMSdevice {
 
     int16_t headerTemp_; // T0
     uint8_t input_;      // IO1
-    uint8_t errorState_; // OE1
+    // uint8_t errorState_; // OE1
-    uint8_t errorPump_;  // IE0
+    // uint8_t errorPump_; // IE0
-    uint8_t outPower_;   // IO1
+    uint8_t outPower_; // IO1
-    uint8_t setPower_;   // request
+    uint8_t setPower_; // request
     uint8_t setPoint_;
     uint8_t dip_; // dip switch
     uint8_t minV_;

src/devices/thermostat.cpp

@@ -2563,7 +2563,7 @@ bool Thermostat::set_mode_n(const uint8_t mode, const uint8_t hc_num) {
         if (Helpers::hasValue(hc->mode_new)) {
             offset = EMS_OFFSET_RCPLUSSet_mode_new;
         } else {
-            offset = EMS_OFFSET_RCPLUSSet_mode;
+            offset         = EMS_OFFSET_RCPLUSSet_mode;
             set_mode_value = set_mode_value == 2 ? 0xFF : 0;
         }
         break;

src/emsdevice.cpp

@@ -854,7 +854,7 @@ bool EMSdevice::export_values(uint8_t device_type, JsonObject & output, const in
 
     if (id > 0 || output_target == EMSdevice::OUTPUT_TARGET::API_VERBOSE) {
         for (const auto & emsdevice : EMSESP::emsdevices) {
-            if (emsdevice->device_type() == device_type) {
+            if (emsdevice && (emsdevice->device_type() == device_type)) {
                 has_value |= emsdevice->generate_values(output, tag, (id < 1), output_target); // use nested for id -1 and 0
             }
         }
@@ -866,7 +866,7 @@ bool EMSdevice::export_values(uint8_t device_type, JsonObject & output, const in
         JsonObject output_hc    = output;
         bool       nest_created = false;
         for (const auto & emsdevice : EMSESP::emsdevices) {
-            if (emsdevice->device_type() == device_type) {
+            if (emsdevice && (emsdevice->device_type() == device_type)) {
                 if (!nest_created && emsdevice->has_tags(tag)) {
                     output_hc    = output.createNestedObject(EMSdevice::tag_to_mqtt(tag));
                     nest_created = true;
@@ -1835,7 +1835,7 @@ bool EMSdevice::handle_telegram(std::shared_ptr<const Telegram> telegram) {
 #if defined(EMSESP_DEBUG)
                 EMSESP::logger().debug("This telegram (%s) is not recognized by the EMS bus", tf.telegram_type_name_);
 #endif
-                // test if this causes issue: https://github.com/emsesp/EMS-ESP32/issues/1420
+                // removing fetch causes issue: https://github.com/emsesp/EMS-ESP32/issues/1420
                 // tf.fetch_ = false;
                 return false;
             }

src/roomcontrol.cpp

@@ -51,7 +51,7 @@ void Roomctrl::set_remotehum(const uint8_t type, const uint8_t hc, const int8_t
         return;
     }
     type_ = type;
-    if (remotehum_[hc] != EMS_VALUE_UINT_NOTSET && hum == EMS_VALUE_UINT_NOTSET) {
+    if (remotehum_[hc] != EMS_VALUE_UINT_NOTSET && (uint8_t)hum == EMS_VALUE_UINT_NOTSET) {
         switch_off_[hc] = true;
     }
     if (remotehum_[hc] != hum) {

src/system.cpp

@@ -115,7 +115,7 @@ bool System::command_allvalues(const char * value, const int8_t id, JsonObject &
     for (const auto & emsdevice : EMSESP::emsdevices) {
         std::string title = emsdevice->device_type_2_device_name_translated() + std::string(" ") + emsdevice->to_string();
         device_output     = output.createNestedObject(title);
-        emsesp::EMSdevice::export_values(emsdevice->unique_id(), device_output, id, EMSdevice::OUTPUT_TARGET::API_VERBOSE);
+        emsdevice->generate_values(device_output, DeviceValueTAG::TAG_NONE, true, EMSdevice::OUTPUT_TARGET::API_VERBOSE); // use nested for id -1 and 0
     }
 
     // Custom entities

src/uart/emsuart_esp32.cpp

@@ -33,7 +33,7 @@
 namespace emsesp {
 
 static QueueHandle_t uart_queue;
-uint8_t              tx_mode_ = 0xFF;
+uint8_t              tx_mode_     = 0xFF;
 uint32_t             inverse_mask = 0;
 
 /*

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.3-dev.8b"
+#define EMSESP_APP_VERSION "3.6.3-dev.9a"