diff options
| author | Chris Liechti <cliechti@gmx.net> | 2016-06-09 20:27:05 +0200 |
|---|---|---|
| committer | Chris Liechti <cliechti@gmx.net> | 2016-06-09 20:27:05 +0200 |
| commit | 279201b57db50b3990f9efea941572c86e3f432e (patch) | |
| tree | 53cfe43fb84f7fc3364e2136438e1a4b2aa01cc6 | |
| parent | c8f3f82cbb314ceee12d27389466ce6f4af5ca72 (diff) | |
| download | pyserial-git-279201b57db50b3990f9efea941572c86e3f432e.tar.gz | |
posix: PATCH: Check delay_before_tx/rx for None in serialposix.py, fixes #126
| -rw-r--r-- | CHANGES.rst | 4 | ||||
| -rw-r--r-- | serial/serialposix.py | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index cf4f6ce..25bf49e 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -634,3 +634,7 @@ Improvements: Bugfixes: - [#122] fix bug in FramedPacket + +Bugfixes (posix): + +- [#126] PATCH: Check delay_before_tx/rx for None in serialposix.py diff --git a/serial/serialposix.py b/serial/serialposix.py index bc2468c..0bf3df5 100644 --- a/serial/serialposix.py +++ b/serial/serialposix.py @@ -139,8 +139,10 @@ if plat[:5] == 'linux': # Linux (confirmed) # noqa buf[0] |= SER_RS485_RTS_AFTER_SEND else: buf[0] &= ~SER_RS485_RTS_AFTER_SEND - buf[1] = int(rs485_settings.delay_before_tx * 1000) - buf[2] = int(rs485_settings.delay_before_rx * 1000) + if rs485_settings.delay_before_tx is not None: + buf[1] = int(rs485_settings.delay_before_tx * 1000) + if rs485_settings.delay_before_rx is not None: + buf[2] = int(rs485_settings.delay_before_rx * 1000) else: buf[0] = 0 # clear SER_RS485_ENABLED fcntl.ioctl(self.fd, TIOCSRS485, buf) |