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

Rename MqttPublishing to MqttHandleInverter

Browse Source
This commit is contained in:
Thomas Basler 2022-12-14 19:13:34 +01:00
parent 5dde17c56b
commit 723a2c6dbe
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/MqttPublishing.h → include/MqttHandleInverter.h
View File

@ -6,7 +6,7 @@
#include <Hoymiles.h> #include <Hoymiles.h>
#include <memory> #include <memory>
class MqttPublishingClass { class MqttHandleInverterClass {
public: public:
void init(); void init();
void loop(); void loop();
@ -37,4 +37,4 @@ private:
}; };
}; };
extern MqttPublishingClass MqttPublishing; extern MqttHandleInverterClass MqttHandleInverter;

4
src/MqttHandleHass.cpp
View File

@ -3,7 +3,7 @@
* Copyright (C) 2022 Thomas Basler and others * Copyright (C) 2022 Thomas Basler and others
*/ */
#include "MqttHandleHass.h" #include "MqttHandleHass.h"
#include "MqttPublishing.h" #include "MqttHandleInverter.h"
#include "MqttSettings.h" #include "MqttSettings.h"
#include "NetworkSettings.h" #include "NetworkSettings.h"
@ -99,7 +99,7 @@ void MqttHandleHassClass::publishField(std::shared_ptr<InverterAbstract> inv, ui
+ "/config"; + "/config";
if (!clear) { if (!clear) {
String stateTopic = MqttSettings.getPrefix() + MqttPublishing.getTopic(inv, channel, fieldType.fieldId); String stateTopic = MqttSettings.getPrefix() + MqttHandleInverter.getTopic(inv, channel, fieldType.fieldId);
const char* devCls = deviceClasses[fieldType.deviceClsId]; const char* devCls = deviceClasses[fieldType.deviceClsId];
const char* stateCls = stateClasses[fieldType.stateClsId]; const char* stateCls = stateClasses[fieldType.stateClsId];

12
src/MqttPublishing.cpp → src/MqttHandleInverter.cpp
View File

@ -2,18 +2,18 @@
/* /*
* Copyright (C) 2022 Thomas Basler and others * Copyright (C) 2022 Thomas Basler and others
*/ */
#include "MqttPublishing.h" #include "MqttHandleInverter.h"
#include "MqttSettings.h" #include "MqttSettings.h"
#include "NetworkSettings.h" #include "NetworkSettings.h"
#include <ctime> #include <ctime>
MqttPublishingClass MqttPublishing; MqttHandleInverterClass MqttHandleInverter;
void MqttPublishingClass::init() void MqttHandleInverterClass::init()
{ {
} }
void MqttPublishingClass::loop() void MqttHandleInverterClass::loop()
{ {
if (!MqttSettings.getConnected() || !Hoymiles.getRadio()->isIdle()) { if (!MqttSettings.getConnected() || !Hoymiles.getRadio()->isIdle()) {
return; return;
@ -102,7 +102,7 @@ void MqttPublishingClass::loop()
} }
} }
void MqttPublishingClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId) void MqttHandleInverterClass::publishField(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
{ {
String topic = getTopic(inv, channel, fieldId); String topic = getTopic(inv, channel, fieldId);
if (topic == "") { if (topic == "") {
@ -112,7 +112,7 @@ void MqttPublishingClass::publishField(std::shared_ptr<InverterAbstract> inv, ui
MqttSettings.publish(topic, String(inv->Statistics()->getChannelFieldValue(channel, fieldId))); MqttSettings.publish(topic, String(inv->Statistics()->getChannelFieldValue(channel, fieldId)));
} }
String MqttPublishingClass::getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId) String MqttHandleInverterClass::getTopic(std::shared_ptr<InverterAbstract> inv, uint8_t channel, uint8_t fieldId)
{ {
if (!inv->Statistics()->hasChannelFieldValue(channel, fieldId)) { if (!inv->Statistics()->hasChannelFieldValue(channel, fieldId)) {
return String(""); return String("");

6
src/main.cpp
View File

@ -5,7 +5,7 @@
#include "Configuration.h" #include "Configuration.h"
#include "Hoymiles.h" #include "Hoymiles.h"
#include "MqttHandleHass.h" #include "MqttHandleHass.h"
#include "MqttPublishing.h" #include "MqttHandleInverter.h"
#include "MqttSettings.h" #include "MqttSettings.h"
#include "NetworkSettings.h" #include "NetworkSettings.h"
#include "NtpSettings.h" #include "NtpSettings.h"
@ -68,7 +68,7 @@ void setup()
// Initialize MqTT // Initialize MqTT
Serial.print(F("Initialize MqTT... ")); Serial.print(F("Initialize MqTT... "));
MqttSettings.init(); MqttSettings.init();
MqttPublishing.init(); MqttHandleInverter.init();
MqttHandleHass.init(); MqttHandleHass.init();
Serial.println(F("done")); Serial.println(F("done"));
@ -133,7 +133,7 @@ void loop()
yield(); yield();
Hoymiles.loop(); Hoymiles.loop();
yield(); yield();
MqttPublishing.loop(); MqttHandleInverter.loop();
yield(); yield();
MqttHandleHass.loop(); MqttHandleHass.loop();
yield(); yield();