Skip to content

Commit

Permalink
Merge pull request #18269 from Ultimaker/PP-389-Increase_retraction-m…
Browse files Browse the repository at this point in the history
…inimal-travel-distance

PP-389 Increase minimum retraction distance
  • Loading branch information
nallath authored Feb 12, 2024
2 parents 4e84bcf + 2d82bb9 commit 234a811
Show file tree
Hide file tree
Showing 64 changed files with 1 addition and 63 deletions.
1 change: 1 addition & 0 deletions resources/definitions/ultimaker.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
"retraction_combing_max_distance": { "value": 15 },
"retraction_count_max": { "value": 25 },
"retraction_extrusion_window": { "value": 1 },
"retraction_min_travel": { "value": 5 },
"roofing_layer_count": { "value": "1" },
"roofing_material_flow": { "value": "material_flow" },
"skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" },
Expand Down
1 change: 0 additions & 1 deletion resources/definitions/ultimaker3.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,6 @@
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
"retraction_hop_only_when_collides": { "value": "True" },
"retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" },
"skin_overlap": { "value": "10" },
"speed_prime_tower": { "value": "speed_topbottom" },
Expand Down
1 change: 0 additions & 1 deletion resources/definitions/ultimaker_method_base.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,6 @@
"retraction_hop": { "value": 0.4 },
"retraction_hop_enabled": { "value": true },
"retraction_hop_only_when_collides": { "value": false },
"retraction_min_travel": { "value": "line_width * 4" },
"retraction_prime_speed": { "value": "retraction_speed" },
"retraction_speed": { "value": 5 },
"roofing_layer_count": { "value": 2 },
Expand Down
1 change: 0 additions & 1 deletion resources/definitions/ultimaker_s3.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
"retraction_hop_only_when_collides": { "value": "True" },
"retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" },
"retraction_speed": { "value": "45" },
"speed_prime_tower": { "value": "speed_topbottom" },
Expand Down
1 change: 0 additions & 1 deletion resources/definitions/ultimaker_s5.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },
"retraction_hop_only_when_collides": { "value": "True" },
"retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" },
"retraction_speed": { "value": "45" },
"speed_prime_tower": { "value": "speed_topbottom" },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 20
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_min_travel = 5
speed_print = 70
speed_topbottom = =math.ceil(speed_print * 30 / 70)
speed_wall = =math.ceil(speed_print * 30 / 70)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.2
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
retraction_prime_speed = 15
speed_print = 25
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True
retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
skin_line_width = =round(line_width / 0.8, 2)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 0.8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ prime_tower_wipe_enabled = True
retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
skin_line_width = =round(line_width / 0.8, 2)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 0.8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True
retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
skin_line_width = =round(line_width / 0.8, 2)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 0.8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ prime_tower_min_volume = 10
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
switch_extruder_prime_speed = 15
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ prime_tower_min_volume = 15
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
switch_extruder_prime_speed = 15
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ prime_tower_min_volume = 20
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
speed_infill = =math.ceil(speed_wall * 30 / 30)
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 25 / 30)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 23 / 30)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
speed_infill = =speed_print
speed_print = 30
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.4
material_print_temperature = =default_material_print_temperature - 20
ooze_shield_angle = 40
raft_airgap = 0.4
retraction_min_travel = 5
speed_print = 70
speed_topbottom = =math.ceil(speed_print * 30 / 70)
speed_wall = =math.ceil(speed_print * 30 / 70)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.2
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
retraction_prime_speed = 15
speed_print = 25
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ prime_tower_wipe_enabled = True
raft_airgap = 0.25
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 25 / 50)
speed_wall = =math.ceil(speed_print * 40 / 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = 0.8
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 25 / 25)
speed_wall = =math.ceil(speed_print * 25 / 25)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True
retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
skin_line_width = =round(line_width / 0.8, 2)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 0.8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ prime_tower_wipe_enabled = True
retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
skin_line_width = =round(line_width / 0.8, 2)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 0.8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ prime_tower_wipe_enabled = True
retraction_count_max = 15
retraction_extra_prime_amount = 0.8
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
skin_line_width = =round(line_width / 0.8, 2)
speed_print = 25
speed_topbottom = =math.ceil(speed_print * 0.8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ prime_tower_min_volume = 10
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
switch_extruder_prime_speed = 15
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ prime_tower_min_volume = 15
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
switch_extruder_prime_speed = 15
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ prime_tower_min_volume = 20
retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 0.5
retraction_min_travel = 1.5
retraction_prime_speed = 15
speed_infill = =math.ceil(speed_wall * 30 / 30)
speed_wall_x = =math.ceil(speed_wall * 30 / 30)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 25 / 30)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
retraction_prime_speed = 15
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 23 / 30)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ retraction_count_max = 15
retraction_extra_prime_amount = 0.5
retraction_hop = 1.5
retraction_hop_only_when_collides = False
retraction_min_travel = =line_width * 2
speed_infill = =speed_print
speed_print = 30
speed_topbottom = =math.ceil(speed_print * 20 / 30)
Expand Down
1 change: 0 additions & 1 deletion resources/variants/ultimaker_s3_aa0.25.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = AA 0.25
machine_nozzle_size = 0.25
machine_nozzle_tip_outer_diameter = 0.65
retraction_min_travel = 0.7
retraction_prime_speed = =retraction_speed
speed_print = 55
speed_topbottom = 20
Expand Down
1 change: 0 additions & 1 deletion resources/variants/ultimaker_s3_aa0.8.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ raft_surface_layers = 1
retraction_amount = 6.5
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 2
retraction_speed = 25
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 25 / 35)
Expand Down
1 change: 0 additions & 1 deletion resources/variants/ultimaker_s3_aa04.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = AA 0.4
machine_nozzle_tip_outer_diameter = 1.0
retraction_amount = 6.5
retraction_min_travel = =line_width * 2
speed_print = 70
speed_topbottom = =math.ceil(speed_print * 30 / 70)
speed_wall = =math.ceil(speed_print * 30 / 70)
Expand Down
1 change: 0 additions & 1 deletion resources/variants/ultimaker_s3_bb0.8.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ prime_tower_wipe_enabled = True
raft_surface_layers = 1
retraction_hop = 2
retraction_hop_only_when_collides = True
retraction_min_travel = =line_width * 3
speed_prime_tower = =math.ceil(speed_print * 7 / 35)
speed_print = 35
speed_support = =math.ceil(speed_print * 25 / 35)
Expand Down
1 change: 0 additions & 1 deletion resources/variants/ultimaker_s3_bb04.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0
retraction_min_travel = =3 * line_width
speed_prime_tower = =math.ceil(speed_print * 10 / 35)
speed_support = =math.ceil(speed_print * 25 / 35)
speed_support_interface = =math.ceil(speed_support * 20 / 25)
Expand Down
1 change: 0 additions & 1 deletion resources/variants/ultimaker_s3_cc04.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC 0.4
machine_nozzle_size = 0.4
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
speed_infill = =speed_print
speed_print = 45
Expand Down
1 change: 0 additions & 1 deletion resources/variants/ultimaker_s3_cc06.inst.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC 0.6
machine_nozzle_size = 0.6
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
speed_infill = =speed_print
speed_print = 45
Expand Down
Loading

0 comments on commit 234a811

Please sign in to comment.