Make sure that the UM3 definition is taken into account when optimising

Otherwise it acts as if the settings were the defaults for FDMPrinter rather than defaulting to the current UM3 settings.

Contributes to issue CURA-3650.

resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg

@@ -10,8 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
 weight = -2
 
 [values]
-brim_line_count = 7
-brim_width = 8.0
+brim_width = 3
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
 infill_before_walls = True
@@ -24,7 +23,6 @@ prime_tower_size = 15
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
-raft_jerk = =jerk_layer_0
 raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
 support_angle = 70
@@ -33,4 +31,3 @@ support_xy_distance = =wall_line_width_0 * 1.5
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-

resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg

@@ -10,8 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
 weight = -4
 
 [values]
-brim_line_count = 7
-brim_width = 8.0
+brim_width = 3
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
 infill_before_walls = True
@@ -25,7 +24,6 @@ prime_tower_size = 15
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
-raft_jerk = =jerk_layer_0
 raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
 support_angle = 70
@@ -34,4 +32,3 @@ support_xy_distance = =wall_line_width_0 * 1.5
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-

resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg

@@ -10,8 +10,7 @@ material = generic_nylon_ultimaker3_AA_0.8
 weight = -3
 
 [values]
-brim_line_count = 7
-brim_width = 8.0
+brim_width = 3
 cool_min_layer_time_fan_speed_max = 20
 cool_min_speed = 10
 infill_before_walls = True
@@ -25,7 +24,6 @@ prime_tower_size = 15
 raft_acceleration = =acceleration_layer_0
 raft_airgap = =round(layer_height_0 * 0.85, 2)
 raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2)
-raft_jerk = =jerk_layer_0
 raft_margin = 10
 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2)
 support_angle = 70
@@ -34,4 +32,3 @@ support_xy_distance = =wall_line_width_0 * 1.5
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-

resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg

@@ -11,7 +11,7 @@ weight = -2
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
-cool_fan_speed_max = =cool_fan_speed
+cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
 gradual_infill_steps = 4
@@ -28,9 +28,9 @@ material_standby_temperature = 100
 prime_tower_size = 15
 support_angle = 70
 support_line_width = =line_width * 0.75
+support_pattern = ='triangles'
 support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4
 wall_line_width = =round(line_width * 0.75 / 0.75, 2)
 wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
 wall_thickness = =wall_line_width_0 + wall_line_width_x
-

resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg

@@ -11,7 +11,7 @@ weight = -4
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
-cool_fan_speed_max = =cool_fan_speed
+cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
 gradual_infill_steps = 4
@@ -29,9 +29,9 @@ material_standby_temperature = 100
 prime_tower_size = 15
 support_angle = 70
 support_line_width = =line_width * 0.75
+support_pattern = ='triangles'
 support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4
 wall_line_width = =round(line_width * 0.75 / 0.75, 2)
 wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
 wall_thickness = =wall_line_width_0 + wall_line_width_x
-

resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg

@@ -11,7 +11,7 @@ weight = -3
 
 [values]
 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
-cool_fan_speed_max = =cool_fan_speed
+cool_fan_speed_max = =100
 cool_min_speed = 2
 gradual_infill_step_height = =3 * layer_height
 gradual_infill_steps = 4
@@ -29,9 +29,9 @@ material_standby_temperature = 100
 prime_tower_size = 15
 support_angle = 70
 support_line_width = =line_width * 0.75
+support_pattern = ='triangles'
 support_xy_distance = =wall_line_width_0 * 1.5
 top_bottom_thickness = =layer_height * 4
 wall_line_width = =round(line_width * 0.75 / 0.75, 2)
 wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
 wall_thickness = =wall_line_width_0 + wall_line_width_x
-

resources/variants/ultimaker3_aa0.8.inst.cfg

@@ -9,16 +9,8 @@ type = variant
 
 [values]
 acceleration_enabled = True
-acceleration_layer_0 = =acceleration_topbottom
-acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
 acceleration_print = 4000
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
-acceleration_support_interface = =acceleration_topbottom
-acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
-acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
-acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
 brim_width = 7
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
 cool_fan_speed = 7
 cool_fan_speed_max = 100
 cool_min_speed = 5
