chiark / gitweb /
Enable retraction when selecting the UM2. Fix the reset-profile which clears out...
[cura.git] / Cura / gui / configWizard.py
index 54e8eb22dfd666391b71e0062a2b3b91ee1e9500..16452b4604abdfd625afdd2b98b248f50fd723b0 100644 (file)
@@ -1,6 +1,7 @@
-# coding=utf-8
 from __future__ import absolute_import
+__copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AGPLv3 License"
 
+import os
 import webbrowser
 import threading
 import time
@@ -13,7 +14,9 @@ from Cura.gui import firmwareInstall
 from Cura.gui import printWindow
 from Cura.util import machineCom
 from Cura.util import profile
-from Cura.util.resources import getPathForImage
+from Cura.util import gcodeGenerator
+from Cura.util import resources
+
 
 class InfoBox(wx.Panel):
        def __init__(self, parent):
@@ -23,14 +26,14 @@ class InfoBox(wx.Panel):
                self.sizer = wx.GridBagSizer(5, 5)
                self.SetSizer(self.sizer)
 
-               self.attentionBitmap = wx.Bitmap(getPathForImage('attention.png'))
-               self.errorBitmap = wx.Bitmap(getPathForImage('error.png'))
-               self.readyBitmap = wx.Bitmap(getPathForImage('ready.png'))
+               self.attentionBitmap = wx.Bitmap(resources.getPathForImage('attention.png'))
+               self.errorBitmap = wx.Bitmap(resources.getPathForImage('error.png'))
+               self.readyBitmap = wx.Bitmap(resources.getPathForImage('ready.png'))
                self.busyBitmap = [
-                       wx.Bitmap(getPathForImage('busy-0.png')),
-                       wx.Bitmap(getPathForImage('busy-1.png')),
-                       wx.Bitmap(getPathForImage('busy-2.png')),
-                       wx.Bitmap(getPathForImage('busy-3.png'))
+                       wx.Bitmap(resources.getPathForImage('busy-0.png')),
+                       wx.Bitmap(resources.getPathForImage('busy-1.png')),
+                       wx.Bitmap(resources.getPathForImage('busy-2.png')),
+                       wx.Bitmap(resources.getPathForImage('busy-3.png'))
                ]
 
                self.bitmap = wx.StaticBitmap(self, -1, wx.EmptyBitmapRGBA(24, 24, red=255, green=255, blue=255, alpha=1))
@@ -132,7 +135,7 @@ class InfoPage(wx.wizard.WizardPageSimple):
                self.rowNr += 1
 
        def AddHiddenSeperator(self):
-               self.AddText('')
+               self.AddText("")
 
        def AddInfoBox(self):
                infoBox = InfoBox(self)
@@ -213,127 +216,217 @@ class InfoPage(wx.wizard.WizardPageSimple):
 
 
 class FirstInfoPage(InfoPage):
-       def __init__(self, parent):
-               super(FirstInfoPage, self).__init__(parent, "First time run wizard")
-               self.AddText('Welcome, and thanks for trying Cura!')
-               self.AddSeperator()
-               self.AddText('This wizard will help you with the following steps:')
-               self.AddText('* Configure Cura for your machine')
-               self.AddText('* Upgrade your firmware')
-               self.AddText('* Check if your machine is working safely')
-               self.AddText('* Level your printer bed')
+       def __init__(self, parent, addNew):
+               if addNew:
+                       super(FirstInfoPage, self).__init__(parent, _("Add new machine wizard"))
+               else:
+                       super(FirstInfoPage, self).__init__(parent, _("First time run wizard"))
+                       self.AddText(_("Welcome, and thanks for trying Cura!"))
+                       self.AddSeperator()
+               self.AddText(_("This wizard will help you with the following steps:"))
+               self.AddText(_("* Configure Cura for your machine"))
+               self.AddText(_("* Optionally upgrade your firmware"))
+               self.AddText(_("* Optionally check if your machine is working safely"))
+               self.AddText(_("* Optionally level your printer bed"))
 
                #self.AddText('* Calibrate your machine')
                #self.AddText('* Do your first print')
 
 
-class RepRapInfoPage(InfoPage):
+class OtherMachineSelectPage(InfoPage):
        def __init__(self, parent):
-               super(RepRapInfoPage, self).__init__(parent, "RepRap information")
-               self.AddText(
-                       'RepRap machines are vastly different, and there is no\ndefault configuration in Cura for any of them.')
-               self.AddText('If you like a default profile for your machine added,\nthen make an issue on github.')
+               super(OtherMachineSelectPage, self).__init__(parent, "Other machine information")
+               self.AddText(_("The following pre-defined machine profiles are available"))
+               self.AddText(_("Note that these profiles are not guaranteed to give good results,\nor work at all. Extra tweaks might be required."))
+               self.options = []
+               machines = resources.getDefaultMachineProfiles()
+               machines.sort()
+               for filename in machines:
+                       name = os.path.splitext(os.path.basename(filename))[0]
+                       item = self.AddRadioButton(name)
+                       item.filename = filename
+                       item.Bind(wx.EVT_RADIOBUTTON, self.OnProfileSelect)
+                       self.options.append(item)
                self.AddSeperator()
-               self.AddText('You will have to manually install Marlin or Sprinter firmware.')
+               item = self.AddRadioButton('Custom...')
+               item.SetValue(True)
+               item.Bind(wx.EVT_RADIOBUTTON, self.OnOtherSelect)
+
+       def OnProfileSelect(self, e):
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().otherMachineInfoPage)
+
+       def OnOtherSelect(self, e):
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().customRepRapInfoPage)
+
+       def StoreData(self):
+               for option in self.options:
+                       if option.GetValue():
+                               profile.loadProfile(option.filename)
+                               profile.loadMachineSettings(option.filename)
+
+class OtherMachineInfoPage(InfoPage):
+       def __init__(self, parent):
+               super(OtherMachineInfoPage, self).__init__(parent, "Cura Ready!")
+               self.AddText(_("Cura is now ready to be used!"))
+
+class CustomRepRapInfoPage(InfoPage):
+       def __init__(self, parent):
+               super(CustomRepRapInfoPage, self).__init__(parent, "Custom RepRap information")
+               self.AddText(_("RepRap machines can be vastly different, so here you can set your own settings."))
+               self.AddText(_("Be sure to review the default profile before running it on your machine."))
+               self.AddText(_("If you like a default profile for your machine added,\nthen make an issue on github."))
+               self.AddSeperator()
+               self.AddText(_("You will have to manually install Marlin or Sprinter firmware."))
                self.AddSeperator()
-               self.machineWidth = self.AddLabelTextCtrl('Machine width (mm)', '80')
-               self.machineDepth = self.AddLabelTextCtrl('Machine depth (mm)', '80')
-               self.machineHeight = self.AddLabelTextCtrl('Machine height (mm)', '60')
-               self.nozzleSize = self.AddLabelTextCtrl('Nozzle size (mm)', '0.5')
-               self.heatedBed = self.AddCheckbox('Heated bed')
-               self.HomeAtCenter = self.AddCheckbox('Bed center is 0,0,0 (RoStock)')
+               self.machineName = self.AddLabelTextCtrl(_("Machine name"), "RepRap")
+               self.machineWidth = self.AddLabelTextCtrl(_("Machine width (mm)"), "80")
+               self.machineDepth = self.AddLabelTextCtrl(_("Machine depth (mm)"), "80")
+               self.machineHeight = self.AddLabelTextCtrl(_("Machine height (mm)"), "60")
+               self.nozzleSize = self.AddLabelTextCtrl(_("Nozzle size (mm)"), "0.5")
+               self.heatedBed = self.AddCheckbox(_("Heated bed"))
+               self.HomeAtCenter = self.AddCheckbox(_("Bed center is 0,0,0 (RoStock)"))
 
        def StoreData(self):
