From 5e4316cd3e9792e36c31ead42e8ddaf7a7196850 Mon Sep 17 00:00:00 2001 From: fvanroie <15969459+fvanroie@users.noreply.github.com> Date: Sat, 24 Apr 2021 05:00:11 +0200 Subject: [PATCH] Add manufacturer --- src/hasp/hasp_dispatch.cpp | 12 +++--------- src/sys/svc/hasp_http.cpp | 6 +++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/hasp/hasp_dispatch.cpp b/src/hasp/hasp_dispatch.cpp index 2fdeaaf7..1d5a0cd9 100644 --- a/src/hasp/hasp_dispatch.cpp +++ b/src/hasp/hasp_dispatch.cpp @@ -919,7 +919,7 @@ void dispatch_output_statusupdate(const char*, const char*) { #if HASP_USE_MQTT > 0 - char data[400]; + char data[512]; char topic[16]; { char buffer[128]; @@ -927,7 +927,8 @@ void dispatch_output_statusupdate(const char*, const char*) haspGetVersion(buffer, sizeof(buffer)); dispatch_get_idle_state(hasp_sleep_state, topic); snprintf_P(data, sizeof(data), - PSTR("{\"node\":\"%s\",\"model\":\"%s\",\"idle\":\"%s\",\"version\":\"%s\",\"uptime\":%lu,"), + PSTR("{\"node\":\"%s\",\"manufacturer\":\"" D_MANUFACTURER + "\",\"model\":\"%s\",\"idle\":\"%s\",\"version\":\"%s\",\"uptime\":%lu,"), haspDevice.get_hostname(), haspDevice.get_model(), topic, buffer, (unsigned long)(millis() / 1000)); // \"status\":\"available\", @@ -961,13 +962,6 @@ void dispatch_output_statusupdate(const char*, const char*) dispatch_state_subtopic(topic, data); dispatchLastMillis = millis(); - /* if(updateEspAvailable) { - mqttStatusPayload += F("\"updateEspAvailable\":true,"); - } else { - mqttStatusPayload += F("\"updateEspAvailable\":false,"); - } - */ - #endif } diff --git a/src/sys/svc/hasp_http.cpp b/src/sys/svc/hasp_http.cpp index cedad49f..de87977b 100644 --- a/src/sys/svc/hasp_http.cpp +++ b/src/sys/svc/hasp_http.cpp @@ -138,7 +138,7 @@ const char HTTP_SCRIPT[] PROGMEM = "