GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 07:06:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added moveHead to usb printing

Browse Source 
And ensured that wizard page uses correct version again

CURA-1339
This commit is contained in:
Jaime van Kessel 2016-04-14 14:21:22 +02:00
parent fc88844cf8
commit 6b7fb894f8
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/USBPrinting/USBPrinterOutputDevice.py
View File

@ -126,6 +126,11 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
gcode_list = getattr( Application.getInstance().getController().getScene(), "gcode_list") gcode_list = getattr( Application.getInstance().getController().getScene(), "gcode_list")
self.printGCode(gcode_list) self.printGCode(gcode_list)
def _moveHead(self, x, y, z, speed):
self._sendCommand("G91")
self._sendCommand("G0 X%s Y%s Z%s F%s" % (x, y, z, speed))
self._sendCommand("G90")
## 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):

22
resources/qml/WizardPages/Bedleveling.qml
View File

@ -22,7 +22,7 @@ Item
Component.onCompleted: Component.onCompleted:
{ {
printer_connection.homeBed() printer_connection.homeBed()
printer_connection.moveHeadRelative(0, 0, 3) printer_connection.moveHead(0, 0, 3)
printer_connection.homeHead() printer_connection.homeHead()
} }
UM.I18nCatalog { id: catalog; name:"cura"} UM.I18nCatalog { id: catalog; name:"cura"}
@ -84,23 +84,23 @@ Item
{ {
if(wizardPage.leveling_state == 0) if(wizardPage.leveling_state == 0)
{ {
printer_connection.moveHeadRelative(0, 0, 3) printer_connection.moveHead(0, 0, 3)
printer_connection.homeHead() printer_connection.homeHead()
printer_connection.moveHeadRelative(0, 0, 3) printer_connection.moveHead(0, 0, 3)
printer_connection.moveHeadRelative(platform_width - 10, 0, 0) printer_connection.moveHead(platform_width - 10, 0, 0)
printer_connection.moveHeadRelative(0, 0, -3) printer_connection.moveHead(0, 0, -3)
} }
if(wizardPage.leveling_state == 1) if(wizardPage.leveling_state == 1)
{ {
printer_connection.moveHeadRelative(0, 0, 3) printer_connection.moveHead(0, 0, 3)
printer_connection.moveHeadRelative(-platform_width/2, platform_height - 10, 0) printer_connection.moveHead(-platform_width/2, platform_height - 10, 0)
printer_connection.moveHeadRelative(0, 0, -3) printer_connection.moveHead(0, 0, -3)
} }
if(wizardPage.leveling_state == 2) if(wizardPage.leveling_state == 2)
{ {
printer_connection.moveHeadRelative(0, 0, 3) printer_connection.moveHead(0, 0, 3)
printer_connection.moveHeadRelative(-platform_width/2 + 10, -(platform_height + 10), 0) printer_connection.moveHead(-platform_width/2 + 10, -(platform_height + 10), 0)
printer_connection.moveHeadRelative(0, 0, -3) printer_connection.moveHead(0, 0, -3)
} }
wizardPage.leveling_state++ wizardPage.leveling_state++
if (wizardPage.leveling_state >= 3){ if (wizardPage.leveling_state >= 3){