GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 02:35:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

make adhesion_extruder_nr optional

Browse Source 
Since the brim_skirt extruder will be -1 by default, it does make sense to allow the parent setting to be -1 as well. This requires an extra resolve for the raft extruders, since these cant be -1.
PP-286
This commit is contained in:
Rijk van Manen 2022-12-16 14:01:55 +01:00
parent 340e03327e
commit 86853a19b6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
resources/definitions/fdmprinter.def.json
View File

@ -5596,9 +5596,9 @@
{ {
"label": "Build Plate Adhesion Extruder", "label": "Build Plate Adhesion Extruder",
"description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.",
"type": "extruder", "type": "optional_extruder",
"default_value": "0", "default_value": "-1",
"value": "int(defaultExtruderPosition())", "value": "int(defaultExtruderPosition()) if resolveOrValue('adhesion_type') == 'raft' else -1",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))", "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))",
"resolve": "max(extruderValues('adhesion_extruder_nr'))", "resolve": "max(extruderValues('adhesion_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5611,8 +5611,9 @@
"description": "The extruder train to use for printing the skirt or brim. This is used in multi-extrusion.", "description": "The extruder train to use for printing the skirt or brim. This is used in multi-extrusion.",
"type": "optional_extruder", "type": "optional_extruder",
"default_value": "-1", "default_value": "-1",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable'))", "value": "adhesion_extruder_nr",
"resolve": "'-1' if '-1' in extruderValues('skirt_brim_extruder_nr') else adhesion_extruder_nr", "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') in ['skirt', 'brim'] or resolveOrValue('prime_tower_brim_enable'))",
"resolve": "max(extruderValues('skirt_brim_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
}, },
@ -5622,7 +5623,7 @@
"description": "The extruder train to use for printing the first layer of the raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the first layer of the raft. This is used in multi-extrusion.",
"type": "extruder", "type": "extruder",
"default_value": "0", "default_value": "0",
"value": "adhesion_extruder_nr", "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'", "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
"resolve": "max(extruderValues('raft_base_extruder_nr'))", "resolve": "max(extruderValues('raft_base_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5634,7 +5635,7 @@
"description": "The extruder train to use for printing the middle layer of the raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the middle layer of the raft. This is used in multi-extrusion.",
"type": "extruder", "type": "extruder",
"default_value": "0", "default_value": "0",
"value": "adhesion_extruder_nr", "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'", "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
"resolve": "max(extruderValues('raft_interface_extruder_nr'))", "resolve": "max(extruderValues('raft_interface_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5646,7 +5647,7 @@
"description": "The extruder train to use for printing the top layer(s) of the raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the top layer(s) of the raft. This is used in multi-extrusion.",
"type": "extruder", "type": "extruder",
"default_value": "0", "default_value": "0",
"value": "adhesion_extruder_nr", "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'", "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
"resolve": "max(extruderValues('raft_surface_extruder_nr'))", "resolve": "max(extruderValues('raft_surface_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,