From f7899931e3c3b61610c249fdf7958e9fb0ffc17d Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 29 Jul 2015 13:13:37 +0200 Subject: [PATCH 1/2] adhesion_extruder_nr --- resources/settings/fdmprinter.json | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 7197552496..2f96784c81 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -1124,11 +1124,20 @@ "description": "Different options that help in preventing corners from lifting due to warping. Brim adds a single-layer-thick flat area around your object which is easy to cut off afterwards, and it is the recommended option. Raft adds a thick grid below the object and a thin interface between this and your object. (Note that enabling the brim or raft disables the skirt.)", "type": "enum", "options": [ - "None", + "Skirt", "Brim", "Raft" ], - "default": "None" + "default": "Skirt" + }, + "adhesion_extruder_nr": { + "label": "Platform Adhesion Extruder", + "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.", + "type": "int", + "default": 0, + "min_value": 0, + "max_value": 16, + "inherit_function": "extruder_nr" }, "skirt_line_count": { "label": "Skirt Line Count", @@ -1137,7 +1146,7 @@ "default": 1, "active_if": { "setting": "adhesion_type", - "value": "None" + "value": "Skirt" } }, "skirt_gap": { @@ -1148,7 +1157,7 @@ "default": 3, "active_if": { "setting": "adhesion_type", - "value": "None" + "value": "Skirt" } }, "skirt_minimal_length": { @@ -1159,7 +1168,7 @@ "default": 250, "active_if": { "setting": "adhesion_type", - "value": "None" + "value": "Skirt" } }, "brim_line_count": { From b203c8e6cb869a8fcf7907ff6adf004964f08187 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Wed, 29 Jul 2015 16:21:54 +0200 Subject: [PATCH 2/2] prime_tower_size, prime_tower_wipe_enabled, support_extruder_nr, support_roof_extruder_nr, category_dual (+icon), caterogy_shield icon --- resources/settings/fdmprinter.json | 55 + resources/themes/cura/icons/category_dual.svg | 3379 +++++++++++++++++ .../themes/cura/icons/category_shield.svg | 94 + 3 files changed, 3528 insertions(+) create mode 100644 resources/themes/cura/icons/category_dual.svg create mode 100644 resources/themes/cura/icons/category_shield.svg diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 2f96784c81..77082e3722 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -256,6 +256,37 @@ } } }, + "dual": { + "label": "Dual Extrusion", + "visible": true, + "icon": "category_dual", + "settings": { + "extruder_nr": { + "label": "Extruder", + "description": "The extruder train used for printing. This is used in multi-extrusion.", + "type": "int", + "default": 0, + "min_value": 0, + "max_value": 16, + "inherit_function": "extruder_nr" + }, + "prime_tower_size": { + "label": "Prime Tower Size", + "description": "Print a tower next to the print which serves to prime the material after each nozzle switch. A size of 0 corresponds to no prime tower at all.", + "type": "float", + "unit": "mm", + "default": 15, + "min_value": 0, + "max_value_warning": 20 + }, + "prime_tower_wipe_enabled": { + "label": "Wipe Nozzle on Prime tower", + "description": "After printing the prime tower with the one nozzle, wipe the oozed material from the other nozzle off on the prime tower.", + "type": "boolean", + "default": false + } + } + }, "shell": { "label": "Shell", "visible": true, @@ -1513,6 +1544,30 @@ "type": "boolean", "default": true }, + "support_extruder_nr": { + "label": "Support Extruder", + "description": "The extruder train to use for printing the support. This is used in multi-extrusion.", + "type": "int", + "default": 0, + "min_value": 0, + "max_value": 16, + "inherit_function": "extruder_nr", + "children": { + "support_roof_extruder_nr": { + "label": "Hammock Extruder", + "description": "The extruder train to use for printing the hammock. This is used in multi-extrusion.", + "type": "int", + "default": 0, + "min_value": 0, + "max_value": 16, + "inherit": true, + "active_if": { + "setting": "support_roof_enable", + "value": true + } + } + } + }, "support_type": { "label": "Placement", "description": "Where to place support structures. The placement can be restricted such that the support structures won't rest on the model, which could otherwise cause scarring.", diff --git a/resources/themes/cura/icons/category_dual.svg b/resources/themes/cura/icons/category_dual.svg new file mode 100644 index 0000000000..fd968da8ff --- /dev/null +++ b/resources/themes/cura/icons/category_dual.svg @@ -0,0 +1,3379 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/resources/themes/cura/icons/category_shield.svg b/resources/themes/cura/icons/category_shield.svg new file mode 100644 index 0000000000..b0fa06bef9 --- /dev/null +++ b/resources/themes/cura/icons/category_shield.svg @@ -0,0 +1,94 @@ + + + +image/svg+xml \ No newline at end of file