Use the pulse_counter_reset event to update the daily last_reset

Author: bouwew

plugwise_usb/nodes/helpers/counter.py

@@ -283,15 +283,9 @@ def update(
             # No syncing needed for the hour-counters, they reset when the device pulsecounter(s) reset
             last_reset = last_reset.replace(minute=0, second=0, microsecond=0)
         if self._energy_id in ENERGY_DAY_COUNTERS:
-            # Sync the daily reset time with the device pulsecounter(s) reset time
-            last_reset = last_reset.replace(hour=0, minute=0, second=0, microsecond=0)
-            if pulse_collection.hourly_reset_time is not None:
-                last_reset = last_reset.replace(
-                    hour=0,
-                    minute=pulse_collection.hourly_reset_time.minute,
-                    second=pulse_collection.hourly_reset_time.second,
-                    microsecond=pulse_collection.hourly_reset_time.microsecond,
-                )
+            # Postpone the daily reset time change until the device pulsecounter(s) reset
+            if pulse_collection.pulse_counter_reset:
+                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

@@ -165,6 +165,10 @@ def last_update(self) -> datetime | None:
         """Return timestamp of last update."""
         return self._pulses_timestamp
 
+    def pulse_counter_reset(self) -> bool:
+        """Return a pulse_counter reset."""
+        return self._cons_pulsecounter_reset or self._prod_pulsecounter_reset
+
     def collected_pulses(
         self, from_timestamp: datetime, is_consumption: bool
     ) -> tuple[int | None, datetime | None]: