From 2e6a75439370330c31da3cf36eb24addad6c23a0 Mon Sep 17 00:00:00 2001 From: stten6 Date: Sat, 10 Jun 2023 11:22:26 +0200 Subject: [PATCH] stten6 at window ok --- config/machine_settings/defaults.ini | 4 ++-- config/machine_settings/st-ten-1.ini | 4 ++-- config/machine_settings/st-ten-2.ini | 4 ++-- config/machine_settings/st-ten-5.ini | 4 ++-- config/machine_settings/st-ten-6.ini | 12 ++++++------ config/machine_settings/st-ten-7.ini | 4 ++-- config/machine_settings/st-ten-8.ini | 4 ++-- src/components/tecna_marposs_provaset_t3.py | 7 ++++--- src/lib/db/__init__.py | 4 ++-- src/lib/helpers/config_reader.py | 2 +- src/ui/leak_step_editor/leak_step_editor.py | 4 ++-- src/ui/leak_step_editor/leak_step_editor.ui | 4 ++-- src/ui/recipe_selection/recipe_selection.py | 16 ++++++++-------- src/ui/test/test.py | 18 +++++++++--------- src/ui/test_leak/test_leak.py | 4 ++-- 15 files changed, 48 insertions(+), 47 deletions(-) diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 23ac1bd..22004bd 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -162,9 +162,9 @@ settling_time: 5 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 test_time: 10 -test_pressure_min_delta: 5 +test_pressure_qneg: 5 test_pressure: 9000 -test_pressure_max_delta: 5 +test_pressure_qpos: 5 flush_time: 1 flush_pressure: 100 diff --git a/config/machine_settings/st-ten-1.ini b/config/machine_settings/st-ten-1.ini index f1d3b85..0a022fa 100644 --- a/config/machine_settings/st-ten-1.ini +++ b/config/machine_settings/st-ten-1.ini @@ -87,9 +87,9 @@ settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 test_time: 10 -test_pressure_min_delta: 10 +test_pressure_qneg: 10 test_pressure: 7000 -test_pressure_max_delta: 5 +test_pressure_qpos: 5 flush_time: 1 flush_pressure: 100 relay_config: 1 \ No newline at end of file diff --git a/config/machine_settings/st-ten-2.ini b/config/machine_settings/st-ten-2.ini index 8d57296..621a3ef 100644 --- a/config/machine_settings/st-ten-2.ini +++ b/config/machine_settings/st-ten-2.ini @@ -49,9 +49,9 @@ settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 test_time: 10 -test_pressure_min_delta: 5 +test_pressure_qneg: 5 test_pressure: 9000 -test_pressure_max_delta: 5 +test_pressure_qpos: 5 flush_time: 1 flush_pressure: 100 relay_config: 1 \ No newline at end of file diff --git a/config/machine_settings/st-ten-5.ini b/config/machine_settings/st-ten-5.ini index 1ddd713..228f784 100644 --- a/config/machine_settings/st-ten-5.ini +++ b/config/machine_settings/st-ten-5.ini @@ -91,9 +91,9 @@ settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 test_time: 10 -test_pressure_min_delta: 10 +test_pressure_qneg: 10 test_pressure: 5000 -test_pressure_max_delta: 5 +test_pressure_qpos: 5 flush_time: 1 flush_pressure: 100 relay_config: 1 \ No newline at end of file diff --git a/config/machine_settings/st-ten-6.ini b/config/machine_settings/st-ten-6.ini index 313002e..46555b6 100644 --- a/config/machine_settings/st-ten-6.ini +++ b/config/machine_settings/st-ten-6.ini @@ -69,16 +69,16 @@ modello_etichetta: EtichettaR5_Montaggio_1prova.prn enabled: true pre_filling_time: 0 pre_filling_pressure: 1000 -filling_time: 15 +filling_time: 10 settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 -test_pressure: 15000 +test_pressure: 7000 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 +test_pressure_qpos: 5 #Q+ Upper test leak limit +test_pressure_qneg: 15 #Q- Lower test leak limit +test_pressure_tt_qpos: 0 # Q+ Upper test leak limit (tube-tube) +test_pressure_tt_qneg: 5 # Q- Lower test leak limit (tube-tube) flush_time: 1 flush_pressure: 100 relay_config: 1 \ No newline at end of file diff --git a/config/machine_settings/st-ten-7.ini b/config/machine_settings/st-ten-7.ini index 2613397..3b3e1f8 100644 --- a/config/machine_settings/st-ten-7.ini +++ b/config/machine_settings/st-ten-7.ini @@ -74,9 +74,9 @@ settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 test_time: 10 -test_pressure_min_delta: 35 +test_pressure_qneg: 35 test_pressure: 15000 -test_pressure_max_delta: 5 +test_pressure_qpos: 5 flush_time: 1 flush_pressure: 100 relay_config: 1 \ No newline at end of file diff --git a/config/machine_settings/st-ten-8.ini b/config/machine_settings/st-ten-8.ini index 3ad5342..f9d764b 100644 --- a/config/machine_settings/st-ten-8.ini +++ b/config/machine_settings/st-ten-8.ini @@ -77,9 +77,9 @@ settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 test_time: 10 -test_pressure_min_delta: 35 +test_pressure_qneg: 35 test_pressure: 15000 -test_pressure_max_delta: 5 +test_pressure_qpos: 5 flush_time: 1 flush_pressure: 100 relay_config: 1 \ No newline at end of file diff --git a/src/components/tecna_marposs_provaset_t3.py b/src/components/tecna_marposs_provaset_t3.py index 8b1d980..93c45f2 100644 --- a/src/components/tecna_marposs_provaset_t3.py +++ b/src/components/tecna_marposs_provaset_t3.py @@ -281,7 +281,8 @@ class TecnaMarpossProvasetT3(ModbusComponent): # **{769 - 1 + i: (recipe_name[i * 2 + 1] << 8) + recipe_name[i * 2] for i in range(8)}, # print field 2 "Print options": 0b0000000000000000 | self.saver_label_count << 12 | self.saver_print_on_fail << 8 | self.saver_label_template, "Test type": "Leak Test", - "Test flags": 0b0110000001011100 if step.spec.get("autotest", False) is not True else 0b0110000001010100, + # "Test flags": 0b0110000001011100 if step.spec.get("autotest", False) is not True else 0b0110000001010100, + "Test flags": 0b0110100001010100 if step.spec.get("autotest", False) in ("ok_check","ko_check") else 0b0110000001010100, "T0 - Pre-filling time": step.spec["pre_filling_time"], "P0 - Pre-filling pressure": step.spec["pre_filling_pressure"], "T1 - Filling time": step.spec["filling_time"], @@ -289,9 +290,9 @@ class TecnaMarpossProvasetT3(ModbusComponent): "PR- - Min pressure tolerance %": step.spec["settling_pressure_min_percent"], "PR+ - Max pressure tolerance % (P+)": step.spec["settling_pressure_max_percent"], "T3 - Measure time": step.spec["test_time"], - "Q- Lower test leak limit": step.spec["test_pressure_min_delta"], + "Q- Lower test leak limit": step.spec["test_pressure_qneg"], "PREL - Nominal test pressure": step.spec["test_pressure"], - "Q+ Upper test leak limit": step.spec["test_pressure_max_delta"], + "Q+ Upper test leak limit": step.spec["test_pressure_qpos"], "FST - Discharge time": step.spec["flush_time"], "FSL - Discharge limit": step.spec["flush_pressure"], } diff --git a/src/lib/db/__init__.py b/src/lib/db/__init__.py index fcf7ce0..fb0510d 100644 --- a/src/lib/db/__init__.py +++ b/src/lib/db/__init__.py @@ -60,8 +60,8 @@ def init_db(): # "connector": {"connector": row["connector"]}, # "barcodes": {"serial": ""}, # "resistance": {"scale": 500, "expected": float(row["resistance_expected"]), "tolerance": float(row["resistance_tolerance"])}, - # "leak_1": {"pre_filling_time": 1, "pre_filling_pressure": 1000, "filling_time": 1, "settling_time": 1, "settling_pressure_min_percent": 5, "settling_pressure_max_percent": 5, "test_time": 5, "test_pressure_min_delta": 100, "test_pressure": 1000, "test_pressure_max_delta": 100, "flush_time": 1, "flush_pressure": 100}, - # "leak_2": {"pre_filling_time": 1, "pre_filling_pressure": 1000, "filling_time": 1, "settling_time": 1, "settling_pressure_min_percent": 5, "settling_pressure_max_percent": 5, "test_time": 5, "test_pressure_min_delta": 100, "test_pressure": 1000, "test_pressure_max_delta": 100, "flush_time": 1, "flush_pressure": 100}, + # "leak_1": {"pre_filling_time": 1, "pre_filling_pressure": 1000, "filling_time": 1, "settling_time": 1, "settling_pressure_min_percent": 5, "settling_pressure_max_percent": 5, "test_time": 5, "test_pressure_qneg": 100, "test_pressure": 1000, "test_pressure_qpos": 100, "flush_time": 1, "flush_pressure": 100}, + # "leak_2": {"pre_filling_time": 1, "pre_filling_pressure": 1000, "filling_time": 1, "settling_time": 1, "settling_pressure_min_percent": 5, "settling_pressure_max_percent": 5, "test_time": 5, "test_pressure_qneg": 100, "test_pressure": 1000, "test_pressure_qpos": 100, "flush_time": 1, "flush_pressure": 100}, # "vision": {"recipe": "termorestringente_923578.ini"}, # "print": {"template": "EtichettaR5.prn", }, # }.items(): diff --git a/src/lib/helpers/config_reader.py b/src/lib/helpers/config_reader.py index f248296..61d39ad 100644 --- a/src/lib/helpers/config_reader.py +++ b/src/lib/helpers/config_reader.py @@ -48,7 +48,7 @@ class ConfigReader(QObject): def read_config_file(self, config_path): config_path = str(config_path) - config = ConfigParser(*self._args, **self._kwargs) + config = ConfigParser(*self._args, **self._kwargs, allow_no_value=True,comment_prefixes="#",inline_comment_prefixes="#") read = config.read(config_path) if len(read) != 1 or config_path != read[0]: raise AssertionError(f"Config file {config_path} could not be read.") diff --git a/src/ui/leak_step_editor/leak_step_editor.py b/src/ui/leak_step_editor/leak_step_editor.py index 2d5203f..e157ef2 100644 --- a/src/ui/leak_step_editor/leak_step_editor.py +++ b/src/ui/leak_step_editor/leak_step_editor.py @@ -15,9 +15,9 @@ class Leak_Step_Editor(Editor): "settling_pressure_max_percent": self.settling_pressure_max_percent_sb, # test "test_time": self.test_time_sb, - "test_pressure_min_delta": self.test_pressure_min_delta_sb, + "test_pressure_qneg": self.test_pressure_qneg_sb, "test_pressure": self.test_pressure_sb, - "test_pressure_max_delta": self.test_pressure_max_delta_sb, + "test_pressure_qpos": self.test_pressure_qpos_sb, # flush "flush_time": self.flush_time_sb, "flush_pressure": self.flush_pressure_sb, diff --git a/src/ui/leak_step_editor/leak_step_editor.ui b/src/ui/leak_step_editor/leak_step_editor.ui index 7b1356b..1bf8742 100644 --- a/src/ui/leak_step_editor/leak_step_editor.ui +++ b/src/ui/leak_step_editor/leak_step_editor.ui @@ -221,7 +221,7 @@ - + 0 @@ -238,7 +238,7 @@ - + 9999 diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index fc27bca..06ec26b 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -214,9 +214,9 @@ class Recipe_Selection(Widget): "settling_pressure_min_percent": int(row.get("percentuale_minima_pressione_assestamento", defaults["percentuale_minima_pressione_assestamento"])), "settling_pressure_max_percent": int(row.get("percentuale_massima_pressione_assestamento", defaults["percentuale_massima_pressione_assestamento"])), "test_time": int(row.get("tempo_di_test", defaults["tempo_di_test"])), - "test_pressure_min_delta": int(row.get("pressione_di_test_delta_minimo", defaults["pressione_di_test_delta_minimo"])), + "test_pressure_qneg": int(row.get("pressione_di_test_delta_minimo", defaults["pressione_di_test_delta_minimo"])), "test_pressure": int(row.get("pressione_di_test", defaults["pressione_di_test"])), - "test_pressure_max_delta": int(row.get("pressione_di_test_delta_massimo", defaults["pressione_di_test_delta_massimo"])), + "test_pressure_qpos": int(row.get("pressione_di_test_delta_massimo", defaults["pressione_di_test_delta_massimo"])), "flush_time": int(row.get("tempo_svuotamento", defaults["tempo_svuotamento"])), "flush_pressure": int(row.get("pressione_svuotamento", defaults["pressione_svuotamento"])), "relay_config": int(row.get("config_elettrovalvole", defaults["config_elettrovalvole"])) @@ -229,9 +229,9 @@ class Recipe_Selection(Widget): "settling_pressure_min_percent": int(row.get("percentuale_minima_pressione_assestamento_2", defaults["percentuale_minima_pressione_assestamento_2"])), "settling_pressure_max_percent": int(row.get("percentuale_massima_pressione_assestamento_2", defaults["percentuale_massima_pressione_assestamento_2"])), "test_time": int(row.get("tempo_di_test_2", defaults["tempo_di_test_2"])), - "test_pressure_min_delta": int(row.get("pressione_di_test_delta_minimo_2", defaults["pressione_di_test_delta_minimo_2"])), + "test_pressure_qneg": int(row.get("pressione_di_test_delta_minimo_2", defaults["pressione_di_test_delta_minimo_2"])), "test_pressure": int(row.get("pressione_di_test_2", defaults["pressione_di_test_2"])), - "test_pressure_max_delta": int(row.get("pressione_di_test_delta_massimo_2", defaults["pressione_di_test_delta_massimo_2"])), + "test_pressure_qpos": int(row.get("pressione_di_test_delta_massimo_2", defaults["pressione_di_test_delta_massimo_2"])), "flush_time": int(row.get("tempo_svuotamento_2", defaults["tempo_svuotamento_2"])), "flush_pressure": int(row.get("pressione_svuotamento_2", defaults["pressione_svuotamento_2"])), "relay_config": int(row.get("config_elettrovalvole_2", defaults["config_elettrovalvole_2"])) @@ -434,9 +434,9 @@ class Recipe_Selection(Widget): "percentuale_minima_pressione_assestamento": steps["leak_1"].spec["settling_pressure_min_percent"], "percentuale_massima_pressione_assestamento": steps["leak_1"].spec["settling_pressure_max_percent"], "tempo_di_test": steps["leak_1"].spec["test_time"], - "pressione_di_test_delta_minimo": steps["leak_1"].spec["test_pressure_min_delta"], + "pressione_di_test_delta_minimo": steps["leak_1"].spec["test_pressure_qneg"], "pressione_di_test": steps["leak_1"].spec["test_pressure"], - "pressione_di_test_delta_massimo": steps["leak_1"].spec["test_pressure_max_delta"], + "pressione_di_test_delta_massimo": steps["leak_1"].spec["test_pressure_qpos"], "tempo_svuotamento": steps["leak_1"].spec["flush_time"], "pressione_svuotamento": steps["leak_1"].spec["flush_pressure"], "prova_tenuta_abilitata_2": "x" if recipe.spec["leak_2"] else "", @@ -447,9 +447,9 @@ class Recipe_Selection(Widget): "percentuale_minima_pressione_assestamento_2": steps["leak_2"].spec["settling_pressure_min_percent"], "percentuale_massima_pressione_assestamento_2": steps["leak_2"].spec["settling_pressure_max_percent"], "tempo_di_test_2": steps["leak_2"].spec["test_time"], - "pressione_di_test_delta_minimo_2": steps["leak_2"].spec["test_pressure_min_delta"], + "pressione_di_test_delta_minimo_2": steps["leak_2"].spec["test_pressure_qneg"], "pressione_di_test_2": steps["leak_2"].spec["test_pressure"], - "pressione_di_test_delta_massimo_2": steps["leak_2"].spec["test_pressure_max_delta"], + "pressione_di_test_delta_massimo_2": steps["leak_2"].spec["test_pressure_qpos"], "tempo_svuotamento_2": steps["leak_2"].spec["flush_time"], "pressione_svuotamento_2": steps["leak_2"].spec["flush_pressure"], "test_visione_abilitato": recipe.spec["vision"], diff --git a/src/ui/test/test.py b/src/ui/test/test.py index ee1a0b9..bf2faf7 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -360,8 +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["test_pressure_qneg"]=l_at_2["test_pressure_tt_qneg"] + l_at_2["test_pressure_qpos"]=l_at_2["test_pressure_tt_qpos"] 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)] @@ -544,10 +544,10 @@ class Test(Widget): leak_test_2_step_spec = leak_test_2_step.get("spec", {}) leak_test_2_results = leak_test_2.get("results", {}) - psetminp_a = leak_test_1_step_spec.get("test_pressure", 0) * (100+leak_test_1_step_spec.get("test_pressure_min_delta", 0)/100) - psetmaxp_a = leak_test_1_step_spec.get("settling_pressure_max_percent", 0) * (100+leak_test_1_step_spec.get("test_pressure_max_delta", 0)/100) - psetminp2_a = leak_test_2_step_spec.get("settling_pressure_min_percent", 0) * (100+leak_test_2_step_spec.get("test_pressure_min_delta", 0)/100) - psetmaxp2_a = leak_test_2_step_spec.get("settling_pressure_max_percent", 0) * (100+leak_test_2_step_spec.get("test_pressure_max_delta", 0)/100) + psetminp_a = leak_test_1_step_spec.get("test_pressure", 0) * (100+leak_test_1_step_spec.get("test_pressure_qneg", 0)/100) + psetmaxp_a = leak_test_1_step_spec.get("settling_pressure_max_percent", 0) * (100+leak_test_1_step_spec.get("test_pressure_qpos", 0)/100) + psetminp2_a = leak_test_2_step_spec.get("settling_pressure_min_percent", 0) * (100+leak_test_2_step_spec.get("test_pressure_qneg", 0)/100) + psetmaxp2_a = leak_test_2_step_spec.get("settling_pressure_max_percent", 0) * (100+leak_test_2_step_spec.get("test_pressure_qpos", 0)/100) printer_fields = self.step.spec context = { @@ -575,11 +575,11 @@ class Test(Widget): "PSETMAXP2_A": self.labellify(psetmaxp2_a), "TTEST": self.labellify(leak_test_1_step_spec.get("test_time", "-")), "TTEST2": self.labellify(leak_test_2_step_spec.get("test_time", "-")), - "PMIN": self.labellify(leak_test_1_step_spec.get("test_pressure_min_delta", "-")), - "PMIN2": self.labellify(leak_test_2_step_spec.get("test_pressure_min_delta", "-")), + "PMIN": self.labellify(leak_test_1_step_spec.get("test_pressure_qneg", "-")), + "PMIN2": self.labellify(leak_test_2_step_spec.get("test_pressure_qneg", "-")), "PTEST": self.labellify(leak_test_1_step_spec.get("test_pressure", "-")), "PTEST2": self.labellify(leak_test_2_step_spec.get("test_pressure", "-")), - "PMAX": self.labellify(leak_test_1_step_spec.get("test_pressure_max_delta", "-")), + "PMAX": self.labellify(leak_test_1_step_spec.get("test_pressure_qpos", "-")), "TFLUSH": self.labellify(leak_test_1_step_spec.get("flush_time", "-")), "PFLUSH": self.labellify(leak_test_1_step_spec.get("flush_pressure", "-")), # ACTUAL TESTED VALUES diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py index 37c3c34..70d4669 100644 --- a/src/ui/test_leak/test_leak.py +++ b/src/ui/test_leak/test_leak.py @@ -50,8 +50,8 @@ class Test_Leak(Test_Test): self.test_num_l.setText("1/1") self.recipe_pressure_l.setText(f"{self.step.spec['test_pressure']}") - self.leak_min_l.setText(f"{self.step.spec['test_pressure_min_delta']}") - self.leak_max_l.setText(f"{self.step.spec['test_pressure_max_delta']}") + self.leak_min_l.setText(f"{self.step.spec['test_pressure_qneg']}") + self.leak_max_l.setText(f"{self.step.spec['test_pressure_qpos']}") # setup test loop self.components["tecna_t3"].write_recipe(self.recipe, self.step) self.get_connection = self.components["tecna_t3"].out.connect(self.get)