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

Renamed MqttHassPublishing to MqttHandleHass

Browse Source
This commit is contained in:
Thomas Basler 2022-12-14 19:07:11 +01:00
parent 9b0ab67849
commit 5dde17c56b
5 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/MqttHassPublishing.h → include/MqttHandleHass.h
View File

@ -51,7 +51,7 @@ const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
};
#define DEVICE_CLS_ASSIGN_LIST_LEN (sizeof(deviceFieldAssignment) / sizeof(byteAssign_fieldDeviceClass_t))
class MqttHassPublishingClass {
class MqttHandleHassClass {
public:
void init();
void loop();
@ -69,4 +69,4 @@ private:
bool _updateForced = false;
};
extern MqttHassPublishingClass MqttHassPublishing;
extern MqttHandleHassClass MqttHandleHass;

22
src/MqttHassPublishing.cpp → src/MqttHandleHass.cpp
View File

@ -2,18 +2,18 @@
/*
* Copyright (C) 2022 Thomas Basler and others
*/
#include "MqttHassPublishing.h"
#include "MqttHandleHass.h"
#include "MqttPublishing.h"
#include "MqttSettings.h"
#include "NetworkSettings.h"
MqttHassPublishingClass MqttHassPublishing;
MqttHandleHassClass MqttHandleHass;
void MqttHassPublishingClass::init()
void MqttHandleHassClass::init()
{
}
void MqttHassPublishingClass::loop()
void MqttHandleHassClass::loop()
{
if (_updateForced) {
publishConfig();
@ -30,12 +30,12 @@ void MqttHassPublishingClass::loop()
}
}
void MqttHassPublishingClass::forceUpdate()
void MqttHandleHassClass::forceUpdate()
{
_updateForced = true;
}
void MqttHassPublishingClass::publishConfig()
void MqttHandleHassClass::publishConfig()
{
if (!Configuration.get().Mqtt_Hass_Enabled) {
return;
@ -79,7 +79,7 @@ void MqttHassPublishingClass::publishConfig()
}
}
void MqttHassPublishingClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear)
void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, byteAssign_fieldDeviceClass_t fieldType, bool clear)
{
if (!inv->Statistics()->hasChannelFieldValue(channel, fieldType.fieldId)) {
return;
@ -137,7 +137,7 @@ void MqttHassPublishingClass::publishField(std::shared_ptr<InverterAbstract> inv
}
}
void MqttHassPublishingClass::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 MqttHandleHassClass::publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload)
{
String serial = inv->serialString();
@ -172,7 +172,7 @@ void MqttHassPublishingClass::publishInverterButton(std::shared_ptr<InverterAbst
MqttSettings.publishHass(configTopic, buffer);
}
void MqttHassPublishingClass::publishInverterNumber(
void MqttHandleHassClass::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, int16_t max)
@ -211,7 +211,7 @@ void MqttHassPublishingClass::publishInverterNumber(
MqttSettings.publishHass(configTopic, buffer);
}
void MqttHassPublishingClass::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)
{
String serial = inv->serialString();
@ -240,7 +240,7 @@ void MqttHassPublishingClass::publishInverterBinarySensor(std::shared_ptr<Invert
MqttSettings.publishHass(configTopic, buffer);
}
void MqttHassPublishingClass::createDeviceInfo(JsonObject& object, std::shared_ptr<InverterAbstract> inv)
void MqttHandleHassClass::createDeviceInfo(JsonObject& object, std::shared_ptr<InverterAbstract> inv)
{
object[F("name")] = inv->name();
object[F("ids")] = inv->serialString();

8
src/WebApi_inverter.cpp
View File

@ -7,7 +7,7 @@
#include "AsyncJson.h"
#include "Configuration.h"
#include "Hoymiles.h"
#include "MqttHassPublishing.h"
#include "MqttHandleHass.h"
#include "WebApi.h"
#include "helper.h"
@ -161,7 +161,7 @@ void WebApiInverterClass::onInverterAdd(AsyncWebServerRequest* request)
}
}
MqttHassPublishing.forceUpdate();
MqttHandleHass.forceUpdate();
}
void WebApiInverterClass::onInverterEdit(AsyncWebServerRequest* request)
@ -280,7 +280,7 @@ void WebApiInverterClass::onInverterEdit(AsyncWebServerRequest* request)
}
}
MqttHassPublishing.forceUpdate();
MqttHandleHass.forceUpdate();
}
void WebApiInverterClass::onInverterDelete(AsyncWebServerRequest* request)
@ -348,5 +348,5 @@ void WebApiInverterClass::onInverterDelete(AsyncWebServerRequest* request)
response->setLength();
request->send(response);
MqttHassPublishing.forceUpdate();
MqttHandleHass.forceUpdate();
}

4
src/WebApi_mqtt.cpp
View File

@ -6,7 +6,7 @@
#include "ArduinoJson.h"
#include "AsyncJson.h"
#include "Configuration.h"
#include "MqttHassPublishing.h"
#include "MqttHandleHass.h"
#include "MqttSettings.h"
#include "WebApi.h"
#include "helper.h"
@ -284,7 +284,7 @@ void WebApiMqttClass::onMqttAdminPost(AsyncWebServerRequest* request)
request->send(response);
MqttSettings.performReconnect();
MqttHassPublishing.forceUpdate();
MqttHandleHass.forceUpdate();
}
String WebApiMqttClass::getRootCaCertInfo(const char* cert)

6
src/main.cpp
View File

@ -4,7 +4,7 @@
*/
#include "Configuration.h"
#include "Hoymiles.h"
#include "MqttHassPublishing.h"
#include "MqttHandleHass.h"
#include "MqttPublishing.h"
#include "MqttSettings.h"
#include "NetworkSettings.h"
@ -69,7 +69,7 @@ void setup()
Serial.print(F("Initialize MqTT... "));
MqttSettings.init();
MqttPublishing.init();
MqttHassPublishing.init();
MqttHandleHass.init();
Serial.println(F("done"));
// Initialize WebApi
@ -135,7 +135,7 @@ void loop()
yield();
MqttPublishing.loop();
yield();
MqttHassPublishing.loop();
MqttHandleHass.loop();
yield();
WebApi.loop();
yield();