Next try

Author: bouwew

plugwise_usb/nodes/helpers/pulses.py

@@ -510,16 +510,18 @@ def _update_log_direction(
             slot,
             timestamp,
         )
+        prev_exists = next_exists = False
         prev_address, prev_slot = calc_log_address(address, slot, -1)
         if self._log_exists(prev_address, prev_slot):
-            timestamp_2 = self._logs[prev_address][prev_slot].timestamp
+            prev_exists = True
+            prev_timestamp = self._logs[prev_address][prev_slot].timestamp
             _LOGGER.debug(
                 "_update_log_direction | pr_address=%s | pr_slot=%s | timestamp=%s",
                 prev_address,
                 prev_slot,
-                timestamp_2,
+                prev_timestamp,
             )
-            if timestamp_2 == timestamp:
+            if prev_timestamp == timestamp:
                 # Given log is the second log with same timestamp,
                 # mark direction as production
                 self._logs[address][slot].is_consumption = False
@@ -533,23 +535,9 @@ def _update_log_direction(
             elif self._log_production is None:
                 self._log_production = False
 
-            prev_prev_address, prev_prev_slot = calc_log_address(address, slot, -2)
-            if self._log_exists(prev_prev_address, prev_prev_slot):
-                timestamp_3 = self._logs[prev_prev_address][prev_prev_slot].timestamp
-                _LOGGER.debug(
-                    "_update_log_direction | pr2_address=%s | pr2_slot=%s | timestamp=%s",
-                    prev_prev_address,
-                    prev_prev_slot,
-                    timestamp_3,
-                )
-                # _log_production is True when 2 out of 3 consecutive slots have
-                # the same timestamp, otherwise it is False
-                self._log_production = (
-                    timestamp_2 == timestamp and timestamp_3 != timestamp
-                ) or (timestamp_2 == timestamp_3 and timestamp_2 != timestamp)
-
         next_address, next_slot = calc_log_address(address, slot, 1)
         if self._log_exists(next_address, next_slot):
+            next_exists = True
             next_timestamp = self._logs[next_address][next_slot].timestamp
             _LOGGER.debug(
                 "_update_log_direction | nxt_address=%s | nxt_slot=%s | timestamp=%s",
@@ -564,12 +552,20 @@ def _update_log_direction(
                 if self._logs[next_address][next_slot].is_consumption:
                     self._logs[next_address][next_slot].is_consumption = False
                     self._reset_log_references()
+                self._log_production = True
             elif self._log_production:
                 self._logs[address][slot].is_consumption = False
                 self._logs[next_address][next_slot].is_consumption = True
             elif self._log_production is None:
                 self._log_production = False
 
+            if prev_exists and next_exists:
+                # _log_production is True when 2 out of 3 consecutive slots have
+                # the same timestamp, otherwise it is False
+                self._log_production = (
+                    next_timestamp == timestamp and prev_timestamp != timestamp
+                ) or (next_timestamp == prev_timestamp and next_timestamp != timestamp)
+
     def _update_log_interval(self) -> None:
         """Update the detected log interval based on the most recent two logs."""
         if self._logs is None or self._log_production is None: