Merge branch 'PP-104_respect-maximum-flow-AA08'

32 files changed, 52 insertions, 38 deletions

diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
index 3805e28d10..fd8e40e1a6 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -17,5 +17,6 @@ material_print_temperature = =default_material_print_temperature + 30
 material_standby_temperature = 100
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
index ab93ceecfd..cfe6b1bf0a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -31,6 +31,7 @@ speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 40 / 50)
 support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
index 813521d10f..1cfd1a7132 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -19,5 +19,6 @@ material_standby_temperature = 100
 prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
index 70dc30c606..d1785e2892 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -26,5 +26,6 @@ speed_layer_0 = =math.ceil(speed_print * 15 / 50)
 speed_print = 50
 speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg
index 2400196121..f8d6b4df20 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -19,7 +19,8 @@ material_standby_temperature = 100
 prime_tower_enable = True
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
 retraction_combing_max_distance = 8
 retraction_combing = all
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
index f53718287b..c2236f4e28 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -29,9 +29,10 @@ raft_margin = 10
 retract_at_layer_change = False
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 35 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 35 / 45)
 support_angle = 70
 support_pattern = ='triangles'
 support_xy_distance = =wall_line_width_0 * 1.5
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
index 70d4c22905..ff729395b9 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -33,6 +33,7 @@ retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_travel = 300
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_infill = =math.ceil(speed_wall * 30 / 30)
 support_bottom_distance = =support_z_distance
 support_offset = =line_width
 switch_extruder_prime_speed = 15
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
index 1908decfe0..53bf19e17b 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -17,7 +17,7 @@ cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
-infill_sparse_density = 10
+infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
index f18a4e23f5..a1cfef6d5f 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -17,7 +17,7 @@ cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
-infill_sparse_density = 10
+infill_sparse_density = 15
 layer_height = 0.4
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
@@ -40,8 +40,9 @@ retraction_prime_speed = 15
 speed_print = 30
 speed_topbottom = =math.ceil(speed_print * 20 / 30)
 speed_travel = 300
-speed_wall = =math.ceil(speed_print * 30 / 30)
-speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_wall = =speed_print
+speed_wall_x = =speed_print
+speed_infill = =speed_print
 support_angle = 50
 support_bottom_distance = =support_z_distance
 support_offset = =line_width
diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 4709acfb58..388959da4a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -17,7 +17,7 @@ cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
-infill_sparse_density = 10
+infill_sparse_density = 15
 layer_height = 0.3
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
index 81b4ebac66..567f8b8c9f 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -17,6 +17,7 @@ material_print_temperature = =default_material_print_temperature + 25
 material_standby_temperature = 100
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
 retract_at_layer_change = False
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
index 4692f15639..2a2ea30d89 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -33,6 +33,7 @@ speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 40 / 50)
 support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
index 02a34a4536..6718f911cc 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -20,7 +20,7 @@ prime_tower_enable = True
 retraction_combing_max_distance = 50
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-
+speed_infill = =math.ceil(speed_print * 33 / 45)
 jerk_travel = 50
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
index 4a268c97a3..ce043bc020 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -26,5 +26,6 @@ speed_layer_0 = =math.ceil(speed_print * 15 / 50)
 speed_print = 50
 speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
index 5c6144c024..663253cf7b 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -20,8 +20,9 @@ prime_tower_enable = True
 retraction_combing_max_distance = 8
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
 jerk_travel = 50
 cool_fan_speed = 20 
 initial_layer_line_width_factor = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
index 6873d6bc4d..cf5af207e0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg
@@ -31,5 +31,4 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-infill_sparse_density = 15
 layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
index 7fedec3c84..b0b5c41bb0 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -29,8 +29,8 @@ top_bottom_thickness = =layer_height * 4
 retract_at_layer_change = False
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 35 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-infill_sparse_density = 15
+speed_infill = =math.ceil(speed_print * 35 / 45)
 layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
index 9a8eceea8e..048a39bbcb 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -31,5 +31,4 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-infill_sparse_density = 15
 layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
index 3d55189662..596f34d7b9 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -32,6 +32,7 @@ retraction_hop = 0.5
 retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_infill = =math.ceil(speed_wall * 30 / 30)
 support_bottom_distance = =support_z_distance
 support_offset = =line_width
 switch_extruder_prime_speed = 15
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
index a7b8e63380..6655f88e39 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -16,7 +16,7 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
-infill_sparse_density = 10
+infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
@@ -37,8 +37,9 @@ retraction_min_travel = =line_width * 2
 retraction_prime_speed = 15
 speed_print = 30
 speed_topbottom = =math.ceil(speed_print * 20 / 30)
