Migrate SunPosition to TaskScheduler
This commit is contained in:
parent
a7c9c2df1a
commit
12031ed09e
@ -1,14 +1,14 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#pragma once
|
||||
|
||||
#include <TaskSchedulerDeclarations.h>
|
||||
#include <atomic>
|
||||
#include <sunset.h>
|
||||
|
||||
class SunPositionClass {
|
||||
public:
|
||||
SunPositionClass();
|
||||
void init();
|
||||
void loop();
|
||||
void init(Scheduler* scheduler);
|
||||
|
||||
bool isDayPeriod();
|
||||
bool isSunsetAvailable();
|
||||
@ -17,10 +17,13 @@ public:
|
||||
void setDoRecalc(bool doRecalc);
|
||||
|
||||
private:
|
||||
void loop();
|
||||
void updateSunData();
|
||||
bool checkRecalcDayChanged();
|
||||
bool getSunTime(struct tm* info, uint32_t offset);
|
||||
|
||||
Task _loopTask;
|
||||
|
||||
bool _isSunsetAvailable = true;
|
||||
uint32_t _sunriseMinutes = 0;
|
||||
uint32_t _sunsetMinutes = 0;
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -93,7 +93,7 @@ void setup()
|
||||
|
||||
// Initialize SunPosition
|
||||
MessageOutput.print("Initialize SunPosition... ");
|
||||
SunPosition.init();
|
||||
SunPosition.init(&scheduler);
|
||||
MessageOutput.println("done");
|
||||
|
||||
// Initialize MqTT
|
||||
@ -171,8 +171,6 @@ void loop()
|
||||
yield();
|
||||
Display.loop();
|
||||
yield();
|
||||
SunPosition.loop();
|
||||
yield();
|
||||
MessageOutput.loop();
|
||||
yield();
|
||||
LedSingle.loop();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user