Skip to content

Commit 214db89

Browse files
committed
Remove unneeded guarding
1 parent 60ef5b7 commit 214db89

File tree

1 file changed

+18
-19
lines changed

1 file changed

+18
-19
lines changed

plugwise/nodes/circle.py

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -319,27 +319,26 @@ def request_power_buffer(self, log_address=None, callback=None):
319319
"""Request power log of specified address"""
320320
if log_address is None:
321321
log_address = self._last_log_address
322-
if log_address is not None:
323-
if bool(self.power_history):
324-
# Only request last 2 power buffer logs
325-
self.stick.send(
326-
CirclePowerBufferRequest(self.mac, log_address - 1),
327-
)
328-
self.stick.send(
329-
CirclePowerBufferRequest(self.mac, log_address),
330-
callback,
331-
)
332-
else:
333-
# Collect power history info of today and yesterday
334-
# Each request contains 4 hours except last request
335-
for req_log_address in range(log_address - 13, log_address):
336-
self.stick.send(
337-
CirclePowerBufferRequest(self.mac, req_log_address),
338-
)
322+
if bool(self.power_history):
323+
# Only request last 2 power buffer logs
324+
self.stick.send(
325+
CirclePowerBufferRequest(self.mac, log_address - 1),
326+
)
327+
self.stick.send(
328+
CirclePowerBufferRequest(self.mac, log_address),
329+
callback,
330+
)
331+
else:
332+
# Collect power history info of today and yesterday
333+
# Each request contains 4 hours except last request
334+
for req_log_address in range(log_address - 13, log_address):
339335
self.stick.send(
340-
CirclePowerBufferRequest(self.mac, log_address),
341-
callback,
336+
CirclePowerBufferRequest(self.mac, req_log_address),
342337
)
338+
self.stick.send(
339+
CirclePowerBufferRequest(self.mac, log_address),
340+
callback,
341+
)
343342

344343
def _response_power_buffer(self, message):
345344
"""returns information about historical power usage

0 commit comments

Comments
 (0)