From 1d5d8c5ac07f07f406bb99695ba2da55637775a5 Mon Sep 17 00:00:00 2001 From: Andreea Scorojitu Date: Fri, 3 Nov 2017 15:02:03 +0100 Subject: [PATCH 1/4] Add_tri-hexagon_and_cross_to_pattern_description --- 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 cffaa1df3d..0a0bb5546b 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1394,7 +1394,7 @@ "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, cubic, octet, quarter cubic and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.", + "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, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.", "type": "enum", "options": { From 873862efd798414c0eb7690d56af47024c4dbc02 Mon Sep 17 00:00:00 2001 From: Brecht Nuyttens Date: Tue, 7 Nov 2017 16:54:18 +0100 Subject: [PATCH 2/4] Fixed Vertex Delta Definition --- resources/definitions/vertex_delta_k8800.def.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/resources/definitions/vertex_delta_k8800.def.json b/resources/definitions/vertex_delta_k8800.def.json index b832620942..ddfa54f4c8 100644 --- a/resources/definitions/vertex_delta_k8800.def.json +++ b/resources/definitions/vertex_delta_k8800.def.json @@ -10,6 +10,9 @@ "author": "Velleman" }, "overrides": { + "material_diameter": { + "default_value": 1.75, + }, "machine_width": { "default_value": 200 }, @@ -40,7 +43,7 @@ "machine_head_shape_max_y": { "default_value": 0 }, - "machine_nozzle_gantry_distance": { + "gantry_height": { "default_value": 0 }, "machine_nozzle_offset_x_1": { From fdcce1780e0dee817cc766f9f01746d078fc7925 Mon Sep 17 00:00:00 2001 From: Mark Date: Wed, 8 Nov 2017 19:24:09 +0100 Subject: [PATCH 3/4] Also check if base.selectedPrinter is null --- plugins/UM3NetworkPrinting/DiscoverUM3Action.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml index eb1bf786b0..65d33369aa 100644 --- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml @@ -276,12 +276,12 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text:{ - if (base.selectedPrinter == undefined) + if (base.selectedPrinter == undefined || base.selectedPrinter == null) { return ""; } // The property cluster size does not exist for older UM3 devices. - if(base.selectedPrinter != undefined && base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1) + if(base.selectedPrinter != undefined && (base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1)) { return ""; } From 1468c3aae5259a850fcea9dbc6d2c597c6e72006 Mon Sep 17 00:00:00 2001 From: Mark Date: Thu, 9 Nov 2017 07:37:09 +0100 Subject: [PATCH 4/4] move undefined/null check --- plugins/UM3NetworkPrinting/DiscoverUM3Action.qml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml index 65d33369aa..e4cbc6a0c7 100644 --- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml +++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.qml @@ -276,12 +276,8 @@ Cura.MachineAction width: parent.width wrapMode: Text.WordWrap text:{ - if (base.selectedPrinter == undefined || base.selectedPrinter == null) - { - return ""; - } // The property cluster size does not exist for older UM3 devices. - if(base.selectedPrinter != undefined && (base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1)) + if(!base.selectedPrinter && (base.selectedPrinter.clusterSize == null || base.selectedPrinter.clusterSize == 1)) { return ""; }