patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented public getPrefix method to get the mqtt topic prefix

Browse Source
This commit is contained in:
Thomas Basler 2022-07-18 19:08:38 +02:00
parent 3d1a56a61c
commit bb52d24c25
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/MqttSettings.h
View File

@ -15,6 +15,8 @@ public:
bool getConnected(); bool getConnected();
void publish(String subtopic, String payload); void publish(String subtopic, String payload);
String getPrefix();
private: private:
void WiFiEvent(WiFiEvent_t event); void WiFiEvent(WiFiEvent_t event);

9
src/MqttSettings.cpp
View File

@ -51,7 +51,7 @@ void MqttSettingsClass::performConnect()
mqttClient.setServer(config.Mqtt_Hostname, config.Mqtt_Port); mqttClient.setServer(config.Mqtt_Hostname, config.Mqtt_Port);
mqttClient.setCredentials(config.Mqtt_Username, config.Mqtt_Password); mqttClient.setCredentials(config.Mqtt_Username, config.Mqtt_Password);
willTopic = String(config.Mqtt_Topic) + config.Mqtt_LwtTopic; willTopic = getPrefix() + config.Mqtt_LwtTopic;
mqttClient.setWill(willTopic.c_str(), 2, config.Mqtt_Retain, config.Mqtt_LwtValue_Offline); mqttClient.setWill(willTopic.c_str(), 2, config.Mqtt_Retain, config.Mqtt_LwtValue_Offline);
clientId = WiFiSettings.getApName(); clientId = WiFiSettings.getApName();
@ -81,9 +81,14 @@ bool MqttSettingsClass::getConnected()
return mqttClient.connected(); return mqttClient.connected();
} }
String MqttSettingsClass::getPrefix()
{
return Configuration.get().Mqtt_Topic;
}
void MqttSettingsClass::publish(String subtopic, String payload) void MqttSettingsClass::publish(String subtopic, String payload)
{ {
String topic = Configuration.get().Mqtt_Topic; String topic = getPrefix();
topic += subtopic; topic += subtopic;
mqttClient.publish(topic.c_str(), 0, Configuration.get().Mqtt_Retain, payload.c_str()); mqttClient.publish(topic.c_str(), 0, Configuration.get().Mqtt_Retain, payload.c_str());
} }