cleanup raft speeds

raft base speed is only 15mm/s to avoid extreme flows. The raft surface speed equals the top/bottom speed, so the raft surface has a flow equal to the top/bottom flow. The raft interface is again the average of the surface and the base. PP-243

20 files changed, 17 insertions, 45 deletions

diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index e12d285ff2..bacaaa9fb8 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -239,15 +239,27 @@
         "gradual_support_infill_step_height": {
             "value": "4*layer_height"
         },
+        "raft_base_speed": {
+            "value": "raft_speed"
+        },
         "raft_base_thickness": {
             "value": "min(machine_nozzle_size * 0.75, 0.3)"
         },
         "raft_interface_line_width": {
             "value": "(raft_base_line_width + raft_surface_line_width) / 2"
         },
+        "raft_interface_speed": {
+            "value": "(raft_surface_speed + raft_base_speed) /2"
+        },
         "raft_interface_thickness": {
             "value": "(raft_base_thickness + raft_surface_thickness) / 2"
         },
+        "raft_speed": {
+            "value": 15
+        },
+        "raft_surface_speed": {
+            "value": "speed_topbottom"
+        },
         "support_interface_height": {
             "value": "2*layer_height"
         },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index a49d9ecc35..6653ffddf4 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -101,9 +101,6 @@
         "optimize_wall_printing_order": { "value": "True" },
         "prime_tower_enable": { "value": "True" },
         "raft_airgap": { "value": "0" },
-        "raft_base_speed": { "value": "20" },
-        "raft_interface_speed": { "value": "20" },
-        "raft_speed": { "value": "25" },
         "retraction_amount": { "value": "6.5" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 4808522393..1f5fa06ee7 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -102,9 +102,6 @@
         "multiple_mesh_overlap": { "value": "0" },
         "prime_tower_enable": { "value": "True" },
         "raft_airgap": { "value": "0" },
-        "raft_base_speed": { "value": "20" },
-        "raft_interface_speed": { "value": "20" },
-        "raft_speed": { "value": "25" },
         "retraction_amount": { "value": "6.5" },
         "retraction_combing": { "value": "'no_outer_surfaces'"},
         "retraction_hop": { "value": "2" },
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
index b2c251acda..c720f91ec8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg
@@ -27,6 +27,4 @@ speed_wall = =math.ceil(speed_print * 30 / 70)
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-
-raft_surface_speed = 45
 speed_layer_0 = 10
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
index 3a23a2fe1a..28775a27a8 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -25,5 +25,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
index 828dbf8d68..56541021e4 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -25,5 +25,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
index afccb4b635..f96b871988 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg
@@ -24,5 +24,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
index 0e3b1d91db..7dac76c1c2 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -25,4 +25,3 @@ speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
index aab6c7346f..98a5043573 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg
@@ -26,4 +26,3 @@ speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
index dc70f20064..3a1ec77384 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg
@@ -26,4 +26,3 @@ speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
 switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
index e39c055894..f49d212766 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg
@@ -24,5 +24,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
index d1af2ebce4..7ff428bed2 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg
@@ -24,5 +24,4 @@ skin_overlap = 50
 speed_layer_0 = 10
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
-switch_extruder_retraction_speeds = 40
-raft_surface_speed = 45
+switch_extruder_retraction_speeds = 40
\ No newline at end of file
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index daabe534b3..ac3b3405ee 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -33,9 +33,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 49837e24ea..05e91d0752 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index e06785e07c..b33e959e8c 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -33,9 +33,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
index 94a687c951..69968e721e 100644
--- a/resources/variants/ultimaker3_extended_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index 03109856cf..63be458a7e 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -32,9 +32,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg
index 526f724eea..9c18713818 100644
--- a/resources/variants/ultimaker_s3_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index 53f2b4ea6c..b8baddc5a7 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -32,9 +32,6 @@ prime_tower_enable = False
 prime_tower_wipe_enabled = True
 raft_acceleration = =acceleration_layer_0
 raft_airgap = 0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 18770b1c4d..6e378bbb82 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_base_speed = 20
-raft_interface_speed = 20
-raft_speed = 25
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
 speed_prime_tower = =math.ceil(speed_print * 10 / 35)