From 4d121aa74d96a115db09851df032b1b3707fa378 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Tue, 7 Sep 2021 16:55:22 +0200 Subject: [PATCH 01/12] 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 From ec096a12f6d93c3307362dbf45830a631527ae47 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Fri, 24 Sep 2021 10:01:15 +0200 Subject: [PATCH 02/12] Also add minimal jerk of 20mm/s to S3 and UM3. --- resources/definitions/ultimaker3.def.json | 10 +++++----- resources/definitions/ultimaker_s3.def.json | 10 +++++----- .../ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg | 6 +++--- .../ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg | 6 +++--- .../ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg | 6 +++--- .../ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg | 6 +++--- .../ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg | 6 +++--- .../ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg | 6 +++--- .../ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg | 6 +++--- .../um_s3_aa0.8_PP_Superdraft_Print.inst.cfg | 6 +++--- .../um_s3_aa0.8_PP_Verydraft_Print.inst.cfg | 6 +++--- .../ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg | 6 +++--- .../um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg | 6 +++--- .../um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg | 6 +++--- resources/variants/ultimaker3_aa0.8.inst.cfg | 6 +++--- resources/variants/ultimaker3_bb0.8.inst.cfg | 8 ++++---- resources/variants/ultimaker3_bb04.inst.cfg | 8 ++++---- resources/variants/ultimaker3_extended_aa0.8.inst.cfg | 6 +++--- resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 8 ++++---- resources/variants/ultimaker_s3_aa0.8.inst.cfg | 6 +++--- resources/variants/ultimaker_s3_bb0.8.inst.cfg | 8 ++++---- resources/variants/ultimaker_s3_bb04.inst.cfg | 8 ++++---- resources/variants/ultimaker_s5_bb0.8.inst.cfg | 2 +- 23 files changed, 76 insertions(+), 76 deletions(-) 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 3b61a18120..8ccd50b014 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/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 6b15dace64..b856efc633 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 6fdc537ec8..4590fdb285 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 1bd7f19da9..0ba356cd0f 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 ee82c4656b..ba50f9126d 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 795ab3be41..36e099b279 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 07cfb23955..42b10e354c 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 f153052075..9db1d9d5f3 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 d80bdf2400..6b3b9150f6 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 57802d961a..379d0c5095 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 fa261a74f4..725adb7fa6 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 79803399f0..ebc417656d 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 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 ec5dd72392..8fde49e791 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 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) From 5f9fc5740ece3e8590ee67316eddf1c947d8ee7d Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 29 Sep 2021 12:32:50 +0200 Subject: [PATCH 03/12] Print profile improvements: - Infill pattern: from triangles to lines => less strong but better visual appearance on large horizontal surfaces - Infill before walls: from true to false => prevent infill push out walls and show artefacts - skin_monotonic:from false to true => low reduction in print time vs large quality increase Note: this switch also sets: retraction_combing from 'all' to 'noskin' The 'noskin' options prevents scarring in top surfaces and gloss streaking in large horizontal surfaces See: CURA-7976 for details - wall_material_flow: from 100% to 90% => reduces line width variations due to overextrusion in walls. Less gloss streaking and more uniform horizontal walls - top_bottom_pattern: from lines to zigzag => prevent the short jerky travel moves of the lines pattern around the walls. Results in a nicer top surface - meshfix_maximum_resolution from (speed_wall_0 + speed_wall_x) / 60 to (speed_wall_0 + speed_wall_x) / 150 => reduce visibility of line segments due to rounding. This will create a higher change of a buffer underrun = surface blobs --- resources/definitions/ultimaker_s5.def.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 446eaf513d..dd3f42f284 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -93,8 +93,9 @@ "cool_min_speed": { "value": "5" }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'triangles'" }, + "infill_pattern": { "value": "'lines'" }, "infill_wipe_dist": { "value": "0" }, + "infill_before_walls": { "value": false }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, @@ -132,6 +133,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, + "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -151,16 +153,18 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, + "top_bottom_pattern" : {"value": "zigzag"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, + "wall_material_flow": {"value": 90}, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "default_value": "all" }, + "retraction_combing": { "default_value": "noskin" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "build_volume_temperature": { "maximum_value": 50 } From 7125aeb1ffe941dd748748b6decf947f3cc808af Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 29 Sep 2021 12:35:55 +0200 Subject: [PATCH 04/12] Same print profile adjustments to the S3 print profile as the S5 print profile --- resources/definitions/ultimaker_s3.def.json | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 8ccd50b014..62cb5c2a30 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -91,8 +91,9 @@ "cool_min_speed": { "value": "5" }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'triangles'" }, + "infill_pattern": { "value": "'lines'" }, "infill_wipe_dist": { "value": "0" }, + "infill_before_walls": { "value": false }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, @@ -130,6 +131,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, + "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -149,16 +151,18 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, + "top_bottom_pattern" : {"value": "zigzag"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, + "wall_material_flow": {"value": 90}, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "default_value": "all" }, + "retraction_combing": { "default_value": "noskin" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } From b99267048ffd4e9768093a93757fe16704cdbf57 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 29 Sep 2021 12:58:34 +0200 Subject: [PATCH 05/12] Same print profile adjustments to the UM print profile as the S5 print profile, except for the maximum resolution adjustments --- resources/definitions/ultimaker3.def.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 125a4036de..2a8e5d17df 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -98,7 +98,7 @@ "cool_min_speed": { "value": "5" }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'triangles'" }, + "infill_pattern": { "value": "'lines'" }, "infill_wipe_dist": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, @@ -140,6 +140,7 @@ "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, "skin_overlap": { "value": "10" }, + "skin_monotonic" : { "value": true }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -158,8 +159,11 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, + "top_bottom_pattern" : {"value": "zigzag"}, "top_bottom_thickness": { "value": "1" }, + "wall_material_flow": {"value": 90}, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "retraction_combing": { "default_value": "noskin" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, From be9f62c5baf5a23cc7768bdab7d8ef2bac465048 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 29 Sep 2021 16:07:26 +0200 Subject: [PATCH 06/12] - Only use monotonic order in top layer (increase print speed). - Explicitly set combing mode to the new 'no_outer_surfaces' strategy - Adjusted the engineering profiles to use 100% wall flow and triangle infill pattern --- resources/definitions/ultimaker3.def.json | 5 +++-- resources/definitions/ultimaker_s3.def.json | 8 +++++--- resources/definitions/ultimaker_s5.def.json | 8 +++++--- .../um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 3 ++- .../um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 3 ++- .../um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 3 ++- .../um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 3 ++- .../um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 3 ++- .../um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 3 ++- .../um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 3 ++- .../um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 3 ++- .../um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg | 2 ++ .../um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg | 2 ++ .../um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 3 +++ .../um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 3 +++ .../um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 3 +++ .../um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 3 +++ 35 files changed, 81 insertions(+), 16 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 2a8e5d17df..cf4d5fd7ff 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -161,9 +161,10 @@ "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_pattern" : {"value": "zigzag"}, "top_bottom_thickness": { "value": "1" }, - "wall_material_flow": {"value": 90}, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, + "wall_material_flow": {"value": "90"}, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "retraction_combing": { "default_value": "noskin" }, + "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 62cb5c2a30..a9b69d9c6c 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -131,7 +131,9 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": true }, + "skin_monotonic" : { "value": "False" }, + "roofing_layer_count": {"value": "1"}, + "roofing_monotonic": {"value": "True"}, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -158,11 +160,11 @@ "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, - "wall_material_flow": {"value": 90}, + "wall_material_flow": {"value": "90"}, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "default_value": "noskin" }, + "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index dd3f42f284..eb1a063863 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -133,7 +133,9 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": true }, + "skin_monotonic" : { "value": "False" }, + "roofing_layer_count": {"value": "1"}, + "roofing_monotonic": {"value": "True"}, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -160,11 +162,11 @@ "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, - "wall_material_flow": {"value": 90}, + "wall_material_flow": {"value": "90"}, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "default_value": "noskin" }, + "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "build_volume_temperature": { "maximum_value": 50 } diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index d5b8978c77..b0563b9805 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -32,3 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index ab56c8d836..61ec3ed8ef 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -32,3 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 5c65e1d42e..053bab50cb 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index 54b6df9384..0982340477 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index c67d55aa5f..ddbd86e5a3 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 86215150f8..25f3814f60 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 36bde0e555..d7fe6164ef 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 74bd8a2252..dc5577b8ef 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg index cdb21d818c..5b7cedf69b 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index 9e9a235a41..37cd6cbeb3 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index 1c06b7869e..832ce40b3a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index a4eb071f00..6a8d51353a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index c5ff496c27..82efa76fbb 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -32,3 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 61d6d979b6..f2b3cbafda 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -32,3 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 21a44e5eda..654ec82959 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -32,3 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 76bee3c415..ea336886e4 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -32,3 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index b06217bb98..0b9bc3a441 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index d1532558c3..4fd6711b3b 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -33,3 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 3afb11c7cd..f5e5d92046 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -33,4 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index c26d5aae4d..6107749788 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -33,4 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index bd8f0a4a92..787be22bf5 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -33,4 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 805437b49e..68a0d2fcb6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -33,4 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index caf7c384b4..0be8e7aac6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -33,4 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 14e5bb1e83..2da7e48d4c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -33,4 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index cee4376aec..3a021441ba 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -33,4 +33,5 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - +infill_pattern = 'triangles' +wall_material_flow = 100 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index 9e9901816c..d87db91e70 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -34,3 +34,5 @@ wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index d61b0226f6..b75d735fb3 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -34,3 +34,5 @@ wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index 7f7b93a24c..d1a0323c3e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -34,3 +34,5 @@ wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 026f917f73..bb1db55941 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,6 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 12457541b7..d91b1215b0 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -33,3 +33,6 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index c799d72a38..7143ceea2e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -33,3 +33,6 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 99d9689181..8873011f29 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -33,3 +33,6 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset + +infill_pattern = 'triangles' +wall_material_flow = 100 \ No newline at end of file From 40fd3203b81e500644adff29e2c8b96ab9760227 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Oct 2021 13:52:42 +0200 Subject: [PATCH 07/12] Fix tests: Removing unnecessary default_value overrides If there's a value, the default_value isn't used. This test exists to prevent confusion between the two, where a contributor could change the default_value but it gets overridden by a value. Contributes to issue PP-1. --- resources/definitions/ultimaker3.def.json | 2 +- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index cf4d5fd7ff..af781a8cbe 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -164,7 +164,7 @@ "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "wall_material_flow": {"value": "90"}, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, + "retraction_combing": { "value": "no_outer_surfaces" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index e0545dda65..7e85683cac 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -163,7 +163,7 @@ "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, + "retraction_combing": { "value": "no_outer_surfaces" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index e2149019e0..62295f858a 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -166,7 +166,7 @@ "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, + "retraction_combing": { "value": "no_outer_surfaces" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "build_volume_temperature": { "maximum_value": 50 } From 5b923d105aa42326b8030263e082decddf821dbc Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Oct 2021 13:55:27 +0200 Subject: [PATCH 08/12] Fix sorting of setting overrides Keeps it maintainable in the long run. Contributes to issue PP-1. --- resources/definitions/ultimaker3.def.json | 6 +++--- resources/definitions/ultimaker_s3.def.json | 10 +++++----- resources/definitions/ultimaker_s5.def.json | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index af781a8cbe..39af8d8363 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -120,6 +120,7 @@ "material_bed_temperature": { "maximum_value": "115" }, "material_bed_temperature_layer_0": { "maximum_value": "115" }, "material_standby_temperature": { "value": "100" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "default_value": true }, @@ -132,6 +133,7 @@ "raft_margin": { "value": "10" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "no_outer_surfaces" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -161,10 +163,8 @@ "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_pattern" : {"value": "zigzag"}, "top_bottom_thickness": { "value": "1" }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, - "wall_material_flow": {"value": "90"}, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "retraction_combing": { "value": "no_outer_surfaces" }, + "wall_material_flow": {"value": "90"}, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 7e85683cac..6e4abcec3b 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -93,6 +93,7 @@ "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'lines'" }, "infill_wipe_dist": { "value": "0" }, + "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "False" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, @@ -107,9 +108,12 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "line_width": { "value": "machine_nozzle_size * 0.875" }, "machine_min_cool_heat_time_window": { "value": "15" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, + "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "value": "True" }, "raft_airgap": { "value": "0" }, "raft_base_speed": { "value": "20" }, @@ -123,6 +127,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "no_outer_surfaces" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -160,11 +165,6 @@ "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, "wall_material_flow": {"value": "90"}, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, - "meshfix_maximum_deviation": { "value": "layer_height / 4" }, - "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "no_outer_surfaces" }, - "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } } diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 62295f858a..3a48c4d6e3 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -87,6 +87,7 @@ "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, "brim_width": { "value": "3" }, + "build_volume_temperature": { "maximum_value": 50 } "cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" }, "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, @@ -96,6 +97,7 @@ "infill_pattern": { "value": "'lines'" }, "infill_wipe_dist": { "value": "0" }, "infill_before_walls": { "value": "False" }, + "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, @@ -112,7 +114,10 @@ "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, + "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "value": "True" }, "raft_airgap": { "value": "0" }, "raft_base_speed": { "value": "20" }, @@ -126,6 +131,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "no_outer_surfaces" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -163,12 +169,6 @@ "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, "wall_material_flow": {"value": "90"}, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, - "meshfix_maximum_deviation": { "value": "layer_height / 4" }, - "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "no_outer_surfaces" }, - "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, - "build_volume_temperature": { "maximum_value": 50 } } } From 6c67b03a5566909f1ab63a878a3eed130cfac250 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Mon, 11 Oct 2021 11:35:38 +0200 Subject: [PATCH 09/12] - Reverted the print profiles to changes agreed by the Print Profile CCB from 06-10-2021 14:00-15:00 --- resources/definitions/ultimaker2.def.json | 13 +++++++ resources/definitions/ultimaker3.def.json | 32 +++++++++------ resources/definitions/ultimaker_s3.def.json | 39 +++++++++++-------- resources/definitions/ultimaker_s5.def.json | 36 ++++++++++------- ..._s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 - ...aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 - ...s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 2 - ...a0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 2 - ..._s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 2 - ...aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 2 - ...3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 2 - ...0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 2 - ...m_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 2 - ..._aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 3 +- ...s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg | 2 - ...a0.4_PETG_Normal_Quality_Accurate.inst.cfg | 2 - ..._s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 2 - ...aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 2 - ...s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 2 - ...a0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 2 - ..._s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 - ...aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 - ...s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 3 +- ...a0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 3 +- ..._s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 3 +- ...aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 3 +- ...5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 3 +- ...0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 3 +- ...m_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 3 +- ..._aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 2 - ...s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg | 2 - ...a0.4_PETG_Normal_Quality_Accurate.inst.cfg | 2 - ..._s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 3 -- ...aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 3 -- ...s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 3 -- ...a0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 3 -- .../um3_aa0.8_PP_Draft_Print.inst.cfg | 3 -- .../um3_aa0.8_PP_Superdraft_Print.inst.cfg | 3 -- .../um3_aa0.8_PP_Verydraft_Print.inst.cfg | 3 -- .../um3_aa0.8_TPU_Draft_Print.inst.cfg | 3 -- .../um3_aa0.8_TPU_Superdraft_Print.inst.cfg | 3 -- .../um3_aa0.8_TPU_Verydraft_Print.inst.cfg | 3 -- .../um_s3_aa0.8_PP_Draft_Print.inst.cfg | 3 -- .../um_s3_aa0.8_PP_Superdraft_Print.inst.cfg | 3 -- .../um_s3_aa0.8_PP_Verydraft_Print.inst.cfg | 3 -- .../um_s3_aa0.8_TPU_Draft_Print.inst.cfg | 3 -- .../um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg | 3 -- .../um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg | 3 -- .../um_s5_aa0.8_PP_Draft_Print.inst.cfg | 3 -- .../um_s5_aa0.8_PP_Superdraft_Print.inst.cfg | 3 -- .../um_s5_aa0.8_PP_Verydraft_Print.inst.cfg | 3 -- .../um_s5_aa0.8_TPU_Draft_Print.inst.cfg | 3 -- .../um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 3 -- .../um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg | 3 -- resources/variants/ultimaker3_aa0.8.inst.cfg | 3 -- resources/variants/ultimaker3_bb0.8.inst.cfg | 4 -- resources/variants/ultimaker3_bb04.inst.cfg | 4 -- .../ultimaker3_extended_aa0.8.inst.cfg | 3 -- .../ultimaker3_extended_bb0.8.inst.cfg | 4 -- .../ultimaker3_extended_bb04.inst.cfg | 4 -- .../variants/ultimaker_s3_aa0.8.inst.cfg | 3 -- .../variants/ultimaker_s3_bb0.8.inst.cfg | 4 -- resources/variants/ultimaker_s3_bb04.inst.cfg | 4 -- .../variants/ultimaker_s5_aa0.8.inst.cfg | 3 -- .../variants/ultimaker_s5_bb0.8.inst.cfg | 4 -- resources/variants/ultimaker_s5_bb04.inst.cfg | 4 -- 66 files changed, 85 insertions(+), 209 deletions(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index c028363239..4ade59985f 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -86,6 +86,19 @@ }, "machine_acceleration": { "default_value": 3000 + }, + "infill_before_walls": { + "value": false + }, + "retraction_combing": { + "value": "no_outer_surfaces", + "default_value": "no_outer_surfaces" + }, + "skin_monotonic" : { + "value": true + }, + "top_bottom_pattern" : { + "value": "zigzag" } } } diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index cf4d5fd7ff..01a54426fa 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -96,20 +96,30 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "infill_before_walls": { "value": false }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'lines'" }, + "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "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)" }, + "jerk_print": { "value": "20", "minimum_value": 20 }, + "jerk_infill": {"minimum_value": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 }, + "jerk_roofing": {"minimum_value": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_support_infill": {"minimum_value": 20 }, + "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 }, + "jerk_support_roof": {"minimum_value": 20 }, + "jerk_support_bottom": {"minimum_value": 20 }, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_travel": {"minimum_value": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20}, + "jerk_print_layer_0": {"minimum_value": 20 }, + "jerk_travel_layer_0": {"minimum_value": 20 }, + "jerk_skirt_brim": {"minimum_value": 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'))" }, @@ -132,6 +142,7 @@ "raft_margin": { "value": "10" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -161,10 +172,7 @@ "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_pattern" : {"value": "zigzag"}, "top_bottom_thickness": { "value": "1" }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, - "wall_material_flow": {"value": "90"}, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index e0545dda65..cd5746fe43 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -89,19 +89,29 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "infill_before_walls": { "value": false }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'lines'" }, + "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, - "jerk_enabled": { "value": "False" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "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)" }, + "jerk_enabled": { "value": "True" }, + "jerk_print": { "value": "20", "minimum_value": 20 }, + "jerk_infill": {"minimum_value": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 }, + "jerk_roofing": {"minimum_value": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_support_infill": {"minimum_value": 20 }, + "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 }, + "jerk_support_roof": {"minimum_value": 20 }, + "jerk_support_bottom": {"minimum_value": 20 }, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_travel": {"minimum_value": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20}, + "jerk_print_layer_0": {"minimum_value": 20 }, + "jerk_travel_layer_0": {"minimum_value": 20 }, + "jerk_skirt_brim": {"minimum_value": 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'))" }, @@ -123,6 +133,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -130,9 +141,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": "False" }, - "roofing_layer_count": {"value": "1"}, - "roofing_monotonic": {"value": "True"}, + "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -159,11 +168,9 @@ "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, - "wall_material_flow": {"value": "90"}, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index e2149019e0..d851238466 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -91,20 +91,29 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "infill_before_walls": { "value": false }, "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'lines'" }, + "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, - "infill_before_walls": { "value": "False" }, "jerk_enabled": { "value": "True" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "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)" }, + "jerk_print": { "value": "20", "minimum_value": 20 }, + "jerk_infill": {"minimum_value": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 }, + "jerk_roofing": {"minimum_value": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_support_infill": {"minimum_value": 20 }, + "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 }, + "jerk_support_roof": {"minimum_value": 20 }, + "jerk_support_bottom": {"minimum_value": 20 }, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 }, + "jerk_travel": {"minimum_value": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20}, + "jerk_print_layer_0": {"minimum_value": 20 }, + "jerk_travel_layer_0": {"minimum_value": 20 }, + "jerk_skirt_brim": {"minimum_value": 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'))" }, @@ -133,9 +142,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": "False" }, - "roofing_layer_count": {"value": "1"}, - "roofing_monotonic": {"value": "True"}, + "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, @@ -162,8 +169,7 @@ "wall_0_inset": { "value": "0" }, "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, - "wall_material_flow": {"value": "90"}, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 150" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 5693df306b..44a4ae7897 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index c5eaa6c3ac..8c753ef948 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 8e6172d8f7..9b6104da25 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index 61ec77d72a..a1e3e05ba5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index 53188692b8..0804f60436 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index ac741853e6..c2bafc30c6 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 732ad0905f..8844a15e45 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 29f455e65a..52fe55ed0a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg index 67db5395f7..d5093dd2b7 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index d689a603d8..bd329948f8 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index a450339861..53bfb3b116 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index 64221bedb3..799fab36e0 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 5c2cac232c..1b404665d4 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 696fe7ec36..74aabdaf9c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 3bcb262450..195a57b041 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 6465503406..402ffb8a51 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,3 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index b45bb53995..9536c24b86 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 8232526ea7..faa957ddea 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index ca9ad0d849..0bcba30cf2 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,4 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index afef4e80d5..cb601ff61e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,4 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index d1dda124bd..a9dd2e0863 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,4 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index d3aae5d932..81424cb862 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,4 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 68a6dbec13..b1a2905659 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,4 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 8822d01402..853307f093 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -33,5 +33,4 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index 579d450696..a4f9cafae9 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -33,5 +33,4 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index 4aa2d5a49f..d49a121334 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -34,5 +34,3 @@ wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index e36a2d4737..a06922a0d1 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -34,5 +34,3 @@ wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index d5dfc07b2b..b4a7b7e3ac 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -34,5 +34,3 @@ wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 4e3fc3de3f..3d6336fce5 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -33,6 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 940a0d4e55..3c1bd032af 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -33,6 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 5a59c962da..c0ddc08d88 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -33,6 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 99e09d51be..1809422b15 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -33,6 +33,3 @@ wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset - -infill_pattern = 'triangles' -wall_material_flow = 100 \ No newline at end of file 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 c17eac097d..87f432b80a 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,6 @@ 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 = =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 a9082464e0..042eb806be 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,6 @@ 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 = =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 8e60621c5d..3a61f887ee 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,6 @@ 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 = =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 e9dd9ba255..df1f349d7e 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,6 @@ 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 = =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 2a25221203..7783a639f3 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,6 @@ 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 = =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 dad835a0c9..fcbbf61e64 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,6 @@ 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 = =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 d4f54922d3..04568434bd 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_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 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 8257a7f854..fc42b6fbd6 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_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 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 566e79dfc7..b4c6cfdf02 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_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 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 4930036a4e..2afe0ec9cb 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,6 @@ 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 = =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 b54ae49d6d..222f356e8b 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 @@ 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 = =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 dda18519b5..272e8f50b4 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 @@ 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 = =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 bdb28c8633..6fc530d8da 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_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 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 3d7b1c1147..5a8a47212d 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_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 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 5cacedaf49..f1cc5604f3 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_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 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 bb5f8b1fb2..ffc21e7071 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_before_walls = True infill_line_width = =round(line_width * 0.7 / 0.8, 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 d83ef48e5a..6ed2dd23e8 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 @@ 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 = =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 180f28db6d..834230cc59 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 @@ 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 = =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/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index f3f19887b3..cb8b95b0fb 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 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 4a48d7f830..6aed23623a 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -25,11 +25,7 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20) jerk_print = 25 -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 5f2409965f..a60190d2ff 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -15,10 +15,6 @@ 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 = =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 f66e83e611..5a1259fc35 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 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 3c45cd355c..df1c09633b 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -25,11 +25,7 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20) jerk_print = 25 -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_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index be3d5ef8c5..c22fb01c15 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -15,10 +15,6 @@ 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) 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_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index df04b8634e..7fac331e72 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 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 819ca14649..ba64926541 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -25,11 +25,7 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -jerk_prime_tower = =max(math.ceil(jerk_print * 2 / 25), 20) jerk_print = 25 -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 8ee593eca5..52f41f837c 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -15,10 +15,6 @@ 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 = =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 c7a4dcd596..7a6bf3deb5 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -23,9 +23,6 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True jerk_print = 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_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index b73eefe19e..06c71b1dfc 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -25,11 +25,7 @@ infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True -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) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 1d2da249af..c178cdcd17 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -15,10 +15,6 @@ 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 = =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 From 0239ce8a78aa63c6a609282b1d94c52046949260 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Mon, 11 Oct 2021 13:53:21 +0200 Subject: [PATCH 10/12] - Bug fix error due to string overrides. - "Minimum_value" changed to "minimum_warning_value" - PVA (BB0.4 and BB0.8) require low support jerk settings for good adhesion - Support roof does follow print_jer and no warning levels set --- resources/definitions/ultimaker3.def.json | 36 +++++++++---------- resources/definitions/ultimaker_s3.def.json | 36 +++++++++---------- resources/definitions/ultimaker_s5.def.json | 36 +++++++++---------- resources/variants/ultimaker3_bb0.8.inst.cfg | 3 ++ resources/variants/ultimaker3_bb04.inst.cfg | 3 ++ .../variants/ultimaker_s3_bb0.8.inst.cfg | 3 ++ resources/variants/ultimaker_s3_bb04.inst.cfg | 3 ++ .../variants/ultimaker_s5_bb0.8.inst.cfg | 3 ++ resources/variants/ultimaker_s5_bb04.inst.cfg | 3 ++ 9 files changed, 69 insertions(+), 57 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 01a54426fa..09c2565f77 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -103,23 +103,21 @@ "infill_wipe_dist": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "20", "minimum_value": 20 }, - "jerk_infill": {"minimum_value": 20 }, - "jerk_wall": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 }, - "jerk_roofing": {"minimum_value": 20 }, - "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_support_infill": {"minimum_value": 20 }, - "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 }, - "jerk_support_roof": {"minimum_value": 20 }, - "jerk_support_bottom": {"minimum_value": 20 }, - "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_travel": {"minimum_value": 20 }, - "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20}, - "jerk_print_layer_0": {"minimum_value": 20 }, - "jerk_travel_layer_0": {"minimum_value": 20 }, - "jerk_skirt_brim": {"minimum_value": 20 }, + "jerk_print": { "value": "20", "minimum_value_warning": 20 }, + "jerk_infill": {"minimum_value_warning": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, + "jerk_roofing": {"minimum_value_warning": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_infill": {"minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel": {"minimum_value_warning": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, + "jerk_print_layer_0": {"minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"minimum_value_warning": 20 }, + "jerk_skirt_brim": {"minimum_value_warning": 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'))" }, @@ -142,7 +140,7 @@ "raft_margin": { "value": "10" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, + "retraction_combing": { "value": "'no_outer_surfaces'", "default_value": "'no_outer_surfaces'" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -170,7 +168,7 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, - "top_bottom_pattern" : {"value": "zigzag"}, + "top_bottom_pattern" : {"value": "'zigzag'"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index cd5746fe43..1bd79aca1a 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -95,23 +95,21 @@ "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "20", "minimum_value": 20 }, - "jerk_infill": {"minimum_value": 20 }, - "jerk_wall": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 }, - "jerk_roofing": {"minimum_value": 20 }, - "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_support_infill": {"minimum_value": 20 }, - "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 }, - "jerk_support_roof": {"minimum_value": 20 }, - "jerk_support_bottom": {"minimum_value": 20 }, - "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_travel": {"minimum_value": 20 }, - "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20}, - "jerk_print_layer_0": {"minimum_value": 20 }, - "jerk_travel_layer_0": {"minimum_value": 20 }, - "jerk_skirt_brim": {"minimum_value": 20 }, + "jerk_print": { "value": "20", "minimum_value_warning": 20 }, + "jerk_infill": {"minimum_value_warning": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, + "jerk_roofing": {"minimum_value_warning": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_infill": {"minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel": {"minimum_value_warning": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, + "jerk_print_layer_0": {"minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"minimum_value_warning": 20 }, + "jerk_skirt_brim": {"minimum_value_warning": 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'))" }, @@ -133,7 +131,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, + "retraction_combing": { "value": "'no_outer_surfaces'", "default_value": "'no_outer_surfaces'" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -161,7 +159,7 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, - "top_bottom_pattern" : {"value": "zigzag"}, + "top_bottom_pattern" : {"value": "'zigzag'"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index d851238466..5e359dc094 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -97,23 +97,21 @@ "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "jerk_print": { "value": "20", "minimum_value": 20 }, - "jerk_infill": {"minimum_value": 20 }, - "jerk_wall": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_wall_0": { "value": "jerk_wall", "minimum_value": 20 }, - "jerk_roofing": {"minimum_value": 20 }, - "jerk_topbottom": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_support": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_support_infill": {"minimum_value": 20 }, - "jerk_support_interface": { "value": "jerk_topbottom", "minimum_value": 20 }, - "jerk_support_roof": {"minimum_value": 20 }, - "jerk_support_bottom": {"minimum_value": 20 }, - "jerk_prime_tower": { "value": "jerk_print", "minimum_value": 20 }, - "jerk_travel": {"minimum_value": 20 }, - "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value": 20}, - "jerk_print_layer_0": {"minimum_value": 20 }, - "jerk_travel_layer_0": {"minimum_value": 20 }, - "jerk_skirt_brim": {"minimum_value": 20 }, + "jerk_print": { "value": "20", "minimum_value_warning": 20 }, + "jerk_infill": {"minimum_value_warning": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, + "jerk_roofing": {"minimum_value_warning": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_infill": {"minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel": {"minimum_value_warning": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, + "jerk_print_layer_0": {"minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"minimum_value_warning": 20 }, + "jerk_skirt_brim": {"minimum_value_warning": 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'))" }, @@ -135,6 +133,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "'no_outer_surfaces'", "default_value": "'no_outer_surfaces'" }, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -162,7 +161,7 @@ "support_z_distance": { "value": "0" }, "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, - "top_bottom_pattern" : {"value": "zigzag"}, + "top_bottom_pattern" : {"value": "'zigzag'"}, "top_bottom_thickness": { "value": "1" }, "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, @@ -172,7 +171,6 @@ "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "value": "no_outer_surfaces", "default_value": "no_outer_surfaces" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "build_volume_temperature": { "maximum_value": 50 } diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 6aed23623a..97e16a2afa 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -26,6 +26,9 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True 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) 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 a60190d2ff..76156b5e1e 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -15,6 +15,9 @@ 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_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) 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_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index ba64926541..c68b46a6ae 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -26,6 +26,9 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True 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) 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 52f41f837c..a2b8eb1b7e 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -15,6 +15,9 @@ 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_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) 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 06c71b1dfc..7bb613a2b4 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -26,6 +26,9 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True 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) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index c178cdcd17..380e634c93 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -15,6 +15,9 @@ 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_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) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 From 17ea8d0de716fe9daae635c2fc720d8eb6c22e36 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Tue, 12 Oct 2021 09:31:20 +0200 Subject: [PATCH 11/12] Merge remote-tracking branch 'origin/PP-1-Improved_print_profiles' into PP-1-Improved_print_profiles # Conflicts: # resources/definitions/ultimaker3.def.json # resources/definitions/ultimaker_s3.def.json # resources/definitions/ultimaker_s5.def.json --- resources/definitions/ultimaker3.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 6a1fe963f5..b3a19f5d53 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -140,6 +140,7 @@ "raft_margin": { "value": "10" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": {"value": "no_outer_surfaces", "default_value": "no_outer_surfaces"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, From 7deb31db98bb7bd3ec12b7b1cfa1975654d96b77 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Tue, 12 Oct 2021 12:54:26 +0200 Subject: [PATCH 12/12] Bug fixes. - Removed default value when value is already set. - Make sure UM3 and UM3 extended variants are the same --- resources/definitions/ultimaker2.def.json | 3 +-- resources/definitions/ultimaker3.def.json | 2 +- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 3 +++ resources/variants/ultimaker3_extended_bb04.inst.cfg | 3 +++ 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 4ade59985f..2f9deb64b1 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -91,8 +91,7 @@ "value": false }, "retraction_combing": { - "value": "no_outer_surfaces", - "default_value": "no_outer_surfaces" + "value": "no_outer_surfaces" }, "skin_monotonic" : { "value": true diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index b3a19f5d53..9428b89f0f 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -140,7 +140,7 @@ "raft_margin": { "value": "10" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": {"value": "no_outer_surfaces", "default_value": "no_outer_surfaces"}, + "retraction_combing": {"value": "no_outer_surfaces"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 4c954c233e..da11ddf0d5 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -132,7 +132,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "'no_outer_surfaces'", "default_value": "'no_outer_surfaces'" }, + "retraction_combing": { "value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 5e359dc094..9493a25add 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -133,7 +133,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "'no_outer_surfaces'", "default_value": "'no_outer_surfaces'" }, + "retraction_combing": { "value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index df1c09633b..bc86c63461 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -26,6 +26,9 @@ infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True 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) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index c22fb01c15..df9a1aa062 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -15,6 +15,9 @@ 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_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) machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0