-               profile.putPreference('machine_width', self.machineWidth.GetValue())
-               profile.putPreference('machine_depth', self.machineDepth.GetValue())
-               profile.putPreference('machine_height', self.machineHeight.GetValue())
+               profile.putMachineSetting('machine_name', self.machineName.GetValue())
+               profile.putMachineSetting('machine_width', self.machineWidth.GetValue())
+               profile.putMachineSetting('machine_depth', self.machineDepth.GetValue())
+               profile.putMachineSetting('machine_height', self.machineHeight.GetValue())
                profile.putProfileSetting('nozzle_size', self.nozzleSize.GetValue())
                profile.putProfileSetting('wall_thickness', float(profile.getProfileSettingFloat('nozzle_size')) * 2)
-               profile.putPreference('has_heated_bed', str(self.heatedBed.GetValue()))
-               profile.putPreference('machine_center_is_zero', str(self.HomeAtCenter.GetValue()))
-
+               profile.putMachineSetting('has_heated_bed', str(self.heatedBed.GetValue()))
+               profile.putMachineSetting('machine_center_is_zero', str(self.HomeAtCenter.GetValue()))
+               profile.putMachineSetting('extruder_head_size_min_x', '0')
+               profile.putMachineSetting('extruder_head_size_min_y', '0')
+               profile.putMachineSetting('extruder_head_size_max_x', '0')
+               profile.putMachineSetting('extruder_head_size_max_y', '0')
+               profile.putMachineSetting('extruder_head_size_height', '0')
+               profile.checkAndUpdateMachineName()
 
 class MachineSelectPage(InfoPage):
        def __init__(self, parent):
-               super(MachineSelectPage, self).__init__(parent, "Select your machine")
-               self.AddText('What kind of machine do you have:')
+               super(MachineSelectPage, self).__init__(parent, _("Select your machine"))
+               self.AddText(_("What kind of machine do you have:"))
 
-               self.UltimakerRadio = self.AddRadioButton("Ultimaker", style=wx.RB_GROUP)
-               self.UltimakerRadio.SetValue(True)
+               self.Ultimaker2Radio = self.AddRadioButton("Ultimaker2", style=wx.RB_GROUP)
+               self.Ultimaker2Radio.SetValue(True)
+               self.Ultimaker2Radio.Bind(wx.EVT_RADIOBUTTON, self.OnUltimaker2Select)
+               self.UltimakerRadio = self.AddRadioButton("Ultimaker")
                self.UltimakerRadio.Bind(wx.EVT_RADIOBUTTON, self.OnUltimakerSelect)
-               self.OtherRadio = self.AddRadioButton("Other (Ex: RepRap)")
+               self.OtherRadio = self.AddRadioButton(_("Other (Ex: RepRap, MakerBot)"))
                self.OtherRadio.Bind(wx.EVT_RADIOBUTTON, self.OnOtherSelect)
+               self.AddSeperator()
+               self.AddText(_("The collection of anonymous usage information helps with the continued improvement of Cura."))
+               self.AddText(_("This does NOT submit your models online nor gathers any privacy related information."))
+               self.SubmitUserStats = self.AddCheckbox(_("Submit anonymous usage information:"))
+               self.AddText(_("For full details see: http://wiki.ultimaker.com/Cura:stats"))
+               self.SubmitUserStats.SetValue(True)
+
+       def OnUltimaker2Select(self, e):
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().ultimaker2ReadyPage)
 
        def OnUltimakerSelect(self, e):
-               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().ultimakerFirmwareUpgradePage)
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().ultimakerSelectParts)
 
        def OnOtherSelect(self, e):
-               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().repRapInfoPage)
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().otherMachineSelectPage)
+
+       def AllowNext(self):
+               wx.wizard.WizardPageSimple.Chain(self, self.GetParent().ultimaker2ReadyPage)
+               return True
 
        def StoreData(self):
-               if self.UltimakerRadio.GetValue():
-                       profile.putPreference('machine_width', '205')
-                       profile.putPreference('machine_depth', '205')
-                       profile.putPreference('machine_height', '200')
-                       profile.putPreference('machine_type', 'ultimaker')
-                       profile.putPreference('machine_center_is_zero', 'False')
+               if self.Ultimaker2Radio.GetValue():
+                       profile.putMachineSetting('machine_width', '230')
+                       profile.putMachineSetting('machine_depth', '225')
+                       profile.putMachineSetting('machine_height', '205')
+                       profile.putMachineSetting('machine_name', 'ultimaker2')
+                       profile.putMachineSetting('machine_type', 'ultimaker2')
+                       profile.putMachineSetting('machine_center_is_zero', 'False')
+                       profile.putMachineSetting('has_heated_bed', 'True')
+                       profile.putMachineSetting('gcode_flavor', 'UltiGCode')
                        profile.putProfileSetting('nozzle_size', '0.4')
+                       profile.putProfileSetting('retraction_enable', 'True')
+                       profile.putMachineSetting('extruder_head_size_min_x', '40.0')
+                       profile.putMachineSetting('extruder_head_size_min_y', '10.0')
+                       profile.putMachineSetting('extruder_head_size_max_x', '60.0')
+                       profile.putMachineSetting('extruder_head_size_max_y', '30.0')
+                       profile.putMachineSetting('extruder_head_size_height', '60.0')
+               elif self.UltimakerRadio.GetValue():
+                       profile.putMachineSetting('machine_width', '205')
+                       profile.putMachineSetting('machine_depth', '205')
+                       profile.putMachineSetting('machine_height', '200')
+                       profile.putMachineSetting('machine_name', 'ultimaker')
+                       profile.putMachineSetting('machine_type', 'ultimaker')
+                       profile.putMachineSetting('machine_center_is_zero', 'False')
+                       profile.putMachineSetting('gcode_flavor', 'RepRap (Marlin/Sprinter)')
+                       profile.putProfileSetting('nozzle_size', '0.4')
+                       profile.putMachineSetting('extruder_head_size_min_x', '75.0')
+                       profile.putMachineSetting('extruder_head_size_min_y', '18.0')
+                       profile.putMachineSetting('extruder_head_size_max_x', '18.0')
+                       profile.putMachineSetting('extruder_head_size_max_y', '35.0')
+                       profile.putMachineSetting('extruder_head_size_height', '60.0')
                else:
-                       profile.putPreference('machine_width', '80')
-                       profile.putPreference('machine_depth', '80')
-                       profile.putPreference('machine_height', '60')
-                       profile.putPreference('machine_type', 'reprap')
+                       profile.putMachineSetting('machine_width', '80')
+                       profile.putMachineSetting('machine_depth', '80')
+                       profile.putMachineSetting('machine_height', '60')
+                       profile.putMachineSetting('machine_name', 'reprap')
+                       profile.putMachineSetting('machine_type', 'reprap')
+                       profile.putMachineSetting('gcode_flavor', 'RepRap (Marlin/Sprinter)')
                        profile.putPreference('startMode', 'Normal')
                        profile.putProfileSetting('nozzle_size', '0.5')
+                       profile.putProfileSetting('retraction_enable', 'True')
+               profile.checkAndUpdateMachineName()
                profile.putProfileSetting('wall_thickness', float(profile.getProfileSetting('nozzle_size')) * 2)
+               if self.SubmitUserStats.GetValue():
+                       profile.putPreference('submit_slice_information', 'True')
+               else:
+                       profile.putPreference('submit_slice_information', 'False')
 
 
 class SelectParts(InfoPage):
        def __init__(self, parent):
-               super(SelectParts, self).__init__(parent, "Select upgraded parts you have")
-               self.AddText('To assist you in having better default settings for your Ultimaker\nCura would like to know which upgrades you have in your machine.')
+               super(SelectParts, self).__init__(parent, _("Select upgraded parts you have"))
+               self.AddText(_("To assist you in having better default settings for your Ultimaker\nCura would like to know which upgrades you have in your machine."))
                self.AddSeperator()
