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

Migrate MqttHandleDtu to TaskScheduler

Browse Source
This commit is contained in:
Thomas Basler 2023-11-20 21:35:56 +01:00
parent 48a27fbfad
commit 5c501f879f
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/MqttHandleDtu.h
View File

@ -1,15 +1,17 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include <TaskSchedulerDeclarations.h>
#include <cstdint>
class MqttHandleDtuClass {
public:
void init();
void loop();
void init(Scheduler* scheduler);
private:
uint32_t _lastPublish = 0;
void loop();
Task _loopTask;
};
extern MqttHandleDtuClass MqttHandleDtu;

28
src/MqttHandleDtu.cpp
View File

@ -10,27 +10,29 @@
MqttHandleDtuClass MqttHandleDtu;
void MqttHandleDtuClass::init()
void MqttHandleDtuClass::init(Scheduler* scheduler)
{
scheduler->addTask(_loopTask);
_loopTask.setCallback(std::bind(&MqttHandleDtuClass::loop, this));
_loopTask.setIterations(TASK_FOREVER);
_loopTask.setInterval(Configuration.get().Mqtt.PublishInterval * TASK_SECOND);
_loopTask.enable();
}
void MqttHandleDtuClass::loop()
{
_loopTask.setInterval(Configuration.get().Mqtt.PublishInterval * TASK_SECOND);
if (!MqttSettings.getConnected() || !Hoymiles.isAllRadioIdle()) {
_loopTask.forceNextIteration();
return;
}
const CONFIG_T& config = Configuration.get();
if (millis() - _lastPublish > (config.Mqtt.PublishInterval * 1000)) {
MqttSettings.publish("dtu/uptime", String(millis() / 1000));
MqttSettings.publish("dtu/ip", NetworkSettings.localIP().toString());
MqttSettings.publish("dtu/hostname", NetworkSettings.getHostname());
if (NetworkSettings.NetworkMode() == network_mode::WiFi) {
MqttSettings.publish("dtu/rssi", String(WiFi.RSSI()));
MqttSettings.publish("dtu/bssid", String(WiFi.BSSIDstr()));
}
_lastPublish = millis();
MqttSettings.publish("dtu/uptime", String(millis() / 1000));
MqttSettings.publish("dtu/ip", NetworkSettings.localIP().toString());
MqttSettings.publish("dtu/hostname", NetworkSettings.getHostname());
if (NetworkSettings.NetworkMode() == network_mode::WiFi) {
MqttSettings.publish("dtu/rssi", String(WiFi.RSSI()));
MqttSettings.publish("dtu/bssid", String(WiFi.BSSIDstr()));
}
}

4
src/main.cpp
View File

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