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 // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include <TaskSchedulerDeclarations.h>
#include <cstdint> #include <cstdint>
class MqttHandleDtuClass { class MqttHandleDtuClass {
public: public:
void init(); void init(Scheduler* scheduler);
void loop();
private: private:
uint32_t _lastPublish = 0; void loop();
Task _loopTask;
}; };
extern MqttHandleDtuClass MqttHandleDtu; extern MqttHandleDtuClass MqttHandleDtu;

28
src/MqttHandleDtu.cpp
View File

@ -10,27 +10,29 @@
MqttHandleDtuClass MqttHandleDtu; 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() void MqttHandleDtuClass::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(); MqttSettings.publish("dtu/uptime", String(millis() / 1000));
MqttSettings.publish("dtu/ip", NetworkSettings.localIP().toString());
if (millis() - _lastPublish > (config.Mqtt.PublishInterval * 1000)) { MqttSettings.publish("dtu/hostname", NetworkSettings.getHostname());
MqttSettings.publish("dtu/uptime", String(millis() / 1000)); if (NetworkSettings.NetworkMode() == network_mode::WiFi) {
MqttSettings.publish("dtu/ip", NetworkSettings.localIP().toString()); MqttSettings.publish("dtu/rssi", String(WiFi.RSSI()));
MqttSettings.publish("dtu/hostname", NetworkSettings.getHostname()); MqttSettings.publish("dtu/bssid", String(WiFi.BSSIDstr()));
if (NetworkSettings.NetworkMode() == network_mode::WiFi) {
MqttSettings.publish("dtu/rssi", String(WiFi.RSSI()));
MqttSettings.publish("dtu/bssid", String(WiFi.BSSIDstr()));
}
_lastPublish = millis();
} }
} }

4
src/main.cpp
View File

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