-               self.springExtruder = self.AddCheckbox('Extruder drive upgrade')
-               self.heatedBed = self.AddCheckbox('Heated printer bed (self built)')
-               self.dualExtrusion = self.AddCheckbox('Dual extrusion (experimental)')
+               self.springExtruder = self.AddCheckbox(_("Extruder drive upgrade"))
+               self.heatedBed = self.AddCheckbox(_("Heated printer bed (self built)"))
+               self.dualExtrusion = self.AddCheckbox(_("Dual extrusion (experimental)"))
                self.AddSeperator()
-               self.AddText('If you have an Ultimaker bought after october 2012 you will have the\nExtruder drive upgrade. If you do not have this upgrade,\nit is highly recommended to improve reliability.')
-               self.AddText('This upgrade can be bought from the Ultimaker webshop\nor found on thingiverse as thing:26094')
+               self.AddText(_("If you have an Ultimaker bought after october 2012 you will have the\nExtruder drive upgrade. If you do not have this upgrade,\nit is highly recommended to improve reliability."))
+               self.AddText(_("This upgrade can be bought from the Ultimaker webshop\nor found on thingiverse as thing:26094"))
                self.springExtruder.SetValue(True)
 
        def StoreData(self):
-               profile.putPreference('ultimaker_extruder_upgrade', str(self.springExtruder.GetValue()))
-               profile.putPreference('has_heated_bed', str(self.heatedBed.GetValue()))
+               profile.putMachineSetting('ultimaker_extruder_upgrade', str(self.springExtruder.GetValue()))
+               profile.putMachineSetting('has_heated_bed', str(self.heatedBed.GetValue()))
                if self.dualExtrusion.GetValue():
-                       profile.putPreference('extruder_amount', '2')
+                       profile.putMachineSetting('extruder_amount', '2')
+                       profile.putMachineSetting('machine_depth', '195')
                else:
-                       profile.putPreference('extruder_amount', '1')
-               if profile.getPreference('ultimaker_extruder_upgrade') == 'True':
+                       profile.putMachineSetting('extruder_amount', '1')
+               if profile.getMachineSetting('ultimaker_extruder_upgrade') == 'True':
                        profile.putProfileSetting('retraction_enable', 'True')
                else:
                        profile.putProfileSetting('retraction_enable', 'False')
 
 
-class FirmwareUpgradePage(InfoPage):
+class UltimakerFirmwareUpgradePage(InfoPage):
        def __init__(self, parent):
-               super(FirmwareUpgradePage, self).__init__(parent, "Upgrade Ultimaker Firmware")
-               self.AddText(
-                       'Firmware is the piece of software running directly on your 3D printer.\nThis firmware controls the step motors, regulates the temperature\nand ultimately makes your printer work.')
+               super(UltimakerFirmwareUpgradePage, self).__init__(parent, _("Upgrade Ultimaker Firmware"))
+               self.AddText(_("Firmware is the piece of software running directly on your 3D printer.\nThis firmware controls the step motors, regulates the temperature\nand ultimately makes your printer work."))
                self.AddHiddenSeperator()
-               self.AddText(
-                       'The firmware shipping with new Ultimakers works, but upgrades\nhave been made to make better prints, and make calibration easier.')
+               self.AddText(_("The firmware shipping with new Ultimakers works, but upgrades\nhave been made to make better prints, and make calibration easier."))
                self.AddHiddenSeperator()
-               self.AddText(
-                       'Cura requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now.')
+               self.AddText(_("Cura requires these new features and thus\nyour firmware will most likely need to be upgraded.\nYou will get the chance to do so now."))
                upgradeButton, skipUpgradeButton = self.AddDualButton('Upgrade to Marlin firmware', 'Skip upgrade')
                upgradeButton.Bind(wx.EVT_BUTTON, self.OnUpgradeClick)
                skipUpgradeButton.Bind(wx.EVT_BUTTON, self.OnSkipClick)
                self.AddHiddenSeperator()
-               self.AddText('Do not upgrade to this firmware if:')
-               self.AddText('* You have an older machine based on ATMega1280')
-               self.AddText('* Have other changes in the firmware')
-               button = self.AddButton('Goto this page for a custom firmware')
-               button.Bind(wx.EVT_BUTTON, self.OnUrlClick)
+               self.AddText(_("Do not upgrade to this firmware if:"))
+               self.AddText(_("* You have an older machine based on ATMega1280"))
+               self.AddText(_("* Have other changes in the firmware"))
+#              button = self.AddButton('Goto this page for a custom firmware')
+#              button.Bind(wx.EVT_BUTTON, self.OnUrlClick)
 
        def AllowNext(self):
                return False
@@ -344,40 +437,40 @@ class FirmwareUpgradePage(InfoPage):
 
        def OnSkipClick(self, e):
                self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()
+               self.GetParent().ShowPage(self.GetNext())
 
        def OnUrlClick(self, e):
-               webbrowser.open('http://daid.mine.nu/~daid/marlin_build/')
-
+               webbrowser.open('http://marlinbuilder.robotfuzz.com/')
 
 class UltimakerCheckupPage(InfoPage):
        def __init__(self, parent):
                super(UltimakerCheckupPage, self).__init__(parent, "Ultimaker Checkup")
 
-               self.checkBitmap = wx.Bitmap(getPathForImage('checkmark.png'))
-               self.crossBitmap = wx.Bitmap(getPathForImage('cross.png'))
-               self.unknownBitmap = wx.Bitmap(getPathForImage('question.png'))
-               self.endStopNoneBitmap = wx.Bitmap(getPathForImage('endstop_none.png'))
-               self.endStopXMinBitmap = wx.Bitmap(getPathForImage('endstop_xmin.png'))
-               self.endStopXMaxBitmap = wx.Bitmap(getPathForImage('endstop_xmax.png'))
-               self.endStopYMinBitmap = wx.Bitmap(getPathForImage('endstop_ymin.png'))
-               self.endStopYMaxBitmap = wx.Bitmap(getPathForImage('endstop_ymax.png'))
-               self.endStopZMinBitmap = wx.Bitmap(getPathForImage('endstop_zmin.png'))
-               self.endStopZMaxBitmap = wx.Bitmap(getPathForImage('endstop_zmax.png'))
+               self.checkBitmap = wx.Bitmap(resources.getPathForImage('checkmark.png'))
+               self.crossBitmap = wx.Bitmap(resources.getPathForImage('cross.png'))
+               self.unknownBitmap = wx.Bitmap(resources.getPathForImage('question.png'))
+               self.endStopNoneBitmap = wx.Bitmap(resources.getPathForImage('endstop_none.png'))
+               self.endStopXMinBitmap = wx.Bitmap(resources.getPathForImage('endstop_xmin.png'))
+               self.endStopXMaxBitmap = wx.Bitmap(resources.getPathForImage('endstop_xmax.png'))
+               self.endStopYMinBitmap = wx.Bitmap(resources.getPathForImage('endstop_ymin.png'))
+               self.endStopYMaxBitmap = wx.Bitmap(resources.getPathForImage('endstop_ymax.png'))
+               self.endStopZMinBitmap = wx.Bitmap(resources.getPathForImage('endstop_zmin.png'))
+               self.endStopZMaxBitmap = wx.Bitmap(resources.getPathForImage('endstop_zmax.png'))
 
                self.AddText(
-                       'It is a good idea to do a few sanity checks now on your Ultimaker.\nYou can skip these if you know your machine is functional.')
-               b1, b2 = self.AddDualButton('Run checks', 'Skip checks')
+                       _("It is a good idea to do a few sanity checks now on your Ultimaker.\nYou can skip these if you know your machine is functional."))
+               b1, b2 = self.AddDualButton(_("Run checks"), _("Skip checks"))
                b1.Bind(wx.EVT_BUTTON, self.OnCheckClick)
                b2.Bind(wx.EVT_BUTTON, self.OnSkipClick)
                self.AddSeperator()
