Re-introduce prime_tower_enable

cura/BuildVolume.py

@@ -880,7 +880,7 @@ def _computeDisallowedAreasPrinted(self, used_extruders):
             result[extruder.getId()] = []
 
         # Currently, the only normally printed object is the prime tower.
-        if self._global_container_stack.getProperty("prime_tower_mode", "value") != 'none':
+        if self._global_container_stack.getProperty("prime_tower_enable", "value"):
             prime_tower_size = self._global_container_stack.getProperty("prime_tower_size", "value")
             machine_width = self._global_container_stack.getProperty("machine_width", "value")
             machine_depth = self._global_container_stack.getProperty("machine_depth", "value")
@@ -1208,7 +1208,7 @@ def _clamp(self, value, min_value, max_value):
     _raft_settings = ["adhesion_type", "raft_base_thickness", "raft_interface_layers", "raft_interface_thickness", "raft_surface_layers", "raft_surface_thickness", "raft_airgap", "layer_0_z_overlap"]
     _extra_z_settings = ["retraction_hop_enabled", "retraction_hop"]
     _prime_settings = ["extruder_prime_pos_x", "extruder_prime_pos_y", "prime_blob_enable"]
-    _tower_settings = ["prime_tower_mode", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y", "prime_tower_brim_enable", "prime_tower_base_size", "prime_tower_base_height"]
+    _tower_settings = ["prime_tower_enable", "prime_tower_size", "prime_tower_position_x", "prime_tower_position_y", "prime_tower_brim_enable", "prime_tower_base_size", "prime_tower_base_height"]
     _ooze_shield_settings = ["ooze_shield_enabled", "ooze_shield_dist"]
     _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset", "support_enable", "travel_avoid_other_parts", "travel_avoid_supports", "wall_line_count", "wall_line_width_0", "wall_line_width_x"]
     _extruder_settings = ["support_enable", "support_bottom_enable", "support_roof_enable", "support_infill_extruder_nr", "support_extruder_nr_layer_0", "support_bottom_extruder_nr", "support_roof_extruder_nr", "brim_line_count", "skirt_brim_extruder_nr", "raft_base_extruder_nr", "raft_interface_extruder_nr", "raft_surface_extruder_nr", "adhesion_type"] #Settings that can affect which extruders are used.

plugins/LegacyProfileReader/DictionaryOfDoom.json

@@ -68,7 +68,7 @@
         "meshfix_keep_open_polygons": "fix_horrible_use_open_bits",
         "magic_mesh_surface_mode": "\"surface\" if simple_mode else \"normal\"",
         "magic_spiralize": "spiralize",
-        "prime_tower_mode": "\"normal\" if wipe_tower else \"none\"",
+        "prime_tower_enable": "wipe_tower",
         "prime_tower_size": "math.sqrt(float(wipe_tower_volume) / float(layer_height))",
         "ooze_shield_enabled": "ooze_shield",
         "skin_overlap": "fill_overlap"

resources/definitions/atmat_signal_pro_base.def.json

@@ -110,7 +110,7 @@
         "min_infill_area": { "value": "5.0" },
         "minimum_polygon_circumference": { "value": "0.2" },
         "optimize_wall_printing_order": { "value": "True" },
-        "prime_tower_mode": { "value": "'normal'" },
+        "prime_tower_enable": { "value": "True" },
         "retraction_amount": { "value": "1" },
         "retraction_combing": { "value": "'noskin'" },
         "retraction_combing_max_distance": { "value": "10" },

resources/definitions/deltacomb_dc20flux.def.json

@@ -31,8 +31,8 @@
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_standby_temperature": { "value": "material_print_temperature" },
+        "prime_tower_enable": { "value": true },
         "prime_tower_min_volume": { "value": "50" },
-        "prime_tower_mode": { "value": "'normal'" },
         "switch_extruder_retraction_amount": { "value": "0" }
     }
 }

