3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Limit retraction_combing_max_distance to be no lower than retraction_min_travel"

Browse source 
This reverts commit 3b1e88e49c.
It was changing the default behaviour for these printers.

Contributes to issue CURA-6860.
This commit is contained in:
Ghostkeeper 2020-01-20 10:47:46 +01:00
parent 8f6fb5e007
commit 92926cfc21
No known key found for this signature in database
GPG key ID: 37E2020986774393
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
resources/definitions/fdmprinter.def.json
View file

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

2
resources/definitions/strateo3d.def.json
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" }, "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_amount": { "default_value": 1.5 },
"retraction_combing": { "default_value": "all" }, "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_count_max": { "default_value": 15 },
"retraction_hop": { "value": "2" }, "retraction_hop": { "value": "2" },
"retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" },