Sync the daily reset time with the device pulsecounter(s) reset

Author: bouwew

plugwise_usb/nodes/helpers/counter.py

@@ -284,9 +284,27 @@ def update(
         """Get pulse update."""
         last_reset = datetime.now(tz=LOCAL_TIMEZONE)
         if self._energy_id in ENERGY_HOUR_COUNTERS:
+            # 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:
-            last_reset = last_reset.replace(hour=0, minute=0, second=0, microsecond=0)
+            # Sync the daily reset time with the device pulsecounter(s) reset time
+            if self._is_consumption:
+                if self._pulse_collection.consumption_last_hourly_reset is not None:
+                    last_reset = last_reset.replace(
+                        hour=0,
+                        minute=self._pulse_collection.consumption_last_hourly_reset.minutes,
+                        second=self._pulse_collection.consumption_last_hourly_reset.seconds,
+                        microsecond=self._pulse_collection.consumption_last_hourly_reset.microseconds,
+                    )
+            elif self._pulse_collection.production_last_hourly_reset is not None:
+                last_reset = last_reset.replace(
+                    hour=0,
+                    minute=self._pulse_collection.production_last_hourly_reset.minutes,
+                    second=self._pulse_collection.production_last_hourly_reset.seconds,
+                    microsecond=self._pulse_collection.production_last_hourly_reset.microseconds,
+                )
+            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