diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 46ade6d85b..125a4036de 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -103,13 +103,13 @@ "initial_layer_line_width_factor": { "value": "120" }, "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/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 803a36fbb0..b0fb52fd16 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -95,13 +95,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/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index e684b77489..9c371489c3 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/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 429a2b2b7b..456c3381c9 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 @@ -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/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index d026ef1012..f56455517d 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 @@ -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/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index 3980068d66..01354446c4 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 @@ -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) 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 41ef63bf46..fa31602dc8 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 @@ -20,9 +20,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/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index 6a3fba05e7..ab697e5487 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 @@ -20,9 +20,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) 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 97d78377fb..9ab587c1c4 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 @@ -20,9 +20,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) 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 d83549604e..c02b61f9cc 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,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_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 deeeb49445..19ad60d6b3 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,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_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 40d19f3f33..e84a2c753b 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,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_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 aaebd2c3e9..97cb06d3f7 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 @@ -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_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 96dc62bfb8..2357faa842 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,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 @@ -58,5 +58,4 @@ travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 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 c816568da0..143e41d1d4 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,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 @@ -57,5 +57,4 @@ travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 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 1d30f3b80d..11a00e7466 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 @@ -37,7 +37,6 @@ retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance support_line_width = =round(line_width * 0.7 / 0.8, 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 5c6247bad8..2f1d841329 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 @@ -37,7 +37,6 @@ retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance support_line_width = =round(line_width * 0.7 / 0.8, 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 9df8d24ede..cc6c666d45 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 @@ -36,7 +36,6 @@ retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance support_line_width = =round(line_width * 0.7 / 0.8, 2) 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 0bdf141bbd..3592e721d7 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 @@ -42,7 +42,6 @@ retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 25 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 @@ -57,5 +56,4 @@ travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 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 4fc076ea74..460dd06716 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 @@ -43,7 +43,6 @@ retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 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) support_angle = 50 @@ -58,5 +57,4 @@ travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 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 603e3ffb14..49aef7edde 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 @@ -42,7 +42,6 @@ retraction_prime_speed = 15 skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 23 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 @@ -57,5 +56,4 @@ travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 580bf065af..7d8207f90e 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 bc6a47b61e..55bdf8a2a7 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 64510ef4e3..12792dd11a 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 bb77c17422..c8fb8b5259 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 35f4e9aa05..36ab2e190a 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 46f92fbf68..796fd5107d 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 b408d69cf2..2a38731668 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 0734903037..f6049e8584 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_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index a2c7a64b20..3da25d39a7 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 60822eea2e..08fd5eef90 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