Skip to content

Commit 5c503c5

Browse files
committed
Update connection-files
1 parent 1e975d8 commit 5c503c5

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

plugwise_usb/connection/__init__.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ async def get_node_details(
214214
self.send, bytes(mac, UTF8), retries=1
215215
)
216216
try:
217-
ping_response = await ping_request.send(suppress_node_errors=True)
217+
ping_response = await ping_request.send()
218218
except StickError:
219219
return (None, None)
220220
if ping_response is None:
@@ -230,7 +230,9 @@ async def get_node_details(
230230
return (info_response, ping_response)
231231

232232
async def send(
233-
self, request: PlugwiseRequest, suppress_node_errors: bool = True
233+
self,
234+
request: PlugwiseRequest,
235+
suppress_node_errors=True,
234236
) -> PlugwiseResponse | None:
235237
"""Submit request to queue and return response."""
236238
if not suppress_node_errors:

plugwise_usb/connection/queue.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ async def submit(self, request: PlugwiseRequest) -> PlugwiseResponse | None:
9090
)
9191
await self._add_request_to_queue(request)
9292
try:
93+
if not request.node_response_expected:
94+
return None
9395
response: PlugwiseResponse = await request.response_future()
9496
return response
9597
except (NodeTimeout, StickTimeout) as e:

plugwise_usb/connection/receiver.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,5 +511,4 @@ async def _notify_node_response_subscribers(
511511
name=f"Postpone subscription task for {node_response.seq_id!r} retry {node_response.retries}",
512512
)
513513

514-
515514
# endregion

plugwise_usb/connection/sender.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,8 @@ async def write_request_to_port(self, request: PlugwiseRequest) -> None:
8181
serialized_data = request.serialize()
8282
_LOGGER.debug("write_request_to_port | Write %s to port as %s", request, serialized_data)
8383
self._transport.write(serialized_data)
84-
request.start_response_timeout()
84+
if request.node_response_expected:
85+
request.start_response_timeout()
8586

8687
# Wait for USB stick to accept request
8788
try:
@@ -118,7 +119,7 @@ async def write_request_to_port(self, request: PlugwiseRequest) -> None:
118119
self._receiver.subscribe_to_stick_responses,
119120
self._receiver.subscribe_to_node_responses,
120121
)
121-
_LOGGER.debug("write_request_to_port | request has subscribed : %s", request)
122+
_LOGGER.debug("write_request_to_port | request has subscribed : %s", request)
122123
elif response.response_type == StickResponseType.TIMEOUT:
123124
_LOGGER.warning(
124125
"USB-Stick directly responded with communication timeout for %s",

0 commit comments

Comments
 (0)