Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add rfc2217 support #95

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add rfc2217 support #95

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a951d6
Add rfc2217 support
Andre0512 Dec 27, 2022
7ff85e5
Use the polling method for any Serial implementation that doesn't sup…
joncar Dec 29, 2022
3bdbbbc
Fix writing issue for rfc2217
Andre0512 Nov 26, 2023
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
93 changes: 46 additions & 47 deletions serial_asyncio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,18 @@ def __init__(self, loop, protocol, serial_instance):
self._poll_wait_time = 0.0005
self._max_out_waiting = 1024

# XXX how to support url handlers too
try:
self._serial.fileno()
self._has_fileno = True
except:
self._has_fileno = False

# Asynchronous I/O requires non-blocking devices
self._serial.timeout = 0
self._serial.write_timeout = 0
try:
self._serial.write_timeout = 0
except:
pass # best effort, not supported by all Serial implementations

# These two callbacks will be enqueued in a FIFO queue by asyncio
loop.call_soon(protocol.connection_made, self)
Expand Down Expand Up @@ -284,60 +291,52 @@ def _write_ready(self):
self._maybe_resume_protocol()
assert self._has_writer

if os.name == "nt":
def _poll_read(self):
if self._has_reader and not self._closing:
try:
self._has_reader = self._loop.call_later(self._poll_wait_time, self._poll_read)
if self.serial.in_waiting:
self._read_ready()
except serial.SerialException as exc:
self._fatal_error(exc, 'Fatal write error on serial transport')

def _ensure_reader(self):
if not self._has_reader and not self._closing:
def _poll_read(self):
if self._has_reader and not self._closing:
try:
self._has_reader = self._loop.call_later(self._poll_wait_time, self._poll_read)

def _remove_reader(self):
if self._has_reader:
self._has_reader.cancel()
self._has_reader = False

def _poll_write(self):
if self._has_writer and not self._closing:
self._has_writer = self._loop.call_later(self._poll_wait_time, self._poll_write)
if self.serial.out_waiting < self._max_out_waiting:
self._write_ready()

def _ensure_writer(self):
if not self._has_writer and not self._closing:
self._has_writer = self._loop.call_soon(self._poll_write)

def _remove_writer(self):
if self._has_writer:
self._has_writer.cancel()
self._has_writer = False

else:
def _ensure_reader(self):
if (not self._has_reader) and (not self._closing):
if self.serial.in_waiting:
self._read_ready()
except serial.SerialException as exc:
self._fatal_error(exc, 'Fatal write error on serial transport')

def _ensure_reader(self):
if not self._has_reader and not self._closing:
if not self._has_fileno:
self._has_reader = self._loop.call_later(self._poll_wait_time, self._poll_read)
else:
self._loop.add_reader(self._serial.fileno(), self._read_ready)
self._has_reader = True

def _remove_reader(self):
if self._has_reader:
def _remove_reader(self):
if self._has_reader:
if not self._has_fileno:
self._has_reader.cancel()
else:
self._loop.remove_reader(self._serial.fileno())
self._has_reader = False
self._has_reader = False

def _ensure_writer(self):
if (not self._has_writer) and (not self._closing):
self._loop.add_writer(self._serial.fileno(), self._write_ready)
def _poll_write(self):
if self._has_writer and not self._closing:
self._has_writer = self._loop.call_later(self._poll_wait_time, self._poll_write)
if not hasattr(self.serial, "out_waiting") or self.serial.out_waiting < self._max_out_waiting:
self._write_ready()

def _ensure_writer(self):
if not self._has_writer and not self._closing:
if not self._has_fileno:
self._has_writer = self._loop.call_soon(self._poll_write)
else:
self._loop.add_writer(self.serial.fileno(), self._write_ready)
self._has_writer = True

def _remove_writer(self):
if self._has_writer:
def _remove_writer(self):
if self._has_writer:
if not self._has_fileno:
self._has_writer.cancel()
else:
self._loop.remove_writer(self._serial.fileno())
self._has_writer = False
self._has_writer = False

def _set_write_buffer_limits(self, high=None, low=None):
"""Ensure consistent write-buffer limits."""
Expand Down