Skip to content

Commit eaad422

Browse files
brefrabouwew
authored andcommitted
Fix pending requests for SED's
1 parent 5372257 commit eaad422

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

plugwise/controller.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,21 +226,22 @@ def _send_message_loop(self):
226226
# if previous seq_id is unknown use fake b"0000"
227227
seq_id = inc_seq_id(self.last_seq_id)
228228
self.expected_responses[seq_id] = request_set
229-
mac = "None"
230-
if hasattr(self.expected_responses[seq_id][0], "mac"):
231-
mac = self.expected_responses[seq_id][0].mac
232229
if self.expected_responses[seq_id][2] == 0:
233230
_LOGGER.info(
234231
"Send %s to %s using seq_id %s",
235232
self.expected_responses[seq_id][0].__class__.__name__,
236-
mac,
233+
self.expected_responses[seq_id][0].mac.decode(
234+
UTF8_DECODE
235+
),
237236
str(seq_id),
238237
)
239238
else:
240239
_LOGGER.info(
241240
"Resend %s to %s using seq_id %s, retry %s",
242241
self.expected_responses[seq_id][0].__class__.__name__,
243-
mac,
242+
self.expected_responses[seq_id][0].mac.decode(
243+
UTF8_DECODE
244+
),
244245
str(seq_id),
245246
str(self.expected_responses[seq_id][2]),
246247
)

plugwise/nodes/sed.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ def _process_awake_response(self, message):
8181
SED_AWAKE_STARTUP,
8282
SED_AWAKE_BUTTON,
8383
]:
84-
for request_message, callback in self._sed_requests.items():
84+
for pending_request in self._sed_requests.values():
85+
request_message, callback = pending_request
8586
_LOGGER.info(
8687
"Send queued %s message to SED node %s",
8788
request_message.__class__.__name__,

0 commit comments

Comments
 (0)