Merge remote-tracking branch 'origin/dev' for 3.2.0 release

force v16 of nodejs
3.1.1
2025-12-07 00:09:51 +03:00 · 2021-08-06 12:06:08 +02:00 · 2021-06-26 11:13:07 +02:00 · 2021-06-26 11:03:03 +02:00 · 2021-06-26 11:02:55 +02:00 · 2021-05-16 15:52:09 +02:00
4 changed files with 7 additions and 4 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 # vscode
 .vscode
 .directory
 workspace.code-workspace
 # build
 build/
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -4,6 +4,4 @@
 ## Fixed
 ## Changed
--- a/src/dallassensor.cpp
+++ b/src/dallassensor.cpp
@@ -539,8 +539,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];
                if (dallas_format_ == Dallas_Format::NUMBER) {
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.2.1b0"
+#define EMSESP_APP_VERSION "3.2.0"
Author	SHA1	Message	Date
proddy	7eb1f061b7	Merge remote-tracking branch 'origin/dev' for 3.2.0 release	2021-08-06 12:06:08 +02:00
proddy	50459a23fe	force v16 of nodejs	2021-06-26 11:13:07 +02:00
proddy	5bf53c3389	3.1.1	2021-06-26 11:03:03 +02:00
proddy	4b7aa95be3	Merge remote-tracking branch 'origin/dev'	2021-06-26 11:02:55 +02:00
Proddy	70943f5758	Update pre_release.yml	2021-05-16 15:52:09 +02:00
Proddy	3bc280b817	Delete check_code.yml	2021-05-16 15:51:56 +02:00
Proddy	62b15a5319	Update pre_release.yml	2021-05-16 15:35:06 +02:00
Proddy	8dd18802d6	Update tagged_release.yml	2021-05-16 15:34:45 +02:00
proddy	57a516a83a	updated README and images	2021-05-09 15:13:16 +02:00
proddy	a57fdaa4b3	Merge remote-tracking branch 'origin/dev' into main	2021-05-04 12:21:51 +02:00
proddy	4841e42286	Merge remote-tracking branch 'origin/dev' into main	2021-03-30 16:35:18 +02:00
proddy	8c2d2b06ed	cleaned up old changelog	2021-03-18 20:59:09 +01:00
proddy	38c8b1b7f0	3.0.0	2021-03-18 20:58:21 +01:00
proddy	6fb5933a02	Merge remote-tracking branch 'origin/dev' into main	2021-03-18 20:58:12 +01:00
proddy	c0944433be	remove workspace.code-workspace	2021-03-16 17:41:42 +01:00
Proddy	478e6362c9	Merge pull request #27 from FauthD:main Add global names to Dallas sensors to avoid ugly <unknown> and other …	2021-03-16 17:39:00 +01:00
fauthd	4d6354db78	Add stuff to gitignore, add vscode workspace	2021-03-16 16:47:09 +01:00
fauthd	beab0f0c77	Add global names to Dallas sensors to avoid ugly <unknown> and other issues in HA	2021-03-16 16:00:23 +01:00
Proddy	c17749bd22	Update README.md	2021-03-14 23:43:33 +01:00
proddy	2bad769c5c	build: include assets	2021-03-14 21:20:51 +01:00
proddy	8ad89ca64b	move repo	2021-03-14 21:05:15 +01:00
proddy	9244d8daec	Semantic Commit Messages	2021-03-14 18:10:57 +01:00
proddy	02d01334b2	update new build	2021-03-14 17:37:18 +01:00
`@@ -4,6 +4,4 @@`

	`## Fixed`	`## Fixed`


	`## Changed`	`## Changed`
`@@ -1 +1 @@`
	`#define EMSESP_APP_VERSION "3.2.1b0"`	`#define EMSESP_APP_VERSION "3.2.0"`