From d84960c7b7c6aa99d5724b935f72b179a8cf5c54 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 25 Apr 2023 17:51:40 +0200 Subject: [PATCH 1/3] Gradual infill with Tree Support 2.0 caused floating parts. Should not be on when doing tree support anyway, so change configs to reflect that. CURA-10065 --- resources/definitions/fdmprinter.def.json | 2 +- resources/definitions/ultimaker.def.json | 2 +- resources/definitions/winbo_dragonl4.def.json | 2 +- resources/definitions/winbo_mini2.def.json | 2 +- resources/definitions/winbo_superhelper105.def.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 044a59ab2e..96b65a9259 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5171,7 +5171,7 @@ "type": "int", "minimum_value": "0", "maximum_value_warning": "1 if (support_pattern == 'cross' or support_pattern == 'lines' or support_pattern == 'concentric') else 5", - "maximum_value": "999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))", + "maximum_value": "(999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))) if support_structure != 'tree' else 0", "enabled": "(support_enable or support_meshes_present) and support_infill_rate > 0", "limit_to_extruder": "support_infill_extruder_nr", "settable_per_mesh": false, diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 0e316d5f2b..ee5821988a 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -43,7 +43,7 @@ "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" }, "cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" }, "gradual_support_infill_step_height": { "value": "4 * layer_height" }, - "gradual_support_infill_steps": { "value": "2 if support_interface_enable else 0" }, + "gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" }, "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, "inset_direction": { "value": "'outside_in'" }, "jerk_infill": { "minimum_value_warning": 20 }, diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index ea61d190cd..5b36423f76 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -33,7 +33,7 @@ "gantry_height": { "value": "80" }, "gradual_infill_step_height": { "value": "1" }, "gradual_support_infill_step_height": { "value": "0.2" }, - "gradual_support_infill_steps": { "value": "1" }, + "gradual_support_infill_steps": { "value": "1 if support_structure != 'tree' else 0" }, "infill_overlap": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index fbb1de3b0e..f38ec5518d 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -33,7 +33,7 @@ "gantry_height": { "value": "75" }, "gradual_infill_step_height": { "value": "1" }, "gradual_support_infill_step_height": { "value": "0.2" }, - "gradual_support_infill_steps": { "value": "1" }, + "gradual_support_infill_steps": { "value": "1 if support_structure != 'tree' else 0" }, "infill_overlap": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index a1a8f2c17e..1f99b07d9e 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -32,7 +32,7 @@ "gantry_height": { "value": "200" }, "gradual_infill_step_height": { "value": "1" }, "gradual_support_infill_step_height": { "value": "0.2" }, - "gradual_support_infill_steps": { "value": "1" }, + "gradual_support_infill_steps": { "value": "1 if support_structure != 'tree' else 0" }, "infill_overlap": { "value": "0" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_enabled": { "value": "True" }, From 376688bbb9dd467fa338889258d88b316553e290 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 26 Apr 2023 09:13:16 +0200 Subject: [PATCH 2/3] Fix unit test: Reference in profile to removed setting. --- resources/definitions/skriware_2.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index ff3d87a154..642b766e0e 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -236,7 +236,6 @@ "support_skip_some_zags": { "default_value": true }, "support_skip_zag_per_mm": { "default_value": 10 }, "support_top_distance": { "value": "0.2" }, - "support_tree_collision_resolution": { "value": "0.2" }, "support_xy_distance": { "default_value": 0.6 }, "support_xy_distance_overhang": { "value": "0.5" }, "support_z_distance": { "default_value": 0.2 }, From 97f818af75ad22c79713a2dbcd135f4b499a72a1 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 26 Apr 2023 09:19:29 +0200 Subject: [PATCH 3/3] Remove settings because of Tree Support upgrade. --- .../VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py index c84ff268b0..ddf0cb1dde 100644 --- a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py +++ b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py @@ -31,6 +31,8 @@ _REMOVED_SETTINGS = { "wireframe_roof_drag_along", "wireframe_roof_outer_delay", "wireframe_nozzle_clearance", + "support_tree_branch_distance", + "support_tree_collision_resolution", }