code cleanup around routingTask

mathieucarbou · Dec 24, 2024 · 4f7579c · 4f7579c
1 parent 451e913
commit 4f7579c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 43 deletions.
diff --git a/include/YaSolR.h b/include/YaSolR.h
@@ -85,46 +85,43 @@ extern Mycila::RouterRelay routerRelay2;
 extern Mycila::TrafficLight lights;
 
 extern Mycila::TaskManager coreTaskManager;
+extern Mycila::Task calibrationTask;
+extern Mycila::Task carouselTask;
 extern Mycila::Task dashboardInitTask;
 extern Mycila::Task dashboardUpdateTask;
 extern Mycila::Task debugTask;
-extern Mycila::Task networkConfigTask;
-extern Mycila::Task networkManagerTask;
-extern Mycila::Task safeBootTask;
+extern Mycila::Task displayTask;
+extern Mycila::Task lightsTask;
+extern Mycila::Task relayTask;
 extern Mycila::Task resetTask;
 extern Mycila::Task restartTask;
+extern Mycila::Task routerTask;
+extern Mycila::Task safeBootTask;
+extern Mycila::Task zcdTask;
 #ifdef APP_MODEL_TRIAL
 extern Mycila::Task trialTask;
 #endif
 
 extern Mycila::TaskManager mqttTaskManager;
 extern Mycila::Task haDiscoveryTask;
 extern Mycila::Task mqttConfigTask;
-extern Mycila::Task mqttPublishTask;
-extern Mycila::Task mqttPublishStaticTask;
 extern Mycila::Task mqttPublishConfigTask;
+extern Mycila::Task mqttPublishStaticTask;
+extern Mycila::Task mqttPublishTask;
 
 extern Mycila::TaskManager pioTaskManager;
-extern Mycila::Task calibrationTask;
-extern Mycila::Task carouselTask;
-extern Mycila::Task displayTask;
 extern Mycila::Task ds18Task;
-extern Mycila::Task lightsTask;
+extern Mycila::Task networkConfigTask;
+extern Mycila::Task networkManagerTask;
 extern Mycila::Task pzemO1PairingTask;
 extern Mycila::Task pzemO2PairingTask;
-extern Mycila::Task relayTask;
-extern Mycila::Task routerTask;
-extern Mycila::Task zcdTask;
 
 extern Mycila::TaskManager jsyTaskManager;
 extern Mycila::Task jsyTask;
 
 extern Mycila::TaskManager pzemTaskManager;
 extern Mycila::Task pzemTask;
 
-// extern Mycila::TaskManager routingTaskManager;
-extern Mycila::Task routingTask;
-
 // Tasks alone without a manager
 extern Mycila::Task bootTask;
 extern Mycila::Task initConfigTask;
@@ -135,6 +132,7 @@ extern Mycila::Task initLoggingTask;
 extern Mycila::Task initMqttSubscribersTask;
 extern Mycila::Task initRestApiTask;
 extern Mycila::Task initWebTask;
+extern Mycila::Task routingTask;
 
 extern Mycila::CircularBuffer<float, 50> udpMessageRateBuffer;
 

diff --git a/src/init/Config.cpp b/src/init/Config.cpp
@@ -48,9 +48,6 @@ Mycila::Task initConfigTask("Init Config", [](void* params) {
   // pzemTaskManager
   pzemTask.setEnabledWhen([]() { return (pzemO1.isEnabled() || pzemO2.isEnabled()) && pzemO1PairingTask.isPaused() && pzemO2PairingTask.isPaused(); });
 
-  // routingTaskManager
-  routingTask.setEnabledWhen([]() { return !router.isCalibrationRunning() && (output1.isAutoDimmerEnabled() || output2.isAutoDimmerEnabled()); });
-
   // Grid
   grid.localMetrics().setExpiration(10000);                             // local is fast
   grid.remoteMetrics().setExpiration(10000);                            // remote JSY is fast

diff --git a/src/init/Core.cpp b/src/init/Core.cpp
@@ -18,11 +18,11 @@ Mycila::Task initCoreTask("Init Core", [](void* params) {
   debugTask.setManager(coreTaskManager);
   displayTask.setManager(coreTaskManager);
   lightsTask.setManager(coreTaskManager);
-  safeBootTask.setManager(coreTaskManager);
   relayTask.setManager(coreTaskManager);
   resetTask.setManager(coreTaskManager);
   restartTask.setManager(coreTaskManager);
   routerTask.setManager(coreTaskManager);
+  safeBootTask.setManager(coreTaskManager);
   zcdTask.setManager(coreTaskManager);
 #ifdef APP_MODEL_TRIAL
   trialTask.setManager(coreTaskManager);
@@ -31,14 +31,14 @@ Mycila::Task initCoreTask("Init Core", [](void* params) {
   // mqttTaskManager
   haDiscoveryTask.setManager(mqttTaskManager);
   mqttConfigTask.setManager(mqttTaskManager);
-  mqttPublishTask.setManager(mqttTaskManager);
-  mqttPublishStaticTask.setManager(mqttTaskManager);
   mqttPublishConfigTask.setManager(mqttTaskManager);
+  mqttPublishStaticTask.setManager(mqttTaskManager);
+  mqttPublishTask.setManager(mqttTaskManager);
 
   // pioTaskManager
   ds18Task.setManager(pioTaskManager);
-  networkManagerTask.setManager(pioTaskManager);
   networkConfigTask.setManager(pioTaskManager);
+  networkManagerTask.setManager(pioTaskManager);
   pzemO1PairingTask.setManager(pioTaskManager);
   pzemO2PairingTask.setManager(pioTaskManager);
 
@@ -48,9 +48,6 @@ Mycila::Task initCoreTask("Init Core", [](void* params) {
   // pzemTaskManager
   pzemTask.setManager(pzemTaskManager);
 
-  // routingTaskManager
-  // routingTask.setManager(routingTaskManager);
-
   // Router
   router.addOutput(output1);
   router.addOutput(output2);
@@ -65,7 +62,6 @@ Mycila::Task initCoreTask("Init Core", [](void* params) {
   Mycila::TaskMonitor.addTask(pioTaskManager.getName());     // YaSolR
   Mycila::TaskMonitor.addTask(coreTaskManager.getName());    // YaSolR
   Mycila::TaskMonitor.addTask(mqttTaskManager.getName());    // YaSolR
-  // Mycila::TaskMonitor.addTask(routingTaskManager.getName()); // YaSolR
   Mycila::TaskMonitor.addTask(jsyTaskManager.getName());     // YaSolR
   Mycila::TaskMonitor.addTask(pzemTaskManager.getName());    // YaSolR
 });
diff --git a/src/tasks/Router.cpp b/src/tasks/Router.cpp
@@ -19,3 +19,21 @@ Mycila::Task routerTask("Router", [](void* params) {
   output1.applyAutoBypass();
   output2.applyAutoBypass();
 });
+
+Mycila::Task routingTask("Routing", Mycila::TaskType::ONCE, [](void* params) {
+  if (router.isCalibrationRunning())
+    return;
+
+  if (!output1.isAutoDimmerEnabled() && !output2.isAutoDimmerEnabled())
+    return;
+
+  std::optional<float> voltage = grid.getVoltage();
+  const Mycila::ExpiringValue<float>& power = grid.power();
+
+  if (voltage.has_value() && power.isPresent()) {
+    router.divert(voltage.value(), power.get());
+    if (config.getBool(KEY_ENABLE_PID_VIEW)) {
+      dashboardUpdateTask.requestEarlyRun();
+    }
+  }
+});
diff --git a/src/tasks/Routing.cpp b/src/tasks/Routing.cpp