From 4d121aa74d96a115db09851df032b1b3707fa378 Mon Sep 17 00:00:00 2001
From: "p.kuiper"
Date: Tue, 7 Sep 2021 16:55:22 +0200
Subject: [PATCH] Minimal jerk of 20mm/s for all profiles.
---
resources/definitions/ultimaker_s5.def.json | 10 +++++-----
.../ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg | 6 +++---
.../um_s5_aa0.8_PP_Superdraft_Print.inst.cfg | 6 +++---
.../um_s5_aa0.8_PP_Verydraft_Print.inst.cfg | 6 +++---
.../ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg | 6 +++---
.../um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 6 +++---
.../um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg | 6 +++---
resources/variants/ultimaker_s5_aa0.8.inst.cfg | 6 +++---
resources/variants/ultimaker_s5_bb04.inst.cfg | 8 ++++----
9 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 8e701eeff4..446eaf513d 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -97,13 +97,13 @@
"infill_wipe_dist": { "value": "0" },
"jerk_enabled": { "value": "True" },
"jerk_layer_0": { "value": "jerk_topbottom" },
- "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" },
+ "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
"jerk_print": { "value": "25" },
- "jerk_support": { "value": "math.ceil(jerk_print * 15 / 25)" },
+ "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
"jerk_support_interface": { "value": "jerk_topbottom" },
- "jerk_topbottom": { "value": "math.ceil(jerk_print * 5 / 25)" },
- "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" },
- "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" },
+ "jerk_topbottom": { "value": "max(math.ceil(jerk_print * 5 / 25), 20)" },
+ "jerk_wall": { "value": "max(math.ceil(jerk_print * 10 / 25), 20)" },
+ "jerk_wall_0": { "value": "max(math.ceil(jerk_wall * 5 / 10), 20)" },
"layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
"layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
"layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
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 5d27f4f326..59beda678e 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,9 @@ top_skin_expand_distance = =line_width * 2
infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = tetrahedral
-jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
-jerk_support = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+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 330f9180d2..6483cebfc1 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,9 @@ top_skin_expand_distance = =line_width * 2
infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = tetrahedral
-jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
-jerk_support = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+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 f062068896..ccc2a7d95c 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,9 @@ top_skin_expand_distance = =line_width * 2
infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = tetrahedral
-jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
-jerk_support = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+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 0161516841..7d7e0e9e09 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,9 @@ top_skin_expand_distance = =line_width * 2
infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = cross_3d
-jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
-jerk_support = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+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 57f8e59466..461f103831 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,9 @@ infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = cross_3d
infill_sparse_density = 10
-jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
-jerk_support = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+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 473aca93dc..73429d432b 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,9 @@ infill_before_walls = True
infill_line_width = =round(line_width * 0.7 / 0.8, 2)
infill_pattern = cross_3d
infill_sparse_density = 10
-jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
-jerk_support = =math.ceil(jerk_print * 25 / 25)
-jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+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/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg
index ce8c40444c..c02a01a8e7 100644
--- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_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_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
index 741b7d78e3..8ac33c9731 100644
--- a/resources/variants/ultimaker_s5_bb04.inst.cfg
+++ b/resources/variants/ultimaker_s5_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