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

Migrate MqttHandleInverter to TaskScheduler

Browse Source
This commit is contained in:
Thomas Basler 2023-11-20 21:42:58 +01:00
parent 5c501f879f
commit 524483451f
3 changed files with 67 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/MqttHandleInverter.h
View File

@ -3,22 +3,23 @@
#include "Configuration.h" #include "Configuration.h"
#include <Hoymiles.h> #include <Hoymiles.h>
#include <TimeoutHelper.h> #include <TaskSchedulerDeclarations.h>
#include <espMqttClient.h> #include <espMqttClient.h>
class MqttHandleInverterClass { class MqttHandleInverterClass {
public: public:
void init(); void init(Scheduler* scheduler);
void loop();
static String getTopic(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId); static String getTopic(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
private: private:
void loop();
void publishField(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId); void publishField(std::shared_ptr<InverterAbstract> inv, ChannelType_t type, ChannelNum_t channel, FieldId_t fieldId);
void onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total); void onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, size_t len, size_t index, size_t total);
Task _loopTask;
uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 }; uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 };
uint32_t _lastPublish = 0;
FieldId_t _publishFields[14] = { FieldId_t _publishFields[14] = {
FLD_UDC, FLD_UDC,

119
src/MqttHandleInverter.cpp
View File

@ -18,7 +18,7 @@
MqttHandleInverterClass MqttHandleInverter; MqttHandleInverterClass MqttHandleInverter;
void MqttHandleInverterClass::init() void MqttHandleInverterClass::init(Scheduler* scheduler)
{ {
using std::placeholders::_1; using std::placeholders::_1;
using std::placeholders::_2; using std::placeholders::_2;
@ -34,90 +34,93 @@ void MqttHandleInverterClass::init()
MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE).c_str(), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6)); MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE).c_str(), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_POWER).c_str(), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6)); MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_POWER).c_str(), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_RESTART).c_str(), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6)); MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_RESTART).c_str(), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
scheduler->addTask(_loopTask);
_loopTask.setCallback(std::bind(&MqttHandleInverterClass::loop, this));
_loopTask.setIterations(TASK_FOREVER);
_loopTask.setInterval(Configuration.get().Mqtt.PublishInterval * TASK_SECOND);
_loopTask.enable();
} }
void MqttHandleInverterClass::loop() void MqttHandleInverterClass::loop()
{ {
_loopTask.setInterval(Configuration.get().Mqtt.PublishInterval * TASK_SECOND);
if (!MqttSettings.getConnected() || !Hoymiles.isAllRadioIdle()) { if (!MqttSettings.getConnected() || !Hoymiles.isAllRadioIdle()) {
_loopTask.forceNextIteration();
return; return;
} }
const CONFIG_T& config = Configuration.get(); // Loop all inverters
for (uint8_t i = 0; i < Hoymiles.getNumInverters(); i++) {
auto inv = Hoymiles.getInverterByPos(i);
if (millis() - _lastPublish > (config.Mqtt.PublishInterval * 1000)) { String subtopic = inv->serialString();
// Loop all inverters
for (uint8_t i = 0; i < Hoymiles.getNumInverters(); i++) {
auto inv = Hoymiles.getInverterByPos(i);
String subtopic = inv->serialString(); // Name
MqttSettings.publish(subtopic + "/name", inv->name());
// Name if (inv->DevInfo()->getLastUpdate() > 0) {
MqttSettings.publish(subtopic + "/name", inv->name()); // Bootloader Version
MqttSettings.publish(subtopic + "/device/bootloaderversion", String(inv->DevInfo()->getFwBootloaderVersion()));
if (inv->DevInfo()->getLastUpdate() > 0) { // Firmware Version
// Bootloader Version MqttSettings.publish(subtopic + "/device/fwbuildversion", String(inv->DevInfo()->getFwBuildVersion()));
MqttSettings.publish(subtopic + "/device/bootloaderversion", String(inv->DevInfo()->getFwBootloaderVersion()));
// Firmware Version // Firmware Build DateTime
MqttSettings.publish(subtopic + "/device/fwbuildversion", String(inv->DevInfo()->getFwBuildVersion())); char timebuffer[32];
const time_t t = inv->DevInfo()->getFwBuildDateTime();
std::strftime(timebuffer, sizeof(timebuffer), "%Y-%m-%d %H:%M:%S", gmtime(&t));
MqttSettings.publish(subtopic + "/device/fwbuilddatetime", String(timebuffer));
// Firmware Build DateTime // Hardware part number
char timebuffer[32]; MqttSettings.publish(subtopic + "/device/hwpartnumber", String(inv->DevInfo()->getHwPartNumber()));
const time_t t = inv->DevInfo()->getFwBuildDateTime();
std::strftime(timebuffer, sizeof(timebuffer), "%Y-%m-%d %H:%M:%S", gmtime(&t));
MqttSettings.publish(subtopic + "/device/fwbuilddatetime", String(timebuffer));
// Hardware part number // Hardware version
MqttSettings.publish(subtopic + "/device/hwpartnumber", String(inv->DevInfo()->getHwPartNumber())); MqttSettings.publish(subtopic + "/device/hwversion", inv->DevInfo()->getHwVersion());
}
// Hardware version if (inv->SystemConfigPara()->getLastUpdate() > 0) {
MqttSettings.publish(subtopic + "/device/hwversion", inv->DevInfo()->getHwVersion()); // Limit
MqttSettings.publish(subtopic + "/status/limit_relative", String(inv->SystemConfigPara()->getLimitPercent()));
uint16_t maxpower = inv->DevInfo()->getMaxPower();
if (maxpower > 0) {
MqttSettings.publish(subtopic + "/status/limit_absolute", String(inv->SystemConfigPara()->getLimitPercent() * maxpower / 100));
} }
}
if (inv->SystemConfigPara()->getLastUpdate() > 0) { MqttSettings.publish(subtopic + "/status/reachable", String(inv->isReachable()));
// Limit MqttSettings.publish(subtopic + "/status/producing", String(inv->isProducing()));
MqttSettings.publish(subtopic + "/status/limit_relative", String(inv->SystemConfigPara()->getLimitPercent()));
uint16_t maxpower = inv->DevInfo()->getMaxPower(); if (inv->Statistics()->getLastUpdate() > 0) {
if (maxpower > 0) { MqttSettings.publish(subtopic + "/status/last_update", String(std::time(0) - (millis() - inv->Statistics()->getLastUpdate()) / 1000));
MqttSettings.publish(subtopic + "/status/limit_absolute", String(inv->SystemConfigPara()->getLimitPercent() * maxpower / 100)); } else {
} MqttSettings.publish(subtopic + "/status/last_update", String(0));
} }
MqttSettings.publish(subtopic + "/status/reachable", String(inv->isReachable())); uint32_t lastUpdateInternal = inv->Statistics()->getLastUpdateFromInternal();
MqttSettings.publish(subtopic + "/status/producing", String(inv->isProducing())); if (inv->Statistics()->getLastUpdate() > 0 && (lastUpdateInternal != _lastPublishStats[i])) {
_lastPublishStats[i] = lastUpdateInternal;
if (inv->Statistics()->getLastUpdate() > 0) { // Loop all channels
MqttSettings.publish(subtopic + "/status/last_update", String(std::time(0) - (millis() - inv->Statistics()->getLastUpdate()) / 1000)); for (auto& t : inv->Statistics()->getChannelTypes()) {
} else { for (auto& c : inv->Statistics()->getChannelsByType(t)) {
MqttSettings.publish(subtopic + "/status/last_update", String(0)); if (t == TYPE_DC) {
} INVERTER_CONFIG_T* inv_cfg = Configuration.getInverterConfig(inv->serial());
if (inv_cfg != nullptr) {
uint32_t lastUpdateInternal = inv->Statistics()->getLastUpdateFromInternal(); // TODO(tbnobody)
if (inv->Statistics()->getLastUpdate() > 0 && (lastUpdateInternal != _lastPublishStats[i])) { MqttSettings.publish(inv->serialString() + "/" + String(static_cast<uint8_t>(c) + 1) + "/name", inv_cfg->channel[c].Name);
_lastPublishStats[i] = lastUpdateInternal;
// Loop all channels
for (auto& t : inv->Statistics()->getChannelTypes()) {
for (auto& c : inv->Statistics()->getChannelsByType(t)) {
if (t == TYPE_DC) {
INVERTER_CONFIG_T* inv_cfg = Configuration.getInverterConfig(inv->serial());
if (inv_cfg != nullptr) {
// TODO(tbnobody)
MqttSettings.publish(inv->serialString() + "/" + String(static_cast<uint8_t>(c) + 1) + "/name", inv_cfg->channel[c].Name);
}
}
for (uint8_t f = 0; f < sizeof(_publishFields) / sizeof(FieldId_t); f++) {
publishField(inv, t, c, _publishFields[f]);
} }
} }
for (uint8_t f = 0; f < sizeof(_publishFields) / sizeof(FieldId_t); f++) {
publishField(inv, t, c, _publishFields[f]);
}
} }
} }
yield();
} }
_lastPublish = millis(); yield();
} }
} }

4
src/main.cpp
View File

@ -100,7 +100,7 @@ void setup()
MessageOutput.print("Initialize MqTT... "); MessageOutput.print("Initialize MqTT... ");
MqttSettings.init(); MqttSettings.init();
MqttHandleDtu.init(&scheduler); MqttHandleDtu.init(&scheduler);
MqttHandleInverter.init(); MqttHandleInverter.init(&scheduler);
MqttHandleInverterTotal.init(&scheduler); MqttHandleInverterTotal.init(&scheduler);
MqttHandleHass.init(&scheduler); MqttHandleHass.init(&scheduler);
MessageOutput.println("done"); MessageOutput.println("done");
@ -157,8 +157,6 @@ void loop()
yield(); yield();
InverterSettings.loop(); InverterSettings.loop();
yield(); yield();
MqttHandleInverter.loop();
yield();
WebApi.loop(); WebApi.loop();
yield(); yield();
Display.loop(); Display.loop();