Fix mangrove creation

[cura.git] / Cura / gui / configWizard.py

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index b5d8fa92f5f3d1300186eb7df39162fd53b49e09..4d230336d2fc7c2fe776801af64fe1f47f0c69d4 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -1150,7 +1150,7 @@ class LulzbotMachineSelectPage(InfoPage):
                return False
 
        def StoreData(self):
-               if self.LulzbotTaz.GetValue() or self.LulzbotMini.GetValue():
+               if self.LulzbotTaz.GetValue() or self.LulzbotMini.GetValue() or self.LulzbotTaz6.GetValue():
                        if self.LulzbotTaz.GetValue():
                                profile.putMachineSetting('machine_width', '290')
                                profile.putMachineSetting('machine_depth', '275')
@@ -1161,6 +1161,16 @@ class LulzbotMachineSelectPage(InfoPage):
                                profile.putMachineSetting('extruder_head_size_min_y', '0.0')
                                profile.putMachineSetting('extruder_head_size_max_y', '0.0')
                                profile.putMachineSetting('extruder_head_size_height', '0.0')
+                       elif self.LulzbotTaz6.GetValue():
+                               profile.putMachineSetting('machine_width', '280')
+                               profile.putMachineSetting('machine_depth', '280')
+                               profile.putMachineSetting('machine_height', '250')
+                               profile.putMachineSetting('serial_baud', '250000')
+                               profile.putMachineSetting('extruder_head_size_min_x', '0.0')
+                               profile.putMachineSetting('extruder_head_size_max_x', '0.0')
+                               profile.putMachineSetting('extruder_head_size_min_y', '0.0')
+                               profile.putMachineSetting('extruder_head_size_max_y', '0.0')
+                               profile.putMachineSetting('extruder_head_size_height', '0.0')
                        else:
                                # Nozzle diameter and machine type will be set in the toolhead selection page
                                profile.putMachineSetting('machine_name', 'LulzBot Mini')
@@ -1222,9 +1232,9 @@ class LulzbotMiniToolheadSelectPage(InfoPage):
                        profile.putMachineSetting('toolhead_shortname', 'Flexystruder')
                        profile.putMachineSetting('machine_type', 'lulzbot_mini_flexystruder')
 
-class LulzbotTaz6SelectPage(InfoPage):
-       def __init__(self, parent):
-               super(LulzbotTaz6SelectPage, self).__init__(parent, _("LulzBot TAZ 6 Selection"))
+class LulzbotTaz6ToolheadSelectPage(InfoPage):
+       def __init__(self, parent, allowBack = True):
+               super(LulzbotTaz6ToolheadSelectPage, self).__init__(parent, _("LulzBot TAZ 6 Tool Head Selection"))
 
                self.panel = self.AddPanel()
                image_size=(LulzbotMachineSelectPage.IMAGE_WIDTH, LulzbotMachineSelectPage.IMAGE_HEIGHT)
@@ -1319,7 +1329,6 @@ class LulzbotTazBedSelectPage(InfoPage):
                        profile.putMachineSetting('machine_type', 'lulzbot_TAZ_4')
                        profile.putMachineSetting('machine_name', 'LulzBot TAZ 4')
 
-
 class LulzbotTazToolheadSelectPage(InfoPage):
        def __init__(self, parent):
                super(LulzbotTazToolheadSelectPage, self).__init__(parent, _("LulzBot TAZ Tool Head Selection"))
@@ -1409,7 +1418,6 @@ class LulzbotTazToolheadSelectPage(InfoPage):
                        profile.putMachineSetting('toolhead_shortname', 'FlexyDually v%d' % self.version)
                        profile.putMachineSetting('machine_type', 'lulzbot_TAZ_%d_FlexyDuallyV%d' % version)
 
-
 class LulzbotHotendSelectPage(InfoPage):
        def __init__(self, parent, allowBack = True):
                super(LulzbotHotendSelectPage, self).__init__(parent, _("LulzBot Tool Head Hot end Selection"))
@@ -1524,6 +1532,7 @@ class LulzbotChangeToolheadWizard(wx.wizard.Wizard):
                self.lulzbotFirmwarePage = LulzbotFirmwareUpdatePage(self)
                self.lulzbotMiniToolheadPage = LulzbotMiniToolheadSelectPage(self, False)
                self.lulzbotTazToolheadPage = LulzbotTazToolheadSelectPage(self)
+               self.lulzbotTaz6ToolheadPage = LulzbotTaz6ToolheadSelectPage(self, False)
                self.lulzbotTazHotendPage = LulzbotHotendSelectPage(self, False)
                self.lulzbotTaz5NozzleSelectPage = LulzbotTaz5NozzleSelectPage(self)
                self.lulzbotTazBedSelectPage = LulzbotTazBedSelectPage(self)
@@ -1535,8 +1544,10 @@ class LulzbotChangeToolheadWizard(wx.wizard.Wizard):
 
                if profile.getMachineSetting('machine_type').startswith('lulzbot_mini'):
                        self.RunWizard(self.lulzbotMiniToolheadPage)
-               else:
+               elif profile.getMachineSetting('machine_type').startswith('lulzbot_TAZ_5'):
                        self.RunWizard(self.lulzbotTazHotendPage)
+               elif profile.getMachineSetting('machine_type').startswith('lulzbot_TAZ_6'):
+                       self.RunWizard(self.lulzbotTaz6ToolheadPage)
                self.Destroy()
 
        def OnPageChanging(self, e):
@@ -1595,6 +1606,8 @@ class ConfigWizard(wx.wizard.Wizard):
                self.lulzbotMachineSelectPage = LulzbotMachineSelectPage(self)
                self.lulzbotTazBedSelectPage = LulzbotTazBedSelectPage(self)
                self.lulzbotTazSelectPage = LulzbotTazSelectPage(self)
+               self.lulzbotTaz6SelectPage = LulzbotTaz6SelectPage(self)
+               self.lulzbotTaz6ToolheadPage = LulzbotTaz6ToolheadSelectPage(self)
 
                wx.wizard.WizardPageSimple.Chain(self.lulzbotMachineSelectPage, self.lulzbotMiniToolheadPage)
                wx.wizard.WizardPageSimple.Chain(self.lulzbotMiniToolheadPage, self.lulzbotReadyPage)