diff --git a/config/label_designs/TUBI RISCALDATI/ETA013.btw b/config/label_designs/TUBI RISCALDATI/ETA013.btw
index 6f710cf..29fc523 100644
Binary files a/config/label_designs/TUBI RISCALDATI/ETA013.btw and b/config/label_designs/TUBI RISCALDATI/ETA013.btw differ
diff --git a/config/label_designs/TUBI RISCALDATI/ETA013_OLD.btw b/config/label_designs/TUBI RISCALDATI/ETA013_OLD.btw
new file mode 100644
index 0000000..f905dd1
Binary files /dev/null and b/config/label_designs/TUBI RISCALDATI/ETA013_OLD.btw differ
diff --git a/config/label_designs/TUBI RISCALDATI/ETA013_PM.btw b/config/label_designs/TUBI RISCALDATI/ETA013_PM.btw
new file mode 100644
index 0000000..f87cc20
Binary files /dev/null and b/config/label_designs/TUBI RISCALDATI/ETA013_PM.btw differ
diff --git a/config/label_designs/TUBI RISCALDATI/TEXA.btw b/config/label_designs/TUBI RISCALDATI/TEXA.btw
new file mode 100644
index 0000000..5598a83
Binary files /dev/null and b/config/label_designs/TUBI RISCALDATI/TEXA.btw differ
diff --git a/config/label_templates/ETA013L.prn b/config/label_templates/ETA013L.prn
index 140631d..43172a9 100644
--- a/config/label_templates/ETA013L.prn
+++ b/config/label_templates/ETA013L.prn
@@ -9,39 +9,39 @@ SET PARTIAL_CUTTER OFF
SET TEAR ON
CLS
CODEPAGE 1252
-TEXT 203,221,"0",180,9,9,"{TSET}s"
-TEXT 205,374,"0",180,9,9,"{RESPFILL}mbar"
-TEXT 260,792,"0",180,9,9,"{CLIENT}"
-TEXT 336,987,"0",180,12,12,"ERRECINQUE"
-TEXT 292,923,"0",180,8,8,"Fluid system"
-TEXT 307,894,"0",180,8,8,"Via Meucci 31/A"
-TEXT 333,865,"0",180,8,8,"10079 Mappano (TO)"
-TEXT 375,792,"0",180,9,9,"Cliente:"
-TEXT 375,763,"0",180,9,9,"N. disegno:"
-TEXT 375,732,"0",180,9,9,"N. dis. R5:"
-TEXT 375,702,"0",180,9,9,"N. pezzo:"
-TEXT 375,671,"0",180,9,9,"Data/ora prova:"
-TEXT 375,640,"0",180,9,9,"{DATETIME}"
-TEXT 252,763,"0",180,9,9,"{RECIPE}"
-TEXT 222,732,"0",180,9,9,"{PART}"
-TEXT 241,702,"0",180,9,9,"{SN}"
-BARCODE 384,583,"128M",102,0,180,2,4,"!105{BCODE}"
-TEXT 381,374,"0",180,9,9,"P. riempimento:"
-TEXT 381,336,"0",180,9,9,"P. assestamento:"
-TEXT 381,298,"0",180,9,9,"Caduta:"
-TEXT 203,336,"0",180,9,9,"{RESPSET}mbar"
-TEXT 203,298,"0",180,9,9,"{RESLEAK}mbar"
-TEXT 381,259,"0",180,9,9,"T. riemp:"
-TEXT 381,221,"0",180,9,9,"T. stab:"
-TEXT 381,182,"0",180,9,9,"T. prova:"
-TEXT 204,259,"0",180,9,9,"{TFILL}s"
-TEXT 203,182,"0",180,9,9,"{TTEST}s"
-TEXT 381,143,"0",180,9,9,"Caduta MAX"
-TEXT 381,104,"0",180,9,9,"Press nominale"
-TEXT 203,143,"0",180,9,9,"{PMIN}mbar"
-TEXT 203,104,"0",180,9,9,"{PTEST}mbar"
-TEXT 375,67,"0",180,11,11,"ESITO:"
-TEXT 274,67,"0",180,11,11,"{RESULT}"
-TEXT 312,450,"0",180,8,8,"{BCODE}"
+TEXT 203,232,"0",180,9,9,"{TSET}s"
+TEXT 203,386,"0",180,9,9,"{RESPFILL}mbar"
+TEXT 292,813,"0",180,9,9,"{CLIENT}"
+TEXT 330,990,"0",180,12,12,"ERRECINQUE"
+TEXT 292,930,"0",180,8,8,"Fluid system"
+TEXT 307,901,"0",180,8,8,"Via Meucci 31/A"
+TEXT 333,872,"0",180,8,8,"10079 Mappano (TO)"
+TEXT 379,813,"0",180,9,9,"Cliente:"
+TEXT 379,778,"0",180,9,9,"N. disegno:"
+TEXT 379,736,"0",180,9,9,"N. dis. R5:"
+TEXT 379,703,"0",180,9,9,"N. pezzo:"
+TEXT 379,667,"0",180,9,9,"Data/ora prova:"
+TEXT 379,632,"0",180,9,9,"{DATETIME}"
+TEXT 257,778,"0",180,9,9,"{RECIPE}"
+TEXT 257,743,"0",180,11,11,"{PART}"
+TEXT 257,703,"0",180,9,9,"{SN}"
+BARCODE 379,576,"128M",102,0,180,2,4,"!105{BCODE}"
+TEXT 379,386,"0",180,9,9,"P. riempimento:"
+TEXT 379,348,"0",180,9,9,"P. assestamento:"
+TEXT 379,310,"0",180,9,9,"Caduta:"
+TEXT 203,348,"0",180,9,9,"{RESPSET}mbar"
+TEXT 203,310,"0",180,9,9,"{RESLEAK}mbar"
+TEXT 379,271,"0",180,9,9,"T. riemp:"
+TEXT 379,232,"0",180,9,9,"T. stab:"
+TEXT 379,194,"0",180,9,9,"T. prova:"
+TEXT 203,271,"0",180,9,9,"{TFILL}s"
+TEXT 203,194,"0",180,9,9,"{TTEST}s"
+TEXT 379,155,"0",180,9,9,"Caduta MAX"
+TEXT 379,116,"0",180,9,9,"Press nominale"
+TEXT 203,155,"0",180,9,9,"{PMIN}mbar"
+TEXT 203,116,"0",180,9,9,"{PTEST}mbar"
+TEXT 379,67,"0",180,11,11,"ESITO:"
+TEXT 285,67,"0",180,11,11,"{RESULT}"
+TEXT 379,464,"0",180,9,9,"{BCODE}"
PRINT 1,1
\ No newline at end of file
diff --git a/config/label_templates/ETA013_DEUTZ.prn b/config/label_templates/ETA013_DEUTZ.prn
index fd96f50..072985f 100644
--- a/config/label_templates/ETA013_DEUTZ.prn
+++ b/config/label_templates/ETA013_DEUTZ.prn
@@ -25,7 +25,7 @@ TEXT 375,617,"0",180,9,9,"{DATETIME}"
TEXT 252,766,"0",180,9,9,"{RECIPE}"
TEXT 222,709,"0",180,9,9,"{PART}"
TEXT 241,678,"0",180,9,9,"{SN}"
-BARCODE 384,560,"128M",102,0,180,2,4,"!10500"
+BARCODE 384,560,"128M",102,0,180,2,4,"!105{BCODE}"
TEXT 381,374,"0",180,9,9,"P. riempimento:"
TEXT 381,336,"0",180,9,9,"P. assestamento:"
TEXT 381,298,"0",180,9,9,"Caduta:"
diff --git a/config/machine_settings/st-ten-2.ini b/config/machine_settings/st-ten-2.ini
index 8639302..41cc687 100644
--- a/config/machine_settings/st-ten-2.ini
+++ b/config/machine_settings/st-ten-2.ini
@@ -20,5 +20,22 @@ recipe_name_field: cod finito cliente
part_number_field: cod finito r5
barcode_enable_field: verifica_codice_a_barre_abilitata
barcode_serial_field: codice_a_barre
-label_template_field: modello_etichetta
-description_field: cod semilavorato costampato
\ No newline at end of file
+label_template_field: etichetta
+description_field: cod semilavorato costampato
+
+[recipes_defaults]
+prova_tenuta_abilitata: x
+warning_img:
+tempo_pre_riempimento: 0
+pressione_pre_riempimento: 1000
+tempo_riempimento: 10
+tempo_assestamento: 10
+percentuale_minima_pressione_assestamento: 5
+percentuale_massima_pressione_assestamento: 5
+tempo_di_test: 10
+pressione_di_test_delta_minimo: 30
+pressione_di_test: 15000
+pressione_di_test_delta_massimo: 30
+tempo_svuotamento: 1
+pressione_svuotamento: 100
+config_elettrovalvole: 0
diff --git a/config/machine_settings/st-ten-3.ini b/config/machine_settings/st-ten-3.ini
index 33ddd83..9480412 100644
--- a/config/machine_settings/st-ten-3.ini
+++ b/config/machine_settings/st-ten-3.ini
@@ -24,3 +24,18 @@ barcode_enable_field: verifica_codice_a_barre_abilitata_cl
[recipes_defaults]
descrizione:
+prova_tenuta_abilitata: x
+warning_img:
+tempo_pre_riempimento: 0
+pressione_pre_riempimento: 1000
+tempo_riempimento: 10
+tempo_assestamento: 10
+percentuale_minima_pressione_assestamento: 5
+percentuale_massima_pressione_assestamento: 5
+tempo_di_test: 10
+pressione_di_test_delta_minimo: 30
+pressione_di_test: 15000
+pressione_di_test_delta_massimo: 30
+tempo_svuotamento: 1
+pressione_svuotamento: 100
+config_elettrovalvole: 0
diff --git a/config/warning_images/generic/Img-06.png b/config/warning_images/generic/Img-06.png
new file mode 100644
index 0000000..ae1b580
Binary files /dev/null and b/config/warning_images/generic/Img-06.png differ
diff --git a/config/warning_images/generic/Img-07.png b/config/warning_images/generic/Img-07.png
new file mode 100644
index 0000000..f76247f
Binary files /dev/null and b/config/warning_images/generic/Img-07.png differ
diff --git a/config/warning_images/generic/Img-08.png b/config/warning_images/generic/Img-08.png
new file mode 100644
index 0000000..c794040
Binary files /dev/null and b/config/warning_images/generic/Img-08.png differ
diff --git a/config/warning_images/generic/Img-09.png b/config/warning_images/generic/Img-09.png
new file mode 100644
index 0000000..f66aa5b
Binary files /dev/null and b/config/warning_images/generic/Img-09.png differ
diff --git a/src/ui/test_leak/test_leak.py b/src/ui/test_leak/test_leak.py
index 488cdc1..8739362 100644
--- a/src/ui/test_leak/test_leak.py
+++ b/src/ui/test_leak/test_leak.py
@@ -96,8 +96,9 @@ class Test_Leak(Test_Test):
ok = type(result) is str and "failed" in result.lower()
# RESET RELAYS
- ret = self.components["digital_io"].set_bit_verify(0, 0, 0)
- ret = self.components["digital_io"].set_bit_verify(0, 1, 0)
+ if "digital_io" in self.components.keys():
+ ret = self.components["digital_io"].set_bit_verify(0, 0, 0)
+ ret = self.components["digital_io"].set_bit_verify(0, 1, 0)
else:
result = None