Skip to content

Commit 2be2532

Browse files
committed
added com port init compatible with posix; updated version to 4.2.6
1 parent eb313dc commit 2be2532

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

pjon_python/base_client.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import sys
12
import time
23
import serial
34
import logging
@@ -48,7 +49,15 @@ def __init__(self, bus_addr=1, com_port=None, baud=115200, write_timeout=0.005,
4849
if com_port not in available_com_ports:
4950
raise EnvironmentError("specified COM port is one of available ports: %s" % available_com_ports)
5051

51-
self._serial = serial.Serial(com_port, baud, write_timeout=write_timeout, timeout=timeout)
52+
if sys.platform.startswith('win'):
53+
self._serial = serial.Serial(com_port, baud, write_timeout=write_timeout, timeout=timeout)
54+
elif sys.platform.startswith('linux') or sys.platform.startswith('cygwin'):
55+
self._serial = serial.Serial(com_port, baud, writeTimeout=write_timeout, timeout=timeout)
56+
elif sys.platform.startswith('darwin'):
57+
self._serial = serial.Serial(com_port, baud, writeTimeout=write_timeout, timeout=timeout)
58+
else:
59+
raise EnvironmentError('Unsupported platform')
60+
5261
else:
5362
if transport is None:
5463
self._serial = fakeserial.Serial(com_port, baud, write_timeout=write_timeout, timeout=timeout,

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
setup(
77
name='pjon_python',
88
packages=['pjon_python', 'pjon_python.protocol', 'pjon_python.strategies', 'pjon_python.utils'],
9-
version='4.2.5',
9+
version='4.2.6',
1010
description='Python implementation of the PJON communication protocol.',
1111
long_description=read_md('./README.rst'),
1212
author='Zbigniew Zasieczny',
1313
author_email='[email protected]',
1414
url='https://github.com/Girgitt/PJON-python',
15-
download_url='https://github.com/Girgitt/PJON-python/tarball/4.2.5',
15+
download_url='https://github.com/Girgitt/PJON-python/tarball/4.2.6',
1616
keywords=['PJON', 'multimaster', 'serial', 'RS485', 'arduino'],
1717
classifiers=[],
1818
)

0 commit comments

Comments
 (0)