Set machine dimensions

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index 545a4a74236626dd41c4106a2912221ecea9e70d..d7955846f76465bf8d8cee02a6b1ea8706d25541 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', '115200')
+                               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')
@@ -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"))

diff --git a/Cura/util/profile.py b/Cura/util/profile.py
index d170dc71d4730fbd24ec815d3aa804520578f7b3..f830b3906c7e549a2de8eab5a2e430c4293a8092 100644 (file)
--- a/Cura/util/profile.py
+++ b/Cura/util/profile.py
@@ -1213,8 +1213,7 @@ def calculateObjectSizeOffsets():
 def getMachineCenterCoords():
        if getMachineSetting('machine_center_is_zero') == 'True':
                return [0, 0]
-       elif getMachineSetting('machine_type') == 'lulzbot_mini' or \
-                getMachineSetting('machine_type') == 'lulzbot_TAZ_6':
+       elif getMachineSetting('machine_type') == 'lulzbot_mini':
                return [(getMachineSettingFloat('machine_width') / 2) + 2.5,
                            (getMachineSettingFloat('machine_width') / 2) + 0.5]
        return [getMachineSettingFloat('machine_width') / 2, getMachineSettingFloat('machine_depth') / 2]