From a9342f743f1e890d3153df6b71a43dc581f1e672 Mon Sep 17 00:00:00 2001 From: Florian <1technophile@users.noreply.github.com> Date: Thu, 27 Jan 2022 15:47:29 -0600 Subject: [PATCH] Change unique id structure for HASS discovery (#1147) Now: "uniq_id":"882D777014C-pres" before it was: "uniq_id":"882D7770014C-CLEARGRASSTRHKPA-pres" This will impact BLE and gateways entities --- main/ZgatewayBT.ino | 2 +- main/ZmqttDiscovery.ino | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino index d51cb70..f33a0ff 100644 --- a/main/ZgatewayBT.ino +++ b/main/ZgatewayBT.ino @@ -843,7 +843,7 @@ void launchBTDiscovery() { Log.trace("Name: %s", prop.value()["name"].as()); String discovery_topic = String(subjectBTtoMQTT) + "/" + macWOdots; String entity_name = String(model_id.c_str()) + "-" + String(prop.key().c_str()); - String unique_id = macWOdots + "-" + entity_name; + String unique_id = macWOdots + "-" + String(prop.key().c_str()); # if OpenHABDiscovery String value_template = "{{ value_json." + String(prop.key().c_str()) + "}}"; # else diff --git a/main/ZmqttDiscovery.ino b/main/ZmqttDiscovery.ino index 1ac221b..d262d6c 100644 --- a/main/ZmqttDiscovery.ino +++ b/main/ZmqttDiscovery.ino @@ -43,7 +43,7 @@ String getMacAddress() { } String getUniqueId(String name, String sufix) { - String uniqueId = (String)getMacAddress() + name + sufix; + String uniqueId = (String)getMacAddress() + "-" + name + sufix; return String(uniqueId); }