Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
rstemmer committed Nov 12, 2023
2 parents 1037ef2 + 4fe308d commit 8419cbf
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 13 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
6.0.3 - 12.11.2023: Deprecated thread API updated (.isAlive() → .is_alive() since Python 3.8) by gizmo1904 (https://github.com/gizmo1904)
6.0.2 - 02.07.2023: --write function fixed by Sam Grove (https://github.com/sg-)
6.0.1 - 07.03.2020: Issue in setup.py fixed
6.0.0 - 07.03.2020: Code refactoring and python packaging
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ There are two ways to install _sterm_.

### Precondition

_sterm_ requires Python 3 to run.
_sterm_ requires Python 3.8+ to run.
Before you start installing _sterm_ make sure you use the correct version.
Depending on your distribution, the you may need to use `pip3` instead of `pip`.
You can check your Python version by executing the following commands:
Expand Down
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,16 @@
],
},
install_requires= ["pyserial"],
python_requires = ">=3.4",
python_requires = ">=3.8",
keywords = "serial-communication serial-terminal terminal uart rs232 monitoring tty pyserial serial",
license = "GPL",
classifiers = [
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.4",
"Programming Language :: Python :: 3.5",
"Programming Language :: Python :: 3.6",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
"Development Status :: 5 - Production/Stable",
"License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
"Operating System :: POSIX :: Linux",
Expand Down
2 changes: 1 addition & 1 deletion sterm.1
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH STERM 1 "02 June 2023" "6.0.2" "sterm Manual"
.TH STERM 1 "12 November 2023" "6.0.3" "sterm Manual"
.SH NAME
sterm \- a minimal serial terminal that focus on being easy to use. A client simply works.

Expand Down
12 changes: 6 additions & 6 deletions sterm/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@



VERSION = "6.0.2"
VERSION = "6.0.3"


# This global variable is used to shutdown the thread used
Expand All @@ -37,7 +37,7 @@


cli = argparse.ArgumentParser(
description="A minimal serial ternimal.",
description="A minimal serial terminal. To exit the program, press the escape key and enter 'exit' followed by enter.",
formatter_class=argparse.ArgumentDefaultsHelpFormatter
)

Expand All @@ -46,13 +46,13 @@
cli.add_argument("-n", "--noecho", default=False, action="store_true",
help="Direct character transmission. Does not echo the user input to stdout.")
cli.add_argument( "--escape", default="\033", type=str, action="store",
help="Change the default escape character (escape)")
help="Change the default escape character (␛).")
cli.add_argument("-b", "--baudrate", default=115200, type=int, action="store",
help="The baudrate used for the communication.")
cli.add_argument("-f", "--format", default="8N1", type=str, action="store",
help="Configuration-triple: xyz with x=bytelength in bits {5,6,7,8}, y=parity {N,E,O}, z=stopbits {1,2}.")
cli.add_argument("-w", "--write", metavar="logfile", type=str, action="store",
help="Write received data into a file")
help="Write received data into a file.")
cli.add_argument("device", type=str, action="store",
help="Path to the serial communication device.")

Expand Down Expand Up @@ -81,7 +81,7 @@ def ReceiveData(uart, term):
# Shutdown receiver thread
ShutdownReceiver = True
if ReceiverThread.isAlive():
if ReceiverThread.is_alive():
ReceiverThread.join()
Expand Down Expand Up @@ -233,7 +233,7 @@ def main():
# Shutdown receiver thread
global ShutdownReceiver
ShutdownReceiver = True
if ReceiverThread.isAlive():
if ReceiverThread.is_alive():
ReceiverThread.join()

# Clean up everything
Expand Down

0 comments on commit 8419cbf

Please sign in to comment.