diff --git a/plugins/USBPrinting/PrinterConnection.py b/plugins/USBPrinting/PrinterConnection.py index 59f3232575..d79d2ef67d 100644 --- a/plugins/USBPrinting/PrinterConnection.py +++ b/plugins/USBPrinting/PrinterConnection.py @@ -347,7 +347,7 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter): @pyqtSlot(int) def heatupBed(self, temperature): - self._sendCommand("M109 S%s" % temperature) + self._sendCommand("M140 S%s" % temperature) ## Directly send the command, withouth checking connection state (eg; printing). # \param cmd string with g-code @@ -466,7 +466,7 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter): if line is None: break # None is only returned when something went wrong. Stop listening - if time.time() > temperature_request_timeout: + if time.time() > temperature_request_timeout: if self._extruder_count > 0: self._temperature_requested_extruder_index = (self._temperature_requested_extruder_index + 1) % self._extruder_count self.sendCommand("M105 T%d" % (self._temperature_requested_extruder_index)) diff --git a/resources/qml/WizardPages/UltimakerCheckup.qml b/resources/qml/WizardPages/UltimakerCheckup.qml index 7d295042cd..b3f8f68cf0 100644 --- a/resources/qml/WizardPages/UltimakerCheckup.qml +++ b/resources/qml/WizardPages/UltimakerCheckup.qml @@ -18,6 +18,7 @@ Column property bool z_min_pressed: false property bool heater_works: false property int extruder_target_temp: 0 + property int bed_target_temp: 0 Component.onCompleted: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.startPollEndstop() @@ -97,7 +98,6 @@ Column heater_status_label.text = qsTr("Checking") UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.heatupNozzle(190) wizardPage.extruder_target_temp = 190 - console.log((UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.extruderTemperature < wizardPage.extruder_target_temp + 10)) } } Label @@ -107,6 +107,33 @@ Column } } + Row + { + Label + { + text: qsTr("bed temperature check: ") + } + Label + { + text: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.bedTemperature + } + Button + { + text: "Start heating" + onClicked: + { + bed_status_label.text = qsTr("Checking") + UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.heatupBed(60) + wizardPage.bed_target_temp = 60 + } + } + Label + { + id: bed_status_label + text: qsTr("Not checked") + } + } + Connections { @@ -134,6 +161,14 @@ Column UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.heatupNozzle(0) } } + onBedTemperatureChanged: + { + if(UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.bedTemperature > wizardPage.bed_target_temp - 5 && UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.bedTemperature < wizardPage.bed_target_temp + 5) + { + bed_status_label.text = qsTr("Works") + UM.USBPrinterManager.connectedPrinterList.getItem(0).printer.heatupBed(0) + } + } } ExclusiveGroup