Migrate InverterSettings to TaskScheduler

hoylabs · Nov 23, 2023 · 77779a1 · 77779a1
1 parent 1501411
commit 77779a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/include/InverterSettings.h b/include/InverterSettings.h
@@ -1,16 +1,20 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
+#include <TaskSchedulerDeclarations.h>
 #include <cstdint>
 
 #define INVERTER_UPDATE_SETTINGS_INTERVAL 60000l
 
 class InverterSettingsClass {
 public:
-    void init();
-    void loop();
+    void init(Scheduler* scheduler);
 
 private:
+    void loop();
+
+    Task _loopTask;
+
     uint32_t _lastUpdate = 0;
 };
 

diff --git a/src/InverterSettings.cpp b/src/InverterSettings.cpp
@@ -25,7 +25,7 @@
 
 InverterSettingsClass InverterSettings;
 
-void InverterSettingsClass::init()
+void InverterSettingsClass::init(Scheduler* scheduler)
 {
     const CONFIG_T& config = Configuration.get();
     const PinMapping_t& pin = PinMapping.get();
@@ -87,6 +87,11 @@ void InverterSettingsClass::init()
     } else {
         MessageOutput.println("Invalid pin config");
     }
+
+    scheduler->addTask(_loopTask);
+    _loopTask.setCallback(std::bind(&InverterSettingsClass::loop, this));
+    _loopTask.setIterations(TASK_FOREVER);
+    _loopTask.enable();
 }
 
 void InverterSettingsClass::loop()

diff --git a/src/main.cpp b/src/main.cpp
@@ -144,7 +144,7 @@ void setup()
     }
     MessageOutput.println("done");
 
-    InverterSettings.init();
+    InverterSettings.init(&scheduler);
 
     Datastore.init(&scheduler);
 }
@@ -153,8 +153,6 @@ void loop()
 {
     scheduler.execute();
 
-    InverterSettings.loop();
-    yield();
     WebApi.loop();
     yield();
     Display.loop();