From fbeed5af28ee72a6bcf6ce5b1a44eb87d35dbeff Mon Sep 17 00:00:00 2001
From: fvanroie <fvanroie@users.noreply.github.com>
Date: Sun, 12 Apr 2020 16:48:22 +0200
Subject: [PATCH] Add and test user_override settings

---
 src/hasp_mqtt.cpp | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/hasp_mqtt.cpp b/src/hasp_mqtt.cpp
index c344ef6d..48f9b6dd 100644
--- a/src/hasp_mqtt.cpp
+++ b/src/hasp_mqtt.cpp
@@ -49,18 +49,6 @@ String mqttLightBrightStateTopic;   // MQTT topic for outgoing panel backlight d
 // String mqttMotionStateTopic;        // MQTT topic for outgoing motion sensor state
 */
 
-#ifdef MQTT_NODENAME
-char mqttNodeName[16] = MQTT_NODENAME;
-#else
-char mqttNodeName[16]  = "";
-#endif
-
-#ifdef MQTT_GROUPNAME
-char mqttGroupName[16] = MQTT_GROUPNAME;
-#else
-char mqttGroupName[16] = "";
-#endif
-
 // String mqttClientId((char *)0); // Auto-generated MQTT ClientID
 // String mqttNodeTopic((char *)0);
 // String mqttGroupTopic((char *)0);
@@ -90,6 +78,19 @@ char mqttPassword[32] = MQTT_PASSW;
 #else
 char mqttPassword[32]  = "";
 #endif
+#ifdef MQTT_NODENAME
+char mqttNodeName[16] = MQTT_NODENAME;
+#else
+char mqttNodeName[16]  = "";
+#endif
+#ifdef MQTT_GROUPNAME
+char mqttGroupName[16] = MQTT_GROUPNAME;
+#else
+char mqttGroupName[16] = "";
+#endif
+#ifndef MQTT_PREFIX
+#define MQTT_PREFIX "hasp"
+#endif
 
 /*
 const String mqttLightSubscription        = "hasp/" + String(haspGetNodename()) + "/light/#";
@@ -559,8 +560,8 @@ bool mqttSetConfig(const JsonObject & settings)
         strncpy(mqttPassword, settings[FPSTR(F_CONFIG_PASS)], sizeof(mqttPassword));
     }
 
-    snprintf_P(mqttNodeTopic, sizeof(mqttNodeTopic), PSTR("hasp/%s/"), mqttNodeName);
-    snprintf_P(mqttGroupTopic, sizeof(mqttGroupTopic), PSTR("hasp/%s/"), mqttGroupName);
+    snprintf_P(mqttNodeTopic, sizeof(mqttNodeTopic), PSTR(MQTT_PREFIX "/%s/"), mqttNodeName);
+    snprintf_P(mqttGroupTopic, sizeof(mqttGroupTopic), PSTR(MQTT_PREFIX "/%s/"), mqttGroupName);
 
     return changed;
 }