From 944266ecb9445e8f9428e8dfcb7211135754b6c4 Mon Sep 17 00:00:00 2001 From: germano laptop Date: Fri, 24 Jan 2025 08:21:22 +0100 Subject: [PATCH 1/2] dev --- config/machine_settings/st-ten-10.ini | 2 +- src/test/modbus_read_data.py | 2 +- src/ui/test_pipe_cutter/test_pipe_cutter.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/machine_settings/st-ten-10.ini b/config/machine_settings/st-ten-10.ini index af65f24..91adffa 100644 --- a/config/machine_settings/st-ten-10.ini +++ b/config/machine_settings/st-ten-10.ini @@ -90,7 +90,7 @@ enabled: false [pipe_cutter] method: rtu -port: /dev/ttyUSB0 +port: COM4 baudrate: 38400 stopbits: stopbits_one parity: parity_none diff --git a/src/test/modbus_read_data.py b/src/test/modbus_read_data.py index 995284e..157f0ba 100644 --- a/src/test/modbus_read_data.py +++ b/src/test/modbus_read_data.py @@ -51,7 +51,7 @@ def main(): # Modbus client configuration client = ModbusClient( method="rtu", - port="/dev/ttyUSB0", # Ensure the correct port for your setup + port="COM4", # Ensure the correct port for your setup stopbits=serial.STOPBITS_ONE, bytesize=serial.EIGHTBITS, parity=serial.PARITY_NONE, diff --git a/src/ui/test_pipe_cutter/test_pipe_cutter.py b/src/ui/test_pipe_cutter/test_pipe_cutter.py index 9be9ef8..d416225 100644 --- a/src/ui/test_pipe_cutter/test_pipe_cutter.py +++ b/src/ui/test_pipe_cutter/test_pipe_cutter.py @@ -48,7 +48,7 @@ class Test_Pipe_Cutter(Test_Test): """ Start the pipe cutting process and activate the pipe cutter component. """ - self.current_status = self.components["pipe_cutter"]._get() + self.current_status = self.components["pipe_cutter"].read(register=766) #print(f"current status is :{str(self.current_status)}") #print(self.step.spec["lenght"]) self.lenght=self.step.spec["lenght"] @@ -81,6 +81,7 @@ class Test_Pipe_Cutter(Test_Test): def stop(self): self.components["pipe_cutter"].pause() self.disconnect(self.get_connection) + super().stop() From d99922c1b9b4c158134f7f820f76436652295e9d Mon Sep 17 00:00:00 2001 From: germano laptop Date: Fri, 24 Jan 2025 08:23:45 +0100 Subject: [PATCH 2/2] dev --- src/ui/test_pipe_cutter/test_pipe_cutter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ui/test_pipe_cutter/test_pipe_cutter.py b/src/ui/test_pipe_cutter/test_pipe_cutter.py index d416225..f1316a5 100644 --- a/src/ui/test_pipe_cutter/test_pipe_cutter.py +++ b/src/ui/test_pipe_cutter/test_pipe_cutter.py @@ -12,7 +12,7 @@ class Test_Pipe_Cutter(Test_Test): A class to manage and operate a pipe cutter machine in a test environment. """ - def __init__(self, config, components, recipe=None, run_once=False,reset_on_start=False, enable_override=False, bench_name="generic", step=None,): + def __init__(self, config, components, recipe=None, run_once=False,reset_on_start=True, enable_override=False, bench_name="generic", step=None,): super().__init__(components=components, recipe=recipe, step=step, run_once=run_once,reset_on_start=reset_on_start, enable_override=enable_override,) self.end_cut = None self.config = config