Merge branch 'master' into PP-99_Line-width-fix-for-.3mm-profiles_master

15 files changed, 18 insertions, 24 deletions

diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg
index a47eee4c3d..a5d2e4ef1e 100644
--- a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg
+++ b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg
@@ -30,8 +30,6 @@ layer_height = 0.3
 layer_height_0 = 0.3
 material_bed_temperature = 60
 material_diameter = 1.75
-material_print_temperature = 200
-material_print_temperature_layer_0 = 0
 retract_at_layer_change = False
 retraction_amount = 6
 retraction_hop = 0.075
diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg
index 6a30a9483d..74f2b08204 100644
--- a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg
+++ b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg
@@ -30,8 +30,6 @@ layer_height = 0.1
 layer_height_0 = 0.1
 material_bed_temperature = 60
 material_diameter = 1.75
-material_print_temperature = 200
-material_print_temperature_layer_0 = 0
 retract_at_layer_change = False
 retraction_amount = 6
 retraction_hop = 0.075
diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg
index 4349fb00a9..835bc555a1 100644
--- a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg
+++ b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg
@@ -30,8 +30,6 @@ layer_height = 0.2
 layer_height_0 = 0.2
 material_bed_temperature = 60
 material_diameter = 1.75
-material_print_temperature = 210
-material_print_temperature_layer_0 = 0
 retract_at_layer_change = False
 retraction_amount = 6
 retraction_hop = 0.075
diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
index b700f8e80d..b3b71ee573 100644
--- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -23,7 +23,6 @@ machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature -10
 material_standby_temperature = 100
 prime_tower_enable = False
-skin_outline_count = 0
 skin_overlap = 20
 speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_print = 50
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 cfeb6d3a27..370f636bc4 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
@@ -43,10 +43,11 @@ 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_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 c6c07aeba3..d7992a20b9 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
@@ -44,10 +44,11 @@ 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_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 cb37e16883..59f0cae71d 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
@@ -41,10 +41,11 @@ 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_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_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
index 522c35cec2..2201b135b1 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -23,7 +23,6 @@ machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature -10
 material_standby_temperature = 100
 prime_tower_enable = False
-skin_outline_count = 0
 skin_overlap = 20
 speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_print = 50
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 20545a51f0..0a01d45a0c 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
@@ -42,11 +42,11 @@ 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_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 a6ab99ffd6..18c5c014f8 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
@@ -42,11 +42,11 @@ 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_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 d8e4c4aae2..536f766916 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
@@ -41,11 +41,11 @@ 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_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_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
index 94be77a109..ef698a68e6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg
@@ -23,7 +23,6 @@ machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature -10
 material_standby_temperature = 100
 prime_tower_enable = False
-skin_outline_count = 0
 skin_overlap = 20
 speed_layer_0 = =math.ceil(speed_print * 20 / 50)
 speed_print = 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 5c4734a32a..30eb73204b 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
@@ -42,11 +42,11 @@ 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_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 62c40c1b18..b63ecbdad8 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
@@ -42,11 +42,11 @@ 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_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 018b755036..ff25dd69a9 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
@@ -41,11 +41,11 @@ 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_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