From 0239ce8a78aa63c6a609282b1d94c52046949260 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Mon, 11 Oct 2021 13:53:21 +0200 Subject: [PATCH] - 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