Skip to content

Removed TextIOWrapper from serial. #383

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
felixdivo merged 5 commits into from
Aug 7, 2018
Merged

Removed TextIOWrapper from serial. #383

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6da911b
Removed TextIOWrapper from serial.
gustavovelascoh Aug 3, 2018
91a76d6
Merge branch 'develop' into Issue-382
felixdivo Aug 6, 2018
7920f2e
Merge branch 'develop' into Issue-382
felixdivo Aug 6, 2018
ccea517
Replaced bytes() function to encode() method, allowing python2.7 to r…
gustavovelascoh Aug 7, 2018
63635e3
Moved decode() method after checking if there are received bytes.
gustavovelascoh Aug 7, 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
11 changes: 6 additions & 5 deletions can/interfaces/slcan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ def __init__(self, channel, ttyBaudrate=115200, timeout=1, bitrate=None, **kwarg
(channel, ttyBaudrate) = channel.split('@')

self.serialPortOrig = serial.Serial(channel, baudrate=ttyBaudrate, timeout=timeout)
self.serialPort = io.TextIOWrapper(io.BufferedRWPair(self.serialPortOrig, self.serialPortOrig, 1),
newline='\r', line_buffering=True)

time.sleep(self._SLEEP_AFTER_SERIAL_OPEN)

Expand All @@ -86,8 +84,8 @@ def __init__(self, channel, ttyBaudrate=115200, timeout=1, bitrate=None, **kwarg
def write(self, string):
if not string.endswith('\r'):
string += '\r'
self.serialPort.write(string.decode())
self.serialPort.flush()
self.serialPortOrig.write(string.encode())
self.serialPortOrig.flush()

def open(self):
self.write('O')
Expand All @@ -103,10 +101,13 @@ def _recv_internal(self, timeout):
remote = False
extended = False
frame = []
readStr = self.serialPort.readline()

readStr = self.serialPortOrig.read_until(b'\r')

if not readStr:
return None, False
else:
readStr = readStr.decode()
if readStr[0] == 'T':
# extended frame
canId = int(readStr[1:9], 16)
Expand Down