Change logic: collect energy_logs for address 0 first, then check if earlier address contains outdated data

Author: bouwew

plugwise_usb/nodes/circle.py

@@ -448,16 +448,8 @@ async def get_missing_energy_logs(self) -> None:
             total_addresses = 11
             log_address = self._current_log_address
             prev_address_timestamp: datetime | None = None
-            log_interval = self.energy_consumption_interval
-            _LOGGER.debug("log_interval: %s", log_interval)
-            factor = 4
-            if self.energy_production_interval is not None:
-                factor = 2
-
             while total_addresses > 0:
                 await self.energy_log_update(log_address)
-                # Check if the most recent timestamp of the current address is recent
-                # (within 2/4 * log_interval plus 5 mins margin), or None
                 if log_address == self._current_log_address:
                     if self._last_collected_energy_timestamp is None:
                         # Handle case with no data in slot 0
@@ -466,19 +458,16 @@ async def get_missing_energy_logs(self) -> None:
                         )
                         break
 
-                    elif (
-                        log_interval is not None
-                        and (
-                            datetime.now(tz=UTC) - self._last_collected_energy_timestamp
-                        ).total_seconds() // 60 > (factor * log_interval) + 5  # minutes
-                    ):
-                        _LOGGER.debug(
-                            "Energy data collected from the current log address is outdated, stopping collection"
-                        )
-                        break
-
                 # Check if the most recent timestamp of an earlier address is recent
+                # (within 2/4 * log_interval plus 5 mins margin)
                 else:
+                    log_interval = self.energy_consumption_interval
+                    _LOGGER.debug("log_interval: %s", log_interval)
+                    _LOGGER.debug("energy_production_interval: %s", self.energy_production_interval)
+                    factor = 4
+                    if self.energy_production_interval is not None:
+                        factor = 2
+
                     _LOGGER.debug("prev_address_timestamp: %s", prev_address_timestamp)
                     if (
                         self._last_collected_energy_timestamp is not None