Revert pulses-change and improve

Author: bouwew

plugwise_usb/nodes/helpers/pulses.py

@@ -518,67 +518,8 @@ def _update_log_direction(
         or double slots containing consumption and production data.
         Single slots containing production data only is NOT supported/tested.
         """
-        if self._logs is None:
-            return
-
-        def check_prev_production(
-            self, address: int, slot: int, timestamp: datetime
-        ) -> datetime | None:
-            """Check the previous slot for production pulses."""
-            prev_address, prev_slot = calc_log_address(address, slot, -1)
-            if self._log_exists(prev_address, prev_slot):
-                prev_timestamp = self._logs[prev_address][prev_slot].timestamp
-                if not self._first_prev_log_processed:
-                    self._first_prev_log_processed = True
-                    if prev_timestamp == timestamp:
-                        # Given log is the second log with same timestamp,
-                        # mark direction as production
-                        self._logs[address][slot].is_consumption = False
-                        self._logs[prev_address][prev_slot].is_consumption = True
-                        self._log_production = True
-                    elif self._log_production:
-                        self._logs[address][slot].is_consumption = True
-                        if self._logs[prev_address][prev_slot].is_consumption:
-                            self._logs[prev_address][prev_slot].is_consumption = False
-                            self._reset_log_references()
-                    elif self._log_production is None:
-                        self._log_production = False
-                return prev_timestamp
-
-            if self._first_prev_log_processed:
-                self._first_prev_log_processed = False
-                return None
-            
-        def check_next_production(
-            self, address: int, slot: int, timestamp: datetime
-        ) -> datetime | None:
-            """Check the next slot for production pulses."""
-            next_address, next_slot = calc_log_address(address, slot, 1)
-            if self._log_exists(next_address, next_slot):
-                next_timestamp = self._logs[next_address][next_slot].timestamp
-                if not self._first_next_log_processed:
-                    self._first_next_log_processed = True
-                    if next_timestamp == timestamp:
-                        # Given log is the first log with same timestamp,
-                        # mark direction as production of next log
-                        self._logs[address][slot].is_consumption = True
-                        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
-                return next_timestamp
-
-            if self._first_next_log_processed:
-                self._first_next_log_processed = False
-                return None
-
-        prev_timestamp = check_prev_production(self, address, slot, timestamp)
-        next_timestamp = check_next_production(self, address, slot, timestamp)
+        prev_timestamp = self._check_prev_production(self, address, slot, timestamp)
+        next_timestamp = self._check_next_production(self, address, slot, timestamp)
         if self._first_prev_log_processed and self._first_next_log_processed:
             # _log_production is True when 2 out of 3 consecutive slots have
             # the same timestamp
@@ -587,6 +528,68 @@ def check_next_production(
                 ^ (next_timestamp == timestamp)
             )
 
+    def _check_prev_production(
+        self, address: int, slot: int, timestamp: datetime
+    ) -> datetime | None:
+        """Check the previous slot for production pulses."""
+        if self._logs is None:
+            return
+    
+        prev_address, prev_slot = calc_log_address(address, slot, -1)
+        if self._log_exists(prev_address, prev_slot):
+            prev_timestamp = self._logs[prev_address][prev_slot].timestamp
+            if not self._first_prev_log_processed:
+                self._first_prev_log_processed = True
+                if prev_timestamp == timestamp:
+                    # Given log is the second log with same timestamp,
+                    # mark direction as production
+                    self._logs[address][slot].is_consumption = False
+                    self._logs[prev_address][prev_slot].is_consumption = True
+                    self._log_production = True
+                elif self._log_production:
+                    self._logs[address][slot].is_consumption = True
+                    if self._logs[prev_address][prev_slot].is_consumption:
+                        self._logs[prev_address][prev_slot].is_consumption = False
+                        self._reset_log_references()
+                elif self._log_production is None:
+                    self._log_production = False
+            return prev_timestamp
+
+        if self._first_prev_log_processed:
+            self._first_prev_log_processed = False
+            return None
+        
+    def _check_next_production(
+        self, address: int, slot: int, timestamp: datetime
+    ) -> datetime | None:
+        """Check the next slot for production pulses."""
+        if self._logs is None:
+            return
+
+        next_address, next_slot = calc_log_address(address, slot, 1)
+        if self._log_exists(next_address, next_slot):
+            next_timestamp = self._logs[next_address][next_slot].timestamp
+            if not self._first_next_log_processed:
+                self._first_next_log_processed = True
+                if next_timestamp == timestamp:
+                    # Given log is the first log with same timestamp,
+                    # mark direction as production of next log
+                    self._logs[address][slot].is_consumption = True
+                    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
+            return next_timestamp
+
+        if self._first_next_log_processed:
+            self._first_next_log_processed = False
+            return None
+
     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: