From 56e4fb71ad80074b504fe2b54e1e193644e68f41 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 18 Aug 2015 16:27:35 +0200 Subject: [PATCH 1/3] JSON: extruder_nr was still present in UMO and UM2 --- resources/settings/dual_extrusion_printer.json | 10 +++++++++- resources/settings/ultimaker2.json | 9 --------- resources/settings/ultimaker_original.json | 9 --------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/resources/settings/dual_extrusion_printer.json b/resources/settings/dual_extrusion_printer.json index 64e9060c76..1b034ccd76 100644 --- a/resources/settings/dual_extrusion_printer.json +++ b/resources/settings/dual_extrusion_printer.json @@ -4,7 +4,15 @@ "inherits": "fdmprinter.json", "machine_settings": { - "extruder_nr": { "default": 0 }, + "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" + }, "machine_use_extruder_offset_to_offset_coords": { "default": false }, diff --git a/resources/settings/ultimaker2.json b/resources/settings/ultimaker2.json index 0e42d73688..64c008c5d4 100644 --- a/resources/settings/ultimaker2.json +++ b/resources/settings/ultimaker2.json @@ -13,15 +13,6 @@ "machine_extruder_trains": [ { - "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" - }, "machine_nozzle_size": { "default": 0.4 }, diff --git a/resources/settings/ultimaker_original.json b/resources/settings/ultimaker_original.json index 5dde73fcf7..84849abb83 100644 --- a/resources/settings/ultimaker_original.json +++ b/resources/settings/ultimaker_original.json @@ -18,15 +18,6 @@ "machine_extruder_trains": [ { - "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" - }, "machine_nozzle_size": { "default": 0.4 }, From 6047d85c7f9bd5a02cc778ca01afe4210f10ac25 Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Tue, 18 Aug 2015 17:14:22 +0200 Subject: [PATCH 2/3] JSON: 100% infill bugfix: 100% infill now triggers all layers to be bottom layers --- resources/settings/fdmprinter.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index d06ecf49f3..7dc8f6db27 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -321,7 +321,7 @@ "default": 6, "type": "int", "visible": false, - "inherit_function": "math.ceil(parent_value / layer_height)" + "inherit_function": "0 if support_infill_rate == 100 else math.ceil(parent_value / layer_height)" } } }, @@ -341,7 +341,7 @@ "default": 6, "type": "int", "visible": false, - "inherit_function": "math.ceil(parent_value / layer_height)" + "inherit_function": "999999 if support_infill_rate == 100 else math.ceil(parent_value / layer_height)" } } } From 48ea6308965bf2fdda2255bcdca97b1c3dc50d7e Mon Sep 17 00:00:00 2001 From: Tim Kuipers Date: Mon, 24 Aug 2015 12:05:31 +0200 Subject: [PATCH 3/3] JSON: new: z_seam_type; bugfix: inherit for top/bottom when 100% infill --- resources/settings/fdmprinter.json | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/resources/settings/fdmprinter.json b/resources/settings/fdmprinter.json index 7dc8f6db27..c46d92b9a4 100644 --- a/resources/settings/fdmprinter.json +++ b/resources/settings/fdmprinter.json @@ -321,7 +321,7 @@ "default": 6, "type": "int", "visible": false, - "inherit_function": "0 if support_infill_rate == 100 else math.ceil(parent_value / layer_height)" + "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } }, @@ -341,7 +341,7 @@ "default": 6, "type": "int", "visible": false, - "inherit_function": "999999 if support_infill_rate == 100 else math.ceil(parent_value / layer_height)" + "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } } @@ -433,6 +433,18 @@ "type": "float", "default": 0, "visible": false + }, + "z_seam_type": { + "label": "Z Seam Alignment", + "description": "Starting point of each part in a layer. When parts in consecutive layers start at the same point a vertical seam may show on the print. When aligning these at the back, the seam is easiest to remove. When placed randomly the inaccuracies at the part start will be less noticable. When taking the shortest path the print will be more quick.", + "type": "enum", + "options": [ + "Back", + "Shortest", + "Random" + ], + "default": "Shortest", + "visible": false } } },