diff --git a/config/machine_settings/st-ten-6.ini b/config/machine_settings/st-ten-6.ini index cc204dd..98711e6 100644 --- a/config/machine_settings/st-ten-6.ini +++ b/config/machine_settings/st-ten-6.ini @@ -73,10 +73,12 @@ filling_time: 15 settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 -test_time: 10 -test_pressure_min_delta: 35 test_pressure: 15000 -test_pressure_max_delta: 5 +test_time: 10 +test_pressure_min_delta: 35 # MAXIMUM LEAK ACCEPTED WITH REF LEAK INSERTED +test_pressure_max_delta: -25 # MINIMUM LEAK ACCEPTED WITH REF LEAK INSERTED +test_pressure_tt_min_delta: -5 #MAXIMUM LEAK ACCEPTED WITH TUBE-TUBE +test_pressure_tt_max_delta: 5 #MINIMUM LEAK ACCEPTED TUBE-TUBE flush_time: 1 flush_pressure: 100 relay_config: 1 \ No newline at end of file diff --git a/src/ui/test/test.py b/src/ui/test/test.py index b86a50b..a5693d9 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -351,6 +351,7 @@ class Test(Widget): self.cycle_steps = steps self.check_steps_dependencies(self.cycle_steps) leak_autotest_steps=[] + # CONFIGURE LEAK AUTOTEST PARAMETERS if self.config["autotest_leak"]["enabled"]=="true": l_at_1=copy.deepcopy(self.config["autotest_leak"]) l_at_1.pop("enabled") @@ -359,6 +360,8 @@ class Test(Widget): 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["test_pressure_min_delta"]=l_at_2["test_pressure_tt_min_delta"] + l_at_2["test_pressure_max_delta"]=l_at_2["test_pressure_tt_max_delta"] l_at_2["autotest"]="ok_check" leak_autotest_steps=[Steps(type="leak_1",spec=l_at_1),Steps(type="leak_1",spec=l_at_2)] diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index 33f7e4f..37c3c34 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -122,7 +122,7 @@ class Test_Leak(Test_Test): if step == "ok_check": ok = type(result) is str and "passed" in result.lower() # AUTOTEST - NO LEAK elif step == "ko_check": - ok = type(result) is str and "failed" in result.lower() # AUTOTEST - LEAK + ok = type(result) is str and "passed" in result.lower() # AUTOTEST - LEAK else: ok = type(result) is str and "passed" in result.lower() # NORMAL TEST @@ -181,6 +181,9 @@ class Test_Leak(Test_Test): if self.parent_assembly_widget is not None: self.parent_assembly_widget().set_text(text="COLLEGARE GLI ATTACCHI PNEUMATICI E PREMERE START PER INIZIARE LA PROVA TENUTA") self.start_b.setEnabled(True) + self.start_b.setDefault(True) + self.start_b.setFocus() + self.stop_b.setEnabled(False) else: if self.step is not None: diff --git a/src/ui/test_leak/test_leak.ui b/src/ui/test_leak/test_leak.ui index 23dfb7e..a9844d9 100644 --- a/src/ui/test_leak/test_leak.ui +++ b/src/ui/test_leak/test_leak.ui @@ -1503,6 +1503,15 @@ START + + false + + + false + + + false +