Limit retraction_combing_max_distance to be no lower than retraction_min_travel

Retraction_min_travel overrides retraction_combing_max_distance in CuraEngine, so it has no effect to make it any lower.

Contributes to issue CURA-6860.
This commit is contained in:
Ghostkeeper 2020-01-20 09:41:48 +01:00
parent 0e5654e44b
commit 3b1e88e49c
No known key found for this signature in database
GPG key ID: 37E2020986774393
2 changed files with 4 additions and 3 deletions

View file

@ -3776,8 +3776,9 @@
"description": "When non-zero, combing travel moves that are longer than this distance will use retraction.",
"unit": "mm",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"default_value": 1.5,
"value": "retraction_min_travel",
"minimum_value": "retraction_min_travel",
"enabled": "resolveOrValue('retraction_combing') != 'off'",
"settable_per_mesh": false,
"settable_per_extruder": true

View file

@ -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": { "default_value": 5 },
"retraction_combing_max_distance": { "value": "max(5, retraction_min_travel)" },
"retraction_count_max": { "default_value": 15 },
"retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },