diff --git a/config/instruction_images/st-ten-5/5803036734.svg b/config/instruction_images/st-ten-5/5803036734.svg index d617908..db5c65c 100644 --- a/config/instruction_images/st-ten-5/5803036734.svg +++ b/config/instruction_images/st-ten-5/5803036734.svg @@ -8,7 +8,7 @@ height="344" viewBox="0 0 1323 344" sodipodi:docname="5803036734.svg" - inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + inkscape:version="1.2.2 (732a01da63, 2022-12-09)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -26,30 +26,2037 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="1.1662887" - inkscape:cx="660.6426" - inkscape:cy="172.77026" + inkscape:cx="661.50002" + inkscape:cy="172.34155" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="g1" /> + inkscape:current-layer="g1" + showgrid="false" /> - diff --git a/config/instruction_images/st-ten-5/5803036735.svg b/config/instruction_images/st-ten-5/5803036735.svg index 46f662f..0f4f90f 100644 --- a/config/instruction_images/st-ten-5/5803036735.svg +++ b/config/instruction_images/st-ten-5/5803036735.svg @@ -8,7 +8,7 @@ height="339" viewBox="0 0 1383 339" sodipodi:docname="5803036735.svg" - inkscape:version="1.3.2 (091e20e, 2023-11-25, custom)" + inkscape:version="1.2.2 (732a01da63, 2022-12-09)" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:xlink="http://www.w3.org/1999/xlink" @@ -26,50 +26,1886 @@ inkscape:pagecheckerboard="0" inkscape:deskcolor="#d1d1d1" inkscape:zoom="1.1156905" - inkscape:cx="509.54992" - inkscape:cy="169.84997" + inkscape:cx="692.39632" + inkscape:cy="170.29812" inkscape:window-width="1920" inkscape:window-height="1017" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" - inkscape:current-layer="g1" /> + inkscape:current-layer="g1" + showgrid="false" /> - + inkscape:current-layer="g1" + showgrid="false" /> - - + inkscape:current-layer="g1" + showgrid="false" /> - - diff --git a/config/machine_settings/defaults.ini b/config/machine_settings/defaults.ini index 27ff439..c6dd9bf 100644 --- a/config/machine_settings/defaults.ini +++ b/config/machine_settings/defaults.ini @@ -199,7 +199,7 @@ test_time: 10 test_pressure_qneg: 5 test_pressure: 9000 test_pressure_qpos: 5 -flush_time: 0 +flush_time: 3 flush_pressure: 0 pid_mod_config: 5 diff --git a/config/machine_settings/st-ten-5.ini b/config/machine_settings/st-ten-5.ini index a126107..cfc7447 100644 --- a/config/machine_settings/st-ten-5.ini +++ b/config/machine_settings/st-ten-5.ini @@ -10,10 +10,10 @@ extra_label_printer: present remote_api: absent tecna_t3: present digital_io: present -digital_io_flush_blow: present +#digital_io_flush_blow: present barcode_recipe_selection: present enforce_piece_removal: yes -external_flush_blow: present # EXTERNAL BOX CONTROLLING MULTI-CHANNEL TEST (IF PRESENT), BLOW-CLEANING AND EXTERNAL FLUSH +#external_flush_blow: present # EXTERNAL BOX CONTROLLING MULTI-CHANNEL TEST (IF PRESENT), BLOW-CLEANING AND EXTERNAL FLUSH show_instructions: yes [tecna_t3] @@ -38,7 +38,7 @@ printer: xlp504 [digital_io] id: USB-5862,BID#0 [digital_io_flush_blow] -id: USB-5860,BID#0 +id: USB-5860,BID#1 # OUTPUT MAP FOR EXTERNAL FLUSH/BLOW UNIT blow_on: 0 # INPUT VALVE TO SERVICE AIR flush_on: 1 # OUTPUT VALVE TO DIRT COLLECTOR @@ -88,6 +88,8 @@ pressione_di_test_delta_massimo_2: 200 tempo_svuotamento_2: 1 pressione_svuotamento_2: 100 +tester_discharge_enable: yes + stampa_etichetta_abilitata: x modello_etichetta: ETA30x16_203dpi.prn descrizione: inserire descrizione ricetta @@ -100,10 +102,10 @@ filling_time: 15 settling_time: 10 settling_pressure_min_percent: 5 settling_pressure_max_percent: 5 -test_pressure: 5000 +test_pressure: 5900 test_time: 10 -test_pressure_qpos: 5 -test_pressure_qneg: 17 +test_pressure_qpos: 4 +test_pressure_qneg: 7 test_pressure_tt_qpos: 1 # Q+ Upper test leak limit (tube-tube) (positive mbar) test_pressure_tt_qneg: 5 # Q- Lower test leak limit (tube-tube) (negative mbar) flush_time: 1 diff --git a/src/ui/recipe_selection/recipe_selection.py b/src/ui/recipe_selection/recipe_selection.py index 3509dd9..2cf046c 100755 --- a/src/ui/recipe_selection/recipe_selection.py +++ b/src/ui/recipe_selection/recipe_selection.py @@ -371,7 +371,6 @@ class Recipe_Selection(Widget): "ricetta_visione", "stampa_etichetta_abilitata", print_template_field, - "etichette_supplementari" ] for recipe in list(Recipes.select()): steps = recipe.get_steps_map() @@ -422,7 +421,6 @@ class Recipe_Selection(Widget): "ricetta_visione": steps["vision"].spec["recipe"], "stampa_etichetta_abilitata": "x" if recipe.spec["print"] else "", print_template_field: steps["print"].spec["template"], - "etichette_supplementari": steps["print"].spec["extra_label"] } data.append(exportable) if len(data):