Eduardo_Scripniciuc/st-ten-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Eduardo 2024-11-15 12:28:28 +01:00
parent 26508cc25c
commit 8474729dd2
2 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/machine_settings/st-ten-6.ini
View File

@ -36,7 +36,7 @@ printer: zd421
[digital_io] [digital_io]
# OUTPUT MAP FOR FIXTURE CONNECTOR # OUTPUT MAP FOR FIXTURE CONNECTOR
id: USB-5862,BID#1 id: USB-5860,BID#0
[digital_io_flush_blow] [digital_io_flush_blow]
id: USB-5860,BID#0 id: USB-5860,BID#0
@ -88,7 +88,7 @@ tempo_svuotamento_2: 1
pressione_svuotamento_2: 100 pressione_svuotamento_2: 100
canale_di_prova_2: 1 canale_di_prova_2: 1
modello_etichetta: EtichettaR5_Montaggio_1prova.prn modello_etichetta: EtichettaR5_Montaggio_1prova.prn
pid_pressure_correction: 105 pid_pressure_correction: 0
[autotest_leak] [autotest_leak]
enabled: true enabled: true

44
src/ui/test/test.py
View File

@ -688,31 +688,31 @@ class Test(Widget):
"DESCRIPTION": self.labellify(recipe.get("description", "-")), "DESCRIPTION": self.labellify(recipe.get("description", "-")),
"RECIPE_TO_PRINT": self.labellify(self.print_step.spec.get("labeltxt_5", "-").replace('{N11}', '')), "RECIPE_TO_PRINT": self.labellify(self.print_step.spec.get("labeltxt_5", "-").replace('{N11}', '')),
# STEP SPEC # STEP SPEC
"TPREFILL": self.labellify(leak_test_1_step_spec.get("pre_filling_time", "-")), "TPREFILL": self.labellify(leak_test_1_step.get("pre_filling_time", "-")),
"PPREFILL": self.labellify(leak_test_1_step_spec.get("pre_filling_pressure", "-")), "PPREFILL": self.labellify(leak_test_1_step.get("pre_filling_pressure", "-")),
"TFILL": self.labellify(leak_test_1_step_spec.get("filling_time", "-")), "TFILL": self.labellify(leak_test_1_step.get("filling_time", "-")),
"TSET": self.labellify(leak_test_1_step_spec.get("settling_time", "-")), "TSET": self.labellify(leak_test_1_step.get("settling_time", "-")),
"TPREFILL2": self.labellify(leak_test_2_step_spec.get("pre_filling_time", "-")), "TPREFILL2": self.labellify(leak_test_2_step.get("pre_filling_time", "-")),
"PPREFILL2": self.labellify(leak_test_2_step_spec.get("pre_filling_pressure", "-")), "PPREFILL2": self.labellify(leak_test_2_step.get("pre_filling_pressure", "-")),
"TFILL2": self.labellify(leak_test_2_step_spec.get("filling_time", "-")), "TFILL2": self.labellify(leak_test_2_step.get("filling_time", "-")),
"TSET2": self.labellify(leak_test_2_step_spec.get("settling_time", "-")), "TSET2": self.labellify(leak_test_2_step.get("settling_time", "-")),
"PSETMINP": self.labellify(leak_test_1_step_spec.get("settling_pressure_min_percent", " -")), "PSETMINP": self.labellify(leak_test_1_step.get("settling_pressure_min_percent", " -")),
"PSETMAXP": self.labellify(leak_test_1_step_spec.get("settling_pressure_max_percent", " -")), "PSETMAXP": self.labellify(leak_test_1_step.get("settling_pressure_max_percent", " -")),
"PSETMINP2": self.labellify(leak_test_2_step_spec.get("settling_pressure_min_percent", " -")), "PSETMINP2": self.labellify(leak_test_2_step.get("settling_pressure_min_percent", " -")),
"PSETMAXP2": self.labellify(leak_test_2_step_spec.get("settling_pressure_max_percent", " -")), "PSETMAXP2": self.labellify(leak_test_2_step.get("settling_pressure_max_percent", " -")),
"PSETMINP_A": self.labellify(psetminp_a), "PSETMINP_A": self.labellify(psetminp_a),
"PSETMAXP_A": self.labellify(psetmaxp_a), "PSETMAXP_A": self.labellify(psetmaxp_a),
"PSETMINP2_A": self.labellify(psetminp2_a), "PSETMINP2_A": self.labellify(psetminp2_a),
"PSETMAXP2_A": self.labellify(psetmaxp2_a), "PSETMAXP2_A": self.labellify(psetmaxp2_a),
"TTEST": self.labellify(leak_test_1_step_spec.get("test_time", "-")), "TTEST": self.labellify(leak_test_1_step.get("test_time", "-")),
"TTEST2": self.labellify(leak_test_2_step_spec.get("test_time", "-")), "TTEST2": self.labellify(leak_test_2_step.get("test_time", "-")),
"PMIN": self.labellify(leak_test_1_step_spec.get("test_pressure_qneg", "-")), "PMIN": self.labellify(leak_test_1_step.get("test_pressure_qneg", "-")),
"PMIN2": self.labellify(leak_test_2_step_spec.get("test_pressure_qneg", "-")), "PMIN2": self.labellify(leak_test_2_step.get("test_pressure_qneg", "-")),
"PTEST": self.labellify(leak_test_1_step_spec.get("test_pressure", "-")), "PTEST": self.labellify(leak_test_1_step.get("test_pressure", "-")),
"PTEST2": self.labellify(leak_test_2_step_spec.get("test_pressure", "-")), "PTEST2": self.labellify(leak_test_2_step.get("test_pressure", "-")),
"PMAX": self.labellify(leak_test_1_step_spec.get("test_pressure_qpos", "-")), "PMAX": self.labellify(leak_test_1_step.get("test_pressure_qpos", "-")),
"TFLUSH": self.labellify(leak_test_1_step_spec.get("flush_time", "-")), "TFLUSH": self.labellify(leak_test_1_step.get("flush_time", "-")),
"PFLUSH": self.labellify(leak_test_1_step_spec.get("flush_pressure", "-")), "PFLUSH": self.labellify(leak_test_1_step.get("flush_pressure", "-")),
# ACTUAL TESTED VALUES # ACTUAL TESTED VALUES
"RESPFILL": self.labellify(leak_test_1_results.get("Running test: filling pressure", "-")), "RESPFILL": self.labellify(leak_test_1_results.get("Running test: filling pressure", "-")),
"RESPFILL2": self.labellify(leak_test_2_results.get("Running test: filling pressure", "-")), "RESPFILL2": self.labellify(leak_test_2_results.get("Running test: filling pressure", "-")),
@ -750,7 +750,7 @@ class Test(Widget):
# RESULT # RESULT
"RESULT": str("CONFORME" if leak_test_1.get("ok", False) else "SCARTO") + str(" FORZATO" if self.data.get("overridden", False) else ""), "RESULT": str("CONFORME" if leak_test_1.get("ok", False) else "SCARTO") + str(" FORZATO" if self.data.get("overridden", False) else ""),
"RESULT_L1": "ESITO" + str(" FORZATO" if self.data.get("overridden", False) else ""), "RESULT_L1": "ESITO" + str(" FORZATO" if self.data.get("overridden", False) else ""),
"RESULT_L2": str("CONFORME" if leak_test_1_results.get("ok", False) else "SCARTO"), "RESULT_L2": str("CONFORME" if leak_test_1.get("ok", False) else "SCARTO"),
} }
#TESTING BROTHER #TESTING BROTHER
label_brother = context.get("RECIPE_TO_PRINT", "-") + context.get("DD","-") + context.get("MO","-") + context.get("YY","-") + context.get("SN5","-") label_brother = context.get("RECIPE_TO_PRINT", "-") + context.get("DD","-") + context.get("MO","-") + context.get("YY","-") + context.get("SN5","-")