resources/definitions/deltacomb_dc21flux.def.json

@@ -31,8 +31,8 @@
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_standby_temperature": { "value": "material_print_temperature" },
+        "prime_tower_enable": { "value": true },
         "prime_tower_min_volume": { "value": "50" },
-        "prime_tower_mode": { "value": "'normal'" },
         "switch_extruder_retraction_amount": { "value": "0" }
     }
 }

resources/definitions/deltacomb_dc30flux.def.json

@@ -31,8 +31,8 @@
         "material_final_print_temperature": { "value": "material_print_temperature" },
         "material_initial_print_temperature": { "value": "material_print_temperature" },
         "material_standby_temperature": { "value": "material_print_temperature" },
+        "prime_tower_enable": { "value": "True" },
         "prime_tower_min_volume": { "value": "50" },
-        "prime_tower_mode": { "value": "'normal'" },
         "switch_extruder_retraction_amount": { "value": "0" }
     }
 }

resources/definitions/dxu_dual.def.json

@@ -5,6 +5,7 @@
     "overrides":
     {
         "machine_end_gcode": { "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \"G90 ;absolute positioning\\nM104 S0 T0 ;extruder heater off\\nM104 S0 T1\\nM140 S0 ;turn off bed\\nT0 ; move to the first head\\nM107 ;fan off\"" },
-        "machine_start_gcode": { "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" }
+        "machine_start_gcode": { "value": "\"\"  if machine_gcode_flavor == \"UltiGCode\" else \";material_bed_temperature={material_bed_temperature} material_print_temperature={material_print_temperature} material_print_temperature_layer_0={material_print_temperature_layer_0}\\nM190 S{material_bed_temperature_layer_0}\\nM104 T0 S{material_standby_temperature, 0}\\nM104 T0 S{material_print_temperature_layer_0, 0}\\nG21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nM200 D0 T0 ;reset filament diameter\\nM200 D0 T1\\nG28 ;home all\\nT1 ; move to the nozzle 2\\nG0 Z20 F2400 ;move the platform to 30mm\\nM109 T1 S{material_print_temperature_layer_0, 1}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0 ;prime distance\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500 ; retract\\nT0 ; move to the nozzle 1\\nM104 T1 S{material_standby_temperature, 1}\\nG0 Z20 F2400\\nM109 T0 S{material_print_temperature_layer_0, 0}\\nG0 X210 Y20 F7200\\nG92 E0\\nG92 E-7.0\\nG1 E0 F45 ;purge nozzle\\nG1 E-6.5 F1500\\nM104 T0 S{material_standby_temperature, 0}\\nT{initial_extruder_nr} ;switch to the first nozzle used for print\\nM109 T{initial_extruder_nr} S{material_print_temperature_layer_0, initial_extruder_nr}\\nM400 ;finish all moves\\nG1 E0 F1500\\nG92 E0\\n;end of startup sequence\\n\"" },
+        "prime_tower_enable": { "default_value": true }
     }
 }

resources/definitions/elegoo_neptune_2D.def.json

@@ -55,6 +55,7 @@
             "settable_per_extruder": false
         },
         "prime_blob_enable": { "default_value": false },
+        "prime_tower_enable": { "default_value": true },
         "prime_tower_min_volume": { "default_value": 90 },
         "prime_tower_size": { "default_value": 30 },
         "raft_airgap": { "default_value": 0.25 },

resources/definitions/fdmprinter.def.json

