Skip to content

Commit 382b49f

Browse files
committed
Combine last-first-next_log inits
1 parent 251574e commit 382b49f

File tree

1 file changed

+10
-18
lines changed

1 file changed

+10
-18
lines changed

plugwise_usb/nodes/helpers/pulses.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -68,21 +68,13 @@ def __init__(self, mac: str) -> None:
6868
self._last_empty_log_address: int | None = None
6969
self._last_empty_log_slot: int | None = None
7070

71-
self._last_log_consumption_timestamp: datetime | None = None
72-
self._last_log_consumption_address: int | None = None
73-
self._last_log_consumption_slot: int | None = None
74-
self._first_log_consumption_timestamp: datetime | None = None
75-
self._first_log_consumption_address: int | None = None
76-
self._first_log_consumption_slot: int | None = None
77-
self._next_log_consumption_timestamp: datetime | None = None
78-
79-
self._last_log_production_timestamp: datetime | None = None
80-
self._last_log_production_address: int | None = None
81-
self._last_log_production_slot: int | None = None
82-
self._first_log_production_timestamp: datetime | None = None
83-
self._first_log_production_address: int | None = None
84-
self._first_log_production_slot: int | None = None
85-
self._next_log_production_timestamp: datetime | None = None
71+
self._last_log_timestamp: datetime | None = None
72+
self._last_log_address: int | None = None
73+
self._last_log_slot: int | None = None
74+
self._first_log_timestamp: datetime | None = None
75+
self._first_log_address: int | None = None
76+
self._first_log_slot: int | None = None
77+
self._next_log_timestamp: datetime | None = None
8678

8779
self._rollover_consumption = False
8880
self._rollover_production = False
@@ -128,11 +120,11 @@ def logs(self) -> dict[int, dict[int, PulseLogRecord]]:
128120
def last_log(self) -> tuple[int, int] | None:
129121
"""Return address and slot of last imported log."""
130122
if (
131-
self._last_log_consumption_address is None
132-
or self._last_log_consumption_slot is None
123+
self._last_log_address is None
124+
or self._last_log_slot is None
133125
):
134126
return None
135-
return (self._last_log_consumption_address, self._last_log_consumption_slot)
127+
return (self._last_log_address, self._last_log_slot)
136128

137129
@property
138130
def production_logging(self) -> bool | None:

0 commit comments

Comments
 (0)