add mqtt base to topic - emsesp#759

proddy · Nov 30, 2022 · 7f18dd9 · 7f18dd9
1 parent 424234e
commit 7f18dd9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
@@ -451,8 +451,7 @@ void AnalogSensor::publish_values(const bool force) {
                 }
                 config["val_tpl"] = str;
 
-                // snprintf(str, sizeof(str), "%s_analog_sensor_%s", Mqtt::basename().c_str(), sensor.name().c_str());
-                snprintf(str, sizeof(str), "analog_sensor_%d", sensor.gpio());
+                snprintf(str, sizeof(str), "%s_analog_sensor_%s", Mqtt::basename().c_str(), sensor.name().c_str());
                 config["object_id"] = str;
                 config["uniq_id"]   = str; // same as object_id
 

diff --git a/src/dallassensor.cpp b/src/dallassensor.cpp
@@ -518,15 +518,13 @@ void DallasSensor::publish_values(const bool force) {
                 }
                 config["val_tpl"] = str;
 
-                // snprintf(str, sizeof(str), "%s_temperature_sensor_%s", Mqtt::basename().c_str(), sensor.id().c_str());
-                snprintf(str, sizeof(str), "temperature_sensor_%s", sensor.id().c_str());
+                snprintf(str, sizeof(str), "%s_temperature_sensor_%s", Mqtt::basename().c_str(), sensor.id().c_str());
                 config["object_id"] = str;
                 config["uniq_id"]   = str; // same as object_id
 
                 snprintf(str, sizeof(str), "%s", sensor.name().c_str());
                 config["name"] = str;
 
-                config["uniq_id"] = str;
                 JsonObject dev    = config.createNestedObject("dev");
                 JsonArray  ids    = dev.createNestedArray("ids");
                 ids.add("ems-esp");