jonathan/scopething
1
0
Fork 0
mirror of https://github.com/jonathanhogg/scopething synced 2025-07-14 11:12:09 +01:00
Code Issues Releases Wiki Activity

Use newer streams.py from Storm project

Browse Source
This commit is contained in:
Jonathan Hogg
2017-03-25 14:35:42 +00:00
parent 2174382464
commit 2bdcd23a14
1 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
streams.py
View File

@ -16,7 +16,7 @@ class SerialStream:
self._loop = loop if loop is not None else asyncio.get_event_loop() self._loop = loop if loop is not None else asyncio.get_event_loop()
self._input_buffer = bytes() self._input_buffer = bytes()
self._output_buffer = bytes() self._output_buffer = bytes()
self._output_wait = None self._output_buffer_empty = None
def __repr__(self): def __repr__(self):
return '<{}:{}>'.format(self.__class__.__name__, self._device) return '<{}:{}>'.format(self.__class__.__name__, self._device)
@ -26,23 +26,54 @@ class SerialStream:
self._connection = None self._connection = None
def write(self, data): def write(self, data):
if not self._output_buffer:
try:
n = self._connection.write(data)
except serial.SerialTimeoutException:
n = 0
except Exception as e:
Log.exception("Error writing to stream")
raise
if n:
Log.debug('Write %r', data[:n])
self._output_buffer = data[n:]
else:
self._output_buffer += data self._output_buffer += data
if self._output_wait is None: if self._output_buffer and self._output_buffer_empty is None:
self._output_wait = asyncio.Future() self._output_buffer_empty = self._loop.create_future()
self._loop.add_writer(self._connection, self._feed_data) self._loop.add_writer(self._connection, self._feed_data)
async def send_break(self):
baudrate = self._connection.baudrate
await self.drain()
self._connection.baudrate = 600
self.write(b'\0')
await self.drain()
self._connection.baudrate = baudrate
async def drain(self): async def drain(self):
if self._output_wait is not None: if self._output_buffer_empty is not None:
await self._output_wait await self._output_buffer_empty
n = self._connection.out_waiting
if n:
await asyncio.sleep(n * 10 / self._connection.baudrate)
def _feed_data(self): def _feed_data(self):
try:
n = self._connection.write(self._output_buffer) n = self._connection.write(self._output_buffer)
Log.debug('Write {}'.format(repr(self._output_buffer[:n]))) except serial.SerialTimeoutException:
n = 0
except Exception as e:
Log.exception("Error writing to stream")
self._output_buffer_empty.set_exception(e)
self.remove_writer(self._connection, self._feed_data)
if n:
Log.debug('Write %r', self._output_buffer[:n])
self._output_buffer = self._output_buffer[n:] self._output_buffer = self._output_buffer[n:]
if not self._output_buffer: if not self._output_buffer:
self._loop.remove_writer(self._connection) self._loop.remove_writer(self._connection)
self._output_wait.set_result(None) self._output_buffer_empty.set_result(None)
self._output_wait = None self._output_buffer_empty = None
async def read(self, n=None): async def read(self, n=None):
while True: while True:
@ -73,15 +104,19 @@ class SerialStream:
return data return data
self._input_buffer += await self._read() self._input_buffer += await self._read()
def _read(self, n=None): async def _read(self, n=None):
future = asyncio.Future() future = self._loop.create_future()
self._loop.add_reader(self._connection, self._handle_data, n, future) self._loop.add_reader(self._connection, self._handle_data, n, future)
return future try:
data = await future
def _handle_data(self, n, future): Log.debug('Read %r', data)
data = self._connection.read(n if n is not None else self._connection.in_waiting) return data
Log.debug('Read {}'.format(repr(data))) finally:
future.set_result(data)
self._loop.remove_reader(self._connection) self._loop.remove_reader(self._connection)
def _handle_data(self, n, future):
if not future.cancelled():
data = self._connection.read(n if n is not None else self._connection.in_waiting)
future.set_result(data)