jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-25 20:26:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add and test user_override settings

Browse Source
This commit is contained in:
fvanroie 2020-04-12 16:48:22 +02:00
parent e9895107c7
commit fbeed5af28
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/hasp_mqtt.cpp
View File

@ -49,18 +49,6 @@ String mqttLightBrightStateTopic; // MQTT topic for outgoing panel backlight d
// String mqttMotionStateTopic; // MQTT topic for outgoing motion sensor state // 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 mqttClientId((char *)0); // Auto-generated MQTT ClientID
// String mqttNodeTopic((char *)0); // String mqttNodeTopic((char *)0);
// String mqttGroupTopic((char *)0); // String mqttGroupTopic((char *)0);
@ -90,6 +78,19 @@ char mqttPassword[32] = MQTT_PASSW;
#else #else
char mqttPassword[32] = ""; char mqttPassword[32] = "";
#endif #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/#"; 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)); strncpy(mqttPassword, settings[FPSTR(F_CONFIG_PASS)], sizeof(mqttPassword));
} }
snprintf_P(mqttNodeTopic, sizeof(mqttNodeTopic), PSTR("hasp/%s/"), mqttNodeName); snprintf_P(mqttNodeTopic, sizeof(mqttNodeTopic), PSTR(MQTT_PREFIX "/%s/"), mqttNodeName);
snprintf_P(mqttGroupTopic, sizeof(mqttGroupTopic), PSTR("hasp/%s/"), mqttGroupName); snprintf_P(mqttGroupTopic, sizeof(mqttGroupTopic), PSTR(MQTT_PREFIX "/%s/"), mqttGroupName);
return changed; return changed;
} }