Changed entity_id to name in DiscoveryComponent

Author: danimtb

MqttManager/MqttDiscoveryComponent.cpp

@@ -1,26 +1,25 @@
 #include "MqttDiscoveryComponent.h"
 
-MqttDiscoveryComponent::MqttDiscoveryComponent(String component, String entity_id)
+MqttDiscoveryComponent::MqttDiscoveryComponent(String component, String name)
 {
     this->component = component;
-    this->entity_id = entity_id;
+    this->entity_id = name;
 
-    String name = entity_id;
-    name.replace("_", " ");
+    this->entity_id.replace(" ", "_");
 
-    this->setConfigurtionVariables("name", name);
+    this->setConfigurtionVariable("name", name);
 
     if (component == "light" || component == "switch")
     {
-        this->setConfigurtionVariables("command_topic", discovery_prefix + "/" + component + "/" + entity_id + "/" + command_suffix);
+        this->setConfigurtionVariable("command_topic", discovery_prefix + "/" + component + "/" + entity_id + "/" + command_suffix);
     }
     else
     {
-        this->setConfigurtionVariables("command_topic", "");
+        this->setConfigurtionVariable("command_topic", "");
     }
 }
 
-void MqttDiscoveryComponent::setConfigurtionVariables(String configKey, String configValue)
+void MqttDiscoveryComponent::setConfigurtionVariable(String configKey, String configValue)
 {
     if (configValue.length() != 0)
     {

MqttManager/MqttDiscoveryComponent.h

@@ -13,8 +13,8 @@ class MqttDiscoveryComponent
     std::map<String, String> m_fields;
 
 public:
-    MqttDiscoveryComponent(String component, String entity_id);
-    void setConfigurtionVariables(String configKey, String configValue);
+    MqttDiscoveryComponent(String component, String name);
+    void setConfigurtionVariable(String configKey, String configValue);
 
     String discovery_prefix{"homeassistant"};
     String component;

MqttManager/MqttManager.cpp

@@ -60,22 +60,22 @@ void MqttManager::setDeviceData(String deviceName, String hardware, String devic
 
     if (m_mqttDiscoveryEnabled)
     {
-        m_deviceNameSensor = new MqttDiscoveryComponent("sensor", m_deviceName + "_name");
+        m_deviceNameSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " name");
         m_discoveryComponents.push_back(m_deviceNameSensor);
 
-        m_deviceIpSensor = new MqttDiscoveryComponent("sensor", m_deviceName + "_IP");
+        m_deviceIpSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " IP");
         m_discoveryComponents.push_back(m_deviceIpSensor);
 
-        m_deviceMacSensor = new MqttDiscoveryComponent("sensor", m_deviceName + "_MAC");
+        m_deviceMacSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " MAC");
         m_discoveryComponents.push_back(m_deviceMacSensor);
 
-        m_deviceHardwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + "_Hardware");
+        m_deviceHardwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Hardware");
         m_discoveryComponents.push_back(m_deviceHardwareSensor);
 
-        m_deviceFirmwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + "_Firmware");
+        m_deviceFirmwareSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Firmware");
         m_discoveryComponents.push_back(m_deviceFirmwareSensor);
 
-        m_deviceFirmwareVersionSensor = new MqttDiscoveryComponent("sensor", m_deviceName + "_Firmware_Version");
+        m_deviceFirmwareVersionSensor = new MqttDiscoveryComponent("sensor", m_deviceName + " Firmware Version");
         m_discoveryComponents.push_back(m_deviceFirmwareVersionSensor);
     }
 }
@@ -265,6 +265,7 @@ void MqttManager::loop()
     {
         if (m_deviceStatusInfoTimer.check())
         {
+            this->publishDiscoveryInfo();
             this->publishDeviceStatusInfo();
 
             m_deviceStatusInfoTimer.start(); //restart timer