Added TAZ 5 to the machine config wizard

Conflicts:
	Cura/gui/simpleMode.py

diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py
index c5166d3b27cbd6867fa0fc00de0e563431e28d22..6f0daeeb231a2e0813909a2f1081272848adb3dc 100644 (file)
--- a/Cura/gui/configWizard.py
+++ b/Cura/gui/configWizard.py
@@ -363,8 +363,10 @@ class MachineSelectPage(InfoPage):
                self.LulzbotMiniRadio = self.AddRadioButton("LulzBot Mini", style=wx.RB_GROUP)
                self.LulzbotMiniRadio.Bind(wx.EVT_RADIOBUTTON, self.OnLulzbotSelect)
                self.LulzbotMiniRadio.SetValue(True)
-               self.LulzbotTazRadio = self.AddRadioButton("LulzBot TAZ")
-               self.LulzbotTazRadio.Bind(wx.EVT_RADIOBUTTON, self.OnLulzbotSelect)
+               self.LulzbotTaz5Radio = self.AddRadioButton("LulzBot TAZ 5")
+               self.LulzbotTaz5Radio.Bind(wx.EVT_RADIOBUTTON, self.OnLulzbotSelect)
+               self.LulzbotTaz4Radio = self.AddRadioButton("LulzBot TAZ 4")
+               self.LulzbotTaz4Radio.Bind(wx.EVT_RADIOBUTTON, self.OnLulzbotSelect)
                self.Ultimaker2Radio = self.AddRadioButton("Ultimaker2")
                self.Ultimaker2Radio.Bind(wx.EVT_RADIOBUTTON, self.OnUltimaker2Select)
                self.UltimakerRadio = self.AddRadioButton("Ultimaker Original")
@@ -449,14 +451,22 @@ class MachineSelectPage(InfoPage):
                        profile.putMachineSetting('has_heated_bed', 'True')
                        profile.putMachineSetting('extruder_amount', '1')
                        profile.putProfileSetting('retraction_enable', 'True')
-               elif self.LulzbotTazRadio.GetValue() or self.LulzbotMiniRadio.GetValue():
-                       if self.LulzbotTazRadio.GetValue():
+               elif self.LulzbotTaz4Radio.GetValue() or self.LulzbotTaz5Radio.GetValue() or self.LulzbotMiniRadio.GetValue():
+                       if self.LulzbotTaz4Radio.GetValue():
                                profile.putMachineSetting('machine_width', '298')
                                profile.putMachineSetting('machine_depth', '275')
                                profile.putMachineSetting('machine_height', '250')
                                profile.putProfileSetting('nozzle_size', '0.35')
-                               profile.putMachineSetting('machine_name', 'LulzBot TAZ')
-                               profile.putMachineSetting('machine_type', 'lulzbot_TAZ')
+                               profile.putMachineSetting('machine_name', 'LulzBot TAZ 4')
+                               profile.putMachineSetting('machine_type', 'lulzbot_TAZ_4')
+                               profile.putMachineSetting('serial_baud', '115200')
+                       elif self.LulzbotTaz5Radio.GetValue():
+                               profile.putMachineSetting('machine_width', '298')
+                               profile.putMachineSetting('machine_depth', '275')
+                               profile.putMachineSetting('machine_height', '250')
+                               profile.putProfileSetting('nozzle_size', '0.35')
+                               profile.putMachineSetting('machine_name', 'LulzBot TAZ 5')
+                               profile.putMachineSetting('machine_type', 'lulzbot_TAZ_5')
                                profile.putMachineSetting('serial_baud', '115200')
                        else:
                                profile.putMachineSetting('machine_width', '155')

diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py
index 9d2ed957d0be0d17990f6b31e5f71b9a69731ec7..7b9684d269ea1ef7320e5eb9ca071ba80ea2b37f 100644 (file)
--- a/Cura/gui/simpleMode.py
+++ b/Cura/gui/simpleMode.py
@@ -24,7 +24,7 @@ class simpleModePanel(wx.Panel):
                self.printTypeJoris.Hide()
 
                printMaterialPanel = wx.Panel(self)
-               if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
+               if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_5' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_4':
                        self.printMaterialHIPS = wx.RadioButton(printMaterialPanel, -1, _('HIPS'), style=wx.RB_GROUP)
                        self.printMaterialABS = wx.RadioButton(printMaterialPanel, -1, _('ABS'))
                else:
@@ -51,7 +51,7 @@ class simpleModePanel(wx.Panel):
 
                sb = wx.StaticBox(printMaterialPanel, label=_("Material:"))
                boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL)
-               if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
+               if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_5' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_4':
                        boxsizer.Add(self.printMaterialHIPS)
                boxsizer.Add(self.printMaterialABS)
                boxsizer.Add(self.printMaterialPLA)
@@ -78,7 +78,7 @@ class simpleModePanel(wx.Panel):
 
                self.printMaterialPLA.Bind(wx.EVT_RADIOBUTTON, lambda e: self._callback())
                self.printMaterialABS.Bind(wx.EVT_RADIOBUTTON, lambda e: self._callback())
-               if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
+               if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_4':
                        self.printMaterialHIPS.Bind(wx.EVT_RADIOBUTTON, lambda e: self._callback())
 
                self.printSupport.Bind(wx.EVT_CHECKBOX, lambda e: self._callback())
@@ -369,8 +369,11 @@ G90                                          ; absolute positioning
                                        put('infill_speed', '30')
                                        put('inset0_speed', '25')
                                        put('insetx_speed', '27')
-### LulzBot TAZ slice settings for use with the simple slice selection.
-               if profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
+### LulzBot TAZ 5 slice settings for use with the simple slice selection.
+
+
+### LulzBot TAZ 4 slice settings for use with the simple slice selection.
+               if profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_4':
                        put('filament_diameter', '2.85')
                        put('nozzle_size', '0.35')
                        put('wall_thickness', '1.05')
@@ -383,7 +386,7 @@ G90                                          ; absolute positioning
                        put('travel_speed', '175')
                        put('cool_min_layer_time', '15')
                        put('retraction_speed', '25')
-                       put('start.gcode', """;This Gcode has been generated specifically for the LulzBot TAZ
+                       put('start.gcode', """;This Gcode has been generated specifically for the LulzBot TAZ 4
        ;Sliced at: {day} {date} {time}
        ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}
        ;Filament Diameter: {filament_diameter}
@@ -507,7 +510,7 @@ G90                                          ; absolute positioning
                                        put('skirt_minimal_length', '0')
                                        put('fan_full_height', '0.28')
                                        put('fill_overlap', '10')
-               elif not profile.getMachineSetting('machine_type') == 'lulzbot_mini' and not profile.getMachineSetting('machine_type') == 'lulzbot_TAZ':
+               elif not profile.getMachineSetting('machine_type') == 'lulzbot_mini' and not profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_5' and not profile.getMachineSetting('machine_type') == 'lulzbot_TAZ_4':
                        nozzle_size = float(get('nozzle_size'))
                        if self.printBrim.GetValue():
                                put('platform_adhesion', 'Brim')