Skip to content

Commit 9d1acff

Browse files
committed
Remove last_hourly_reset
Already present as hourly_reset_time
1 parent c79a5ab commit 9d1acff

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

plugwise_usb/nodes/helpers/counter.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -285,12 +285,12 @@ def update(
285285
if self._energy_id in ENERGY_DAY_COUNTERS:
286286
# Sync the daily reset time with the device pulsecounter(s) reset time
287287
last_reset = last_reset.replace(hour=0, minute=0, second=0, microsecond=0)
288-
if pulse_collection.last_hourly_reset is not None:
288+
if pulse_collection.hourly_reset_time is not None:
289289
last_reset = last_reset.replace(
290290
hour=0,
291-
minute=pulse_collection.last_hourly_reset.minute,
292-
second=pulse_collection.last_hourly_reset.second,
293-
microsecond=pulse_collection.last_hourly_reset.microsecond,
291+
minute=pulse_collection.hourly_reset_time.minute,
292+
second=pulse_collection.hourly_reset_time.second,
293+
microsecond=pulse_collection.hourly_reset_time.microsecond,
294294
)
295295

296296
pulses, last_update = pulse_collection.collected_pulses(

plugwise_usb/nodes/helpers/pulses.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,9 @@ def collected_logs(self) -> int:
106106
counter += len(self._logs[address])
107107
return counter
108108

109-
@property
110-
def last_hourly_reset(self) -> datetime | None:
111-
"""Consumption and production last hourly reset."""
112-
return self._last_hourly_reset
113-
114109
@property
115110
def hourly_reset_time(self) -> datetime | None:
116-
"""Provide the device hourly pulse reset time, using in testing."""
111+
"""Provide the device hourly pulse reset time."""
117112
if (timestamp := self._last_hourly_reset) is not None:
118113
return timestamp
119114
return None

0 commit comments

Comments
 (0)