Skip to content

Follow guidance to migrate from pyserial to serialx #95

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

Open
WillCodeForCats wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Follow guidance to migrate from pyserial to serialx #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion tekmar_packetserv/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM ${BUILD_FROM}
ENV LANG=C.UTF-8

# Install requirements for app
RUN apk add --no-cache python3 py3-pyserial
RUN apk add --no-cache python3 py3-pip && pip3 install --no-cache-dir serialx

# Copy data
COPY rootfs /
Expand Down
32 changes: 16 additions & 16 deletions tekmar_packetserv/rootfs/usr/local/packetserv/packetserv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import traceback

import packet
import serial
import serialx
import tpck

# ******************************************************************************
Expand Down Expand Up @@ -195,7 +195,7 @@ def run(self):
self.connections.lst.remove(s)
self.connections.lock.release()

except serial.SerialException as err:
except (serialx.SerialException, OSError) as err:
self.running = False
message(err)

Expand All @@ -211,7 +211,7 @@ def run(self):
message("Serial port closing.")
try:
self.port.close()
except (select.error, serial.SerialException):
except (select.error, serialx.SerialException, OSError):
pass

# --------------------------------------------------------------------------
Expand Down Expand Up @@ -247,33 +247,33 @@ def stop(self):
try:
if ser_mode == "device":
message(f"Opening serial port device: {ser_name}")
serial_port = serial.Serial(
serial_port = serialx.serial_for_url(
ser_name,
baudrate=9600,
bytesize=serial.EIGHTBITS,
parity=serial.PARITY_NONE,
stopbits=serial.STOPBITS_ONE,
timeout=TIMEOUT,
byte_size=8,
parity=serialx.Parity.NONE,
stopbits=serialx.StopBits.ONE,
read_timeout=TIMEOUT,
)

if ser_mode == "rfc2217":
message(f"Opening RFC2217 connection to {ser_host} port {ser_port}")
serial_port = serial.serial_for_url(
serial_port = serialx.serial_for_url(
f"rfc2217://{ser_host}:{ser_port}",
baudrate=9600,
bytesize=serial.EIGHTBITS,
parity=serial.PARITY_NONE,
stopbits=serial.STOPBITS_ONE,
timeout=TIMEOUT,
byte_size=8,
parity=serialx.Parity.NONE,
stopbits=serialx.StopBits.ONE,
read_timeout=TIMEOUT,
)

if ser_mode == "socket":
message(f"Opening socket connection to {ser_host} port {ser_port}")
serial_port = serial.serial_for_url(
f"socket://{ser_host}:{ser_port}", timeout=TIMEOUT
serial_port = serialx.serial_for_url(
f"socket://{ser_host}:{ser_port}", read_timeout=TIMEOUT
)

except serial.SerialException:
except (serialx.SerialException, OSError):
message("Could not open serial port. Exiting.")

else:
Expand Down
Loading