Skip to content

Commit 6127526

Browse files
committed
Improve midnight reset delaying code further
1 parent b50ba2b commit 6127526

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

plugwise_usb/nodes/helpers/counter.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,9 +280,6 @@ def update(
280280
) -> tuple[float | None, datetime | None]:
281281
"""Get pulse update."""
282282
last_reset = datetime.now(tz=LOCAL_TIMEZONE)
283-
if self._midnight_reset_passed and last_reset.hour == 1:
284-
self._midnight_reset_passed = False
285-
286283
if self._energy_id in ENERGY_HOUR_COUNTERS:
287284
last_reset = last_reset.replace(minute=0, second=0, microsecond=0)
288285
if self._energy_id in ENERGY_DAY_COUNTERS:
@@ -303,8 +300,10 @@ def update(
303300
)
304301
else:
305302
last_reset = last_reset.replace(hour=0, minute=0, second=0, microsecond=0)
306-
if pulse_collection.pulse_counter_reset:
303+
if last_reset.hour == 0 and pulse_collection.pulse_counter_reset:
307304
self._midnight_reset_passed = True
305+
if last_reset.hour == 1 and self._midnight_reset_passed:
306+
self._midnight_reset_passed = False
308307

309308
pulses, last_update = pulse_collection.collected_pulses(
310309
last_reset, self._is_consumption

0 commit comments

Comments
 (0)