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") diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index 951996f699..f915b54718 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..1721f0fd4a 100644 --- a/resources/qml/WizardPages/Bedleveling.qml +++ b/resources/qml/WizardPages/Bedleveling.qml @@ -21,6 +21,8 @@ Item property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer Component.onCompleted: { + printer_connection.homeBed() + printer_connection.moveHeadRelative(0, 0, 3) printer_connection.homeHead() } UM.I18nCatalog { id: catalog; name:"cura"}