Merge branch 'PP-95_reduce-top/bottom-speed-for-TPU' into 4.13

9 files changed, 18 insertions, 15 deletions

diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
index 4c1c2a1d9e..0ec8263f43 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -46,11 +46,12 @@ retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_travel = 300
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
index 0dda14dcfc..068edf5972 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -47,11 +47,12 @@ retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_travel = 300
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
index 5eded26b9f..947b33a6cb 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -44,11 +44,12 @@ retraction_hop = 1.5
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_travel = 300
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
index 194a7d41ca..3c02550a8c 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg
@@ -44,12 +44,12 @@ retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
 support_angle = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
index 436b8a32e3..110fd361be 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg
@@ -44,12 +44,12 @@ retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
 support_angle = 50
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
index d8ade5a573..0e8d3c7e70 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -43,12 +43,12 @@ retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
 support_angle = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
index 79f3a1b769..664f651341 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg
@@ -44,12 +44,12 @@ retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
 support_angle = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
index 7bce192f75..2edc53b7c4 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg
@@ -44,12 +44,12 @@ retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
 support_angle = 50
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
index 056871cfa9..7804a7cb74 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg
@@ -43,12 +43,12 @@ retraction_extrusion_window = 1
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
+skin_line_width = =round(line_width / 0.8, 2)
 skin_overlap = 5
 speed_equalize_flow_enabled = True
 speed_layer_0 = =math.ceil(speed_print * 18 / 25)
 speed_print = 25
-speed_topbottom = =math.ceil(speed_print * 25 / 25)
-
+speed_topbottom = =math.ceil(speed_print * 0.8)
 speed_wall = =math.ceil(speed_print * 25 / 25)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 25)
 support_angle = 50