jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-24 11:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make mqtt_esp honour the MQTT_GROUPNAME define

Browse Source
This commit is contained in:
Ben Suffolk 2023-07-02 13:54:54 +01:00
parent 2bf8ebfb56
commit 14d5c7ace5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/mqtt/hasp_mqtt_esp.cpp
View File

@ -26,7 +26,7 @@
#include "esp_tls.h"
#define MQTT_DEFAULT_NODE_TOPIC MQTT_PREFIX "/%hostname%/%topic%"
#define MQTT_DEFAULT_GROUP_TOPIC MQTT_PREFIX "/plates/%topic%"
#define MQTT_DEFAULT_GROUP_TOPIC MQTT_PREFIX "/" MQTT_GROUPNAME "/%topic%"
#define MQTT_DEFAULT_BROADCAST_TOPIC MQTT_PREFIX "/" MQTT_TOPIC_BROADCAST "/%topic%"
#define MQTT_DEFAULT_HASS_TOPIC "homeassistant/status"
@ -509,7 +509,7 @@ void mqttStart()
subtopic.reserve(64);
String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting
nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, "plates");
nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, MQTT_GROUPNAME);
nvsOldGroup += "/%topic%";
subtopic = F(MQTT_TOPIC_COMMAND);
@ -700,7 +700,7 @@ bool mqttGetConfig(const JsonObject& settings)
{
String nvsOldGroup = MQTT_PREFIX "/"; // recover group setting
nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, "plates");
nvsOldGroup += preferences.getString(FP_CONFIG_GROUP, MQTT_GROUPNAME);
nvsOldGroup += "/%topic%";
String nvsGroupTopic =
@ -784,7 +784,7 @@ bool mqttSetConfig(const JsonObject& settings)
}
// if(strlen(mqttGroupName) == 0) {
// strcpy_P(mqttGroupName, PSTR("plates"));
// strcpy_P(mqttGroupName, PSTR(MQTT_GROUPNAME));
// changed = true;
// }