Migrate SunPosition to TaskScheduler

This commit is contained in:
Thomas Basler 2023-11-20 20:57:14 +01:00
parent a7c9c2df1a
commit 12031ed09e
3 changed files with 11 additions and 6 deletions

View File

@ -1,14 +1,14 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once
#include <TaskSchedulerDeclarations.h>
#include <atomic> #include <atomic>
#include <sunset.h> #include <sunset.h>
class SunPositionClass { class SunPositionClass {
public: public:
SunPositionClass(); SunPositionClass();
void init(); void init(Scheduler* scheduler);
void loop();
bool isDayPeriod(); bool isDayPeriod();
bool isSunsetAvailable(); bool isSunsetAvailable();
@ -17,10 +17,13 @@ public:
void setDoRecalc(bool doRecalc); void setDoRecalc(bool doRecalc);
private: private:
void loop();
void updateSunData(); void updateSunData();
bool checkRecalcDayChanged(); bool checkRecalcDayChanged();
bool getSunTime(struct tm* info, uint32_t offset); bool getSunTime(struct tm* info, uint32_t offset);
Task _loopTask;
bool _isSunsetAvailable = true; bool _isSunsetAvailable = true;
uint32_t _sunriseMinutes = 0; uint32_t _sunriseMinutes = 0;
uint32_t _sunsetMinutes = 0; uint32_t _sunsetMinutes = 0;

View File

@ -13,8 +13,12 @@ SunPositionClass::SunPositionClass()
{ {
} }
void SunPositionClass::init() void SunPositionClass::init(Scheduler* scheduler)
{ {
scheduler->addTask(_loopTask);
_loopTask.setCallback(std::bind(&SunPositionClass::loop, this));
_loopTask.setIterations(TASK_FOREVER);
_loopTask.enable();
} }
void SunPositionClass::loop() void SunPositionClass::loop()

View File

@ -93,7 +93,7 @@ void setup()
// Initialize SunPosition // Initialize SunPosition
MessageOutput.print("Initialize SunPosition... "); MessageOutput.print("Initialize SunPosition... ");
SunPosition.init(); SunPosition.init(&scheduler);
MessageOutput.println("done"); MessageOutput.println("done");
// Initialize MqTT // Initialize MqTT
@ -171,8 +171,6 @@ void loop()
yield(); yield();
Display.loop(); Display.loop();
yield(); yield();
SunPosition.loop();
yield();
MessageOutput.loop(); MessageOutput.loop();
yield(); yield();
LedSingle.loop(); LedSingle.loop();