Update _update_log_interval()

Author: bouwew

plugwise_usb/nodes/helpers/pulses.py

@@ -390,67 +390,30 @@ def _update_log_interval(self) -> None:
             )
             return
 
-        last_cons_address, last_cons_slot = self._last_log_reference(
-            is_consumption=True
-        )
-        if last_cons_address is None or last_cons_slot is None:
+        last_address, last_slot = self._last_log_reference()
+        if last_address is None or last_slot is None:
             return
 
-        # Update interval of consumption
-        last_cons_timestamp = self._logs[last_cons_address][last_cons_slot].timestamp
-        address, slot = calc_log_address(last_cons_address, last_cons_slot, -1)
+        last_timestamp = self._logs[last_address][last__slot].timestamp
+        address, slot = calc_log_address(last_address, last_slot, -1)
         while self._log_exists(address, slot):
-            if self._logs[address][slot].is_consumption:
-                delta1: timedelta = (
-                    last_cons_timestamp - self._logs[address][slot].timestamp
-                )
-                self._log_interval_consumption = int(
-                    delta1.total_seconds() / MINUTE_IN_SECONDS
-                )
-                break
-
-            address, slot = calc_log_address(address, slot, -1)
-
-        if (
-            self._log_interval_consumption is not None
-            and self._last_log_consumption_timestamp is not None
-        ):
-            self._next_log_consumption_timestamp = (
-                self._last_log_consumption_timestamp
-                + timedelta(minutes=self._log_interval_consumption)
+            delta: timedelta = (
+                last_timestamp - self._logs[address][slot].timestamp
             )
-
-        if not self._log_production:
-            return
-
-        # Update interval of production
-        last_prod_address, last_prod_slot = self._last_log_reference(
-            is_consumption=False
-        )
-        if last_prod_address is None or last_prod_slot is None:
-            return
-
-        last_prod_timestamp = self._logs[last_prod_address][last_prod_slot].timestamp
-        address, slot = calc_log_address(last_prod_address, last_prod_slot, -1)
-        while self._log_exists(address, slot):
-            if not self._logs[address][slot].is_consumption:
-                delta2: timedelta = (
-                    last_prod_timestamp - self._logs[address][slot].timestamp
-                )
-                self._log_interval_production = int(
-                    delta2.total_seconds() / MINUTE_IN_SECONDS
-                )
-                break
+            self._log_interval = int(
+                delta.total_seconds() / MINUTE_IN_SECONDS
+            )
+            break
 
             address, slot = calc_log_address(address, slot, -1)
 
         if (
-            self._log_interval_production is not None
-            and self._last_log_production_timestamp is not None
+            self._log_interval is not None
+            and self._last_log_timestamp is not None
         ):
-            self._next_log_production_timestamp = (
-                self._last_log_production_timestamp
-                + timedelta(minutes=self._log_interval_production)
+            self._next_log_timestamp = (
+                self._last_log_timestamp
+                + timedelta(minutes=self._log_interval)
             )
 
     def _log_exists(self, address: int, slot: int) -> bool: