Also add minimal jerk of 20mm/s to S3 and UM3.

9 files changed, 30 insertions, 30 deletions

diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg
index 94c5f0238b..fe6aac25ae 100644
--- a/resources/variants/ultimaker3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.8.inst.cfg
@@ -23,9 +23,9 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
+jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
+jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
+jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 200
 layer_height = 0.2
 line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
index 7aecc8e631..426981e0d4 100644
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -25,11 +25,11 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
+jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
index 7a8b7a9944..ae5394ac4c 100644
--- a/resources/variants/ultimaker3_bb04.inst.cfg
+++ b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -15,10 +15,10 @@ acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000)
 acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
index 5209ce08c4..f20905a265 100644
--- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg
@@ -23,9 +23,9 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
+jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
+jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
+jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
index a5fb164591..bf88839ff6 100644
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -25,11 +25,11 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
+jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
index 72adb16dd8..eaed2d531d 100644
--- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg
@@ -23,9 +23,9 @@ infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
 jerk_print = 25
-jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
-jerk_wall = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
+jerk_topbottom = =max(math.ceil(jerk_print * 25 / 25), 20)
+jerk_wall = =max(math.ceil(jerk_print * 25 / 25), 20)
+jerk_wall_0 = =max(math.ceil(jerk_wall * 25 / 25), 20)
 layer_height = 0.2
 line_width = =machine_nozzle_size
 machine_min_cool_heat_time_window = 15
diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
index af100aa1e7..2779a11cce 100644
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -25,11 +25,11 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
+jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 layer_height = 0.2
 machine_min_cool_heat_time_window = 15
 machine_nozzle_heat_up_speed = 1.5
diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg
index 064fd004b8..3d59f8de56 100644
--- a/resources/variants/ultimaker_s3_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb04.inst.cfg
@@ -15,10 +15,10 @@ acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 /
 acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000)
 cool_fan_speed_max = =cool_fan_speed
 gradual_support_infill_steps = 2
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
-jerk_support = =math.ceil(jerk_print * 15 / 25)
-jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
-jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
+jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
+jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20)
+jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20)
+jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20)
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
index bc484f53df..23a4bfa48d 100644
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -25,7 +25,7 @@ infill_overlap = 0
 infill_pattern = triangles
 infill_wipe_dist = 0
 jerk_enabled = True
-jerk_prime_tower = =math.ceil(jerk_print * 2 / 25)
+jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20)
 jerk_print = 25
 jerk_support = =math.ceil(jerk_print * 15 / 25)
 jerk_support_interface = =math.ceil(jerk_support * 10 / 15)