Use Configured MQTT Topic
This commit is contained in:
+23
-8
@@ -1,13 +1,13 @@
|
||||
#include "MessageHandler.h"
|
||||
#include <Logging.h>
|
||||
#include <sstream>
|
||||
|
||||
|
||||
namespace ToonBridge {
|
||||
namespace Toon {
|
||||
|
||||
MessageHandler::MessageHandler(MQTT::MQTT& mqtt) :
|
||||
m_mqtt(mqtt)
|
||||
MessageHandler::MessageHandler(MQTT::MQTT& mqtt, const std::string& mqttTopic) :
|
||||
m_mqtt(mqtt),
|
||||
m_mqttTopic(mqttTopic)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -46,8 +46,11 @@ void MessageHandler::Disconnect(size_t connection)
|
||||
|
||||
void MessageHandler::HandlePowerUsageMessage(const nlohmann::json& data)
|
||||
{
|
||||
std::stringstream ss;
|
||||
ss << m_mqttTopic << "/PowerUsage";
|
||||
|
||||
MQTT::MQTTMessage message;
|
||||
message.topic = "ToonBridge/PowerUsage";
|
||||
message.topic = ss.str();
|
||||
message.payload = data.dump();
|
||||
m_mqtt.Send(message);
|
||||
/*
|
||||
@@ -74,8 +77,11 @@ void MessageHandler::HandlePowerUsageMessage(const nlohmann::json& data)
|
||||
|
||||
void MessageHandler::HandleGasUsageMessage(const nlohmann::json& data)
|
||||
{
|
||||
std::stringstream ss;
|
||||
ss << m_mqttTopic << "/GasUsage";
|
||||
|
||||
MQTT::MQTTMessage message;
|
||||
message.topic = "ToonBridge/GasUsage";
|
||||
message.topic = ss.str();
|
||||
message.payload = data.dump();
|
||||
m_mqtt.Send(message);
|
||||
/*
|
||||
@@ -92,8 +98,11 @@ void MessageHandler::HandleGasUsageMessage(const nlohmann::json& data)
|
||||
|
||||
void MessageHandler::HandleWaterUsageMessage(const nlohmann::json& data)
|
||||
{
|
||||
std::stringstream ss;
|
||||
ss << m_mqttTopic << "/WaterUsage";
|
||||
|
||||
MQTT::MQTTMessage message;
|
||||
message.topic = "ToonBridge/WaterUsage";
|
||||
message.topic = ss.str();
|
||||
message.payload = data.dump();
|
||||
m_mqtt.Send(message);
|
||||
/*
|
||||
@@ -109,8 +118,11 @@ void MessageHandler::HandleWaterUsageMessage(const nlohmann::json& data)
|
||||
|
||||
void MessageHandler::HandleThermostatInfoMessage(const nlohmann::json& data)
|
||||
{
|
||||
std::stringstream ss;
|
||||
ss << m_mqttTopic << "/ThermostatInfo";
|
||||
|
||||
MQTT::MQTTMessage message;
|
||||
message.topic = "ToonBridge/ThermostatInfo";
|
||||
message.topic = ss.str();
|
||||
message.payload = data.dump();
|
||||
m_mqtt.Send(message);
|
||||
/*
|
||||
@@ -138,8 +150,11 @@ void MessageHandler::HandleThermostatInfoMessage(const nlohmann::json& data)
|
||||
|
||||
void MessageHandler::HandleThermostatStatesMessage(const nlohmann::json& data)
|
||||
{
|
||||
std::stringstream ss;
|
||||
ss << m_mqttTopic << "/ThermostatStates";
|
||||
|
||||
MQTT::MQTTMessage message;
|
||||
message.topic = "ToonBridge/ThermostatStates";
|
||||
message.topic = ss.str();
|
||||
message.payload = data.dump();
|
||||
m_mqtt.Send(message);
|
||||
/*
|
||||
|
||||
Reference in New Issue
Block a user