Merge branch 'master' into merge_main_20211019

21 files changed, 41 insertions, 56 deletions

diff --git a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg
new file mode 100644
index 0000000000..8eeedbf299
--- /dev/null
+++ b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg
@@ -0,0 +1,37 @@
+[general]
+version = 4
+name = Extra Fast
+definition = eryone_thinker
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = verydraft
+weight = -3
+global_quality = True
+
+[values]
+acceleration_print = 1500
+acceleration_travel = 3000
+infill_sparse_density = 10
+initial_layer_line_width_factor = 100.0
+layer_height = 0.3
+layer_height_0 = =layer_height
+material_bed_temperature = =default_material_bed_temperature
+material_bed_temperature_layer_0 = =material_bed_temperature
+material_final_print_temperature = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_print_temperature = =default_material_print_temperature
+material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5)
+skirt_brim_speed = =math.ceil(speed_print * 40 / 50)
+speed_print = 100.0
+speed_infill = =math.ceil(speed_print * 60 / 50)
+speed_topbottom = =math.ceil(speed_print * 40 / 50)
+speed_travel = =speed_print if magic_spiralize else 150
+speed_layer_0 = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_print * 40 / 50)
+speed_wall_x = =math.ceil(speed_print * 60 / 50)
+speed_z_hop = =math.ceil(speed_print * 30 / 60)
+top_layers = 4
+bottom_layers = 2
+wall_line_count = 2
diff --git a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
index 2455e0cf38..e44d39ae7d 100644
--- a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
+++ b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg
@@ -11,9 +11,11 @@ weight = -1
 global_quality = True
 
 [values]
+acceleration_print = 1500
+acceleration_travel = 3000
 infill_sparse_density = 15
 initial_layer_line_width_factor = 100.0
-layer_height = 0.3
+layer_height = 0.25
 layer_height_0 = =layer_height
 material_bed_temperature = =default_material_bed_temperature
 material_bed_temperature_layer_0 = =material_bed_temperature
diff --git a/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt b/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt
index fec1807b9e..89f09b6a8c 100644
--- a/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt
+++ b/resources/quality/jgaurora_a6/jgaurora_a6_0.28_fast.inst.cfg.txt
@@ -5,7 +5,7 @@ definition = jgaurora_a6
 
 [metadata]
 quality_type = fast
-setting_version = 18
+setting_version = 19
 type = quality
 weight = -4
 global_quality = true
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
index b72bb5deb0..eb7258b819 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg
@@ -17,9 +17,6 @@ cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 17
 top_skin_expand_distance = =line_width * 2
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature - 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
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 7404371746..0e73a51c3a 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
@@ -17,9 +17,6 @@ cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 17
 top_skin_expand_distance = =line_width * 2
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature + 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
index 182ecd4fe7..9b0892b81a 100644
--- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -17,9 +17,6 @@ cool_min_layer_time_fan_speed_max = 6
 cool_min_speed = 17
 top_skin_expand_distance = =line_width * 2
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 layer_height = 0.3
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
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 efcc99228f..c80d7dc66d 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
@@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 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 cbe9ab9a47..db3e9a7859 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
@@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 layer_height = 0.4
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
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 00b1c0d97e..59d9a9987f 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
@@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2
 gradual_infill_step_height = =4 * layer_height
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 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_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
index a79e349ae7..edabd04a60 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature - 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
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 aea3306a5d..0e826b2c20 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
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature + 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
index 515dc48f38..d7b22b3a76 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
index c901be85b6..6c47e4c8b3 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg
@@ -16,9 +16,6 @@ brim_width = 8.75
 cool_min_layer_time_fan_speed_max = 6
 top_skin_expand_distance = =line_width * 2
 infill_pattern = cross_3d
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 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_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 dbe1ade2d9..5830b94fb7 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
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 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_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 ebe6dad9dc..28d7d3d756 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
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 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_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
index 9d8662a172..351685d6a3 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature - 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
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 dca926fe63..d012240e7d 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
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = =default_material_print_temperature + 2
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
index 81f7a935f8..a3e3d01f0b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 
 infill_pattern = tetrahedral
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature_layer_0 = =default_material_print_temperature + 2
 material_standby_temperature = 100
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
index fe60c7acd8..5cdd4198b1 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg
@@ -18,9 +18,6 @@ top_skin_expand_distance = =line_width * 2
 
 
 infill_pattern = cross_3d
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 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_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg
index ded2729f68..0c5ce71871 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
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 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_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg
index 03f293d9de..eb7b83f949 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
@@ -19,9 +19,6 @@ top_skin_expand_distance = =line_width * 2
 
 infill_pattern = cross_3d
 infill_sparse_density = 10
-jerk_prime_tower = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_support = =max(math.ceil(jerk_print * 25 / 25), 20)
-jerk_wall_0 = =max(math.ceil(jerk_wall * 15 / 25), 20)
 machine_nozzle_cool_down_speed = 0.5
 machine_nozzle_heat_up_speed = 2.5
 material_final_print_temperature = =material_print_temperature