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

fix: Custom Group Topic name does not work

Browse Source 
issues #697

https://github.com/HASwitchPlate/openHASP/issues/697
This commit is contained in:
marsman7 2024-04-07 21:03:59 +02:00
parent f0eda5018a
commit 482cda6898
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/mqtt/hasp_mqtt_esp.cpp
View File

@ -313,6 +313,7 @@ static int mqttSubscribeTo(String topic)
return err; return err;
} }
/*
String mqttGetTopic(Preferences preferences, String subtopic, String key, String value, bool add_slash) String mqttGetTopic(Preferences preferences, String subtopic, String key, String value, bool add_slash)
{ {
String topic = preferences.getString(key.c_str(), value); String topic = preferences.getString(key.c_str(), value);
@ -327,6 +328,20 @@ String mqttGetTopic(Preferences preferences, String subtopic, String key, String
} }
return topic; return topic;
} }
*/
void mqttParseTopic(String *topic, String subtopic, bool add_slash)
{
topic->replace(F("%hostname%"), haspDevice.get_hostname());
topic->replace(F("%hwid%"), haspDevice.get_hardware_id());
topic->replace(F("%topic%"), subtopic);
topic->replace(F("%prefix%"), MQTT_PREFIX);
if(add_slash && !topic->endsWith("/")) {
*topic += "/";
}
}
void onMqttConnect(esp_mqtt_client_handle_t client) void onMqttConnect(esp_mqtt_client_handle_t client)
{ {
@ -513,23 +528,29 @@ void mqttStart()
nvsOldGroup += "/%topic%"; nvsOldGroup += "/%topic%";
subtopic = F(MQTT_TOPIC_COMMAND); subtopic = F(MQTT_TOPIC_COMMAND);
mqttNodeCommandTopic = mqttNodeCommandTopic = preferences.getString(FP_CONFIG_NODE_TOPIC, MQTT_DEFAULT_NODE_TOPIC);
mqttGetTopic(preferences, subtopic, FP_CONFIG_NODE_TOPIC, MQTT_DEFAULT_NODE_TOPIC, false); mqttParseTopic(&mqttNodeCommandTopic, subtopic, false);
mqttGroupCommandTopic = mqttGetTopic(preferences, subtopic, FP_CONFIG_GROUP_TOPIC, nvsOldGroup.c_str(), false); mqttGroupCommandTopic = preferences.getString(FP_CONFIG_GROUP_TOPIC, nvsOldGroup.c_str());
mqttParseTopic(&mqttGroupCommandTopic, subtopic, false);
#ifdef HASP_USE_BROADCAST #ifdef HASP_USE_BROADCAST
mqttBroadcastCommandTopic = mqttBroadcastCommandTopic = preferences.getString(FP_CONFIG_BROADCAST_TOPIC, MQTT_DEFAULT_BROADCAST_TOPIC);
mqttGetTopic(preferences, subtopic, FP_CONFIG_BROADCAST_TOPIC, MQTT_DEFAULT_BROADCAST_TOPIC, false); mqttParseTopic(&mqttBroadcastCommandTopic, subtopic, false);
#endif #endif
subtopic = F(MQTT_TOPIC_STATE); subtopic = F(MQTT_TOPIC_STATE);
mqttNodeStateTopic = mqttGetTopic(preferences, subtopic, FP_CONFIG_NODE_TOPIC, MQTT_DEFAULT_NODE_TOPIC, true); mqttNodeStateTopic = preferences.getString(FP_CONFIG_NODE_TOPIC, MQTT_DEFAULT_NODE_TOPIC);
mqttParseTopic(&mqttNodeStateTopic, subtopic, true);
subtopic = F(MQTT_TOPIC_LWT); subtopic = F(MQTT_TOPIC_LWT);
mqttNodeLwtTopic = mqttGetTopic(preferences, subtopic, FP_CONFIG_NODE_TOPIC, MQTT_DEFAULT_NODE_TOPIC, false); mqttNodeLwtTopic = preferences.getString(FP_CONFIG_NODE_TOPIC, MQTT_DEFAULT_NODE_TOPIC);
mqttParseTopic(&mqttNodeLwtTopic, subtopic, false);
LOG_WARNING(TAG_MQTT, mqttNodeLwtTopic.c_str()); LOG_WARNING(TAG_MQTT, mqttNodeLwtTopic.c_str());
subtopic = F(MQTT_TOPIC_LWT); subtopic = F(MQTT_TOPIC_LWT);
mqttHassLwtTopic = mqttGetTopic(preferences, subtopic, FP_CONFIG_HASS_TOPIC, MQTT_DEFAULT_HASS_TOPIC, false); mqttHassLwtTopic = preferences.getString(FP_CONFIG_HASS_TOPIC, MQTT_DEFAULT_HASS_TOPIC);
mqttParseTopic(&mqttHassLwtTopic, subtopic, false);
LOG_WARNING(TAG_MQTT, mqttNodeLwtTopic.c_str()); LOG_WARNING(TAG_MQTT, mqttNodeLwtTopic.c_str());
preferences.end(); preferences.end();