Initial support for HA autodiscovery

src/svc/hasp_mqtt.cpp

@@ -7,6 +7,7 @@
     #include "PubSubClient.h"
 
     #include "hasp_mqtt.h"
+    #include "hasp_mqtt_ha.h"
 
     #if defined(ARDUINO_ARCH_ESP32)
         #include <WiFi.h>
@@ -57,7 +58,7 @@ String mqttCommandTopic;            // MQTT topic for incoming panel commands
 char mqttNodeTopic[24];
 char mqttGroupTopic[24];
 bool mqttEnabled        = false;
-bool mqttHAautodiscover = false;
+bool mqttHAautodiscover = true;
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     // These defaults may be overwritten with values saved by the web interface
@@ -170,9 +171,6 @@ void IRAM_ATTR mqtt_send_obj_attribute_str(uint8_t pageid, uint8_t btnid, const
     //           data);
 }
 
-void mqtt_ha_send_config()
-{}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Receive incoming messages
 static void mqtt_message_cb(char * topic, byte * payload, unsigned int length)
@@ -198,9 +196,9 @@ static void mqtt_message_cb(char * topic, byte * payload, unsigned int length)
         dispatch_topic_payload(topic, (const char *)payload);
         return;
 
-    } else if(mqttHAautodiscover && topic == strstr_P(topic, PSTR("homeassistant/status"))) { // HA discovery topic
+    } else if(topic == strstr_P(topic, PSTR("hass/status"))) { // HA discovery topic
-        if(!strcasecmp_P((char *)payload, PSTR("online"))) {
+        if(mqttHAautodiscover && !strcasecmp_P((char *)payload, PSTR("online"))) {
-            mqtt_ha_send_config();
+            mqtt_ha_send_backlight();
         }
         return;
 
@@ -337,6 +335,7 @@ void mqttStart()
     mqttSubscribeTo(PSTR("%slight/#"), mqttNodeTopic);
     mqttSubscribeTo(PSTR("%sbrightness/#"), mqttNodeTopic);
     mqttSubscribeTo(PSTR("%sLWT"), mqttNodeTopic);
+    mqttSubscribeTo(PSTR("hass/status"), "");
 
     /* Home Assistant auto-configuration */
     if(mqttHAautodiscover) mqttSubscribeTo(PSTR("homeassistant/status"), mqttClientId);

src/svc/hasp_mqtt_ha.cpp

@@ -0,0 +1,135 @@
+/* MIT License - Copyright (c) 2020 Francis Van Roie
+   For full license information read the LICENSE file in the project folder */
+
+#include "hasp_conf.h"
+#if HASP_USE_MQTT > 0
+
+    #include "PubSubClient.h"
+
+    #include "hasp_mqtt.h"
+    #include "hasp_mqtt_ha.h"
+
+    #define RETAINED true
+
+extern PubSubClient mqttClient;
+extern char mqttNodeName[16];
+extern char mqttNodeTopic[24];
+extern char mqttGroupTopic[24];
+extern bool mqttEnabled;
+extern bool mqttHAautodiscover;
+
+char discovery_prefix[] = "homeassistant";
+
+void mqtt_ha_send_backlight()
+{
+    char component[20];
+    char object_id[20]; // object
+    char device_id[20];
+    char unique_id[20];
+    char configtopic[64];
+    char payload[512];
+
+    snprintf_P(device_id, sizeof(device_id), PSTR("%s_0123456"), mqttNodeName);
+
+    snprintf_P(component, sizeof(component), PSTR("light"));
+    snprintf_P(object_id, sizeof(object_id), PSTR("light"));
+    snprintf_P(unique_id, sizeof(unique_id), PSTR("%s_%s"), mqttNodeName, object_id);
+
+    snprintf_P(configtopic, sizeof(configtopic), PSTR("%s/%s/%s/%s/config"), discovery_prefix, component, mqttNodeName,
+               object_id);
+    snprintf_P(payload, sizeof(payload),
+               PSTR("{"
+                    "\"device\":{\"ids\":\"%s\",\"name\":\"%s\",\"mdl\":\"Lanbon "
+                    "L8\",\"sw\":\"%d.%d.%d\",\"mf\":\"hasp-lvgl\"},"
+                    "\"name\":\"Backlight\","
+                    "\"uniq_id\":\"%s\","
+                    "\"~\":\"%s\","
+                    "\"cmd_t\":\"~command/light\","
+                    "\"stat_t\":\"~state/light\","
+                    "\"avty_t\":\"~LWT\","
+                    "\"bri_stat_t\":\"~state/dim\","
+                    "\"bri_cmd_t\":\"~command/dim\","
+                    "\"bri_scl\":100,"
+                    "\"pl_on\":\"ON\","
+                    "\"pl_off\":\"OFF\""
+                    "}"),
+               device_id, mqttNodeName, HASP_VERSION_MAJOR, HASP_VERSION_MINOR, HASP_VERSION_REVISION, unique_id,
+               mqttNodeTopic);
+
+    mqttClient.publish(configtopic, payload, RETAINED);
+
+    snprintf_P(component, sizeof(component), PSTR("sensor"));
+    snprintf_P(object_id, sizeof(object_id), PSTR("sensor"));
+    snprintf_P(unique_id, sizeof(unique_id), PSTR("%s_%s"), mqttNodeName, object_id);
+
+    snprintf_P(configtopic, sizeof(configtopic), PSTR("%s/%s/%s/%s/config"), discovery_prefix, component, mqttNodeName,
+               object_id);
+    snprintf_P(payload, sizeof(payload),
+               PSTR("{"
+                    "\"device\":{\"ids\":\"%s\",\"name\":\"%s\",\"mdl\":\"Lanbon "
+                    "L8\",\"sw\":\"%d.%d.%d\",\"mf\":\"hasp-lvgl\"},"
+                    "\"name\":\"Idle State\","
+                    "\"uniq_id\":\"%s\","
+                    "\"~\":\"%s\","
+                    "\"avty_t\":\"~LWT\","
+                    "\"stat_t\":\"~state/idle\","
+                    "\"json_attr_t\":\"~state/statusupdate\","
+                    "\"val_tpl\":\"{{ value | capitalize }}\""
+                    "}"),
+               device_id, mqttNodeName, HASP_VERSION_MAJOR, HASP_VERSION_MINOR, HASP_VERSION_REVISION, unique_id,
+               mqttNodeTopic);
+
+    mqttClient.publish(configtopic, payload, RETAINED);
+}
+#endif
+
+/*
+{
+    "device":
+        {"ids": "plate_87546c", "name": "Test Switchplate", "mdl": "Lanbon L8", "sw": "v0.3.1", "mf": "hasp-lvgl"},
+    "name": "Backlight",
+    "uniq_id": "hasp35_light",
+    "~": "hasp/plate35",
+    "cmd_t": "~/command/light",
+    "stat_t": "~/state/light",
+    "avty_t": "~/LWT",
+    "bri_stat_t": "~/state/dim",
+    "bri_cmd_t": "~/command/dim",
+    "bri_scl": 100,
+    "pl_on": "ON",
+    "pl_off": "OFF"
+}
+
+{
+    "name": "Lanbon idle State",
+    "state_topic": "hasp/lanbon/state/idle",
+    "value_template": "{{ value | capitalize }}",
+    "icon": "hass:card",
+    "json_attributes_topic": "hasp/lanbon/state/statusupdate",
+    "availability_topic": "hasp/lanbon/LWT",
+    "unique_id": "plate_87546c_idle",
+    "device": {
+        "identifiers": ["plate_87546c"],
+        "name": "Test Switchplate",
+        "model": "Lanbon L8",
+        "sw_version": "v0.3.1",
+        "manufacturer": "hasp-lvgl"
+    }
+}
+
+{
+    "name" : "Lanbon Backlight",
+             "state_topic" : "hasp/lanbon/state/light",
+                             "command_topic" : "hasp/lanbon/command/light",
+                                               "brightness_state_topic" : "hasp/lanbon/state/dim",
+                                                                          "brightness_scale" : 100,
+                                                                          "brightness_command_topic"
+        : "hasp/lanbon/command/dim",
+          "availability_topic" : "hasp/lanbon/LWT",
+                                 "unique_id" : "plate_87546c_bcklght",
+                                               "device":
+    {
+        "identifiers" : ["plate_87546c"]
+    }
+}
+*/

src/svc/hasp_mqtt_ha.h

@@ -0,0 +1,9 @@
+/* MIT License - Copyright (c) 2020 Francis Van Roie
+   For full license information read the LICENSE file in the project folder */
+
+#ifndef HASP_MQTT_HA_H
+#define HASP_MQTT_HA_H
+
+void mqtt_ha_send_backlight();
+
+#endif