Merge pull request #12415 from Ultimaker/PP-170-clean-up-retraction_count_max

Pp 170 clean up retraction limits

resources/definitions/ultimaker.def.json

@@ -56,6 +56,12 @@
         "retraction_combing": {
             "value": "'no_outer_surfaces'"
         },
+        "retraction_count_max": {
+            "value": 25
+        },
+        "retraction_extrusion_window": {
+            "value": 1
+        },
         "roofing_layer_count": {
             "value": "1"
         },

resources/definitions/ultimaker3.def.json

@@ -122,8 +122,6 @@
         "raft_margin": { "value": "10" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },

resources/definitions/ultimaker_s3.def.json

@@ -114,8 +114,6 @@
         "raft_speed": { "value": "25" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },

resources/definitions/ultimaker_s5.def.json

@@ -116,8 +116,6 @@
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
         "retraction_combing": { "value": "'no_outer_surfaces'"},
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },

resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg

@@ -39,8 +39,7 @@ 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)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True

resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg

@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True

resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg

@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True

resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg

@@ -39,8 +39,7 @@ 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)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True

resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg

@@ -30,8 +30,7 @@ infill_overlap = 0
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic'
 infill_wipe_dist = 0
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True

resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg

@@ -39,8 +39,7 @@ 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)
 multiple_mesh_overlap = 0
-retraction_count_max = 12
-retraction_extrusion_window = 1
+retraction_count_max = 15
 retraction_hop = 0.15
 retraction_hop_enabled = True
 retraction_hop_only_when_collides = True