From 9bbc404a8aa4a7bc5aa057677b82ce3ce5ee3cb1 Mon Sep 17 00:00:00 2001 From: Luis Antonio Obis Aparicio Date: Wed, 21 Feb 2024 12:01:44 +0100 Subject: [PATCH] made some parameters named only to avoid confusion --- examples/vsr53dl.py | 2 +- examples/vsr53usb.py | 2 +- src/vsr53/sys.py | 2 +- src/vsr53/vsr53.py | 15 ++++++++------- test/test_stress.py | 2 +- test/test_vsr53dl.py | 2 +- test/test_vsr53usb.py | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/vsr53dl.py b/examples/vsr53dl.py index e964f04..1e0f10c 100644 --- a/examples/vsr53dl.py +++ b/examples/vsr53dl.py @@ -13,7 +13,7 @@ log.setLevel(logging.INFO) sensor_address = 1 - with VSR53DL(dev_tty, sensor_address) as vacuum_sense: + with VSR53DL(dev_tty, address=sensor_address) as vacuum_sense: vacuum_sense.get_device_type() vacuum_sense.get_product_name() vacuum_sense.get_serial_number_device() diff --git a/examples/vsr53usb.py b/examples/vsr53usb.py index 0d22fda..f580876 100644 --- a/examples/vsr53usb.py +++ b/examples/vsr53usb.py @@ -11,7 +11,7 @@ log.setLevel(logging.INFO) sensor_address = 1 - with VSR53USB(dev_tty, sensor_address) as vacuum_sense: + with VSR53USB(dev_tty, address=sensor_address) as vacuum_sense: vacuum_sense.get_device_type() vacuum_sense.get_product_name() vacuum_sense.get_serial_number_device() diff --git a/src/vsr53/sys.py b/src/vsr53/sys.py index 7ffddfe..0103278 100644 --- a/src/vsr53/sys.py +++ b/src/vsr53/sys.py @@ -5,6 +5,6 @@ if platform.system() == "Darwin": dev_tty = "/dev/cu.usbserial-FT4VOTGK" elif platform.system() == "Windows": - dev_tty = "COM6" + dev_tty = "COM5" elif platform.system() == "Linux": dev_tty = "/dev/ttyUSB0" diff --git a/src/vsr53/vsr53.py b/src/vsr53/vsr53.py index aa04706..dd84118 100644 --- a/src/vsr53/vsr53.py +++ b/src/vsr53/vsr53.py @@ -374,14 +374,15 @@ class VSR53DL(VSR53): Thyracont's VSR53DL vacuum sensor RS458 interface """ - def __init__(self, device_label: str, address: int = 1, baudrate: int = 115200): + def __init__(self, port: str, *, address: int = 1, baudrate: int = 9600): """ - Constructor will initiate serial port communication in rs485 mode and define address for device - :param device_label: Device label assigned by the operating system when the device is connected + Constructor will initiate serial port communication in rs485 mode and define address for device. + :param port: device label assigned by the operating system when the device is connected :param address: Defined by the address switch mounted in the device from 1 to 16 + :param baudrate: Baud rate for data transmission """ self._port = serial.rs485.RS485( - device_label, + port, baudrate=baudrate, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, @@ -394,9 +395,9 @@ def __init__(self, device_label: str, address: int = 1, baudrate: int = 115200): class VSR53USB(VSR53): - def __init__(self, device_label: str, address: int = 1, baudrate: int = 9600): + def __init__(self, port: str, *, address: int = 1, baudrate: int = 9600): self._port = serial.Serial( - device_label, + port, baudrate=baudrate, parity=serial.PARITY_NONE, stopbits=serial.STOPBITS_ONE, @@ -414,7 +415,7 @@ def __init__(self, device_label: str, address: int = 1, baudrate: int = 9600): log.setLevel(logging.INFO) sensor_address = 1 - vacuum_sense = VSR53DL(dev_tty, sensor_address) + vacuum_sense = VSR53DL(dev_tty, address=sensor_address) vacuum_sense.open_communication() vacuum_sense.get_device_type() diff --git a/test/test_stress.py b/test/test_stress.py index 6a2f091..b7cbc33 100644 --- a/test/test_stress.py +++ b/test/test_stress.py @@ -33,7 +33,7 @@ def stress_test(): from vsr53.sys import dev_tty sensor_address = 1 - vacuum_sense = VSR53DL(dev_tty, sensor_address) + vacuum_sense = VSR53DL(dev_tty, address=sensor_address) vacuum_sense.open_communication() filename = f"./results/Stress_test_results_{get_now_timestamp_str()}.csv" diff --git a/test/test_vsr53dl.py b/test/test_vsr53dl.py index d5150cf..6609c16 100644 --- a/test/test_vsr53dl.py +++ b/test/test_vsr53dl.py @@ -10,7 +10,7 @@ @pytest.fixture() def vacuum_sensor(): sensor_address = 1 - vacuum_sense = VSR53DL(dev_tty, sensor_address) + vacuum_sense = VSR53DL(dev_tty, address=sensor_address) vacuum_sense.open_communication() yield vacuum_sense vacuum_sense.close_communication() diff --git a/test/test_vsr53usb.py b/test/test_vsr53usb.py index 0674a24..3d8d7c5 100644 --- a/test/test_vsr53usb.py +++ b/test/test_vsr53usb.py @@ -9,7 +9,7 @@ @pytest.fixture() def vacuum_sensor(): sensor_address = 1 - vacuum_sense = VSR53USB(dev_tty, sensor_address) + vacuum_sense = VSR53USB(dev_tty, address=sensor_address) vacuum_sense.open_communication() yield vacuum_sense vacuum_sense.close_communication()