From b72e200e2cd4bc5aedc3817289f0cdca83d12b18 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 4 Aug 2021 11:07:21 +0200 Subject: [PATCH] Add wall_min_flow[_retract] to removed settings in upgrade. Also remove these settings from profiles which included them. CURA-8442 --- .../VersionUpgrade49to50/VersionUpgrade49to50.py | 4 +++- resources/definitions/maker_made_300x.def.json | 1 - resources/quality/key3d/key3d_tyro_best.inst.cfg | 1 - resources/quality/key3d/key3d_tyro_fast.inst.cfg | 1 - resources/quality/key3d/key3d_tyro_normal.inst.cfg | 1 - resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg | 1 - resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg | 1 - resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg | 1 - resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg | 1 - resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg | 1 - resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg | 1 - resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg | 1 - 12 files changed, 3 insertions(+), 12 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py index 168ed12669..5e311f49e7 100644 --- a/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py +++ b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py @@ -10,7 +10,9 @@ _removed_settings = { "travel_compensate_overlapping_walls_enabled", "travel_compensate_overlapping_walls_0_enabled", "travel_compensate_overlapping_walls_x_enabled", - "fill_perimeter_gaps" + "fill_perimeter_gaps", + "wall_min_flow", + "wall_min_flow_retract" } diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json index a4b49820b7..b9aaac9e96 100644 --- a/resources/definitions/maker_made_300x.def.json +++ b/resources/definitions/maker_made_300x.def.json @@ -51,7 +51,6 @@ "optimize_wall_printing_order": {"value": false }, "inset_direction": {"value": "'inside_out'" }, "alternate_extra_perimeter": {"value": false }, - "wall_min_flow": {"value": 0}, "filter_out_tiny_gaps": {"value": true }, "fill_outline_gaps": {"value": true }, "xy_offset": {"value": 0}, diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index dd36c2ff67..f88172adff 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -30,7 +30,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index 3f567b78f7..bdbc8dd9b6 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -29,7 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index 77033a57ae..49dd6797f8 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -29,7 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index 93a536b995..9be48dbbd9 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -31,7 +31,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 164bdd8a8d..4d79d72c0d 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -28,7 +28,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index 7546bfbfad..4d5235d3b0 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -31,7 +31,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index 5f799daf06..a6f8929e02 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -30,7 +30,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 5d1e69c6cf..e5d7378267 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -29,7 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 60c0334472..4fee0b35d9 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -29,7 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 4e15ce7cef..7130766951 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -29,7 +29,6 @@ wall_0_inset = 0 optimize_wall_printing_order = False inset_direction = inside_out alternate_extra_perimeter = False -wall_min_flow = 0 filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0