Line up interval reset with device hourly pulsecounter reset

Author: bouwew

plugwise_usb/nodes/helpers/counter.py

@@ -206,6 +206,7 @@ def __init__(
             self._is_consumption = False
         self._last_reset: datetime | None = None
         self._last_update: datetime | None = None
+        self._pulse_collection = PulseCollection(mac)
         self._pulses: int | None = None
 
     @property
@@ -282,10 +283,17 @@ def update(
     ) -> tuple[float | None, datetime | None]:
         """Get pulse update."""
         last_reset = datetime.now(tz=LOCAL_TIMEZONE)
+        timestamp = self._pulse_collection.hourly_reset_time
         if self._energy_id in ENERGY_HOUR_COUNTERS:
-            last_reset = last_reset.replace(minute=0, second=0, microsecond=0)
-        elif self._energy_id in ENERGY_DAY_COUNTERS:
-            last_reset = last_reset.replace(hour=0, minute=0, second=0, microsecond=0)
+            if timestamp is not None:
+                last_reset = timestamp
+            else:
+                last_reset = last_reset.replace(minute=0, second=0, microsecond=0)
+        if self._energy_id in ENERGY_DAY_COUNTERS:
+            if timestamp is not None:
+                last_reset = timestamp.replace(hour=0)
+            else:
+                last_reset = last_reset.replace(hour=0, minute=0, second=0, microsecond=0)
 
         pulses, last_update = pulse_collection.collected_pulses(
             last_reset, self._is_consumption

plugwise_usb/nodes/helpers/pulses.py

@@ -106,6 +106,14 @@ def collected_logs(self) -> int:
             counter += len(self._logs[address])
         return counter
 
+    @property
+    def hourly_reset_time(self) -> datetime:
+        """Provide the device hourly pulse reset time.""" 
+        if timestamp := self.cons_last_hourly_reset is not None:
+            return timestamp
+        if timestamp := self.prod_last_hourly_reset is not None:
+            return timestamp
+
     @property
     def logs(self) -> dict[int, dict[int, PulseLogRecord]]:
         """Return currently collected pulse logs in reversed order."""