correction enregistrement HA

Author: xlyric

src/config/enums.h

@@ -668,9 +668,9 @@ struct HA {
             "ids": ")" + String(node_id) + R"(",
             "name": ")" + String(node_id) + R"(",
             "sw": "PvRouter )" + String(VERSION) + R"(",
-            "mdl": "ESP32 TTGO )" + IPaddress + R"(",
+            "mdl": "ESP32 TTGO )" + IPaddress.toString() + R"(",
             "mf": "Cyril Poissonnier",
-            "cu": "http://)" + IPaddress + R"("
+            "cu": "http://)" + IPaddress.toString() + R"("
         })";
         return info;
     }
@@ -715,14 +715,14 @@ struct HA {
     if (dev_cla =="" ) { 
       dev_cla = name; 
     }
-    char final_topic[100];
+    char final_topic[150];
     if (strlen(name.c_str()) != 0 ) {
-      snprintf(final_topic, sizeof(final_topic), "%s%s/config", topic, name.c_str());
-      client.publish(final_topic , device.c_str() , true); // déclaration autoconf dimmer
+      snprintf(final_topic, sizeof(final_topic), "%s%s/config", topic.c_str(), name.c_str());
+      client.publish(final_topic , device.c_str() , true); // déclaration autoconf routeur
     }
     else {
-      snprintf(final_topic, sizeof(final_topic), "%sconfig", topic);
-      client.publish(final_topic, device.c_str() , true); // déclaration autoconf dimmer
+      snprintf(final_topic, sizeof(final_topic), "%sconfig", topic.c_str());
+      client.publish(final_topic, device.c_str() , true); // déclaration autoconf routeur
     }       
   } // discovery
 

src/functions/Mqtt_http_Functions.h

@@ -43,6 +43,7 @@ extern HA power_apparent;
 extern HA switch_relay1;
 extern HA switch_relay2;
 extern HA device_dimmer_boost;
+extern HA device_dimmer_alarm_temp;
 extern xSemaphoreHandle mutex;
 
 //***********************************

src/functions/homeassistant.h

@@ -28,6 +28,7 @@
   extern HA switch_relay2;
   extern HA device_dimmer_boost;
   extern HA power_apparent;
+  extern HA device_dimmer_alarm_temp; 
 #endif
 
 #ifndef LIGHT_FIRMWARE
@@ -96,6 +97,10 @@
     power_apparent.Set_stat_cla("measurement");
     power_apparent.Set_dev_cla("apparent_power");
 
+      // création des binary_sensor
+    device_dimmer_alarm_temp.Set_name("Surchauffe");
+    device_dimmer_alarm_temp.Set_dev_cla("problem");
+
     switch_relay1.Set_name("Relay1");
     switch_relay1.Set_dev_cla("switch");
 
@@ -117,6 +122,9 @@
     switch_relay1.discovery();
     switch_relay2.discovery();
     device_dimmer_boost.discovery();
+    device_dimmer_alarm_temp.discovery();
+    device_dimmer_alarm_temp.send("RAS"); // Initialisation de l'état de l'alarme à RAS
+    
   }
 #endif // not LIGHT_FIRMWARE
 

src/main.cpp

@@ -193,6 +193,7 @@ unsigned short measurements[LOCAL_MEASUREMENTS]; // NOSONAR
     HA switch_relay1;
     HA switch_relay2;
     HA device_dimmer_boost;
+    HA device_dimmer_alarm_temp;
 #endif
 
 //***********************************
@@ -752,7 +753,8 @@ void setup()
             }
             // HA autoconf
             if (configmqtt.HA) 
-              init_HA_sensor();            
+              init_HA_sensor(); 
+              //Serial.println(F("Home Assistant enabled"));           
           }
       }
     #endif // not LIGHT_FIRMWARE

src/tasks/send-mqtt.h

@@ -102,7 +102,15 @@ void send_to_mqtt(void * parameter) { // NOSONAR
                 device_dimmer.sendInt(unified_dimmer.get_power()); // Modif RV - pour être plus en accord avec le nommage sur les dimmers
                 switch_relay1.sendInt(digitalRead(RELAY1));
                 switch_relay2.sendInt(digitalRead(RELAY2));
-                device_dimmer_boost.send(stringBool(programme_marche_forcee.run));                                            
+                device_dimmer_boost.send(stringBool(programme_marche_forcee.run));       
+                // si dallas.security actif alors on envoie l'alarme
+                if (dallas.security) {
+                  device_dimmer_alarm_temp.send("Ballon Chaud");
+                }
+                else {
+                  device_dimmer_alarm_temp.send("RAS");
+                } 
+
               }
 
               // remonté énergie domoticz et jeedom