From 554263cc218d9ec1758fbeed2c8ee11b597c1153 Mon Sep 17 00:00:00 2001 From: stten6 Date: Sat, 10 Jun 2023 09:55:19 +0200 Subject: [PATCH] stten6 --- config/machine_settings/st-ten-6.ini | 6 +++--- runme_noautotest.bat | 4 ++++ src/ui/test/test.py | 24 ++++++++++-------------- 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 runme_noautotest.bat diff --git a/config/machine_settings/st-ten-6.ini b/config/machine_settings/st-ten-6.ini index cc204dd..328d6ac 100644 --- a/config/machine_settings/st-ten-6.ini +++ b/config/machine_settings/st-ten-6.ini @@ -39,7 +39,7 @@ dimensione_lotto_abilitata: tempo_pre_riempimento: 0 pressione_pre_riempimento: 1000 tempo_riempimento: 10 -tempo_assestamento: 15 +tempo_assestamento: 10 tempo_di_test: 10 percentuale_minima_pressione_assestamento: 5 percentuale_massima_pressione_assestamento: 5 @@ -52,8 +52,8 @@ config_elettrovalvole: 1 prova_tenuta_abilitata_2: tempo_pre_riempimento_2: 0 pressione_pre_riempimento_2: 1000 -tempo_riempimento_2: 20 -tempo_assestamento_2: 40 +tempo_riempimento_2: 10 +tempo_assestamento_2: 10 tempo_di_test_2: 10 percentuale_minima_pressione_assestamento_2: 5 percentuale_massima_pressione_assestamento_2: 5 diff --git a/runme_noautotest.bat b/runme_noautotest.bat new file mode 100644 index 0000000..0e1d578 --- /dev/null +++ b/runme_noautotest.bat @@ -0,0 +1,4 @@ +echo on +SET mypath=%~dp0 +cd %mypath% +.\venv\Scripts\activate.bat && python -O "./src/main.py" --no-edgetpu --no-tflite --no-autotest diff --git a/src/ui/test/test.py b/src/ui/test/test.py index 5d11dd3..63d9071 100755 --- a/src/ui/test/test.py +++ b/src/ui/test/test.py @@ -526,16 +526,14 @@ class Test(Widget): self.log.info("cycle printed already compiled label") # LABEL PRINT recipe = archived.test_data.get("recipe", {}) - leak_test_1 = archived.test_data.get("leak_1", {}).get("0", {}) + leak_test_1 = archived.test_data.get("leak_1", {}) leak_test_1_step = leak_test_1.get("step", {}) leak_test_1_step_spec = leak_test_1_step.get("spec", {}) leak_test_1_results = leak_test_1.get("results", {}) - leak_test_1_results_data = leak_test_1_results.get("data", {}) - leak_test_2 = archived.test_data.get("leak_2", {}).get("0", {}) + leak_test_2 = archived.test_data.get("leak_2", {}) leak_test_2_step = leak_test_2.get("step", {}) leak_test_2_step_spec = leak_test_2_step.get("spec", {}) leak_test_2_results = leak_test_2.get("results", {}) - leak_test_2_results_data = leak_test_2_results.get("data", {}) 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) @@ -576,16 +574,14 @@ class Test(Widget): "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 - "RESTPB": self.labellify(leak_test_1_results_data.get("Running test: phase backwards time", "-")), - "RESPFILL": self.labellify(leak_test_1_results_data.get("Running test: filling pressure", "-")), - "RESPSET": self.labellify(leak_test_1_results_data.get("Running test: pressure at the end of settling", "-")), - "RESPSET2": self.labellify(leak_test_2_results_data.get("Running test: pressure at the end of settling", "-")), - "RESPB": self.labellify(leak_test_1_results_data.get("Running test: burst pressure", "-")), - "RESLEAK": self.labellify(leak_test_1_results_data.get("Running test: measured leak", "-")), - "RESLEAK2": self.labellify(leak_test_2_results_data.get("Running test: measured leak", "-")), - "RESFLOW": self.labellify(leak_test_1_results_data.get("Running test: calculated leak flow rate", "-")), - "RESRVP": self.labellify(leak_test_1_results_data.get("Running test: calculate RVP%", "-")), - "RESRES": self.labellify(leak_test_1_results_data.get("Running test: result", "-")), + "RESPFILL": self.labellify(leak_test_1_results.get("Running test: filling pressure", "-")), + "RESPFILL2": self.labellify(leak_test_2_results.get("Running test: filling pressure", "-")), + "RESPSET": self.labellify(leak_test_1_results.get("Running test: pressure at the end of settling", "-")), + "RESPSET2": self.labellify(leak_test_2_results.get("Running test: pressure at the end of settling", "-")), + "RESLEAK": self.labellify(leak_test_1_results.get("Running test: measured leak", "-")), + "RESLEAK2": self.labellify(leak_test_2_results.get("Running test: measured leak", "-")), + "RESRES": self.labellify(leak_test_1_results.get("Running test: result", "-")), + "RESRES2": self.labellify(leak_test_2_results.get("Running test: result", "-")), # SERIAL DEFINITION "SN": str(archived.id), "SN4": f"{archived.id:0>4}",