fix discovery prefix

Author: danimtb

MqttManager/MqttDiscoveryComponent.cpp

@@ -1,18 +1,20 @@
 #include "MqttDiscoveryComponent.h"
 
-MqttDiscoveryComponent::MqttDiscoveryComponent(String component, String name)
+
+MqttDiscoveryComponent::MqttDiscoveryComponent(String component, String name, String discovery_prefix)
 {
     this->component = component;
     this->entity_id = name;
+    this->discovery_prefix = discovery_prefix;
 
     this->entity_id.replace(" ", "_");
 
     this->setConfigurtionVariable("name", name);
-    this->setConfigurtionVariable("state_topic", discovery_prefix + "/" + component + "/" + entity_id + "/" + state_suffix);
+    this->setConfigurtionVariable("state_topic", this->discovery_prefix + "/" + this->component + "/" + this->entity_id + "/" + this->state_suffix);
 
     if (component == "light" || component == "switch")
     {
-        this->setConfigurtionVariable("command_topic", discovery_prefix + "/" + component + "/" + entity_id + "/" + command_suffix);
+        this->setConfigurtionVariable("command_topic", this->discovery_prefix + "/" + this->component + "/" + this->entity_id + "/" + this->command_suffix);
     }
     else
     {

MqttManager/MqttDiscoveryComponent.h

@@ -1,7 +1,6 @@
 #ifndef MQTTDISCOVERYCOMPONENT_H
 #define MQTTDISCOVERYCOMPONENT_H
 
-#include <string>
 #include <map>
 
 #include "ArduinoJson.h"
@@ -13,10 +12,10 @@ class MqttDiscoveryComponent
     std::map<String, String> m_fields;
 
 public:
-    MqttDiscoveryComponent(String component, String name);
+    MqttDiscoveryComponent(String component, String name, String discovery_prefix="homeassistant");
     void setConfigurtionVariable(String configKey, String configValue);
 
-    String discovery_prefix{"homeassistant"};
+    String discovery_prefix;
     String component;
     String entity_id;
     String discovery_suffix{"config"};

MqttManager/MqttManager.cpp

@@ -62,29 +62,23 @@ void MqttManager::setDeviceData(String deviceName, String hardware, String devic
 
     if (m_mqttDiscoveryEnabled)
     {
-        m_deviceStatusSensor = new MqttDiscoveryComponent("binary_sensor", m_deviceName + " Status");
-        m_deviceStatusSensor->discovery_prefix = discovery_prefix;
+        m_deviceStatusSensor = new MqttDiscoveryComponent("binary_sensor", m_deviceName + " Status", discovery_prefix);
         m_deviceStatusSensor->setConfigurtionVariable("device_class", "connectivity");
         m_discoveryComponents.push_back(m_deviceStatusSensor);
 
-        m_deviceIpSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " IP");
-        m_deviceIpSensor->discovery_prefix = discovery_prefix;
+        m_deviceIpSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " IP", discovery_prefix);
         m_discoveryComponents.push_back(m_deviceIpSensor);
 
-        m_deviceMacSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " MAC");
-        m_deviceMacSensor->discovery_prefix = discovery_prefix;
+        m_deviceMacSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " MAC", discovery_prefix);
         m_discoveryComponents.push_back(m_deviceMacSensor);
 
-        m_deviceHardwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Hardware");
-        m_deviceHardwareSensor->discovery_prefix = discovery_prefix;
+        m_deviceHardwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Hardware", discovery_prefix);
         m_discoveryComponents.push_back(m_deviceHardwareSensor);
 
-        m_deviceFirmwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Firmware");
-        m_deviceFirmwareSensor->discovery_prefix = discovery_prefix;
+        m_deviceFirmwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Firmware", discovery_prefix);
         m_discoveryComponents.push_back(m_deviceFirmwareSensor);
 
-        m_deviceFirmwareVersionSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Firmware Version");
-        m_deviceFirmwareVersionSensor->discovery_prefix = discovery_prefix;
+        m_deviceFirmwareVersionSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Firmware Version", discovery_prefix);
         m_discoveryComponents.push_back(m_deviceFirmwareVersionSensor);
 
         this->setLastWillMQTT(m_deviceStatusSensor->getStateTopic(), m_lastWillPayload);