From 05611a9c47c40461197821f8b397a6446d04a467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xose=20P=C3=A9rez?= <xose.perez@gmail.com>
Date: Thu, 11 Jan 2018 01:09:25 +0100
Subject: [PATCH] Send Home Assistant blank message only once

---
 code/espurna/homeassitant.ino | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/code/espurna/homeassitant.ino b/code/espurna/homeassitant.ino
index 67c1ec4f..e14d61a3 100644
--- a/code/espurna/homeassitant.ino
+++ b/code/espurna/homeassitant.ino
@@ -11,6 +11,7 @@ Copyright (C) 2017-2018 by Xose Pérez <xose dot perez at gmail dot com>
 #include <ArduinoJson.h>
 
 bool _haEnabled = false;
+bool _haSendFlag = false;
 
 // -----------------------------------------------------------------------------
 
@@ -19,21 +20,19 @@ void _haWebSocketOnSend(JsonObject& root) {
     root["haPrefix"] = getSetting("haPrefix", HOMEASSISTANT_PREFIX);
 }
 
-void _haConfigure() {
-    bool enabled = getSetting("haEnabled", HOMEASSISTANT_ENABLED).toInt() == 1;
-    if (enabled != _haEnabled) haSend(enabled);
-    _haEnabled = enabled;
-}
+void _haSend() {
 
-// -----------------------------------------------------------------------------
+    // Pending message to send?
+    if (!_haSendFlag) return;
 
-void haSend(bool add) {
+    // Are we connected?
+    if (!mqttConnected()) return;
 
     DEBUG_MSG_P(PSTR("[HA] Sending autodiscovery MQTT message\n"));
 
     String output;
 
-    if (add) {
+    if (_haEnabled) {
 
         DynamicJsonBuffer jsonBuffer;
         JsonObject& root = jsonBuffer.createObject();
@@ -84,18 +83,33 @@ void haSend(bool add) {
 
     mqttSendRaw(topic.c_str(), output.c_str());
     mqttSend(MQTT_TOPIC_STATUS, MQTT_STATUS_ONLINE, true);
+    _haSendFlag = false;
+
+}
 
+void _haConfigure() {
+    bool enabled = getSetting("haEnabled", HOMEASSISTANT_ENABLED).toInt() == 1;
+    _haSendFlag = (enabled != _haEnabled);
+    _haEnabled = enabled;
+    _haSend();
 }
 
+// -----------------------------------------------------------------------------
+
 void haSetup() {
+
     _haConfigure();
+
     #if WEB_SUPPORT
         wsOnSendRegister(_haWebSocketOnSend);
         wsOnAfterParseRegister(_haConfigure);
     #endif
+
+    // On MQTT connect check if we have something to send
     mqttRegister([](unsigned int type, const char * topic, const char * payload) {
-        if (type == MQTT_CONNECT_EVENT) haSend(_haEnabled);
+        if (type == MQTT_CONNECT_EVENT) _haSend();
     });
+
 }
 
 #endif // HOMEASSISTANT_SUPPORT