From 56b15a284c60cb1ad34309adea0ca6f4fcb90c0c Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 9 Aug 2023 22:52:31 +0200 Subject: [PATCH 1/5] Add fluid motion related settings CURA-10811 --- resources/definitions/fdmprinter.def.json | 33 +++++++++++++++++++++-- resources/setting_visibility/expert.cfg | 4 +++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index fca9e69310..ac52e9d52f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6794,8 +6794,7 @@ "maximum_value_warning": "0.3", "settable_per_mesh": true }, - "meshfix_maximum_extrusion_area_deviation": - { + "meshfix_maximum_extrusion_area_deviation": { "label": "Maximum Extrusion Area Deviation", "description": "The maximum extrusion area deviation allowed when removing intermediate points from a straight line. An intermediate point may serve as width-changing point in a long straight line. Therefore, if it is removed, it will cause the line to have a uniform width and, as a result, lose (or gain) a bit of extrusion area. If you increase this you may notice slight under- (or over-) extrusion in between straight parallel walls, as more intermediate width-changing points will be allowed to be removed. Your print will be less accurate, but the g-code will be smaller.", "type": "float", @@ -6805,6 +6804,36 @@ "minimum_value_warning": "500", "maximum_value_warning": "100000", "settable_per_mesh": true + }, + "meshfix_fluid_motion_enabled": { + "label": "Enable Fluid Motion", + "description": "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions.", + "type": "bool", + "default_value": true + }, + "meshfix_fluid_motion_shift_distance": { + "label": "Fluid Motion Shift Distance", + "description": "Distance points are shifted to smooth the path", + "enabled": "meshfix_fluid_motion_enabled", + "type": "float", + "unit": "mm", + "default_value": 0.3 + }, + "meshfix_fluid_motion_small_distance": { + "label": "Fluid Motion Small Distance", + "description": "Distance points are shifted to smooth the path", + "enabled": "meshfix_fluid_motion_enabled", + "unit": "mm", + "type": "float", + "default_value": 0.001 + }, + "meshfix_fluid_motion_angle": { + "label": "Fluid Motion Angle", + "description": "Threshold angle of smooth toolpath transitions", + "enabled": "meshfix_fluid_motion_enabled", + "type": "float", + "unit": "\u00b0", + "default_value": 5 } } }, diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 6517728968..9247ad1b9e 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -365,6 +365,10 @@ multiple_mesh_overlap carve_multiple_volumes alternate_carve_order remove_empty_first_layers +meshfix_fluid_motion_enabled +meshfix_fluid_motion_shift_distance +meshfix_fluid_motion_small_distance +meshfix_fluid_motion_angle [blackmagic] print_sequence From b93be35b89446921be5d1ead9d3625b6c57cf295 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 9 Aug 2023 20:53:36 +0000 Subject: [PATCH 2/5] Applied printer-linter format --- resources/definitions/fdmprinter.def.json | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ac52e9d52f..8f5a40f25c 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6794,7 +6794,8 @@ "maximum_value_warning": "0.3", "settable_per_mesh": true }, - "meshfix_maximum_extrusion_area_deviation": { + "meshfix_maximum_extrusion_area_deviation": + { "label": "Maximum Extrusion Area Deviation", "description": "The maximum extrusion area deviation allowed when removing intermediate points from a straight line. An intermediate point may serve as width-changing point in a long straight line. Therefore, if it is removed, it will cause the line to have a uniform width and, as a result, lose (or gain) a bit of extrusion area. If you increase this you may notice slight under- (or over-) extrusion in between straight parallel walls, as more intermediate width-changing points will be allowed to be removed. Your print will be less accurate, but the g-code will be smaller.", "type": "float", @@ -6805,13 +6806,15 @@ "maximum_value_warning": "100000", "settable_per_mesh": true }, - "meshfix_fluid_motion_enabled": { + "meshfix_fluid_motion_enabled": + { "label": "Enable Fluid Motion", "description": "When enabled tool paths are corrected for printers with smooth motion planners. Small movements that deviate from the general tool path direction are smoothed to improve fluid motions.", "type": "bool", "default_value": true }, - "meshfix_fluid_motion_shift_distance": { + "meshfix_fluid_motion_shift_distance": + { "label": "Fluid Motion Shift Distance", "description": "Distance points are shifted to smooth the path", "enabled": "meshfix_fluid_motion_enabled", @@ -6819,7 +6822,8 @@ "unit": "mm", "default_value": 0.3 }, - "meshfix_fluid_motion_small_distance": { + "meshfix_fluid_motion_small_distance": + { "label": "Fluid Motion Small Distance", "description": "Distance points are shifted to smooth the path", "enabled": "meshfix_fluid_motion_enabled", @@ -6827,7 +6831,8 @@ "type": "float", "default_value": 0.001 }, - "meshfix_fluid_motion_angle": { + "meshfix_fluid_motion_angle": + { "label": "Fluid Motion Angle", "description": "Threshold angle of smooth toolpath transitions", "enabled": "meshfix_fluid_motion_enabled", From 00607cf157f45321ddeb79f017fd8ec2a8022293 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 10 Aug 2023 12:18:54 +0200 Subject: [PATCH 3/5] Use more reasonable settings values for fluid motion CURA-10811 --- resources/definitions/fdmprinter.def.json | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8f5a40f25c..18806da422 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6820,25 +6820,31 @@ "enabled": "meshfix_fluid_motion_enabled", "type": "float", "unit": "mm", - "default_value": 0.3 + "default_value": 0.1, + "minimum_value": "0.01", + "maximum_value": "1" }, - "meshfix_fluid_motion_small_distance": - { + "meshfix_fluid_motion_small_distance": { "label": "Fluid Motion Small Distance", "description": "Distance points are shifted to smooth the path", "enabled": "meshfix_fluid_motion_enabled", "unit": "mm", "type": "float", - "default_value": 0.001 + "default_value": 0.01, + "minimum_value": "0.01", + "maximum_value": "0.1" }, - "meshfix_fluid_motion_angle": - { + "meshfix_fluid_motion_angle": { "label": "Fluid Motion Angle", - "description": "Threshold angle of smooth toolpath transitions", + "description": "Threshold angle of smooth toolpath transitions. If a toolpath deviates more then this angle from the general direction it is smoothed.", "enabled": "meshfix_fluid_motion_enabled", "type": "float", "unit": "\u00b0", - "default_value": 5 + "default_value": 15, + "maximum_value": "90", + "minimum_value": "0", + "minimum_value_warning": "1", + "maximum_value_warning": "35" } } }, From 99bcec18d653283080a881c02f831f7aba30c188 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Thu, 10 Aug 2023 10:20:25 +0000 Subject: [PATCH 4/5] Applied printer-linter format --- resources/definitions/fdmprinter.def.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 18806da422..0ecc8957cd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6824,7 +6824,8 @@ "minimum_value": "0.01", "maximum_value": "1" }, - "meshfix_fluid_motion_small_distance": { + "meshfix_fluid_motion_small_distance": + { "label": "Fluid Motion Small Distance", "description": "Distance points are shifted to smooth the path", "enabled": "meshfix_fluid_motion_enabled", @@ -6834,7 +6835,8 @@ "minimum_value": "0.01", "maximum_value": "0.1" }, - "meshfix_fluid_motion_angle": { + "meshfix_fluid_motion_angle": + { "label": "Fluid Motion Angle", "description": "Threshold angle of smooth toolpath transitions. If a toolpath deviates more then this angle from the general direction it is smoothed.", "enabled": "meshfix_fluid_motion_enabled", From 1d6df4cd8831f7ee5d95473f9e152cba4a8bbbdc Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 10 Aug 2023 12:23:48 +0200 Subject: [PATCH 5/5] Update copy CURA-7913 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 0ecc8957cd..3d95c3af50 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6838,7 +6838,7 @@ "meshfix_fluid_motion_angle": { "label": "Fluid Motion Angle", - "description": "Threshold angle of smooth toolpath transitions. If a toolpath deviates more then this angle from the general direction it is smoothed.", + "description": "If a toolpath-segment deviates more than this angle from the general motion it is smoothed.", "enabled": "meshfix_fluid_motion_enabled", "type": "float", "unit": "\u00b0",