-               self.commState = self.AddCheckmark('Communication:', self.unknownBitmap)
-               self.tempState = self.AddCheckmark('Temperature:', self.unknownBitmap)
-               self.stopState = self.AddCheckmark('Endstops:', self.unknownBitmap)
+               self.commState = self.AddCheckmark(_("Communication:"), self.unknownBitmap)
+               self.tempState = self.AddCheckmark(_("Temperature:"), self.unknownBitmap)
+               self.stopState = self.AddCheckmark(_("Endstops:"), self.unknownBitmap)
                self.AddSeperator()
                self.infoBox = self.AddInfoBox()
-               self.machineState = self.AddText('')
-               self.temperatureLabel = self.AddText('')
-               self.errorLogButton = self.AddButton('Show error log')
+               self.machineState = self.AddText("")
+               self.temperatureLabel = self.AddText("")
+               self.errorLogButton = self.AddButton(_("Show error log"))
                self.errorLogButton.Show(False)
                self.AddSeperator()
                self.endstopBitmap = self.AddBitmap(self.endStopNoneBitmap)
@@ -401,6 +494,7 @@ class UltimakerCheckupPage(InfoPage):
 
        def OnSkipClick(self, e):
                self.GetParent().FindWindowById(wx.ID_FORWARD).Enable()
+               self.GetParent().ShowPage(self.GetNext())
 
        def OnCheckClick(self, e=None):
                self.errorLogButton.Show(False)
@@ -410,11 +504,12 @@ class UltimakerCheckupPage(InfoPage):
                        self.comm = None
                        wx.CallAfter(self.OnCheckClick)
                        return
-               self.infoBox.SetBusy('Connecting to machine.')
+               self.infoBox.SetBusy(_("Connecting to machine."))
                self.commState.SetBitmap(self.unknownBitmap)
                self.tempState.SetBitmap(self.unknownBitmap)
                self.stopState.SetBitmap(self.unknownBitmap)
                self.checkupState = 0
+               self.checkExtruderNr = 0
                self.comm = machineCom.MachineCom(callbackObject=self)
 
        def OnErrorLog(self, e):
@@ -428,62 +523,67 @@ class UltimakerCheckupPage(InfoPage):
                        return
                if self.checkupState == 0:
                        self.tempCheckTimeout = 20
-                       if temp > 70:
+                       if temp[self.checkExtruderNr] > 70:
                                self.checkupState = 1
-                               wx.CallAfter(self.infoBox.SetInfo, 'Cooldown before temperature check.')
-                               self.comm.sendCommand('M104 S0')
-                               self.comm.sendCommand('M104 S0')
+                               wx.CallAfter(self.infoBox.SetInfo, _("Cooldown before temperature check."))
+                               self.comm.sendCommand("M104 S0 T%d" % (self.checkExtruderNr))
+                               self.comm.sendCommand('M104 S0 T%d' % (self.checkExtruderNr))
                        else:
-                               self.startTemp = temp
+                               self.startTemp = temp[self.checkExtruderNr]
                                self.checkupState = 2
-                               wx.CallAfter(self.infoBox.SetInfo, 'Checking the heater and temperature sensor.')
-                               self.comm.sendCommand('M104 S200')
-                               self.comm.sendCommand('M104 S200')
+                               wx.CallAfter(self.infoBox.SetInfo, _("Checking the heater and temperature sensor."))
+                               self.comm.sendCommand('M104 S200 T%d' % (self.checkExtruderNr))
+                               self.comm.sendCommand('M104 S200 T%d' % (self.checkExtruderNr))
                elif self.checkupState == 1:
                        if temp < 60:
-                               self.startTemp = temp
+                               self.startTemp = temp[self.checkExtruderNr]
                                self.checkupState = 2
-                               wx.CallAfter(self.infoBox.SetInfo, 'Checking the heater and temperature sensor.')
-                               self.comm.sendCommand('M104 S200')
-                               self.comm.sendCommand('M104 S200')
+                               wx.CallAfter(self.infoBox.SetInfo, _("Checking the heater and temperature sensor."))
+                               self.comm.sendCommand('M104 S200 T%d' % (self.checkExtruderNr))
+                               self.comm.sendCommand('M104 S200 T%d' % (self.checkExtruderNr))
                elif self.checkupState == 2:
                        #print "WARNING, TEMPERATURE TEST DISABLED FOR TESTING!"
-                       if temp > self.startTemp + 40:
-                               self.checkupState = 3
-                               wx.CallAfter(self.infoBox.SetAttention, 'Please make sure none of the endstops are pressed.')
-                               wx.CallAfter(self.endstopBitmap.Show, True)
-                               wx.CallAfter(self.Layout)
-                               self.comm.sendCommand('M104 S0')
-                               self.comm.sendCommand('M104 S0')
-                               self.comm.sendCommand('M119')
-                               wx.CallAfter(self.tempState.SetBitmap, self.checkBitmap)
+                       if temp[self.checkExtruderNr] > self.startTemp + 40:
+                               self.comm.sendCommand('M104 S0 T%d' % (self.checkExtruderNr))
+                               self.comm.sendCommand('M104 S0 T%d' % (self.checkExtruderNr))
+                               if self.checkExtruderNr < int(profile.getMachineSetting('extruder_amount')):
+                                       self.checkExtruderNr = 0
+                                       self.checkupState = 3
+                                       wx.CallAfter(self.infoBox.SetAttention, _("Please make sure none of the endstops are pressed."))
+                                       wx.CallAfter(self.endstopBitmap.Show, True)
+                                       wx.CallAfter(self.Layout)
+                                       self.comm.sendCommand('M119')
+                                       wx.CallAfter(self.tempState.SetBitmap, self.checkBitmap)
+                               else:
+                                       self.checkupState = 0
+                                       self.checkExtruderNr += 1
                        else:
                                self.tempCheckTimeout -= 1
                                if self.tempCheckTimeout < 1:
                                        self.checkupState = -1
                                        wx.CallAfter(self.tempState.SetBitmap, self.crossBitmap)
-                                       wx.CallAfter(self.infoBox.SetError, 'Temperature measurement FAILED!', 'http://wiki.ultimaker.com/Cura:_Temperature_measurement_problems')
-                                       self.comm.sendCommand('M104 S0')
-                                       self.comm.sendCommand('M104 S0')
+                                       wx.CallAfter(self.infoBox.SetError, _("Temperature measurement FAILED!"), 'http://wiki.ultimaker.com/Cura:_Temperature_measurement_problems')
+                                       self.comm.sendCommand('M104 S0 T%d' % (self.checkExtruderNr))
+                                       self.comm.sendCommand('M104 S0 T%d' % (self.checkExtruderNr))
                elif self.checkupState >= 3 and self.checkupState < 10:
                        self.comm.sendCommand('M119')
-               wx.CallAfter(self.temperatureLabel.SetLabel, 'Head temperature: %d' % (temp))
+               wx.CallAfter(self.temperatureLabel.SetLabel, _("Head temperature: %d") % (temp[self.checkExtruderNr]))
 
        def mcStateChange(self, state):
                if self.comm is None:
                        return
                if self.comm.isOperational():
                        wx.CallAfter(self.commState.SetBitmap, self.checkBitmap)
-                       wx.CallAfter(self.machineState.SetLabel, 'Communication State: %s' % (self.comm.getStateString()))
+                       wx.CallAfter(self.machineState.SetLabel, _("Communication State: %s") % (self.comm.getStateString()))
                elif self.comm.isError():
                        wx.CallAfter(self.commState.SetBitmap, self.crossBitmap)
-                       wx.CallAfter(self.infoBox.SetError, 'Failed to establish connection with the printer.', 'http://wiki.ultimaker.com/Cura:_Connection_problems')
+                       wx.CallAfter(self.infoBox.SetError, _("Failed to establish connection with the printer."), 'http://wiki.ultimaker.com/Cura:_Connection_problems')
                        wx.CallAfter(self.endstopBitmap.Show, False)
                        wx.CallAfter(self.machineState.SetLabel, '%s' % (self.comm.getErrorString()))
                        wx.CallAfter(self.errorLogButton.Show, True)
                        wx.CallAfter(self.Layout)
                else:
-                       wx.CallAfter(self.machineState.SetLabel, 'Communication State: %s' % (self.comm.getStateString()))
+                       wx.CallAfter(self.machineState.SetLabel, _("Communication State: %s") % (self.comm.getStateString()))
 
        def mcMessage(self, message):
                if self.checkupState >= 3 and self.checkupState < 10 and ('_min' in message or '_max' in message):
@@ -522,38 +622,38 @@ class UltimakerCheckupPage(InfoPage):
                        if self.checkupState == 3:
                                if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
                                        self.checkupState = 4
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the right X endstop.')
+                                       wx.CallAfter(self.infoBox.SetAttention, _("Please press the right X endstop."))
                                        wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopXMaxBitmap)
                        elif self.checkupState == 4:
                                if not self.xMinStop and self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
                                        self.checkupState = 5
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the left X endstop.')
+                                       wx.CallAfter(self.infoBox.SetAttention, _("Please press the left X endstop."))
                                        wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopXMinBitmap)
                        elif self.checkupState == 5:
                                if self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
                                        self.checkupState = 6
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the front Y endstop.')
+                                       wx.CallAfter(self.infoBox.SetAttention, _("Please press the front Y endstop."))
                                        wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopYMinBitmap)
                        elif self.checkupState == 6:
                                if not self.xMinStop and not self.xMaxStop and self.yMinStop and not self.yMaxStop and not self.zMinStop and not self.zMaxStop:
                                        self.checkupState = 7
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the back Y endstop.')
+                                       wx.CallAfter(self.infoBox.SetAttention, _("Please press the back Y endstop."))
                                        wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopYMaxBitmap)
                        elif self.checkupState == 7:
                                if not self.xMinStop and not self.xMaxStop and not self.yMinStop and self.yMaxStop and not self.zMinStop and not self.zMaxStop:
                                        self.checkupState = 8
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the top Z endstop.')
+                                       wx.CallAfter(self.infoBox.SetAttention, _("Please press the top Z endstop."))
                                        wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopZMinBitmap)
                        elif self.checkupState == 8:
                                if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and self.zMinStop and not self.zMaxStop:
                                        self.checkupState = 9
-                                       wx.CallAfter(self.infoBox.SetAttention, 'Please press the bottom Z endstop.')
+                                       wx.CallAfter(self.infoBox.SetAttention, _("Please press the bottom Z endstop."))
                                        wx.CallAfter(self.endstopBitmap.SetBitmap, self.endStopZMaxBitmap)
                        elif self.checkupState == 9:
                                if not self.xMinStop and not self.xMaxStop and not self.yMinStop and not self.yMaxStop and not self.zMinStop and self.zMaxStop:
                                        self.checkupState = 10
                                        self.comm.close()
-                                       wx.CallAfter(self.infoBox.SetInfo, 'Checkup finished')
+                                       wx.CallAfter(self.infoBox.SetInfo, _("Checkup finished"))
                                        wx.CallAfter(self.infoBox.SetReadyIndicator)
                                        wx.CallAfter(self.endstopBitmap.Show, False)
                                        wx.CallAfter(self.stopState.SetBitmap, self.checkBitmap)
@@ -593,23 +693,23 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
        def __init__(self, parent):
                super(UltimakerCalibrateStepsPerEPage, self).__init__(parent, "Ultimaker Calibration")
 
-               if profile.getPreference('steps_per_e') == '0':
-                       profile.putPreference('steps_per_e', '865.888')
-
-               self.AddText("Calibrating the Steps Per E requires some manual actions.")
-               self.AddText("First remove any filament from your machine.")
-               self.AddText("Next put in your filament so the tip is aligned with the\ntop of the extruder drive.")
-               self.AddText("We'll push the filament 100mm")
-               self.extrudeButton = self.AddButton("Extrude 100mm filament")
-               self.AddText("Now measure the amount of extruded filament:\n(this can be more or less then 100mm)")
-               self.lengthInput, self.saveLengthButton = self.AddTextCtrlButton('100', 'Save')
-               self.AddText("This results in the following steps per E:")
-               self.stepsPerEInput = self.AddTextCtrl(profile.getPreference('steps_per_e'))
-               self.AddText("You can repeat these steps to get better calibration.")
+               #if profile.getMachineSetting('steps_per_e') == '0':
+               #       profile.putMachineSetting('steps_per_e', '865.888')
+
+               self.AddText(_("Calibrating the Steps Per E requires some manual actions."))
+               self.AddText(_("First remove any filament from your machine."))
+               self.AddText(_("Next put in your filament so the tip is aligned with the\ntop of the extruder drive."))
+               self.AddText(_("We'll push the filament 100mm"))
+               self.extrudeButton = self.AddButton(_("Extrude 100mm filament"))
+               self.AddText(_("Now measure the amount of extruded filament:\n(this can be more or less then 100mm)"))
+               self.lengthInput, self.saveLengthButton = self.AddTextCtrlButton("100", _("Save"))
+               self.AddText(_("This results in the following steps per E:"))
+               self.stepsPerEInput = self.AddTextCtrl(profile.getMachineSetting('steps_per_e'))
+               self.AddText(_("You can repeat these steps to get better calibration."))
                self.AddSeperator()
                self.AddText(
-                       "If you still have filament in your printer which needs\nheat to remove, press the heat up button below:")
-               self.heatButton = self.AddButton("Heatup for filament removal")
+                       _("If you still have filament in your printer which needs\nheat to remove, press the heat up button below:"))
+               self.heatButton = self.AddButton(_("Heatup for filament removal"))
 
                self.saveLengthButton.Bind(wx.EVT_BUTTON, self.OnSaveLengthClick)
                self.extrudeButton.Bind(wx.EVT_BUTTON, self.OnExtrudeClick)
@@ -632,7 +732,7 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
                self.comm = machineCom.MachineCom()
                if not self.comm.isOpen():
                        wx.MessageBox(
-                               "Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable",
+                               _("Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable"),
                                'Printer error', wx.OK | wx.ICON_INFORMATION)
                        self.heatButton.Enable(True)
                        self.extrudeButton.Enable(True)
@@ -664,7 +764,7 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
                self.comm = machineCom.MachineCom()
                if not self.comm.isOpen():
                        wx.MessageBox(
-                               "Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable",
+                               _("Error: Failed to open serial port to machine\nIf this keeps happening, try disconnecting and reconnecting the USB cable"),
                                'Printer error', wx.OK | wx.ICON_INFORMATION)
                        self.heatButton.Enable(True)
                        self.extrudeButton.Enable(True)
@@ -702,30 +802,43 @@ class UltimakerCalibrateStepsPerEPage(InfoPage):
        def StoreData(self):
                profile.putPreference('steps_per_e', self.stepsPerEInput.GetValue())
 
+class Ultimaker2ReadyPage(InfoPage):
+       def __init__(self, parent):
+               super(Ultimaker2ReadyPage, self).__init__(parent, "Ultimaker2")
+               self.AddText('Congratulations on your the purchase of your brand new Ultimaker2.')
+               self.AddText('Cura is now ready to be used with your Ultimaker2.')
+               self.AddSeperator()
 
 class configWizard(wx.wizard.Wizard):
-       def __init__(self):
+       def __init__(self, addNew = False):
                super(configWizard, self).__init__(None, -1, "Configuration Wizard")
 
                self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged)
                self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGING, self.OnPageChanging)
 
-               self.firstInfoPage = FirstInfoPage(self)
+               self.firstInfoPage = FirstInfoPage(self, addNew)
                self.machineSelectPage = MachineSelectPage(self)
                self.ultimakerSelectParts = SelectParts(self)
-               self.ultimakerFirmwareUpgradePage = FirmwareUpgradePage(self)
+               self.ultimakerFirmwareUpgradePage = UltimakerFirmwareUpgradePage(self)
                self.ultimakerCheckupPage = UltimakerCheckupPage(self)
                self.ultimakerCalibrationPage = UltimakerCalibrationPage(self)
                self.ultimakerCalibrateStepsPerEPage = UltimakerCalibrateStepsPerEPage(self)
                self.bedLevelPage = bedLevelWizardMain(self)
-               self.repRapInfoPage = RepRapInfoPage(self)
+               self.headOffsetCalibration = headOffsetCalibrationPage(self)
+               self.otherMachineSelectPage = OtherMachineSelectPage(self)
+               self.customRepRapInfoPage = CustomRepRapInfoPage(self)
+               self.otherMachineInfoPage = OtherMachineInfoPage(self)
+
+               self.ultimaker2ReadyPage = Ultimaker2ReadyPage(self)
 
                wx.wizard.WizardPageSimple.Chain(self.firstInfoPage, self.machineSelectPage)
+               #wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimaker2ReadyPage)
                wx.wizard.WizardPageSimple.Chain(self.machineSelectPage, self.ultimakerSelectParts)
                wx.wizard.WizardPageSimple.Chain(self.ultimakerSelectParts, self.ultimakerFirmwareUpgradePage)
                wx.wizard.WizardPageSimple.Chain(self.ultimakerFirmwareUpgradePage, self.ultimakerCheckupPage)
                wx.wizard.WizardPageSimple.Chain(self.ultimakerCheckupPage, self.bedLevelPage)
                #wx.wizard.WizardPageSimple.Chain(self.ultimakerCalibrationPage, self.ultimakerCalibrateStepsPerEPage)
+               wx.wizard.WizardPageSimple.Chain(self.otherMachineSelectPage, self.customRepRapInfoPage)
 
                self.FitToPage(self.firstInfoPage)
                self.GetPageAreaSizer().Add(self.firstInfoPage)
@@ -778,29 +891,31 @@ class bedLevelWizardMain(InfoPage):
                self._wizardState = 0
 
        def AllowNext(self):
+               if self.GetParent().headOffsetCalibration is not None and int(profile.getMachineSetting('extruder_amount')) > 1:
+                       wx.wizard.WizardPageSimple.Chain(self, self.GetParent().headOffsetCalibration)
                return True
 
        def OnResume(self, e):
-               feedZ = profile.getProfileSettingFloat('max_z_speed') * 60
+               feedZ = profile.getProfileSettingFloat('print_speed') * 60
                feedTravel = profile.getProfileSettingFloat('travel_speed') * 60
                if self._wizardState == 2:
                        wx.CallAfter(self.infoBox.SetBusy, 'Moving head to back left corner...')
                        self.comm.sendCommand('G1 Z3 F%d' % (feedZ))
-                       self.comm.sendCommand('G1 X%d Y%d F%d' % (0, profile.getPreferenceFloat('machine_depth'), feedTravel))
+                       self.comm.sendCommand('G1 X%d Y%d F%d' % (0, profile.getMachineSettingFloat('machine_depth'), feedTravel))
                        self.comm.sendCommand('G1 Z0 F%d' % (feedZ))
                        self.comm.sendCommand('M400')
                        self._wizardState = 3
                elif self._wizardState == 4:
                        wx.CallAfter(self.infoBox.SetBusy, 'Moving head to back right corner...')
                        self.comm.sendCommand('G1 Z3 F%d' % (feedZ))
-                       self.comm.sendCommand('G1 X%d Y%d F%d' % (profile.getPreferenceFloat('machine_width'), profile.getPreferenceFloat('machine_depth') - 25, feedTravel))
+                       self.comm.sendCommand('G1 X%d Y%d F%d' % (profile.getMachineSettingFloat('machine_width') - 5.0, profile.getMachineSettingFloat('machine_depth') - 25, feedTravel))
                        self.comm.sendCommand('G1 Z0 F%d' % (feedZ))
                        self.comm.sendCommand('M400')
                        self._wizardState = 5
                elif self._wizardState == 6:
                        wx.CallAfter(self.infoBox.SetBusy, 'Moving head to front right corner...')
                        self.comm.sendCommand('G1 Z3 F%d' % (feedZ))
-                       self.comm.sendCommand('G1 X%d Y%d F%d' % (profile.getPreferenceFloat('machine_width'), 20, feedTravel))
+                       self.comm.sendCommand('G1 X%d Y%d F%d' % (profile.getMachineSettingFloat('machine_width') - 5.0, 20, feedTravel))
                        self.comm.sendCommand('G1 Z0 F%d' % (feedZ))
                        self.comm.sendCommand('M400')
                        self._wizardState = 7
@@ -810,6 +925,40 @@ class bedLevelWizardMain(InfoPage):
                        self.comm.sendCommand('M104 S%d' % (profile.getProfileSettingFloat('print_temperature')))
                        self.comm.sendCommand('G1 X%d Y%d F%d' % (0, 0, feedTravel))
                        self._wizardState = 9
+               elif self._wizardState == 10:
+                       self._wizardState = 11
+                       wx.CallAfter(self.infoBox.SetInfo, 'Printing a square on the printer bed at 0.3mm height.')
+                       feedZ = profile.getProfileSettingFloat('print_speed') * 60
+                       feedPrint = profile.getProfileSettingFloat('print_speed') * 60
+                       feedTravel = profile.getProfileSettingFloat('travel_speed') * 60
+                       w = profile.getMachineSettingFloat('machine_width')
+                       d = profile.getMachineSettingFloat('machine_depth')
+                       filamentRadius = profile.getProfileSettingFloat('filament_diameter') / 2
+                       filamentArea = math.pi * filamentRadius * filamentRadius
+                       ePerMM = (profile.calculateEdgeWidth() * 0.3) / filamentArea
+                       eValue = 0.0
+
+                       gcodeList = [
+                               'G1 Z2 F%d' % (feedZ),
+                               'G92 E0',
+                               'G1 X%d Y%d F%d' % (5, 5, feedTravel),
+                               'G1 Z0.3 F%d' % (feedZ)]
+                       eValue += 5.0
+                       gcodeList.append('G1 E%f F%d' % (eValue, profile.getProfileSettingFloat('retraction_speed') * 60))
+
+                       for i in xrange(0, 3):
+                               dist = 5.0 + 0.4 * float(i)
+                               eValue += (d - 2.0*dist) * ePerMM
+                               gcodeList.append('G1 X%f Y%f E%f F%d' % (dist, d - dist, eValue, feedPrint))
+                               eValue += (w - 2.0*dist) * ePerMM
+                               gcodeList.append('G1 X%f Y%f E%f F%d' % (w - dist, d - dist, eValue, feedPrint))
+                               eValue += (d - 2.0*dist) * ePerMM
+                               gcodeList.append('G1 X%f Y%f E%f F%d' % (w - dist, dist, eValue, feedPrint))
+                               eValue += (w - 2.0*dist) * ePerMM
+                               gcodeList.append('G1 X%f Y%f E%f F%d' % (dist, dist, eValue, feedPrint))
+
+                       gcodeList.append('M400')
+                       self.comm.printGCode(gcodeList)
                self.resumeButton.Enable(False)
 
        def mcLog(self, message):
@@ -833,42 +982,12 @@ class bedLevelWizardMain(InfoPage):
                        wx.CallAfter(self.infoBox.SetAttention, 'Adjust the front right screw of your printer bed\nSo the nozzle just hits the bed.')
                        wx.CallAfter(self.resumeButton.Enable, True)
                elif self._wizardState == 9:
-                       if temp < profile.getProfileSettingFloat('print_temperature') - 5:
-                               wx.CallAfter(self.infoBox.SetInfo, 'Heating up printer: %d/%d' % (temp, profile.getProfileSettingFloat('print_temperature')))
+                       if temp[0] < profile.getProfileSettingFloat('print_temperature') - 5:
+                               wx.CallAfter(self.infoBox.SetInfo, 'Heating up printer: %d/%d' % (temp[0], profile.getProfileSettingFloat('print_temperature')))
                        else:
+                               wx.CallAfter(self.infoBox.SetAttention, 'The printer is hot now. Please insert some PLA filament into the printer.')
+                               wx.CallAfter(self.resumeButton.Enable, True)
                                self._wizardState = 10
-                               wx.CallAfter(self.infoBox.SetInfo, 'Printing a square on the printer bed at 0.3mm height.')
-                               feedZ = profile.getProfileSettingFloat('max_z_speed') * 60
-                               feedPrint = profile.getProfileSettingFloat('print_speed') * 60
-                               feedTravel = profile.getProfileSettingFloat('travel_speed') * 60
-                               w = profile.getPreferenceFloat('machine_width')
-                               d = profile.getPreferenceFloat('machine_depth')
-                               filamentRadius = profile.getProfileSettingFloat('filament_diameter') / 2
-                               filamentArea = math.pi * filamentRadius * filamentRadius
-                               ePerMM = (profile.calculateEdgeWidth() * 0.3) / filamentArea
-                               eValue = 0.0
-
-                               gcodeList = [
-                                       'G1 Z2 F%d' % (feedZ),
-                                       'G92 E0',
-                                       'G1 X%d Y%d F%d' % (5, 5, feedTravel),
-                                       'G1 Z0.3 F%d' % (feedZ)]
-                               eValue += 5;
-                               gcodeList.append('G1 E%f F%d' % (eValue, profile.getProfileSettingFloat('retraction_speed') * 60))
-
-                               for i in xrange(0, 3):
-                                       dist = 5.0 + 0.4 * i
-                                       eValue += (d - 2*dist) * ePerMM
-                                       gcodeList.append('G1 X%d Y%d E%f F%d' % (dist, d - dist, eValue, feedPrint))
-                                       eValue += (w - 2*dist) * ePerMM
-                                       gcodeList.append('G1 X%d Y%d E%f F%d' % (w - dist, d - dist, eValue, feedPrint))
-                                       eValue += (d - 2*dist) * ePerMM
-                                       gcodeList.append('G1 X%d Y%d E%f F%d' % (w - dist, dist, eValue, feedPrint))
-                                       eValue += (w - 2*dist) * ePerMM
-                                       gcodeList.append('G1 X%d Y%d E%f F%d' % (dist, dist, eValue, feedPrint))
-
-                               gcodeList.append('M400')
-                               self.comm.printGCode(gcodeList)
 
        def mcStateChange(self, state):
                if self.comm is None:
@@ -879,8 +998,8 @@ class bedLevelWizardMain(InfoPage):
                                self.comm.sendCommand('M105')
                                self.comm.sendCommand('G28')
                                self._wizardState = 1
-                       elif self._wizardState == 10 and not self.comm.isPrinting():
-                               self.comm.sendCommand('G1 Z15 F%d' % (profile.getProfileSettingFloat('max_z_speed') * 60))
+                       elif self._wizardState == 11 and not self.comm.isPrinting():
+                               self.comm.sendCommand('G1 Z15 F%d' % (profile.getProfileSettingFloat('print_speed') * 60))
                                self.comm.sendCommand('G92 E0')
                                self.comm.sendCommand('G1 E-10 F%d' % (profile.getProfileSettingFloat('retraction_speed') * 60))
                                self.comm.sendCommand('M104 S0')
@@ -888,7 +1007,222 @@ class bedLevelWizardMain(InfoPage):
                                wx.CallAfter(self.infoBox.SetReadyIndicator)
                                wx.CallAfter(self.GetParent().FindWindowById(wx.ID_FORWARD).Enable)
                                wx.CallAfter(self.connectButton.Enable, True)