@@ -29,25 +21,24 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =jerk_topbottom
 jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
 jerk_wall = =math.ceil(jerk_print * 25 / 25)
 jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
 layer_height = 0.2
-layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
+line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
 machine_nozzle_cool_down_speed = 0.85
 machine_nozzle_heat_up_speed = 1.5
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
+prime_tower_enable = False
 prime_tower_size = 16
+prime_tower_wipe_enabled = True
 retract_at_layer_change = True
+retraction_amount = 6.5
 retraction_count_max = 25
 retraction_extrusion_window = 1
 retraction_hop = 2
@@ -56,22 +47,17 @@ retraction_hop_only_when_collides = True
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = 20
-speed_prime_tower = =speed_topbottom
 speed_print = 35
-speed_support = =speed_wall_0
-speed_support_interface = =speed_topbottom
 speed_topbottom = =math.ceil(speed_print * 25 / 35)
-speed_wall = =math.ceil(speed_print * 30 / 35)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
-speed_wall_x = =speed_wall
 support_angle = 60
 support_bottom_distance = =support_z_distance / 2
+support_pattern = zigzag
 support_top_distance = =support_z_distance
-support_xy_distance = =wall_line_width_0 * 2.5
-support_xy_distance_overhang = =wall_line_width_0
 support_z_distance = =layer_height * 2
 switch_extruder_retraction_amount = 16.5
 top_bottom_thickness = 1.4
 travel_avoid_distance = 3
 wall_0_inset = 0
+wall_line_width_x = =wall_line_width
 wall_thickness = 2

resources/variants/ultimaker3_bb0.8.inst.cfg

@@ -9,40 +9,26 @@ type = variant
 
 [values]
 acceleration_enabled = True
-acceleration_layer_0 = =acceleration_topbottom
-acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
 acceleration_print = 4000
-acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
 acceleration_support_interface = =math.ceil(acceleration_topbottom * 100 / 500)
-acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
-acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
-acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
 brim_width = 3
-cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
 cool_fan_speed = 50
 cool_min_speed = 5
 infill_line_width = =round(line_width * 0.8 / 0.7, 2)
 infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_layer_0 = =jerk_topbottom
-jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
 jerk_support_interface = =math.ceil(jerk_topbottom * 1 / 5)
-jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
-jerk_wall = =math.ceil(jerk_print * 10 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
 layer_height = 0.2
-layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
-line_width = =machine_nozzle_size * 0.875
 machine_min_cool_heat_time_window = 15
-machine_nozzle_cool_down_speed = 0.8
 machine_nozzle_heat_up_speed = 1.5
 material_print_temperature = =default_material_print_temperature + 10
 material_standby_temperature = 100
 multiple_mesh_overlap = 0
+prime_tower_enable = False
+prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
 raft_base_speed = 20
@@ -51,27 +37,22 @@ raft_interface_line_spacing = 0.5
 raft_interface_line_width = 0.5
 raft_interface_speed = 20
 raft_interface_thickness = 0.2
-raft_jerk = =jerk_layer_0
 raft_margin = 10
 raft_speed = 25
 raft_surface_layers = 1
 retraction_amount = 4.5
 retraction_count_max = 15
+retraction_extrusion_window = =retraction_amount
 retraction_hop = 2
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True
 retraction_min_travel = 5
 retraction_prime_speed = 15
 skin_overlap = 5
 speed_layer_0 = 20
-speed_prime_tower = =speed_topbottom
 speed_print = 35
-speed_support = =speed_wall_0
 speed_support_interface = =math.ceil(speed_topbottom * 15 / 20)
-speed_topbottom = =math.ceil(speed_print * 20 / 35)
-speed_wall = =math.ceil(speed_print * 30 / 35)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
-speed_wall_x = =speed_wall
 support_angle = 60
 support_bottom_height = =layer_height * 2
 support_bottom_stair_step_height = =layer_height
@@ -91,4 +72,5 @@ switch_extruder_retraction_amount = 12
 top_bottom_thickness = 1
 travel_avoid_distance = 3
 wall_0_inset = 0
+wall_line_width_x = =wall_line_width
 wall_thickness = 1