3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixes so the QML displays right temperatures again

Browse source 
CURA-1339
This commit is contained in:
Jaime van Kessel 2016-04-14 11:02:16 +02:00
parent ceb8ef86f8
commit 5f2e0ceec8
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/USBPrinting/USBPrinterOutputDevice.py
View file

@ -121,7 +121,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
## Start a print based on a g-code. ## Start a print based on a g-code.
# \param gcode_list List with gcode (strings). # \param gcode_list List with gcode (strings).
def printGCode(self, gcode_list): def printGCode(self, gcode_list):
if not self._progress or self._connection_state != ConnectionState.CONNECTED: if self._progress or self._connection_state != ConnectionState.CONNECTED:
Logger.log("d", "Printer is busy or not connected, aborting print") Logger.log("d", "Printer is busy or not connected, aborting print")
self.writeError.emit(self) self.writeError.emit(self)
return return
@ -363,7 +363,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
def sendCommand(self, cmd): def sendCommand(self, cmd):
if not self._progress: if not self._progress:
self._command_queue.put(cmd) self._command_queue.put(cmd)
elif self.isConnected(): elif self._connection_state == ConnectionState.CONNECTED:
self._sendCommand(cmd) self._sendCommand(cmd)
## Set the error state with a message. ## Set the error state with a message.

14
resources/qml/WizardPages/UltimakerCheckup.qml
View file

@ -239,7 +239,7 @@ Item
if(printer_connection != null) if(printer_connection != null)
{ {
nozzleTempStatus.text = catalog.i18nc("@info:progress","Checking") nozzleTempStatus.text = catalog.i18nc("@info:progress","Checking")
printer_connection.heatupNozzle(190) printer_connection.setHotendTemperature(0, 190)
wizardPage.extruder_target_temp = 190 wizardPage.extruder_target_temp = 190
} }
} }
@ -253,7 +253,7 @@ Item
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
width: wizardPage.rightRow * 0.2 width: wizardPage.rightRow * 0.2
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: printer_connection != null ? printer_connection.extruderTemperature + "°C" : "0°C" text: printer_connection != null ? printer_connection.hotendTemperatures[0] + "°C" : "0°C"
font.bold: true font.bold: true
} }
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -295,7 +295,7 @@ Item
if(printer_connection != null) if(printer_connection != null)
{ {
bedTempStatus.text = catalog.i18nc("@info:progress","Checking") bedTempStatus.text = catalog.i18nc("@info:progress","Checking")
printer_connection.heatupBed(60) printer_connection.setBedTemperature(60)
wizardPage.bed_target_temp = 60 wizardPage.bed_target_temp = 60
} }
} }
@ -348,16 +348,16 @@ Item
} }
} }
onExtruderTemperatureChanged: onHotendTemperaturesChanged:
{ {
if(printer_connection.extruderTemperature > wizardPage.extruder_target_temp - 10 && printer_connection.extruderTemperature < wizardPage.extruder_target_temp + 10) if(printer_connection.extruderTemperatures[0] > wizardPage.extruder_target_temp - 10 && printer_connection.extruderTemperatures[0] < wizardPage.extruder_target_temp + 10)
{ {
if(printer_connection != null) if(printer_connection != null)
{ {
nozzleTempStatus.text = catalog.i18nc("@info:status","Works") nozzleTempStatus.text = catalog.i18nc("@info:status","Works")
wizardPage.checkupProgress.nozzleTemp = true wizardPage.checkupProgress.nozzleTemp = true
checkTotalCheckUp() checkTotalCheckUp()
printer_connection.heatupNozzle(0) printer_connection.setTargetHotendTemperature(0, 0)
} }
} }
} }
@ -368,7 +368,7 @@ Item
bedTempStatus.text = catalog.i18nc("@info:status","Works") bedTempStatus.text = catalog.i18nc("@info:status","Works")
wizardPage.checkupProgress.bedTemp = true wizardPage.checkupProgress.bedTemp = true
checkTotalCheckUp() checkTotalCheckUp()
printer_connection.heatupBed(0) printer_connection.setBedTemperature(0)
} }
} }
} }