More Development...

mathieucarbou · Jun 10, 2024 · a26c8dc · a26c8dc
1 parent 4b220c6
commit a26c8dc
Showing 1 changed file with 8 additions and 58 deletions.
diff --git a/src/init/Events.cpp b/src/init/Events.cpp
@@ -28,60 +28,6 @@ Mycila::Task initEventsTask("Init Events", [](void* params) {
 
     if (key == KEY_ENABLE_DEBUG) {
       initLoggingTask.forceRun();
-
-    } else if (key == KEY_RELAY1_LOAD) {
-      routerRelay1.setLoad(config.get(KEY_RELAY1_LOAD).toInt());
-
-    } else if (key == KEY_RELAY2_LOAD) {
-      routerRelay2.setLoad(config.get(KEY_RELAY2_LOAD).toInt());
-
-    } else if (key == KEY_ENABLE_OUTPUT1_AUTO_DIMMER) {
-      output1.config.autoDimmer = config.getBool(KEY_ENABLE_OUTPUT1_AUTO_DIMMER);
-
-    } else if (key == KEY_OUTPUT1_DIMMER_LIMITER) {
-      output1.config.dimmerLimit = config.get(KEY_OUTPUT1_DIMMER_LIMITER).toInt();
-
-    } else if (key == KEY_ENABLE_OUTPUT1_AUTO_BYPASS) {
-      output1.config.autoBypass = config.getBool(KEY_ENABLE_OUTPUT1_AUTO_BYPASS);
-
-    } else if (key == KEY_OUTPUT1_TEMPERATURE_START) {
-      output1.config.autoStartTemperature = config.get(KEY_OUTPUT1_TEMPERATURE_START).toInt();
-
-    } else if (key == KEY_OUTPUT1_TEMPERATURE_STOP) {
-      output1.config.autoStopTemperature = config.get(KEY_OUTPUT1_TEMPERATURE_STOP).toInt();
-
-    } else if (key == KEY_OUTPUT1_TIME_START) {
-      output1.config.autoStartTime = config.get(KEY_OUTPUT1_TIME_START);
-
-    } else if (key == KEY_OUTPUT1_TIME_STOP) {
-      output1.config.autoStopTime = config.get(KEY_OUTPUT1_TIME_STOP);
-
-    } else if (key == KEY_OUTPUT1_DAYS) {
-      output1.config.weekDays = config.get(KEY_OUTPUT1_DAYS);
-
-    } else if (key == KEY_ENABLE_OUTPUT2_AUTO_DIMMER) {
-      output2.config.autoDimmer = config.getBool(KEY_ENABLE_OUTPUT2_AUTO_DIMMER);
-
-    } else if (key == KEY_OUTPUT2_DIMMER_LIMITER) {
-      output2.config.dimmerLimit = config.get(KEY_OUTPUT2_DIMMER_LIMITER).toInt();
-
-    } else if (key == KEY_ENABLE_OUTPUT2_AUTO_BYPASS) {
-      output2.config.autoBypass = config.getBool(KEY_ENABLE_OUTPUT2_AUTO_BYPASS);
-
-    } else if (key == KEY_OUTPUT2_TEMPERATURE_START) {
-      output2.config.autoStartTemperature = config.get(KEY_OUTPUT2_TEMPERATURE_START).toInt();
-
-    } else if (key == KEY_OUTPUT2_TEMPERATURE_STOP) {
-      output2.config.autoStopTemperature = config.get(KEY_OUTPUT2_TEMPERATURE_STOP).toInt();
-
-    } else if (key == KEY_OUTPUT2_TIME_START) {
-      output2.config.autoStartTime = config.get(KEY_OUTPUT2_TIME_START);
-
-    } else if (key == KEY_OUTPUT2_TIME_STOP) {
-      output2.config.autoStopTime = config.get(KEY_OUTPUT2_TIME_STOP);
-
-    } else if (key == KEY_OUTPUT2_DAYS) {
-      output2.config.weekDays = config.get(KEY_OUTPUT2_DAYS);
     }
 
     YaSolR::Website.initCards();
@@ -226,10 +172,14 @@ Mycila::Task initEventsTask("Init Events", [](void* params) {
     // mqttPublishTask.requestEarlyRun();
   });
 
-  const bool jsyPow = config.get(KEY_GRID_POWER_MQTT_TOPIC).isEmpty();
-  jsy.setCallback([jsyPow](const Mycila::JSYEventType eventType) {
-    if (eventType == Mycila::JSYEventType::EVT_READ) {
+  jsy.setCallback([](const Mycila::JSYEventType eventType) {
+    if (eventType == Mycila::JSYEventType::EVT_READ)
       routingTask.resume();
-    }
+  });
+  pzemO1.setCallback([](const Mycila::PZEMEventType eventType) {
+    routingTask.resume();
+  });
+  pzemO2.setCallback([](const Mycila::PZEMEventType eventType) {
+    routingTask.resume();
   });
 });