From 92926cfc21819b9b6df030f2d93041e07fcee7e3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 20 Jan 2020 10:47:46 +0100 Subject: [PATCH] Revert "Limit retraction_combing_max_distance to be no lower than retraction_min_travel" This reverts commit 3b1e88e49c005657e463f6c76c505ad253ce8636. It was changing the default behaviour for these printers. Contributes to issue CURA-6860. --- resources/definitions/fdmprinter.def.json | 5 ++--- resources/definitions/strateo3d.def.json | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index efa59a17de..ca70f0d7de 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3776,9 +3776,8 @@ "description": "When non-zero, combing travel moves that are longer than this distance will use retraction.", "unit": "mm", "type": "float", - "default_value": 1.5, - "value": "retraction_min_travel", - "minimum_value": "retraction_min_travel", + "default_value": 0, + "minimum_value": "0", "enabled": "resolveOrValue('retraction_combing') != 'off'", "settable_per_mesh": false, "settable_per_extruder": true diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 177e208ebc..2ee3650404 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -93,7 +93,7 @@ "prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" }, "retraction_amount": { "default_value": 1.5 }, "retraction_combing": { "default_value": "all" }, - "retraction_combing_max_distance": { "value": "max(5, retraction_min_travel)" }, + "retraction_combing_max_distance": { "default_value": 5 }, "retraction_count_max": { "default_value": 15 }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },