From ff7d75374a9994bd767ae9f57b36ec458bb8ff22 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 28 Apr 2023 11:44:22 +0200 Subject: [PATCH] Fixed upgrade settings There were some redundant tree settings: - support_tree_branch_distance - support_tree_collision_resolution --- .../VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py | 2 ++ resources/definitions/skriware_2.def.json | 1 - resources/setting_visibility/expert.cfg | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py index f3a8314769..88d0fb2ec2 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", } _RENAMED_PROFILES = { 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 }, diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 14dea66b70..6517728968 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -249,10 +249,8 @@ support_roof_extruder_nr support_bottom_extruder_nr support_structure support_tree_angle -support_tree_branch_distance support_tree_branch_diameter support_tree_branch_diameter_angle -support_tree_collision_resolution support_type support_angle support_pattern