From d98c122bd5be9c8dfddf2cdaf1480904a5919314 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 8 Aug 2016 12:56:34 +0200 Subject: [PATCH 1/2] Disable extruder selection drop-downs in single-extrusion machines They don't function in single-extrusion machines. --- resources/definitions/fdmprinter.def.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1a91bbea9c..f652d637ad 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3161,6 +3161,7 @@ "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.", "type": "extruder", "default_value": "0", + "enabled": "machine_extruder_count > 1", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -3170,7 +3171,7 @@ "description": "The extruder train to use for printing the support. This is used in multi-extrusion.", "type": "extruder", "default_value": "0", - "enabled": "support_enable", + "enabled": "support_enable and machine_extruder_count > 1", "settable_per_mesh": false, "settable_per_extruder": false, "children": { @@ -3181,7 +3182,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "support_enable", + "enabled": "support_enable and machine_extruder_count > 1", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -3192,7 +3193,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "support_enable", + "enabled": "support_enable and machine_extruder_count > 1", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -3203,7 +3204,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "support_enable and extruderValue(support_extruder_nr, 'support_interface_enable')", + "enabled": "support_enable and machine_extruder_count > 1 and extruderValue(support_extruder_nr, 'support_interface_enable')", "settable_per_mesh": false, "settable_per_extruder": false } From ca8ded6c350d82b71d8ed18354492571856eb9a5 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 8 Aug 2016 13:23:03 +0200 Subject: [PATCH 2/2] JSON fix: support z dist defaults to 1 layer instead of 2 (CURA-1283) --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index f652d637ad..74a8545fdd 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2333,7 +2333,7 @@ "type": "float", "minimum_value": "0", "maximum_value_warning": "10", - "default_value": 0.15, + "default_value": 0.1, "global_inherits_stack": "support_extruder_nr", "enabled": "support_enable", "settable_per_mesh": true, @@ -2346,7 +2346,7 @@ "unit": "mm", "minimum_value": "0", "maximum_value_warning": "10", - "default_value": 0.15, + "default_value": 0.1, "type": "float", "enabled": "support_enable", "value": "extruderValue(support_extruder_nr, 'support_z_distance')", @@ -2361,7 +2361,7 @@ "minimum_value": "0", "maximum_value_warning": "10", "default_value": 0.1, - "value": "0.1 if support_type == 'everywhere' else 0", + "value": "extruderValue(support_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0", "global_inherits_stack": "support_extruder_nr", "type": "float", "enabled": "support_enable and support_type == 'everywhere'",