From 89256b54236a35248752b68d4d33a2c50bcc21fe Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Mar 2016 14:44:09 +0100 Subject: [PATCH 1/3] Added explicit home bed before rest of bed leveling CURA-1102 --- plugins/USBPrinting/PrinterConnection.py | 4 ++++ resources/qml/WizardPages/Bedleveling.qml | 1 + 2 files changed, 5 insertions(+) diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index 907cebc012..00df335828 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -391,6 +391,10 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter): def homeHead(self): self._sendCommand("G28") + @pyqtSlot() + def homeBed(self): + self._sendCommand("G28 Z") + ## Directly send the command, withouth checking connection state (eg; printing). # \param cmd string with g-code def _sendCommand(self, cmd): diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index 076a2398fc..40735f8b0a 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -21,6 +21,7 @@ Item property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer Component.onCompleted: { + printer_connection.homeBed() printer_connection.homeHead() } UM.I18nCatalog { id: catalog; name:"cura"} From 479c6c3319151c79725472874880ba2c5f6612ae Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Mar 2016 14:57:44 +0100 Subject: [PATCH 2/3] Added extra relative move to prevent nozzle scraping CURA-1102 --- resources/qml/WizardPages/Bedleveling.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/WizardPages/Bedleveling.qml b/resources/qml/WizardPages/Bedleveling.qml index 40735f8b0a..1721f0fd4a 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -22,6 +22,7 @@ Item Component.onCompleted: { printer_connection.homeBed() + printer_connection.moveHeadRelative(0, 0, 3) printer_connection.homeHead() } UM.I18nCatalog { id: catalog; name:"cura"} From eeb2c0454a5de477af1403bd5a506aa411c9e562 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 17 Mar 2016 15:51:36 +0100 Subject: [PATCH 3/3] Build volume now uses linecount for disallowed areas CURA-1152 --- cura/BuildVolume.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index e9b90e3a61..8750cbe03f 100644 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -259,7 +259,7 @@ class BuildVolume(SceneNode): skirt_line_count = profile.getSettingValue("skirt_line_count") skirt_size = skirt_distance + (skirt_line_count * profile.getSettingValue("skirt_line_width")) elif adhesion_type == "brim": - skirt_size = profile.getSettingValue("brim_width") + skirt_size = profile.getSettingValue("brim_line_count") * profile.getSettingValue("skirt_line_width") elif adhesion_type == "raft": skirt_size = profile.getSettingValue("raft_margin")