-speed_wall = =math.ceil(speed_print * 30 / 30)
-speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_wall = =speed_print
+speed_wall_x = =speed_print
+speed_infill = =speed_print
 support_angle = 50
 support_bottom_distance = =support_z_distance
 support_offset = =line_width
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
index 470f043fa5..c4444eb43d 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -16,7 +16,7 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
-infill_sparse_density = 10
+infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
index 1337d0845e..88c5aee1a2 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg
@@ -17,6 +17,7 @@ material_print_temperature = =default_material_print_temperature + 25
 material_standby_temperature = 100
 speed_print = 50
 speed_topbottom = =math.ceil(speed_print * 30 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 37 / 50)
 retract_at_layer_change = False
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
index 2785b662c0..7f3b35fa36 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg
@@ -33,6 +33,7 @@ speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 35 / 50)
 speed_wall = =math.ceil(speed_print * 40 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+speed_infill = =math.ceil(speed_print * 40 / 50)
 support_bottom_distance = =support_z_distance
 support_z_distance = =layer_height
 top_bottom_thickness = 1.2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
index 45f59de1bd..577ae0e24b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg
@@ -20,7 +20,7 @@ prime_tower_enable = True
 retraction_combing_max_distance = 50
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-
+speed_infill = =math.ceil(speed_print * 33 / 45)
 jerk_travel = 50
\ No newline at end of file
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
index d4dcfb6eb2..72be6682c6 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg
@@ -26,6 +26,6 @@ speed_layer_0 = =math.ceil(speed_print * 15 / 50)
 speed_print = 50
 speed_slowdown_layers = 8
 speed_topbottom = =math.ceil(speed_print * 25 / 50)
-speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall = =math.ceil(speed_print * 37 / 50)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
-
+speed_infill = =math.ceil(speed_print * 37 / 50)
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
index dbc320d383..a8182573d5 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg
@@ -20,9 +20,9 @@ prime_tower_enable = True
 retraction_combing_max_distance = 8
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 30 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 33 / 45)
 speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+speed_infill = =math.ceil(speed_print * 33 / 45)
 jerk_travel = 50
 cool_fan_speed = 20
 initial_layer_line_width_factor = 100
-
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
index b44d0ef5fb..5904532c52 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg
@@ -31,5 +31,4 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-infill_sparse_density = 15
 layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
index b2cb8cff86..8aadfa2352 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg
@@ -29,8 +29,8 @@ top_bottom_thickness = =layer_height * 4
 retract_at_layer_change = False
 speed_print = 45
 speed_topbottom = =math.ceil(speed_print * 35 / 45)
-speed_wall = =math.ceil(speed_print * 40 / 45)
+speed_wall = =math.ceil(speed_print * 35 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-infill_sparse_density = 15
+speed_infill = =math.ceil(speed_print * 35 / 45)
 layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
index e574800962..0263adbe59 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg
@@ -31,5 +31,4 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45)
 speed_wall = =math.ceil(speed_print * 40 / 45)
 speed_wall_x = =speed_wall
 speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
-infill_sparse_density = 15
 layer_height_0 = 0.4
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
index 6c3c755d14..7026544931 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg
@@ -32,6 +32,7 @@ retraction_hop = 0.5
 retraction_min_travel = 1.5
 retraction_prime_speed = 15
 speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_infill = =math.ceil(speed_wall * 30 / 30)
 support_bottom_distance = =support_z_distance
 support_offset = =line_width
 switch_extruder_prime_speed = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index d3f07a54cf..5b8b097a57 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
@@ -16,7 +16,7 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
-infill_sparse_density = 10
+infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature
@@ -36,8 +36,9 @@ retraction_hop_only_when_collides = False
 retraction_min_travel = =line_width * 2
 speed_print = 30
 speed_topbottom = =math.ceil(speed_print * 20 / 30)
-speed_wall = =math.ceil(speed_print * 30 / 30)
-speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+speed_wall = =speed_print
+speed_wall_x = =speed_print
+speed_infill = =speed_print
 support_angle = 50
 support_bottom_distance = =support_z_distance
 support_offset = =line_width
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index 2edceb4c11..77c9e91886 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
@@ -16,7 +16,7 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d'
-infill_sparse_density = 10
+infill_sparse_density = 15
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature