Merge remote-tracking branch 'origin/dev' into main

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,20 @@ 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).
 
+# Changelog
+
+## [3.4.1] May 29 2022
+
+### Fixed
+
+- Fix memory leak in api [#524](https://github.com/emsesp/EMS-ESP32/issues/524)
+
+### 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,17 +0,0 @@
-# Changelog
-
-## [3.4.1]
-
-### Added
-
-### Fixed
-
-- fix memory leak in api [#524](https://github.com/emsesp/EMS-ESP32/issues/524)
-
-### 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)
-
-## **BREAKING CHANGES:**

src/dallassensor.cpp

@@ -504,8 +504,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.1b1"
+#define EMSESP_APP_VERSION "3.4.1"