From bcffa3f09a2df57cf578bfe55e6130d6ee2fc041 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 1 Jul 2016 00:39:04 +0200 Subject: [PATCH 1/3] JSON fix: support roof extruder could be chosen even when roofs weren't enabled (CURA-1723) just putting this commit under that issue so that it will be reviewed... --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d187dc66be..91b5014794 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2793,7 +2793,7 @@ "type": "extruder", "default_value": "0", "value": "support_extruder_nr", - "enabled": "support_enable", + "enabled": "support_enable and support_roof_enable", "settable_per_mesh": false, "settable_per_extruder": false } From c8e61a326728c2fa02214130d746ef4a7cfc9698 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Fri, 1 Jul 2016 00:56:48 +0200 Subject: [PATCH 2/3] JSON feat: cubic isometric infill (CURA-1723) --- resources/definitions/fdmprinter.def.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 91b5014794..b2f41e6860 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -717,7 +717,7 @@ "type": "float", "default_value": 2, "minimum_value": "0", - "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == \"grid\" else (3 if infill_pattern == \"triangles\" else 1))", + "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == \"grid\" else (3 if infill_pattern == \"triangles\" else (3 if infill_pattern == \"cubic\" else 1)))", "settable_per_mesh": true } } @@ -725,12 +725,13 @@ "infill_pattern": { "label": "Infill Pattern", - "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle and concentric patterns are fully printed every layer.", + "description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, cubic, triangle and concentric patterns are fully printed every layer.", "type": "enum", "options": { "grid": "Grid", "lines": "Lines", + "cubic": "Cubic", "triangles": "Triangles", "concentric": "Concentric", "zigzag": "Zig Zag" From f424097387f75ec9a6671b5e261262be9a3ff256 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 Jul 2016 14:01:32 +0200 Subject: [PATCH 3/3] Improve defaults for raft settings These better defaults and formulas are coming from Paul, one of our material testers. --- resources/definitions/fdmprinter.def.json | 32 ++++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index b3fb5edab4..077b9d2162 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1912,7 +1912,7 @@ "unit": "mm", "type": "float", "default_value": 0.5, - "value": "layer_height_0", + "value": "0 if adhesion_type == \"raft\" else layer_height_0", "minimum_value": "0", "maximum_value_warning": "10.0", "settable_per_mesh": false, @@ -2405,7 +2405,7 @@ "description": "If the raft is enabled, this is the extra raft area around the object which is also given a raft. Increasing this margin will create a stronger raft while using more material and leaving less area for your print.", "unit": "mm", "type": "float", - "default_value": 5, + "default_value": 15, "minimum_value_warning": "0", "maximum_value_warning": "10", "enabled": "adhesion_type == \"raft\"" @@ -2455,6 +2455,7 @@ "unit": "mm", "type": "float", "default_value": 0.1, + "value": "layer_height", "minimum_value": "0", "maximum_value_warning": "2.0", "enabled": "adhesion_type == \"raft\"", @@ -2467,7 +2468,8 @@ "description": "Width of the lines in the top surface of the raft. These can be thin lines so that the top of the raft becomes smooth.", "unit": "mm", "type": "float", - "default_value": 0.3, + "default_value": 0.4, + "value": "line_width", "minimum_value": "0.0001", "maximum_value_warning": "machine_nozzle_size * 2", "enabled": "adhesion_type == \"raft\"", @@ -2480,7 +2482,7 @@ "description": "The distance between the raft lines for the top raft layers. The spacing should be equal to the line width, so that the surface is solid.", "unit": "mm", "type": "float", - "default_value": 0.3, + "default_value": 0.4, "minimum_value": "0.0001", "maximum_value_warning": "5.0", "enabled": "adhesion_type == \"raft\"", @@ -2494,7 +2496,8 @@ "description": "Layer thickness of the middle raft layer.", "unit": "mm", "type": "float", - "default_value": 0.27, + "default_value": 0.15, + "value": "layer_height * 1.5", "minimum_value": "0", "maximum_value_warning": "5.0", "enabled": "adhesion_type == \"raft\"", @@ -2507,7 +2510,7 @@ "description": "Width of the lines in the middle raft layer. Making the second layer extrude more causes the lines to stick to the bed.", "unit": "mm", "type": "float", - "default_value": 1, + "default_value": 0.7, "value": "line_width * 2", "minimum_value": "0.0001", "maximum_value_warning": "machine_nozzle_size * 2", @@ -2521,7 +2524,8 @@ "description": "The distance between the raft lines for the middle raft layer. The spacing of the middle should be quite wide, while being dense enough to support the top raft layers.", "unit": "mm", "type": "float", - "default_value": 1.0, + "default_value": 0.9, + "value": "raft_interface_line_width + 0.2", "minimum_value": "0", "maximum_value_warning": "15.0", "enabled": "adhesion_type == \"raft\"", @@ -2535,6 +2539,7 @@ "unit": "mm", "type": "float", "default_value": 0.3, + "value": "layer_height_0 * 1.2", "minimum_value": "0", "maximum_value_warning": "5.0", "enabled": "adhesion_type == \"raft\"", @@ -2547,10 +2552,10 @@ "description": "Width of the lines in the base raft layer. These should be thick lines to assist in bed adhesion.", "unit": "mm", "type": "float", - "default_value": 1, + "default_value": 0.8, "minimum_value": "0.0001", - "value": "line_width * 2", - "maximum_value_warning": "machine_nozzle_size * 2", + "value": "machine_nozzle_size * 2", + "maximum_value_warning": "machine_nozzle_size * 3", "enabled": "adhesion_type == \"raft\"", "settable_per_mesh": false, "settable_per_extruder": true @@ -2561,7 +2566,8 @@ "description": "The distance between the raft lines for the base raft layer. Wide spacing makes for easy removal of the raft from the build plate.", "unit": "mm", "type": "float", - "default_value": 3.0, + "default_value": 1.6, + "value": "raft_base_line_width * 2", "minimum_value": "0.0001", "maximum_value_warning": "100", "enabled": "adhesion_type == \"raft\"", @@ -2605,12 +2611,12 @@ "description": "The speed at which the middle raft layer is printed. This should be printed quite slowly, as the volume of material coming out of the nozzle is quite high.", "unit": "mm/s", "type": "float", - "default_value": 20, + "default_value": 15, + "value": "raft_speed * 0.75", "minimum_value": "0.1", "maximum_value": "299792458000", "maximum_value_warning": "150", "enabled": "adhesion_type == \"raft\"", - "value": "raft_speed", "settable_per_mesh": false, "settable_per_extruder": true },