From 96f36193cd2b534c2bc23fda2a337bb92c7be8fc Mon Sep 17 00:00:00 2001 From: ST-TEN-1 Date: Wed, 2 Nov 2022 14:11:32 +0100 Subject: [PATCH] wip --- src/components/modbus_component.py | 2 +- src/requirements.txt | 1 + src/ui/test_barcodes/test_barcodes.py | 4 ++-- src/ui/test_connector/test_connector.py | 4 ++-- src/ui/test_count/test_count.py | 4 ++-- src/ui/test_count_end/test_count_end.py | 4 ++-- src/ui/test_fail/test_fail.py | 4 ++-- src/ui/test_leak/test_leak.py | 4 ++-- src/ui/test_resistance/test_resistance.py | 4 ++-- src/ui/test_screws/test_screws.py | 4 ++-- src/ui/test_test/test_test.py | 5 ++++- src/ui/test_vision/test_vision.py | 4 ++-- 12 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/components/modbus_component.py b/src/components/modbus_component.py index 4052055..0a33db6 100644 --- a/src/components/modbus_component.py +++ b/src/components/modbus_component.py @@ -11,7 +11,7 @@ from pymodbus.constants import Endian from pymodbus.payload import BinaryPayloadBuilder, BinaryPayloadDecoder if "--sim-modbus" not in sys.argv: - from pymodbus.client.sync import ModbusSerialClient as ModbusClient + from pymodbus.client import ModbusSerialClient as ModbusClient else: from components.dummies.pymodbus import ModbusClient diff --git a/src/requirements.txt b/src/requirements.txt index 13616c5..ac8abdf 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -11,6 +11,7 @@ pycoral pymodbus pyqt5 pyserial +pyserial-asyncio requests tensorflow tflite-runtime diff --git a/src/ui/test_barcodes/test_barcodes.py b/src/ui/test_barcodes/test_barcodes.py index 3244cbc..76d5c16 100644 --- a/src/ui/test_barcodes/test_barcodes.py +++ b/src/ui/test_barcodes/test_barcodes.py @@ -9,8 +9,8 @@ from ui.test_test import Test_Test class Test_Barcodes(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=False): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) self.barcodes_spec = { "serial": self.check_serial_barcode } diff --git a/src/ui/test_connector/test_connector.py b/src/ui/test_connector/test_connector.py index 12a7a9f..6895f73 100644 --- a/src/ui/test_connector/test_connector.py +++ b/src/ui/test_connector/test_connector.py @@ -8,8 +8,8 @@ from ui.test_test import Test_Test class Test_Connector(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=False): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) QShortcut(QKeySequence("Return"), self).activated.connect(self.get) QShortcut(QKeySequence("Enter"), self).activated.connect(self.get) self.connector_le.setFocus() diff --git a/src/ui/test_count/test_count.py b/src/ui/test_count/test_count.py index 42cef9a..8e7ce5e 100644 --- a/src/ui/test_count/test_count.py +++ b/src/ui/test_count/test_count.py @@ -9,8 +9,8 @@ from ui.test_test import Test_Test class Test_Count(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=False, enable_override=False): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) self.amount_sb.setRange(0, 9999) self.amount = 0 self.continue_b.clicked.connect(lambda checked, self=weakref.ref(self): self().get(self().amount_sb.value())) diff --git a/src/ui/test_count_end/test_count_end.py b/src/ui/test_count_end/test_count_end.py index ea24b3d..abe0e08 100644 --- a/src/ui/test_count_end/test_count_end.py +++ b/src/ui/test_count_end/test_count_end.py @@ -9,8 +9,8 @@ from ui.test_test import Test_Test class Test_Count_End(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=False, enable_override=False): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) self.continue_b.clicked.connect(lambda checked, self=weakref.ref(self): self().ok.emit(None)) self.amount = 0 self.lots = 0 diff --git a/src/ui/test_fail/test_fail.py b/src/ui/test_fail/test_fail.py index 1ed050e..f01da20 100644 --- a/src/ui/test_fail/test_fail.py +++ b/src/ui/test_fail/test_fail.py @@ -10,8 +10,8 @@ from ui.test_test import Test_Test class Test_Fail(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=False): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) self.continue_b.clicked.connect(lambda checked, self=weakref.ref(self): self().ok.emit(None)) def start(self, recipe=None, step=None, pieces=None): diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index daa88ba..8d07b3a 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -5,8 +5,8 @@ from ui.test_test import Test_Test class Test_Leak(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=False): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) self.start_b.clicked.connect(lambda checked, self=weakref.ref(self): self().components["tecna_t3"].start_test()) self.stop_b.clicked.connect(lambda checked, self=weakref.ref(self): self().components["tecna_t3"].stop_test()) diff --git a/src/ui/test_resistance/test_resistance.py b/src/ui/test_resistance/test_resistance.py index 400a4ff..78b5376 100644 --- a/src/ui/test_resistance/test_resistance.py +++ b/src/ui/test_resistance/test_resistance.py @@ -5,8 +5,8 @@ from ui.test_test import Test_Test class Test_Resistance(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=False): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) self.ok_counter_limit = 3 def start(self, recipe=None, step=None, pieces=None): diff --git a/src/ui/test_screws/test_screws.py b/src/ui/test_screws/test_screws.py index 53ecde8..c51a8dc 100644 --- a/src/ui/test_screws/test_screws.py +++ b/src/ui/test_screws/test_screws.py @@ -5,8 +5,8 @@ from ui.test_test import Test_Test class Test_Screws(Test_Test): - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=True): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=True): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) def start(self, recipe=None, step=None, pieces=None): # TESTING diff --git a/src/ui/test_test/test_test.py b/src/ui/test_test/test_test.py index 341a144..5fba40d 100644 --- a/src/ui/test_test/test_test.py +++ b/src/ui/test_test/test_test.py @@ -13,13 +13,14 @@ class Test_Test(Widget): ok = pyqtSignal(object) ko = pyqtSignal(object) - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=True): + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=True): super().__init__() self.components = components self.recipe = recipe self.step = step self.pieces = pieces self.run_once = run_once + self.reset_on_start = reset_on_start self.enable_override = enable_override # setup variables self.ok_counter = 0 @@ -89,6 +90,8 @@ class Test_Test(Widget): self.pieces = pieces if self.run_once is True and self.done is True and self.done_ok is True: return False + if self.reset_on_start: + self.reset() if self.enable_override: self.override_b.setVisible(True) self.override_b.setEnabled(True) diff --git a/src/ui/test_vision/test_vision.py b/src/ui/test_vision/test_vision.py index acf5fc7..d118eb9 100644 --- a/src/ui/test_vision/test_vision.py +++ b/src/ui/test_vision/test_vision.py @@ -10,8 +10,8 @@ from ui.test_test import Test_Test class Test_Vision(Test_Test): request_frame = pyqtSignal() - def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=True): - super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) + def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, reset_on_start=True, enable_override=True): + super().__init__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, reset_on_start=reset_on_start, enable_override=enable_override) if "--sim-camera" not in sys.argv: self.ok_counter_limit = 2 else: