Skip to content

Commit 3e636b9

Browse files
committed
Blacked via VSC
1 parent 214db89 commit 3e636b9

File tree

1 file changed

+11
-24
lines changed

1 file changed

+11
-24
lines changed

plugwise/nodes/circle.py

Lines changed: 11 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,19 @@ def __init__(self, mac, address, stick):
8383
def _request_calibration(self, callback=None):
8484
"""Request calibration info"""
8585
self.stick.send(
86-
CircleCalibrationRequest(self.mac),
87-
callback,
86+
CircleCalibrationRequest(self.mac), callback,
8887
)
8988

9089
def _request_switch(self, state, callback=None):
9190
"""Request to switch relay state and request state info"""
9291
self.stick.send(
93-
CircleSwitchRelayRequest(self.mac, state),
94-
callback,
92+
CircleSwitchRelayRequest(self.mac, state), callback,
9593
)
9694

9795
def update_power_usage(self, callback=None):
9896
"""Request power usage"""
9997
self.stick.send(
100-
CirclePowerUsageRequest(self.mac),
101-
callback,
98+
CirclePowerUsageRequest(self.mac), callback,
10299
)
103100

104101
def _on_message(self, message):
@@ -204,16 +201,14 @@ def _node_ack_response(self, message):
204201
if message.ack_id == ACK_ON:
205202
if not self._relay_state:
206203
_LOGGER.debug(
207-
"Switch relay on for %s",
208-
self.get_mac(),
204+
"Switch relay on for %s", self.get_mac(),
209205
)
210206
self._relay_state = True
211207
self.do_callback(SWITCH_RELAY["id"])
212208
elif message.ack_id == ACK_OFF:
213209
if self._relay_state:
214210
_LOGGER.debug(
215-
"Switch relay off for %s",
216-
self.get_mac(),
211+
"Switch relay off for %s", self.get_mac(),
217212
)
218213
self._relay_state = False
219214
self.do_callback(SWITCH_RELAY["id"])
@@ -321,23 +316,17 @@ def request_power_buffer(self, log_address=None, callback=None):
321316
log_address = self._last_log_address
322317
if bool(self.power_history):
323318
# Only request last 2 power buffer logs
319+
self.stick.send(CirclePowerBufferRequest(self.mac, log_address - 1),)
324320
self.stick.send(
325-
CirclePowerBufferRequest(self.mac, log_address - 1),
326-
)
327-
self.stick.send(
328-
CirclePowerBufferRequest(self.mac, log_address),
329-
callback,
321+
CirclePowerBufferRequest(self.mac, log_address), callback,
330322
)
331323
else:
332324
# Collect power history info of today and yesterday
333325
# Each request contains 4 hours except last request
334326
for req_log_address in range(log_address - 13, log_address):
335-
self.stick.send(
336-
CirclePowerBufferRequest(self.mac, req_log_address),
337-
)
327+
self.stick.send(CirclePowerBufferRequest(self.mac, req_log_address),)
338328
self.stick.send(
339-
CirclePowerBufferRequest(self.mac, log_address),
340-
callback,
329+
CirclePowerBufferRequest(self.mac, log_address), callback,
341330
)
342331

343332
def _response_power_buffer(self, message):
@@ -415,15 +404,13 @@ def _response_clock(self, message):
415404
def get_clock(self, callback=None):
416405
""" get current datetime of internal clock of Circle """
417406
self.stick.send(
418-
CircleClockGetRequest(self.mac),
419-
callback,
407+
CircleClockGetRequest(self.mac), callback,
420408
)
421409

422410
def set_clock(self, callback=None):
423411
""" set internal clock of CirclePlus """
424412
self.stick.send(
425-
CircleClockSetRequest(self.mac, datetime.utcnow()),
426-
callback,
413+
CircleClockSetRequest(self.mac, datetime.utcnow()), callback,
427414
)
428415

429416
def sync_clock(self, max_drift=0):

0 commit comments

Comments
 (0)