From: Steven Abadie Date: Wed, 15 Oct 2014 04:46:26 +0000 (-0600) Subject: SimpleMode settings can now use machine type to change settings per machine selection. X-Git-Tag: 14.09-1.18~117 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f481a86d7238d3113f6b15faa45fe1be756957cb;p=cura.git SimpleMode settings can now use machine type to change settings per machine selection. --- diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py index c6db7903..8bb7e9d6 100644 --- a/Cura/gui/configWizard.py +++ b/Cura/gui/configWizard.py @@ -487,13 +487,14 @@ class MachineSelectPage(InfoPage): profile.putMachineSetting('machine_height', '250') profile.putProfileSetting('nozzle_size', '0.35') profile.putMachineSetting('machine_name', 'Lulzbot TAZ') + profile.putMachineSetting('machine_type', 'lulzbot_TAZ') else: profile.putMachineSetting('machine_width', '160') profile.putMachineSetting('machine_depth', '160') profile.putMachineSetting('machine_height', '160') profile.putProfileSetting('nozzle_size', '0.5') profile.putMachineSetting('machine_name', 'Lulzbot Mini') - profile.putMachineSetting('machine_type', 'Aleph Objects') + profile.putMachineSetting('machine_type', 'lulzbot_mini') profile.putMachineSetting('machine_center_is_zero', 'False') profile.putMachineSetting('gcode_flavor', 'RepRap (Marlin/Sprinter)') profile.putMachineSetting('has_heated_bed', 'True') diff --git a/Cura/gui/simpleMode.py b/Cura/gui/simpleMode.py index 3c17519b..993fcbf6 100644 --- a/Cura/gui/simpleMode.py +++ b/Cura/gui/simpleMode.py @@ -25,7 +25,8 @@ class simpleModePanel(wx.Panel): printMaterialPanel = wx.Panel(self) self.printMaterialPLA = wx.RadioButton(printMaterialPanel, -1, 'PLA', style=wx.RB_GROUP) self.printMaterialABS = wx.RadioButton(printMaterialPanel, -1, 'ABS') - self.printMaterialHIPS = wx.RadioButton(printMaterialPanel, -1, 'HIPS') + if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ': + self.printMaterialHIPS = wx.RadioButton(printMaterialPanel, -1, 'HIPS') self.printMaterialDiameter = wx.TextCtrl(printMaterialPanel, -1, profile.getProfileSetting('filament_diameter')) if profile.getMachineSetting('gcode_flavor') == 'UltiGCode': printMaterialPanel.Show(False) @@ -49,7 +50,8 @@ class simpleModePanel(wx.Panel): boxsizer = wx.StaticBoxSizer(sb, wx.VERTICAL) boxsizer.Add(self.printMaterialPLA) boxsizer.Add(self.printMaterialABS) - boxsizer.Add(self.printMaterialHIPS) + if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ': + boxsizer.Add(self.printMaterialHIPS) boxsizer.Add(wx.StaticText(printMaterialPanel, -1, _("Diameter:"))) boxsizer.Add(self.printMaterialDiameter) printMaterialPanel.SetSizer(wx.BoxSizer(wx.VERTICAL)) @@ -71,7 +73,8 @@ class simpleModePanel(wx.Panel): self.printMaterialPLA.Bind(wx.EVT_RADIOBUTTON, lambda e: self._callback()) self.printMaterialABS.Bind(wx.EVT_RADIOBUTTON, lambda e: self._callback()) - self.printMaterialHIPS.Bind(wx.EVT_RADIOBUTTON, lambda e: self._callback()) + if profile.getMachineSetting('machine_type') == 'lulzbot_mini' or profile.getMachineSetting('machine_type') == 'lulzbot_TAZ': + self.printMaterialHIPS.Bind(wx.EVT_RADIOBUTTON, lambda e: self._callback()) self.printMaterialDiameter.Bind(wx.EVT_TEXT, lambda e: self._callback()) self.printSupport.Bind(wx.EVT_CHECKBOX, lambda e: self._callback()) @@ -88,15 +91,16 @@ class simpleModePanel(wx.Panel): put('support', _("Exterior Only")) # LulzBot Mini slice settings for use with the simple slice selection. This needs to be further modified to only be used when the Mini machine config is loaded. - put('print_temperature', '0') - put('print_bed_temperature', '0') - put('retraction_speed', '25') - put('bottom_thickness', '0.425') - put('layer0_width_factor', '125') - put('fan_speed', '10') - put('fan_speed_max', '50') - put('cool_head_lift', 'True') - put('end.gcode', """;End GCode + if profile.getMachineSetting('machine_type') == 'lulzbot_mini': + put('print_temperature', '0') + put('print_bed_temperature', '0') + put('retraction_speed', '25') + put('bottom_thickness', '0.425') + put('layer0_width_factor', '125') + put('fan_speed', '10') + put('fan_speed_max', '50') + put('cool_head_lift', 'True') + put('end.gcode', """;End GCode M104 T0 S0 ;extruder heater off M104 T1 S0 ;extruder heater off M140 S0 ;heated bed heater off (if you have it) @@ -108,12 +112,13 @@ class simpleModePanel(wx.Panel): G90 ;absolute positioning ;{profile_string}""") - if self.printMaterialHIPS.GetValue() or self.printMaterialABS.GetValue(): - put('solid_layer_thickness', '0.8') - put('fill_density', '40') - put('retraction_amount', '1.5') - put('travel_speed', '175') - put('start.gcode', """;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} + if self.printMaterialHIPS.GetValue() or self.printMaterialABS.GetValue(): + put('solid_layer_thickness', '0.8') + put('fill_density', '40') + put('retraction_amount', '1.5') + put('travel_speed', '175') + put('start.gcode', """;LulzBot Mini + ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} ;Print time: {print_time} ;Filament used: {filament_amount}m {filament_weight}g ;Filament cost: {filament_cost} @@ -166,8 +171,9 @@ class simpleModePanel(wx.Panel): G1 Z2 E5 F200 ; extrude filament back into nozzle M140 S110 ; get bed temping up during first layer M206 X0.0 Y0.0 Z0.0 ; offset home position for fine tuning""") - elif self.printMaterialPLA.GetValue(): - put('start.gcode', """;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} + elif self.printMaterialPLA.GetValue(): + put('start.gcode', """;LulzBot Mini + ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} ;Print time: {print_time} ;Filament used: {filament_amount}m {filament_weight}g ;Filament cost: {filament_cost} @@ -232,86 +238,118 @@ end.gcode = M104 S0 G90 ;absolute positioning ;{profile_string}""") - nozzle_size = float(get('nozzle_size')) - if self.printMaterialHIPS.GetValue(): - put('retraction_hop', '0.6') - put('bottom_layer_speed', '30') - put('fan_full_height', '5') - put('cool_min_feedrate', '45') - if self.printTypeLow.GetValue(): - put('layer_height', '0.38') - put('print_speed', '85') - put('infill_speed', '115') - put('inset0_speed', '75') - put('insetx_speed', '80') - if self.printTypeNormal.GetValue(): - put('layer_height', '0.25') - put('print_speed', '65') - put('infill_speed', '85') - put('inset0_speed', '45') - put('insetx_speed', '50') - if self.printTypeHigh.GetValue(): - put('layer_height', '0.14') - put('print_speed', '40') - put('infill_speed', '65') - put('inset0_speed', '30') - put('insetx_speed', '35') - if self.printMaterialABS.GetValue(): - put('retraction_hop', '0.6') - put('cool_min_feedrate', '10') - put('fan_enabled', 'False') - if self.printTypeLow.GetValue(): - put('layer_height', '0.38') - put('print_speed', '85') + nozzle_size = float(get('nozzle_size')) + if self.printMaterialHIPS.GetValue(): + put('retraction_hop', '0.6') put('bottom_layer_speed', '30') - put('infill_speed', '110') - put('inset0_speed', '70') - put('insetx_speed', '80') - put('brim_line_count', '8') - if self.printTypeNormal.GetValue(): - put('layer_height', '0.25') - put('print_speed', '75') - put('bottom_layer_speed', '25') - put('infill_speed', '80') - put('inset0_speed', '60') - put('insetx_speed', '70') - if self.printTypeHigh.GetValue(): - put('layer_height', '0.14') - put('print_speed', '60') - put('bottom_layer_speed', '25') - put('infill_speed', '60') - put('inset0_speed', '40') - put('insetx_speed', '50') put('fan_full_height', '5') - put('skirt_line_count', '4') - if self.printMaterialPLA.GetValue(): - put('solid_Layer_thickness', '1') - put('fill_density', '70') - put('retraction_amount', '3') - put('retraction_hop', '0.5') - put('travel_speed', '150') - put('bottom_travel_speed', '30') - put('fan_full_height', '1') - put('cool_min_feedrate', '15') - put('skirt_line_count', '2') - if self.printTypeLow.GetValue(): - put('layer_height', '0.38') - put('print_speed', '90') - put('infill_speed', '125') - put('inset0_speed', '75') - put('insetx_speed', '85') + put('cool_min_feedrate', '45') + if self.printTypeLow.GetValue(): + put('layer_height', '0.38') + put('print_speed', '85') + put('infill_speed', '115') + put('inset0_speed', '75') + put('insetx_speed', '80') + if self.printTypeNormal.GetValue(): + put('layer_height', '0.25') + put('print_speed', '65') + put('infill_speed', '85') + put('inset0_speed', '45') + put('insetx_speed', '50') + if self.printTypeHigh.GetValue(): + put('layer_height', '0.14') + put('print_speed', '40') + put('infill_speed', '65') + put('inset0_speed', '30') + put('insetx_speed', '35') + if self.printMaterialABS.GetValue(): + put('retraction_hop', '0.6') + put('cool_min_feedrate', '10') + put('fan_enabled', 'False') + if self.printTypeLow.GetValue(): + put('layer_height', '0.38') + put('print_speed', '85') + put('bottom_layer_speed', '30') + put('infill_speed', '110') + put('inset0_speed', '70') + put('insetx_speed', '80') + put('brim_line_count', '8') + if self.printTypeNormal.GetValue(): + put('layer_height', '0.25') + put('print_speed', '75') + put('bottom_layer_speed', '25') + put('infill_speed', '80') + put('inset0_speed', '60') + put('insetx_speed', '70') + if self.printTypeHigh.GetValue(): + put('layer_height', '0.14') + put('print_speed', '60') + put('bottom_layer_speed', '25') + put('infill_speed', '60') + put('inset0_speed', '40') + put('insetx_speed', '50') + put('fan_full_height', '5') + put('skirt_line_count', '4') + if self.printMaterialPLA.GetValue(): + put('solid_Layer_thickness', '1') + put('fill_density', '70') + put('retraction_amount', '3') + put('retraction_hop', '0.5') + put('travel_speed', '150') + put('bottom_travel_speed', '30') + put('fan_full_height', '1') + put('cool_min_feedrate', '15') + put('skirt_line_count', '2') + if self.printTypeLow.GetValue(): + put('layer_height', '0.38') + put('print_speed', '90') + put('infill_speed', '125') + put('inset0_speed', '75') + put('insetx_speed', '85') + if self.printTypeNormal.GetValue(): + put('layer_height', '0.25') + put('print_speed', '70') + put('infill_speed', '95') + put('inset0_speed', '65') + put('insetx_speed', '75') + if self.printTypeHigh.GetValue(): + pass + + nozzle_size = float(get('nozzle_size')) + put('filament_diameter', self.printMaterialDiameter.GetValue()) + put('plugin_config', '') +### TAZ profile settings are needed here + else: + nozzle_size = float(get('nozzle_size')) if self.printTypeNormal.GetValue(): - put('layer_height', '0.25') - put('print_speed', '70') - put('infill_speed', '95') - put('inset0_speed', '65') - put('insetx_speed', '75') - if self.printTypeHigh.GetValue(): - pass + put('layer_height', '0.2') + put('wall_thickness', nozzle_size * 2.0) + put('layer_height', '0.10') + put('fill_density', '20') + elif self.printTypeLow.GetValue(): + put('wall_thickness', nozzle_size * 2.5) + put('layer_height', '0.20') + put('fill_density', '10') + put('print_speed', '60') + put('cool_min_layer_time', '3') + put('bottom_layer_speed', '30') + elif self.printTypeHigh.GetValue(): + put('wall_thickness', nozzle_size * 2.0) + put('layer_height', '0.06') + put('fill_density', '20') + put('bottom_layer_speed', '15') + elif self.printTypeJoris.GetValue(): + put('wall_thickness', nozzle_size * 1.5) - nozzle_size = float(get('nozzle_size')) - put('filament_diameter', self.printMaterialDiameter.GetValue()) - put('plugin_config', '') + put('filament_diameter', self.printMaterialDiameter.GetValue()) + if self.printMaterialPLA.GetValue(): + pass + if self.printMaterialABS.GetValue(): + put('print_bed_temperature', '100') + put('platform_adhesion', 'Brim') + put('filament_flow', '107') + put('print_temperature', '245') + put('plugin_config', '') def updateProfileToControls(self): pass diff --git a/scripts/linux/debian_amd64_release b/scripts/linux/debian_amd64_release index 1e8b3149..b4de3947 100644 --- a/scripts/linux/debian_amd64_release +++ b/scripts/linux/debian_amd64_release @@ -1 +1 @@ -6 +11 diff --git a/scripts/linux/debian_i386_release b/scripts/linux/debian_i386_release index 0cfbf088..00750edc 100644 --- a/scripts/linux/debian_i386_release +++ b/scripts/linux/debian_i386_release @@ -1 +1 @@ -2 +3