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

Move publishHass method to MqttHandleHassClass

Browse Source
This commit is contained in:
Thomas Basler 2022-12-14 21:08:35 +01:00
parent 113caf510f
commit 91f79fea19
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/MqttHandleHass.h
View File

@ -59,6 +59,7 @@ public:
void forceUpdate(); void forceUpdate();
private: private:
void publish(const String& subtopic, const String& payload);
void publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear = false); void publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear = false);
void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload); void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload);
void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, int16_t min = 1, int16_t max = 100); void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, int16_t min = 1, int16_t max = 100);

1
include/MqttSettings.h
View File

@ -16,7 +16,6 @@ public:
bool getConnected(); bool getConnected();
void publish(const String& subtopic, const String& payload); void publish(const String& subtopic, const String& payload);
void publishGeneric(const String& topic, const String& payload, bool retain, uint8_t qos = 0); void publishGeneric(const String& topic, const String& payload, bool retain, uint8_t qos = 0);
void publishHass(const String& subtopic, const String& payload);
void subscribe(const String& topic, uint8_t qos, const espMqttClientTypes::OnMessageCallback& cb); void subscribe(const String& topic, uint8_t qos, const espMqttClientTypes::OnMessageCallback& cb);
void unsubscribe(const String& topic); void unsubscribe(const String& topic);

17
src/MqttHandleHass.cpp
View File

@ -131,9 +131,9 @@ void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, ui
char buffer[512]; char buffer[512];
serializeJson(root, buffer); serializeJson(root, buffer);
MqttSettings.publishHass(configTopic, buffer); publish(configTopic, buffer);
} else { } else {
MqttSettings.publishHass(configTopic, ""); publish(configTopic, "");
} }
} }
@ -169,7 +169,7 @@ void MqttHandleHassClass::publishInverterButton(std::shared_ptr<InverterAbstract
char buffer[512]; char buffer[512];
serializeJson(root, buffer); serializeJson(root, buffer);
MqttSettings.publishHass(configTopic, buffer); publish(configTopic, buffer);
} }
void MqttHandleHassClass::publishInverterNumber( void MqttHandleHassClass::publishInverterNumber(
@ -208,7 +208,7 @@ void MqttHandleHassClass::publishInverterNumber(
char buffer[512]; char buffer[512];
serializeJson(root, buffer); serializeJson(root, buffer);
MqttSettings.publishHass(configTopic, buffer); publish(configTopic, buffer);
} }
void MqttHandleHassClass::publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off) void MqttHandleHassClass::publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off)
@ -237,7 +237,7 @@ void MqttHandleHassClass::publishInverterBinarySensor(std::shared_ptr<InverterAb
char buffer[512]; char buffer[512];
serializeJson(root, buffer); serializeJson(root, buffer);
MqttSettings.publishHass(configTopic, buffer); publish(configTopic, buffer);
} }
void MqttHandleHassClass::createDeviceInfo(JsonObject& object, std::shared_ptr<InverterAbstract> inv) void MqttHandleHassClass::createDeviceInfo(JsonObject& object, std::shared_ptr<InverterAbstract> inv)
@ -249,3 +249,10 @@ void MqttHandleHassClass::createDeviceInfo(JsonObject& object, std::shared_ptr<I
object[F("mdl")] = inv->typeName(); object[F("mdl")] = inv->typeName();
object[F("sw")] = AUTO_GIT_HASH; object[F("sw")] = AUTO_GIT_HASH;
} }
void MqttHandleHassClass::publish(const String& subtopic, const String& payload)
{
String topic = Configuration.get().Mqtt_Hass_Topic;
topic += subtopic;
MqttSettings.publishGeneric(topic.c_str(), payload.c_str(), Configuration.get().Mqtt_Hass_Retain);
}

7
src/MqttSettings.cpp
View File

@ -165,13 +165,6 @@ void MqttSettingsClass::publishGeneric(const String& topic, const String& payloa
mqttClient->publish(topic.c_str(), qos, retain, payload.c_str()); mqttClient->publish(topic.c_str(), qos, retain, payload.c_str());
} }
void MqttSettingsClass::publishHass(const String& subtopic, const String& payload)
{
String topic = Configuration.get().Mqtt_Hass_Topic;
topic += subtopic;
mqttClient->publish(topic.c_str(), 0, Configuration.get().Mqtt_Hass_Retain, payload.c_str());
}
void MqttSettingsClass::init() void MqttSettingsClass::init()
{ {
using std::placeholders::_1; using std::placeholders::_1;