@@ -6794,20 +6794,30 @@
             "description": "Settings used for printing with multiple extruders.",
             "children":
             {
+                "prime_tower_enable":
+                {
+                    "label": "Enable Prime Tower",
+                    "description": "Print a tower next to the print which serves to prime the material after each nozzle switch.",
+                    "type": "bool",
+                    "enabled": "extruders_enabled_count > 1",
+                    "default_value": false,
+                    "resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable'))",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": false
+                },
                 "prime_tower_mode":
                 {
                     "label": "Prime Tower",
-                    "description": "<html>Print a tower next to the model, which serves to prime the material after each nozzle switch.<ul><li><b>None:</b> do not generate a prime tower</li><li><b>Normal:</b> generate a bucket in which secondary materials are primed</li><li><b>Interleaved:</b> generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.</li></ul></html>",
+                    "description": "<html>Print a tower next to the model, which serves to prime the material after each nozzle switch.<ul><li><b>Normal:</b> generate a bucket in which secondary materials are primed</li><li><b>Interleaved:</b> generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.</li></ul></html>",
                     "type": "enum",
-                    "value": "'none' if (extruders_enabled_count < 2) else ('interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal')",
+                    "value": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'",
                     "options":
                     {
-                        "none": "None",
                         "normal": "Normal",
                         "interleaved": "Interleaved"
                     },
-                    "default_value": "none",
-                    "enabled": "extruders_enabled_count > 1",
+                    "default_value": "normal",
+                    "enabled": "prime_tower_enable",
                     "settable_per_mesh": false,
                     "settable_per_extruder": false
                 },

resources/definitions/leapfrog_bolt_pro.def.json

@@ -80,7 +80,7 @@
         "material_final_print_temperature": { "value": "default_material_print_temperature" },
         "material_initial_print_temperature": { "value": "default_material_print_temperature" },
         "material_standby_temperature": { "enabled": false },
-        "prime_tower_mode": { "resolve": "'normal' if extruders_enabled_count > 1 else 'none'" },
+        "prime_tower_enable": { "resolve": "extruders_enabled_count > 1" },
         "retraction_amount": { "default_value": 2 },
         "retraction_combing": { "value": "'all'" },
         "skirt_line_count": { "default_value": 3 },

resources/definitions/lotmaxx_sc60.def.json

@@ -44,8 +44,8 @@
         "machine_width": { "default_value": 235 },
         "meshfix_maximum_resolution": { "value": 0.25 },
         "optimize_wall_printing_order": { "value": true },
+        "prime_tower_enable": { "value": true },
         "prime_tower_min_volume": { "value": 30 },
-        "prime_tower_mode": { "value": "'normal'" },
         "retract_at_layer_change": { "value": false },
         "retraction_amount": { "value": 4.5 },
         "roofing_layer_count": { "value": 1 },

resources/definitions/strateo3d_IDEX420.def.json

@@ -112,6 +112,7 @@
         "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_width": { "default_value": 420 },
         "material_diameter": { "default_value": 1.75 },
+        "prime_tower_enable": { "default_value": true },
         "prime_tower_min_volume": { "default_value": 35.6 },
         "raft_acceleration": { "value": "machine_acceleration" },
         "raft_base_acceleration": { "value": "machine_acceleration" },

resources/definitions/ultimaker3.def.json

@@ -149,6 +149,7 @@
             "enabled": true,
             "value": "resolveOrValue('print_sequence') != 'one_at_a_time'"
         },
+        "prime_tower_enable": { "default_value": true },
         "prime_tower_position_x": { "value": "185" },
         "prime_tower_wipe_enabled": { "default_value": false },
         "retraction_amount": { "value": "6.5" },

resources/definitions/ultimaker_method_base.def.json

@@ -345,9 +345,9 @@
         "prime_tower_base_curve_magnitude": { "value": 2 },
         "prime_tower_base_height": { "value": 6 },
         "prime_tower_base_size": { "value": 10 },
+        "prime_tower_enable": { "value": false },
         "prime_tower_flow": { "value": "material_flow" },
         "prime_tower_line_width": { "value": 1 },
-        "prime_tower_mode": { "value": "none" },
         "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" },
         "prime_tower_wipe_enabled": { "value": true },
         "print_sequence": { "enabled": false },

resources/definitions/ultimaker_s3.def.json

@@ -103,7 +103,7 @@
             "default_value": false,
             "enabled": true
         },
