diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 05d7447..5bb1649 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -148,3 +148,21 @@ ricetta_visione: termorestringente_923578.ini stampa_etichetta_abilitata: x modello_etichetta: ETA013L.prn descrizione: inserire descrizione ricetta + +[autotest_leak] +enabled: true +pre_filling_time: 0 +pre_filling_pressure: 1000 +filling_time: 5 +settling_time: 5 +settling_pressure_min_percent: 5 +settling_pressure_max_percent: 5 +test_time: 10 +test_pressure_min_delta: 5 +test_pressure: 9000 +test_pressure_max_delta: 5 +flush_time: 1 +flush_pressure: 100 + +[autotest_resistance] +enabled: false diff --git a/config/machine_settings/st-ten-6.ini b/config/machine_settings/st-ten-6.ini index fda6a0b..9fa6840 100644 --- a/config/machine_settings/st-ten-6.ini +++ b/config/machine_settings/st-ten-6.ini @@ -22,6 +22,12 @@ model: t3l [neo_pixels] port: COM5 +[label_printer] +platform: windows +printer: zd421 + +[digital_io] +id: USB-5860,BID#0 [recipe] recipe_name_field: codice_ricetta part_number_field: codice_prodotto @@ -59,9 +65,17 @@ pressione_svuotamento_2: 100 config_elettrovalvole_2: 2 modello_etichetta: EtichettaR5_Montaggio_1prova.prn -[label_printer] -platform: windows -printer: zd421 - -[digital_io] -id: USB-5860,BID#0 \ No newline at end of file +[autotest_leak] +enabled: true +pre_filling_time: 0 +pre_filling_pressure: 1000 +filling_time: 15 +settling_time: 15 +settling_pressure_min_percent: 5 +settling_pressure_max_percent: 5 +test_time: 10 +test_pressure_min_delta: 5 +test_pressure: 15000 +test_pressure_max_delta: 5 +flush_time: 1 +flush_pressure: 100 diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 56b78be..4f5ec75 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -1,3 +1,4 @@ +import copy import logging import os import sys @@ -326,6 +327,18 @@ class Test(Widget): steps.append(Steps(type="wait")) self.cycle_steps = steps self.check_steps_dependencies(self.cycle_steps) + leak_autotest_steps=[] + if self.config["autotest_leak"]["enabled"]=="true": + l_at_1=copy.deepcopy(self.config["autotest_leak"]) + l_at_1.pop("enabled") + l_at_1={a: float(x) for a, x in l_at_1.items()} + l_at_1["autotest"]=True + l_at_2=copy.deepcopy(self.config["autotest_leak"]) + l_at_2.pop("enabled") + l_at_2={a: float(x) for a, x in l_at_2.items()} + l_at_2["autotest"]=False + leak_autotest_steps=[Steps(type="leak_1",spec=l_at_1),Steps(type="leak_1",spec=l_at_2)] + self.autotest_cycle_steps = [ *([ Steps(type="resistance", spec={ @@ -357,40 +370,41 @@ class Test(Widget): "autotest": True, }), ] if "resistance" not in self.unsupported_steps else []), - *([ - Steps(type="leak_1", spec={ - "pre_filling_time": 0, - "pre_filling_pressure": 1000, - "filling_time": 5, - "settling_time": 5, - "settling_pressure_min_percent": 5, - "settling_pressure_max_percent": 5, - "test_time": 10, - "test_pressure_min_delta": 5, - "test_pressure": 9000, - "test_pressure_max_delta": 5, - "flush_time": 1, - "flush_pressure": 100, - "autotest": True, - }), - ] if "leak_1" not in self.unsupported_steps else []), - *([ - Steps(type="leak_1", spec={ - "pre_filling_time": 0, - "pre_filling_pressure": 1000, - "filling_time": 5, - "settling_time": 5, - "settling_pressure_min_percent": 5, - "settling_pressure_max_percent": 5, - "test_time": 10, - "test_pressure_min_delta": 5, - "test_pressure": 9000, - "test_pressure_max_delta": 5, - "flush_time": 1, - "flush_pressure": 100, - "autotest": False, - }), - ] if "leak_1" not in self.unsupported_steps else []), + *(leak_autotest_steps), + # *([ + # Steps(type="leak_1", spec={ + # "pre_filling_time": 0, + # "pre_filling_pressure": 1000, + # "filling_time": 5, + # "settling_time": 5, + # "settling_pressure_min_percent": 5, + # "settling_pressure_max_percent": 5, + # "test_time": 10, + # "test_pressure_min_delta": 5, + # "test_pressure": 9000, + # "test_pressure_max_delta": 5, + # "flush_time": 1, + # "flush_pressure": 100, + # "autotest": True, + # }), + # ] if "leak_1" not in self.unsupported_steps else []), + # *([ + # Steps(type="leak_1", spec={ + # "pre_filling_time": 0, + # "pre_filling_pressure": 1000, + # "filling_time": 5, + # "settling_time": 5, + # "settling_pressure_min_percent": 5, + # "settling_pressure_max_percent": 5, + # "test_time": 10, + # "test_pressure_min_delta": 5, + # "test_pressure": 9000, + # "test_pressure_max_delta": 5, + # "flush_time": 1, + # "flush_pressure": 100, + # "autotest": False, + # }), + # ] if "leak_1" not in self.unsupported_steps else []), Steps(type="done"), Steps(type="wait"), ] diff --git a/src/ui/test_assembly/test_assembly.py b/src/ui/test_assembly/test_assembly.py index c68e559..9ddfc61 100755 --- a/src/ui/test_assembly/test_assembly.py +++ b/src/ui/test_assembly/test_assembly.py @@ -22,11 +22,15 @@ class Test_Assembly(Widget): self.img = None self.img_l.setVisible(False) - def set_text(self, text=None): + def set_text(self, text=None,color=None): if text is not None: self.text = text self.text_l.setText(str(self.text)) self.text_l.setVisible(True) + if color is None: + color = "green" + self.text_l.setStyleSheet(f"background-color: {color};") + else: self.text = None self.text_l.setVisible(False) diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index b82685d..b7a40e3 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -139,7 +139,7 @@ class Test_Leak(Test_Test): self.parent_assembly_widget().set_text(text="COLLEGARE GLI ATTACCHI PNEUMATICI E PREMERE START PER INIZIARE LA PROVA TENUTA") else: if self.parent_assembly_widget is not None: - self.parent_assembly_widget().set_text(text="AUTOTEST: COLLEGARE GLI ATTACCHI PNEUMATICI CALIBRATI E PREMERE START PER INIZIARE LA PROVA TENUTA DI PROVA") + self.parent_assembly_widget().set_text(text="AUTOTEST: COLLEGARE LA FUGA CALIBRATA E PREMERE START PER INIZIARE LA PROVA TENUTA DI PROVA",color="blue") self.start_b.setEnabled(True) self.stop_b.setEnabled(False) else: