Fix PZEM async task

mathieucarbou · Jun 7, 2024 · b9971ac · b9971ac
1 parent cbcf169
commit b9971ac
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 40 deletions.
diff --git a/include/YaSolR.h b/include/YaSolR.h
@@ -97,13 +97,10 @@ extern Mycila::Task dashboardTask;
 extern Mycila::Task trialTask;
 #endif
 
-extern Mycila::TaskManager pzemO1TaskManager;
+extern Mycila::TaskManager pzemTaskManager;
 extern Mycila::Task pzemO1PairingTask;
-extern Mycila::Task pzemO1Task;
-
-extern Mycila::TaskManager pzemO2TaskManager;
 extern Mycila::Task pzemO2PairingTask;
-extern Mycila::Task pzemO2Task;
+extern Mycila::Task pzemTask;
 
 extern Mycila::TaskManager routerTaskManager;
 extern Mycila::Task relaysTask;

diff --git a/src/init/Config.cpp b/src/init/Config.cpp
@@ -20,8 +20,7 @@ Mycila::Task initConfigTask("Init Config", [](void* params) {
   mqttPublishTask.setEnabledWhen([]() { return mqtt.isConnected(); });
   mqttPublishTask.setInterval(config.get(KEY_MQTT_PUBLISH_INTERVAL).toInt() * Mycila::TaskDuration::SECONDS);
   profilerTask.setInterval(10 * Mycila::TaskDuration::SECONDS);
-  pzemO1Task.setEnabledWhen([]() { return pzemO1.isEnabled() && pzemO1PairingTask.isPaused() && pzemO2PairingTask.isPaused() && Mycila::Grid.isConnected(); });
-  pzemO2Task.setEnabledWhen([]() { return pzemO2.isEnabled() && pzemO1PairingTask.isPaused() && pzemO2PairingTask.isPaused() && Mycila::Grid.isConnected(); });
+  pzemTask.setEnabledWhen([]() { return (pzemO1.isEnabled() || pzemO2.isEnabled()) && pzemO1PairingTask.isPaused() && pzemO2PairingTask.isPaused() && Mycila::Grid.isConnected(); });
   relaysTask.setInterval(10 * Mycila::TaskDuration::SECONDS);
   routerTask.setInterval(200 * Mycila::TaskDuration::MILLISECONDS);
   dashboardTask.setEnabledWhen([]() { return ESPConnect.isConnected() && dashboard.hasClient() && !dashboard.isAsyncAccessInProgress(); });
@@ -103,14 +102,12 @@ Mycila::Task initConfigTask("Init Config", [](void* params) {
 
   // Task Monitor
   Mycila::TaskMonitor.begin();
-  // Mycila::TaskMonitor.addTask("loopTask");                 // Arduino
   Mycila::TaskMonitor.addTask("async_tcp");                 // AsyncTCP
   Mycila::TaskMonitor.addTask("mqtt_task");                 // MQTT
   Mycila::TaskMonitor.addTask(ioTaskManager.getName());     // YaSolR
   Mycila::TaskMonitor.addTask(jsyTaskManager.getName());    // YaSolR
   Mycila::TaskMonitor.addTask(coreTaskManager.getName());   // YaSolR
-  Mycila::TaskMonitor.addTask(pzemO1TaskManager.getName()); // YaSolR
-  Mycila::TaskMonitor.addTask(pzemO2TaskManager.getName()); // YaSolR
+  Mycila::TaskMonitor.addTask(pzemTaskManager.getName());   // YaSolR
   Mycila::TaskMonitor.addTask(routerTaskManager.getName()); // YaSolR
 
   // Display

diff --git a/src/init/Core.cpp b/src/init/Core.cpp
@@ -37,13 +37,10 @@ Mycila::Task initCoreTask("Init Core", [](void* params) {
   trialTask.setManager(coreTaskManager);
 #endif
 
-  // pzemO1TaskManager
-  pzemO1Task.setManager(pzemO1TaskManager);
-  pzemO1PairingTask.setManager(pzemO1TaskManager);
-
-  // pzemO2TaskManager
-  pzemO2Task.setManager(pzemO2TaskManager);
-  pzemO2PairingTask.setManager(pzemO2TaskManager);
+  // pzemTaskManager
+  pzemTask.setManager(pzemTaskManager);
+  pzemO1PairingTask.setManager(pzemTaskManager);
+  pzemO2PairingTask.setManager(pzemTaskManager);
 
   // routerTaskManager
   relaysTask.setManager(routerTaskManager);

diff --git a/src/init/Logging.cpp b/src/init/Logging.cpp
@@ -24,22 +24,20 @@ Mycila::Task initLoggingTask("Init Logging", [](void* params) {
 
   if (debug) {
     // Enable profiling for some FOREVER tasks
-    displayTask.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    ds18Task.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    jsyTask.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    mqttPublishTask.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    pzemO1Task.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    pzemO2Task.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    profilerTask.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    routerTask.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
-    dashboardTask.enableProfiling(8, Mycila::TaskTimeUnit::MILLISECONDS);
+    displayTask.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
+    ds18Task.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
+    jsyTask.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
+    mqttPublishTask.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
+    pzemTask.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
+    profilerTask.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
+    routerTask.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
+    dashboardTask.enableProfiling(10, Mycila::TaskTimeUnit::MILLISECONDS);
   } else {
     displayTask.disableProfiling();
     ds18Task.disableProfiling();
     jsyTask.disableProfiling();
     mqttPublishTask.disableProfiling();
-    pzemO1Task.disableProfiling();
-    pzemO2Task.disableProfiling();
+    pzemTask.disableProfiling();
     profilerTask.disableProfiling();
     routerTask.disableProfiling();
     dashboardTask.disableProfiling();

diff --git a/src/init/REST.cpp b/src/init/REST.cpp
@@ -45,8 +45,7 @@ Mycila::Task initRestApiTask("Init REST API", [](void* params) {
       ioTaskManager.toJson(root["ioTaskManager"].to<JsonObject>());
       jsyTaskManager.toJson(root["jsyTaskManager"].to<JsonObject>());
       coreTaskManager.toJson(root["coreTaskManager"].to<JsonObject>());
-      pzemO1TaskManager.toJson(root["pzemO1TaskManager"].to<JsonObject>());
-      pzemO2TaskManager.toJson(root["pzemO2TaskManager"].to<JsonObject>());
+      pzemTaskManager.toJson(root["pzemTaskManager"].to<JsonObject>());
       routerTaskManager.toJson(root["routerTaskManager"].to<JsonObject>());
 
       response->setLength();

diff --git a/src/main.cpp b/src/main.cpp
@@ -28,8 +28,7 @@ Mycila::TrafficLight lights;
 Mycila::TaskManager ioTaskManager("I/O");
 Mycila::TaskManager jsyTaskManager("JSY");
 Mycila::TaskManager coreTaskManager("Core");
-Mycila::TaskManager pzemO1TaskManager("PZEM Output 1");
-Mycila::TaskManager pzemO2TaskManager("PZEM Output 2");
+Mycila::TaskManager pzemTaskManager("PZEM");
 Mycila::TaskManager routerTaskManager("Router");
 
 Mycila::RouterOutput output1("output1", dimmerO1, ds18O1, bypassRelayO1, pzemO1);
@@ -52,8 +51,7 @@ void setup() {
   assert(  coreTaskManager.asyncStart(1024 * 4, 0, 1, 100, true)); // NOLINT
   assert(    ioTaskManager.asyncStart(1024 * 5, 0, 1, 100, true)); // NOLINT
   assert(   jsyTaskManager.asyncStart(1024 * 3, 0, 0, 100, true)); // NOLINT
-  assert(pzemO1TaskManager.asyncStart(1024 * 3, 0, 0, 100, true)); // NOLINT
-  assert(pzemO2TaskManager.asyncStart(1024 * 3, 0, 0, 100, true)); // NOLINT
+  assert(  pzemTaskManager.asyncStart(1024 * 3, 0, 0, 100, true)); // NOLINT
   assert(routerTaskManager.asyncStart(1024 * 3, 0, 1, 100, true)); // NOLINT
 
   // STARTUP READY!

diff --git a/src/tasks/PZEM.cpp b/src/tasks/PZEM.cpp
@@ -6,10 +6,13 @@
 
 #define TAG "YASOLR"
 
-Mycila::Task pzemO1Task("PZEM 0x01", [](void* params) { pzemO1.read(); });
-Mycila::Task pzemO2Task("PZEM 0x02", [](void* params) { pzemO2.read(); });
+Mycila::Task pzemTask("PZEM", [](void* params) {
+  // PZEM are on the same serial so cannot be read concurrently
+  pzemO1.read();
+  pzemO2.read();
+});
 
-Mycila::Task pzemO1PairingTask("PZEM 0x01 Pairing", Mycila::TaskType::ONCE, [](void* params) {
+Mycila::Task pzemO1PairingTask("PZEM Pairing 0x01", Mycila::TaskType::ONCE, [](void* params) {
   logger.info(TAG, "Pairing connected PZEM to Output 1...");
   pzemO1.end();
   pzemO2.end();
@@ -39,7 +42,7 @@ Mycila::Task pzemO1PairingTask("PZEM 0x01 Pairing", Mycila::TaskType::ONCE, [](v
   }
 });
 
-Mycila::Task pzemO2PairingTask("PZEM 0x02 Pairing", Mycila::TaskType::ONCE, [](void* params) {
+Mycila::Task pzemO2PairingTask("PZEM Pairing 0x02", Mycila::TaskType::ONCE, [](void* params) {
   logger.info(TAG, "Pairing connected PZEM to Output 2...");
   pzemO1.end();
   pzemO2.end();

diff --git a/src/tasks/Profiler.cpp b/src/tasks/Profiler.cpp
@@ -9,7 +9,6 @@ Mycila::Task profilerTask("Profiler", [](void* params) {
   ioTaskManager.log();
   jsyTaskManager.log();
   coreTaskManager.log();
-  pzemO1TaskManager.log();
-  pzemO2TaskManager.log();
+  pzemTaskManager.log();
   routerTaskManager.log();
 });