This commit is contained in:
ST-TEN-1 2022-11-02 14:11:32 +01:00
parent 1ea859fc22
commit 96f36193cd
12 changed files with 24 additions and 20 deletions

View File

@ -11,7 +11,7 @@ from pymodbus.constants import Endian
from pymodbus.payload import BinaryPayloadBuilder, BinaryPayloadDecoder from pymodbus.payload import BinaryPayloadBuilder, BinaryPayloadDecoder
if "--sim-modbus" not in sys.argv: if "--sim-modbus" not in sys.argv:
from pymodbus.client.sync import ModbusSerialClient as ModbusClient from pymodbus.client import ModbusSerialClient as ModbusClient
else: else:
from components.dummies.pymodbus import ModbusClient from components.dummies.pymodbus import ModbusClient

View File

@ -11,6 +11,7 @@ pycoral
pymodbus pymodbus
pyqt5 pyqt5
pyserial pyserial
pyserial-asyncio
requests requests
tensorflow tensorflow
tflite-runtime tflite-runtime

View File

@ -9,8 +9,8 @@ from ui.test_test import Test_Test
class Test_Barcodes(Test_Test): class Test_Barcodes(Test_Test):
def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): 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, enable_override=enable_override) 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 = { self.barcodes_spec = {
"serial": self.check_serial_barcode "serial": self.check_serial_barcode
} }

View File

@ -8,8 +8,8 @@ from ui.test_test import Test_Test
class Test_Connector(Test_Test): class Test_Connector(Test_Test):
def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): 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, enable_override=enable_override) 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("Return"), self).activated.connect(self.get)
QShortcut(QKeySequence("Enter"), self).activated.connect(self.get) QShortcut(QKeySequence("Enter"), self).activated.connect(self.get)
self.connector_le.setFocus() self.connector_le.setFocus()

View File

@ -9,8 +9,8 @@ from ui.test_test import Test_Test
class Test_Count(Test_Test): class Test_Count(Test_Test):
def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): 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, enable_override=enable_override) 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_sb.setRange(0, 9999)
self.amount = 0 self.amount = 0
self.continue_b.clicked.connect(lambda checked, self=weakref.ref(self): self().get(self().amount_sb.value())) self.continue_b.clicked.connect(lambda checked, self=weakref.ref(self): self().get(self().amount_sb.value()))

View File

@ -9,8 +9,8 @@ from ui.test_test import Test_Test
class Test_Count_End(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): 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, enable_override=enable_override) 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.continue_b.clicked.connect(lambda checked, self=weakref.ref(self): self().ok.emit(None))
self.amount = 0 self.amount = 0
self.lots = 0 self.lots = 0

View File

@ -10,8 +10,8 @@ from ui.test_test import Test_Test
class Test_Fail(Test_Test): class Test_Fail(Test_Test):
def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): 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, enable_override=enable_override) 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.continue_b.clicked.connect(lambda checked, self=weakref.ref(self): self().ok.emit(None))
def start(self, recipe=None, step=None, pieces=None): def start(self, recipe=None, step=None, pieces=None):

View File

@ -5,8 +5,8 @@ from ui.test_test import Test_Test
class Test_Leak(Test_Test): class Test_Leak(Test_Test):
def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): 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, enable_override=enable_override) 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.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()) self.stop_b.clicked.connect(lambda checked, self=weakref.ref(self): self().components["tecna_t3"].stop_test())

View File

@ -5,8 +5,8 @@ from ui.test_test import Test_Test
class Test_Resistance(Test_Test): class Test_Resistance(Test_Test):
def __init__(self, components=None, recipe=None, step=None, pieces=None, run_once=False, enable_override=False): 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, enable_override=enable_override) 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 self.ok_counter_limit = 3
def start(self, recipe=None, step=None, pieces=None): def start(self, recipe=None, step=None, pieces=None):

View File

@ -5,8 +5,8 @@ from ui.test_test import Test_Test
class Test_Screws(Test_Test): class Test_Screws(Test_Test):
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__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) 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): def start(self, recipe=None, step=None, pieces=None):
# TESTING # TESTING

View File

@ -13,13 +13,14 @@ class Test_Test(Widget):
ok = pyqtSignal(object) ok = pyqtSignal(object)
ko = 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__() super().__init__()
self.components = components self.components = components
self.recipe = recipe self.recipe = recipe
self.step = step self.step = step
self.pieces = pieces self.pieces = pieces
self.run_once = run_once self.run_once = run_once
self.reset_on_start = reset_on_start
self.enable_override = enable_override self.enable_override = enable_override
# setup variables # setup variables
self.ok_counter = 0 self.ok_counter = 0
@ -89,6 +90,8 @@ class Test_Test(Widget):
self.pieces = pieces self.pieces = pieces
if self.run_once is True and self.done is True and self.done_ok is True: if self.run_once is True and self.done is True and self.done_ok is True:
return False return False
if self.reset_on_start:
self.reset()
if self.enable_override: if self.enable_override:
self.override_b.setVisible(True) self.override_b.setVisible(True)
self.override_b.setEnabled(True) self.override_b.setEnabled(True)

View File

@ -10,8 +10,8 @@ from ui.test_test import Test_Test
class Test_Vision(Test_Test): class Test_Vision(Test_Test):
request_frame = pyqtSignal() request_frame = pyqtSignal()
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__(components=components, recipe=recipe, step=step, pieces=pieces, run_once=run_once, enable_override=enable_override) 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: if "--sim-camera" not in sys.argv:
self.ok_counter_limit = 2 self.ok_counter_limit = 2
else: else: