Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/defib/transport/serial.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,17 @@ async def read(self, size: int, timeout: float | None = None) -> bytes:
old_timeout = self._port.timeout
try:
self._port.timeout = timeout
data = await asyncio.get_event_loop().run_in_executor(
coro = asyncio.get_event_loop().run_in_executor(
None, self._port.read, size
)
# Guard against pyserial blocking despite the timeout
guard = timeout * 2 + 1.0 if timeout is not None else None
data = await asyncio.wait_for(coro, timeout=guard)
if not data and timeout is not None:
raise TransportTimeout(f"Read timeout ({timeout}s)")
return bytes(data)
except asyncio.TimeoutError:
raise TransportTimeout(f"Read timeout ({timeout}s, asyncio guard)")
finally:
self._port.timeout = old_timeout

Expand Down
Loading