Merge remote-tracking branch 'origin/dev'

Add global names to Dallas sensors to avoid ugly <unknown> and other …

.gitignore

@@ -1,5 +1,7 @@
 # vscode
 .vscode
+.directory
+workspace.code-workspace
 
 # build
 build/

CHANGELOG.md

@@ -5,6 +5,35 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# [3.4.2]
+
+## Added
+
+- RC310 additions [#520](https://github.com/emsesp/EMS-ESP32/pull/520)
+  - damping
+  - wwprio for RC310 heating circuits
+  - switchonoptimization for RC310 heating circuits
+  - enum_controlmode for RC310 (new enum list)
+  - nofrostmode, reducemode, reducetemp & noreducetemp for RC310
+  - emergencyops and emergencytemp, wwmaxtemp, wwflowtempoffset and wwcomfort1 for RC310
+  - HM200 hybrid module [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
+  - AM200 alternative heatsource module [#573](https://github.com/emsesp/EMS-ESP32/issues/573)
+  - EM10 error module as gateway [#575](https://github.com/emsesp/EMS-ESP32/issues/575)
+
+## Fixed
+
+- fix Table resizing in WebUI [#519](https://github.com/emsesp/EMS-ESP32/issues/519)
+- allow larger customization files [#570](https://github.com/emsesp/EMS-ESP32/issues/570)
+- losing entitiy wwcomfort [#581](https://github.com/emsesp/EMS-ESP32/issues/581)
+
+## Changed
+
+- Shorten "friendly names" in Home Assistant [#555](https://github.com/emsesp/EMS-ESP32/issues/555)
+
+- platformio 2.3.0 (IDF 4, Arduino 2)
+- remove master-thermostat, support multiple thermostats
+- merge up- and download in webui [#577](https://github.com/emsesp/EMS-ESP32/issues/577)
+
 # [3.4.1] May 29 2022
 
 ## Fixed
@@ -13,10 +42,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Changed
 
-- Controller data in web-ui only for IVT [#522](https://github.com/emsesp/EMS-ESP32/issues/522)
-- Rename hidden `climate` to a more explaining name [#523](https://github.com/emsesp/EMS-ESP32/issues/523)
-- Minor changes to the Customizations web page [#527](https://github.com/emsesp/EMS-ESP32/pull/527)
-
 # [3.4.0] May 23 2022
 
 ## Added

CHANGELOG_LATEST.md

@@ -1,32 +0,0 @@
-# Changelog
-
-# [3.4.2]
-
-## Added
-
-- RC310 additions [#520](https://github.com/emsesp/EMS-ESP32/pull/520)
-  - damping
-  - wwprio for RC310 heating circuits
-  - switchonoptimization for RC310 heating circuits
-  - enum_controlmode for RC310 (new enum list)
-  - nofrostmode, reducemode, reducetemp & noreducetemp for RC310
-  - emergencyops and emergencytemp, wwmaxtemp, wwflowtempoffset and wwcomfort1 for RC310
-  - HM200 hybrid module [#500](https://github.com/emsesp/EMS-ESP32/issues/500)
-  - AM200 alternative heatsource module [#573](https://github.com/emsesp/EMS-ESP32/issues/573)
-  - EM10 error module as gateway [#575](https://github.com/emsesp/EMS-ESP32/issues/575)
-
-## Fixed
-
-- fix Table resizing in WebUI [#519](https://github.com/emsesp/EMS-ESP32/issues/519)
-- allow larger customization files [#570](https://github.com/emsesp/EMS-ESP32/issues/570)
-- losing entitiy wwcomfort [#581](https://github.com/emsesp/EMS-ESP32/issues/581)
-
-## Changed
-
-- Shorten "friendly names" in Home Assistant [#555](https://github.com/emsesp/EMS-ESP32/issues/555)
-
-- platformio 2.3.0 (IDF 4, Arduino 2)
-- remove master-thermostat, support multiple thermostats
-- merge up- and download in webui [#577](https://github.com/emsesp/EMS-ESP32/issues/577)
-
-## **BREAKING CHANGES:**

src/dallassensor.cpp

@@ -507,8 +507,11 @@ void DallasSensor::publish_values(const bool force) {
                 config["uniq_id"] = str;
 
                 JsonObject dev = config.createNestedObject("dev");
+                dev["name"]    = FJSON("EMS-ESP Dallas");               // Global name for device (all Dallas sensors, avoids using the very first name for the group)
+                dev["mf"]      = FJSON("Dallas");                       // Manufacturer (avoids the ugly <unknown> in HA)
+                dev["mdl"]     = FJSON("1Wire");                        // Model (avoids the ugly <unknown> in HA)
                 JsonArray  ids = dev.createNestedArray("ids");
-                ids.add("ems-esp");
+                ids.add("ems-esp-dallas");                              // Different ids as the other portions of the EMS-ESP
 
                 char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
                 // use '_' as HA doesn't like '-' in the topic name

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.4.2b5"
+#define EMSESP_APP_VERSION "3.4.2"