Skip to content

Fix AsyncioModbusSerialClient (serial options and create_serial_connection usage) #268

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

Merged
dhoomakethu merged 6 commits into from
May 10, 2018
Merged

Fix AsyncioModbusSerialClient (serial options and create_serial_connection usage) #268

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ddd937
[ADD] serial options for AsyncioModbusSerialClient
Jan 23, 2018
8756520
[ADD] changed default parity to None
Jan 23, 2018
8864dfd
[ADD] updated async_io_factory with the changes made to AsyncioModbus…
Jan 23, 2018
c8ad91f
[ADD] updated async_io_factory
Jan 24, 2018
25fad28
[FIX] protocol factory, synchronize connect event
Jan 27, 2018
960bc0f
[ADD] use _connected property instead of _connected_event
Jan 28, 2018
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
34 changes: 17 additions & 17 deletions pymodbus/client/async/asyncio/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,8 @@ class AsyncioModbusSerialClient(object):
transport = None
framer = None

def __init__(self, port, protocol_class=None, framer=None, loop=None):
def __init__(self, port, protocol_class=None, framer=None, loop=None,
baudrate=9600, bytesize=8, parity='N', stopbits=1):
"""
Initializes Asyncio Modbus Serial Client
:param port: Port to connect
Expand All @@ -674,6 +675,10 @@ def __init__(self, port, protocol_class=None, framer=None, loop=None):
#: Event loop to use.
self.loop = loop or asyncio.get_event_loop()
self.port = port
self.baudrate = baudrate
self.bytesize = bytesize
self.parity = parity
self.stopbits = stopbits
self.framer = framer
self._connected = False

Expand All @@ -687,18 +692,6 @@ def stop(self):
if self.protocol.transport:
self.protocol.transport.close()

def _create_protocol(self):
"""
Factory function to create initialized protocol instance.
"""
from serial_asyncio import create_serial_connection

def factory():
return self.protocol_class(framer=self.framer)

cor = create_serial_connection(self.loop, factory, self.port)
return cor

@asyncio.coroutine
def connect(self):
"""
Expand All @@ -707,11 +700,18 @@ def connect(self):
"""
_logger.debug('Connecting.')
try:
yield from self.loop.create_connection(self._create_protocol)
_logger.info('Connected to %s:%s.' % (self.host, self.port))
from serial_asyncio import create_serial_connection
Copy link
Contributor

@dhoomakethu dhoomakethu Jan 23, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Please move this change to serial factory. https://github.com/cbergmiller/pymodbus/blob/fix/serial_async_client/pymodbus/client/async/factory/serial.py#L82.

Copy link
Contributor Author

@cbergmiller cbergmiller Jan 23, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review. I updated the pull request.


def factory():
return self.protocol_class(framer=self.framer)

yield from create_serial_connection(
self.loop, factory, self.port, baudrate=self.baudrate,
bytesize=self.bytesize, stopbits=self.stopbits
)
_logger.info('Connected to %s', self.port)
except Exception as ex:
_logger.warning('Failed to connect: %s' % ex)
# asyncio.async(self._reconnect(), loop=self.loop)
_logger.warning('Failed to connect: %s', ex)

def protocol_made_connection(self, protocol):
"""
Expand Down