-                               self._wizardState = 11
+                               self._wizardState = 12
+               elif self.comm.isError():
+                       wx.CallAfter(self.infoBox.SetError, 'Failed to establish connection with the printer.', 'http://wiki.ultimaker.com/Cura:_Connection_problems')
+
+       def mcMessage(self, message):
+               pass
+
+       def mcProgress(self, lineNr):
+               pass
+
+       def mcZChange(self, newZ):
+               pass
+
+class headOffsetCalibrationPage(InfoPage):
+       def __init__(self, parent):
+               super(headOffsetCalibrationPage, self).__init__(parent, "Printer head offset calibration")
+
+               self.AddText('This wizard will help you in calibrating the printer head offsets of your dual extrusion machine')
+               self.AddSeperator()
+
+               self.connectButton = self.AddButton('Connect to printer')
+               self.comm = None
+
+               self.infoBox = self.AddInfoBox()
+               self.textEntry = self.AddTextCtrl('')
+               self.textEntry.Enable(False)
+               self.resumeButton = self.AddButton('Resume')
+               self.resumeButton.Enable(False)
+
+               self.Bind(wx.EVT_BUTTON, self.OnConnect, self.connectButton)
+               self.Bind(wx.EVT_BUTTON, self.OnResume, self.resumeButton)
+
+       def OnConnect(self, e = None):
+               if self.comm is not None:
+                       self.comm.close()
+                       del self.comm
+                       self.comm = None
+                       wx.CallAfter(self.OnConnect)
+                       return
+               self.connectButton.Enable(False)
+               self.comm = machineCom.MachineCom(callbackObject=self)
+               self.infoBox.SetBusy('Connecting to machine.')
+               self._wizardState = 0
+
+       def OnResume(self, e):
+               if self._wizardState == 2:
+                       self._wizardState = 3
+                       wx.CallAfter(self.infoBox.SetBusy, 'Printing initial calibration cross')
+
+                       w = profile.getMachineSettingFloat('machine_width')
+                       d = profile.getMachineSettingFloat('machine_depth')
+
+                       gcode = gcodeGenerator.gcodeGenerator()
+                       gcode.setExtrusionRate(profile.getProfileSettingFloat('nozzle_size') * 1.5, 0.2)
+                       gcode.setPrintSpeed(profile.getProfileSettingFloat('bottom_layer_speed'))
+                       gcode.addCmd('T0')
+                       gcode.addPrime(15)
+                       gcode.addCmd('T1')
+                       gcode.addPrime(15)
+
+                       gcode.addCmd('T0')
+                       gcode.addMove(w/2, 5)
+                       gcode.addMove(z=0.2)
+                       gcode.addPrime()
+                       gcode.addExtrude(w/2, d-5.0)
+                       gcode.addRetract()
+                       gcode.addMove(5, d/2)
+                       gcode.addPrime()
+                       gcode.addExtrude(w-5.0, d/2)
+                       gcode.addRetract(15)
+
+                       gcode.addCmd('T1')
+                       gcode.addMove(w/2, 5)
+                       gcode.addPrime()
+                       gcode.addExtrude(w/2, d-5.0)
+                       gcode.addRetract()
+                       gcode.addMove(5, d/2)
+                       gcode.addPrime()
+                       gcode.addExtrude(w-5.0, d/2)
+                       gcode.addRetract(15)
+                       gcode.addCmd('T0')
+
+                       gcode.addMove(z=25)
+                       gcode.addMove(0, 0)
+                       gcode.addCmd('M400')
+
+                       self.comm.printGCode(gcode.list())
+                       self.resumeButton.Enable(False)
+               elif self._wizardState == 4:
+                       try:
+                               float(self.textEntry.GetValue())
+                       except ValueError:
+                               return
+                       profile.putPreference('extruder_offset_x1', self.textEntry.GetValue())
+                       self._wizardState = 5
+                       self.infoBox.SetAttention('Please measure the distance between the horizontal lines in millimeters.')
+                       self.textEntry.SetValue('0.0')
+                       self.textEntry.Enable(True)
+               elif self._wizardState == 5:
+                       try:
+                               float(self.textEntry.GetValue())
+                       except ValueError:
+                               return
+                       profile.putPreference('extruder_offset_y1', self.textEntry.GetValue())
+                       self._wizardState = 6
+                       self.infoBox.SetBusy('Printing the fine calibration lines.')
+                       self.textEntry.SetValue('')
+                       self.textEntry.Enable(False)
+                       self.resumeButton.Enable(False)
+
+                       x = profile.getMachineSettingFloat('extruder_offset_x1')
+                       y = profile.getMachineSettingFloat('extruder_offset_y1')
+                       gcode = gcodeGenerator.gcodeGenerator()
+                       gcode.setExtrusionRate(profile.getProfileSettingFloat('nozzle_size') * 1.5, 0.2)
+                       gcode.setPrintSpeed(25)
+                       gcode.addHome()
+                       gcode.addCmd('T0')
+                       gcode.addMove(50, 40, 0.2)
+                       gcode.addPrime(15)
+                       for n in xrange(0, 10):
+                               gcode.addExtrude(50 + n * 10, 150)
+                               gcode.addExtrude(50 + n * 10 + 5, 150)
+                               gcode.addExtrude(50 + n * 10 + 5, 40)
+                               gcode.addExtrude(50 + n * 10 + 10, 40)
+                       gcode.addMove(40, 50)
+                       for n in xrange(0, 10):
+                               gcode.addExtrude(150, 50 + n * 10)
+                               gcode.addExtrude(150, 50 + n * 10 + 5)
+                               gcode.addExtrude(40, 50 + n * 10 + 5)
+                               gcode.addExtrude(40, 50 + n * 10 + 10)
+                       gcode.addRetract(15)
+
+                       gcode.addCmd('T1')
+                       gcode.addMove(50 - x, 30 - y, 0.2)
+                       gcode.addPrime(15)
+                       for n in xrange(0, 10):
+                               gcode.addExtrude(50 + n * 10.2 - 1.0 - x, 140 - y)
+                               gcode.addExtrude(50 + n * 10.2 - 1.0 + 5.1 - x, 140 - y)
+                               gcode.addExtrude(50 + n * 10.2 - 1.0 + 5.1 - x, 30 - y)
+                               gcode.addExtrude(50 + n * 10.2 - 1.0 + 10 - x, 30 - y)
+                       gcode.addMove(30 - x, 50 - y, 0.2)
+                       for n in xrange(0, 10):
+                               gcode.addExtrude(160 - x, 50 + n * 10.2 - 1.0 - y)
+                               gcode.addExtrude(160 - x, 50 + n * 10.2 - 1.0 + 5.1 - y)
+                               gcode.addExtrude(30 - x, 50 + n * 10.2 - 1.0 + 5.1 - y)
+                               gcode.addExtrude(30 - x, 50 + n * 10.2 - 1.0 + 10 - y)
+                       gcode.addRetract(15)
+                       gcode.addMove(z=15)
+                       gcode.addCmd('M400')
+                       gcode.addCmd('M104 T0 S0')
+                       gcode.addCmd('M104 T1 S0')
+                       self.comm.printGCode(gcode.list())
+               elif self._wizardState == 7:
+                       try:
+                               n = int(self.textEntry.GetValue()) - 1
+                       except:
+                               return
+                       x = profile.getMachineSettingFloat('extruder_offset_x1')
+                       x += -1.0 + n * 0.1
+                       profile.putPreference('extruder_offset_x1', '%0.2f' % (x))
+                       self.infoBox.SetAttention('Which horizontal line number lays perfect on top of each other? Front most line is zero.')
+                       self.textEntry.SetValue('10')
+                       self._wizardState = 8
+               elif self._wizardState == 8:
+                       try:
+                               n = int(self.textEntry.GetValue()) - 1
+                       except:
+                               return
+                       y = profile.getMachineSettingFloat('extruder_offset_y1')
+                       y += -1.0 + n * 0.1
+                       profile.putPreference('extruder_offset_y1', '%0.2f' % (y))
+                       self.infoBox.SetInfo('Calibration finished. Offsets are: %s %s' % (profile.getMachineSettingFloat('extruder_offset_x1'), profile.getMachineSettingFloat('extruder_offset_y1')))
+                       self.infoBox.SetReadyIndicator()
+                       self._wizardState = 8
+                       self.comm.close()
+                       self.resumeButton.Enable(False)
+
+       def mcLog(self, message):
+               print 'Log:', message
+
+       def mcTempUpdate(self, temp, bedTemp, targetTemp, bedTargetTemp):
+               if self._wizardState == 1:
+                       if temp[0] >= 210 and temp[1] >= 210:
+                               self._wizardState = 2
+                               wx.CallAfter(self.infoBox.SetAttention, 'Please load both extruders with PLA.')
+                               wx.CallAfter(self.resumeButton.Enable, True)
+                               wx.CallAfter(self.resumeButton.SetFocus)
+
+       def mcStateChange(self, state):
+               if self.comm is None:
+                       return
+               if self.comm.isOperational():
+                       if self._wizardState == 0:
+                               wx.CallAfter(self.infoBox.SetInfo, 'Homing printer and heating up both extruders.')
+                               self.comm.sendCommand('M105')
+                               self.comm.sendCommand('M104 S220 T0')
+                               self.comm.sendCommand('M104 S220 T1')
+                               self.comm.sendCommand('G28')
+                               self.comm.sendCommand('G1 Z15 F%d' % (profile.getProfileSettingFloat('print_speed') * 60))
+                               self._wizardState = 1
+                       if not self.comm.isPrinting():
+                               if self._wizardState == 3:
+                                       self._wizardState = 4
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Please measure the distance between the vertical lines in millimeters.')
+                                       wx.CallAfter(self.textEntry.SetValue, '0.0')
+                                       wx.CallAfter(self.textEntry.Enable, True)
+                                       wx.CallAfter(self.resumeButton.Enable, True)
+                                       wx.CallAfter(self.resumeButton.SetFocus)
+                               elif self._wizardState == 6:
+                                       self._wizardState = 7
+                                       wx.CallAfter(self.infoBox.SetAttention, 'Which vertical line number lays perfect on top of each other? Leftmost line is zero.')
+                                       wx.CallAfter(self.textEntry.SetValue, '10')
+                                       wx.CallAfter(self.textEntry.Enable, True)
+                                       wx.CallAfter(self.resumeButton.Enable, True)
+                                       wx.CallAfter(self.resumeButton.SetFocus)
+
                elif self.comm.isError():
                        wx.CallAfter(self.infoBox.SetError, 'Failed to establish connection with the printer.', 'http://wiki.ultimaker.com/Cura:_Connection_problems')
 
@@ -909,6 +1243,32 @@ class bedLevelWizard(wx.wizard.Wizard):
                self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGING, self.OnPageChanging)
 
                self.mainPage = bedLevelWizardMain(self)
+               self.headOffsetCalibration = None
+
+               self.FitToPage(self.mainPage)
+               self.GetPageAreaSizer().Add(self.mainPage)
+
+               self.RunWizard(self.mainPage)
+               self.Destroy()
+
+       def OnPageChanging(self, e):
+               e.GetPage().StoreData()
+
+       def OnPageChanged(self, e):
+               if e.GetPage().AllowNext():
+                       self.FindWindowById(wx.ID_FORWARD).Enable()
+               else:
+                       self.FindWindowById(wx.ID_FORWARD).Disable()
+               self.FindWindowById(wx.ID_BACKWARD).Disable()
+
+class headOffsetWizard(wx.wizard.Wizard):
+       def __init__(self):
+               super(headOffsetWizard, self).__init__(None, -1, "Head offset wizard")
+
+               self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGED, self.OnPageChanged)
+               self.Bind(wx.wizard.EVT_WIZARD_PAGE_CHANGING, self.OnPageChanging)
+
+               self.mainPage = headOffsetCalibrationPage(self)
 
                self.FitToPage(self.mainPage)
                self.GetPageAreaSizer().Add(self.mainPage)