Skip to content

Commit

Permalink
added com port init compatible with posix; updated version to 4.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Girgitt committed Jan 29, 2017
1 parent eb313dc commit 2be2532
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
11 changes: 10 additions & 1 deletion pjon_python/base_client.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import sys
import time
import serial
import logging
Expand Down Expand Up @@ -48,7 +49,15 @@ def __init__(self, bus_addr=1, com_port=None, baud=115200, write_timeout=0.005,
if com_port not in available_com_ports:
raise EnvironmentError("specified COM port is one of available ports: %s" % available_com_ports)

self._serial = serial.Serial(com_port, baud, write_timeout=write_timeout, timeout=timeout)
if sys.platform.startswith('win'):
self._serial = serial.Serial(com_port, baud, write_timeout=write_timeout, timeout=timeout)
elif sys.platform.startswith('linux') or sys.platform.startswith('cygwin'):
self._serial = serial.Serial(com_port, baud, writeTimeout=write_timeout, timeout=timeout)
elif sys.platform.startswith('darwin'):
self._serial = serial.Serial(com_port, baud, writeTimeout=write_timeout, timeout=timeout)
else:
raise EnvironmentError('Unsupported platform')

else:
if transport is None:
self._serial = fakeserial.Serial(com_port, baud, write_timeout=write_timeout, timeout=timeout,
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
setup(
name='pjon_python',
packages=['pjon_python', 'pjon_python.protocol', 'pjon_python.strategies', 'pjon_python.utils'],
version='4.2.5',
version='4.2.6',
description='Python implementation of the PJON communication protocol.',
long_description=read_md('./README.rst'),
author='Zbigniew Zasieczny',
author_email='z.zasieczny@gmail.com',
url='https://github.com/Girgitt/PJON-python',
download_url='https://github.com/Girgitt/PJON-python/tarball/4.2.5',
download_url='https://github.com/Girgitt/PJON-python/tarball/4.2.6',
keywords=['PJON', 'multimaster', 'serial', 'RS485', 'arduino'],
classifiers=[],
)

0 comments on commit 2be2532

Please sign in to comment.