Merge branch 'connection_rework'

This commit is contained in:
Ghostkeeper 2016-04-26 11:51:09 +02:00
commit fe68be4f62
8 changed files with 498 additions and 276 deletions

View file

@ -18,11 +18,11 @@ Item
property int platform_width: UM.MachineManager.getSettingValue("machine_width")
property int platform_height: UM.MachineManager.getSettingValue("machine_depth")
anchors.fill: parent;
property variant printer_connection: UM.USBPrinterManager.connectedPrinterList.getItem(0).printer
property variant printer_connection: Cura.USBPrinterManager.connectedPrinterList.getItem(0).printer
Component.onCompleted:
{
printer_connection.homeBed()
printer_connection.moveHeadRelative(0, 0, 3)
printer_connection.moveHead(0, 0, 3)
printer_connection.homeHead()
}
UM.I18nCatalog { id: catalog; name:"cura"}
@ -73,23 +73,23 @@ Item
{
if(wizardPage.leveling_state == 0)
{
printer_connection.moveHeadRelative(0, 0, 3)
printer_connection.moveHead(0, 0, 3)
printer_connection.homeHead()
printer_connection.moveHeadRelative(0, 0, 3)
printer_connection.moveHeadRelative(platform_width - 10, 0, 0)
printer_connection.moveHeadRelative(0, 0, -3)
printer_connection.moveHead(0, 0, 3)
printer_connection.moveHead(platform_width - 10, 0, 0)
printer_connection.moveHead(0, 0, -3)
}
if(wizardPage.leveling_state == 1)
{
printer_connection.moveHeadRelative(0, 0, 3)
printer_connection.moveHeadRelative(-platform_width/2, platform_height - 10, 0)
printer_connection.moveHeadRelative(0, 0, -3)
printer_connection.moveHead(0, 0, 3)
printer_connection.moveHead(-platform_width/2, platform_height - 10, 0)
printer_connection.moveHead(0, 0, -3)
}
if(wizardPage.leveling_state == 2)
{
printer_connection.moveHeadRelative(0, 0, 3)
printer_connection.moveHeadRelative(-platform_width/2 + 10, -(platform_height + 10), 0)
printer_connection.moveHeadRelative(0, 0, -3)
printer_connection.moveHead(0, 0, 3)
printer_connection.moveHead(-platform_width/2 + 10, -(platform_height + 10), 0)
printer_connection.moveHead(0, 0, -3)
}
wizardPage.leveling_state++
if (wizardPage.leveling_state >= 3){