relay: properly handle zero interlock time

schedule when >0, execute immediately otherwise
xoseperez · Jan 17, 2023 · 11c8978 · 11c8978
1 parent e2c8dd7
commit 11c8978
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/code/espurna/relay.cpp b/code/espurna/relay.cpp
@@ -1664,33 +1664,34 @@ void _relaySyncRelaysDelay(size_t first, size_t second) {
     });
 }
 
-void _relaySyncUnlock() {
-    bool unlock = true;
-    bool all_off = true;
-    for (const auto& relay : _relays) {
-        unlock = unlock && (relay.current_status == relay.target_status);
-        if (!unlock) break;
-        all_off = all_off && !relay.current_status;
-    }
-
-    if (unlock) {
-        static const auto action = []() {
-            _relayUnlockAll();
+void _relaySyncUnlockAction() {
+    _relayUnlockAll();
 #if WEB_SUPPORT
-            _relayScheduleWsReport();
+    _relayScheduleWsReport();
 #endif
-        };
+}
+
+
+void _relaySyncUnlock() {
+    bool interlock { false };
+
+    for (const auto& relay : _relays) {
+        if (relay.current_status != relay.target_status) {
+            return;
+        }
 
-        if (all_off) {
-            _relay_sync_timer.schedule(_relay_delay_interlock, action);
-        } else {
-            action();
+        if (relay.current_status) {
+            interlock = true;
         }
     }
-}
 
-void _relaySync() {
-    _relay_sync_timer.process();
+    if (interlock && (_relay_delay_interlock.count() > 0)) {
+        _relay_sync_timer.schedule(
+            _relay_delay_interlock, _relaySyncUnlockAction);
+    } else {
+        _relay_sync_timer.stop();
+        _relaySyncUnlockAction();
+    }
 }
 
 void _relaySyncTryUnlock() {
@@ -1708,6 +1709,10 @@ void _relaySyncTryUnlock() {
     }
 }
 
+void _relaySync() {
+    _relay_sync_timer.process();
+}
+
 } // namespace
 
 // -----------------------------------------------------------------------------