From 73e809b956ce79629cc70d47c94a4e8d3b14ee63 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 25 Oct 2017 13:20:05 +0200 Subject: [PATCH 1/3] Remove specialised start g-code from Creality CR-10 By request from Michael. This makes it the same as the start g-code for the Custom FDM Printer, which apparently works better. --- resources/definitions/creality_cr10.def.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/definitions/creality_cr10.def.json b/resources/definitions/creality_cr10.def.json index ced6f32b7b..bacae6e2e5 100644 --- a/resources/definitions/creality_cr10.def.json +++ b/resources/definitions/creality_cr10.def.json @@ -59,9 +59,6 @@ "skirt_gap": { "default_value": 5 }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute Positioning\nG28 ; home all axes\nG1 Z5 F3000 ; lift\nG1 X20 Y2 F1500 ; avoid binder clips\nG1 Z0.2 F3000 ; get ready to prime\nG92 E0 ; reset extrusion distance\nG1 X120 E10 F600 ; prime nozzle\nG1 X150 F5000 ; quick wipe" - }, "machine_end_gcode": { "default_value": "G91\nG1 F1800 E-3\nG1 F3000 Z10\nG90\nG28 X0 Y0 ; home x and y axis\nM106 S0 ; turn off cooling fan\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors" }, From 87ba4056ee86682d78c31e4edacb7cdfd4bc710a Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 25 Oct 2017 13:55:30 +0200 Subject: [PATCH 2/3] CURA-4485 Minor changes --- plugins/UM3NetworkPrinting/UM3InfoComponents.qml | 2 +- resources/qml/Menus/MaterialMenu.qml | 2 +- resources/qml/Menus/NozzleMenu.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/UM3InfoComponents.qml b/plugins/UM3NetworkPrinting/UM3InfoComponents.qml index 87b8b219b7..8d0d8a0754 100644 --- a/plugins/UM3NetworkPrinting/UM3InfoComponents.qml +++ b/plugins/UM3NetworkPrinting/UM3InfoComponents.qml @@ -121,7 +121,7 @@ Item function isClusterPrinter() { var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize // This is a non cluster printer or the cluster it is just one printer - if (typeof clusterSize == "undefined" || clusterSize == 1) + if (clusterSize == undefined || clusterSize == 1) return false return true } diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml index 5422457140..359f4f41d0 100644 --- a/resources/qml/Menus/MaterialMenu.qml +++ b/resources/qml/Menus/MaterialMenu.qml @@ -18,7 +18,7 @@ Menu { var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize // This is a non cluster printer or the cluster it is just one printer - if (typeof clusterSize == "undefined" || clusterSize == 1) + if (clusterSize == undefined || clusterSize == 1) return false return true } diff --git a/resources/qml/Menus/NozzleMenu.qml b/resources/qml/Menus/NozzleMenu.qml index 79bc105b58..1c75a346f3 100644 --- a/resources/qml/Menus/NozzleMenu.qml +++ b/resources/qml/Menus/NozzleMenu.qml @@ -18,7 +18,7 @@ Menu { var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize // This is a non cluster printer or the cluster it is just one printer - if (typeof clusterSize == "undefined" || clusterSize == 1) + if (clusterSize == undefined || clusterSize == 1) return false return true } From e4fec1f63d0406221422bc191d6043db1d16fb68 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 25 Oct 2017 16:34:41 +0200 Subject: [PATCH 3/3] Move SaveButton downwards CURA-4490 Move SaveButton downwards so it doesn't overlay with the estimated print time in some language. --- resources/qml/SaveButton.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/qml/SaveButton.qml b/resources/qml/SaveButton.qml index 7423fc2368..acc97ebf11 100644 --- a/resources/qml/SaveButton.qml +++ b/resources/qml/SaveButton.qml @@ -91,8 +91,8 @@ Item { id: saveRow width: base.width height: saveToButton.height - anchors.top: progressBar.bottom - anchors.topMargin: UM.Theme.getSize("sidebar_margin").height + anchors.bottom: parent.bottom + anchors.bottomMargin: UM.Theme.getSize("sidebar_margin").height anchors.left: parent.left Row {