-        "prime_tower_mode": { "value": "'normal'" },
+        "prime_tower_enable": { "value": "True" },
         "retraction_amount": { "value": "6.5" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },

resources/definitions/ultimaker_s5.def.json

@@ -104,7 +104,7 @@
             "default_value": false,
             "enabled": true
         },
-        "prime_tower_mode": { "value": "'normal'" },
+        "prime_tower_enable": { "value": "True" },
         "retraction_amount": { "value": "6.5" },
         "retraction_combing": { "value": "'no_outer_surfaces'" },
         "retraction_hop": { "value": "2" },

resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg

@@ -38,8 +38,8 @@ line_width = 0.4
 min_infill_area = 0
 optimize_wall_printing_order = True
 prime_tower_brim_enable = True
+prime_tower_enable = True
 prime_tower_min_volume = 6
-prime_tower_mode = normal
 prime_tower_size = 20
 prime_tower_wipe_enabled = True
 retract_at_layer_change = False

resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg

@@ -38,8 +38,8 @@ line_width = 0.4
 min_infill_area = 0
 optimize_wall_printing_order = True
 prime_tower_brim_enable = True
+prime_tower_enable = True
 prime_tower_min_volume = 6
-prime_tower_mode = normal
 prime_tower_size = 20
 prime_tower_wipe_enabled = True
 retract_at_layer_change = False

resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg

@@ -36,8 +36,8 @@ line_width = 0.4
 min_infill_area = 0
 optimize_wall_printing_order = True
 prime_tower_brim_enable = True
+prime_tower_enable = True
 prime_tower_min_volume = 6
-prime_tower_mode = normal
 prime_tower_size = 20
 prime_tower_wipe_enabled = True
 retract_at_layer_change = False

resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg

@@ -36,8 +36,8 @@ line_width = 0.4
 min_infill_area = 0
 optimize_wall_printing_order = True
 prime_tower_brim_enable = True
+prime_tower_enable = True
 prime_tower_min_volume = 6
-prime_tower_mode = normal
 prime_tower_size = 20
 prime_tower_wipe_enabled = True
 retract_at_layer_change = False

resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg

@@ -35,8 +35,8 @@ line_width = 0.4
 min_infill_area = 0
 optimize_wall_printing_order = True
 prime_tower_brim_enable = True
+prime_tower_enable = True
 prime_tower_min_volume = 6
-prime_tower_mode = normal
 prime_tower_size = 20
 prime_tower_wipe_enabled = True
 retract_at_layer_change = False

resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg

@@ -35,8 +35,8 @@ line_width = 0.4
 min_infill_area = 0
 optimize_wall_printing_order = True
 prime_tower_brim_enable = True
+prime_tower_enable = True
 prime_tower_min_volume = 6
-prime_tower_mode = normal
 prime_tower_size = 20
 prime_tower_wipe_enabled = True
 retract_at_layer_change = False

resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_A.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_B.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_C.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_D.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.40_PVA_E.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_C.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.60mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_D.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.60mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_E.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.60mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_DBE0.60_PVA_F.inst.cfg

@@ -13,7 +13,7 @@ variant = DBE 0.60mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_A.inst.cfg

@@ -13,7 +13,7 @@ variant = FBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_B.inst.cfg

@@ -13,7 +13,7 @@ variant = FBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_C.inst.cfg

@@ -13,7 +13,7 @@ variant = FBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_D.inst.cfg

@@ -13,7 +13,7 @@ variant = FBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0

resources/quality/deltacomb/PVA/deltacomb_FBE0.40_PVA_E.inst.cfg

@@ -13,7 +13,7 @@ variant = FBE 0.40mm
 [values]
 brim_replaces_support = False
 material_standby_temperature = 100
-prime_tower_mode = none
+prime_tower_enable = False
 support_bottom_distance = =support_z_distance
 support_bottom_stair_step_height = 0
 support_bottom_stair_step_width = 0