From 7deb31db98bb7bd3ec12b7b1cfa1975654d96b77 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Tue, 12 Oct 2021 12:54:26 +0200 Subject: [PATCH] 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