From: daid Date: Tue, 16 Dec 2014 11:34:30 +0000 (+0100) Subject: Update the printrbot settings, adding the auto bed leveling sensor code and fixing... X-Git-Tag: 15.01-RC3~3 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b0968488b8e2c40d94fda7e031d3f9fc1d502c6e;p=cura.git Update the printrbot settings, adding the auto bed leveling sensor code and fixing the nozzle size for the metal machines. --- diff --git a/Cura/gui/configWizard.py b/Cura/gui/configWizard.py index 9ac26ce3..658abaaa 100644 --- a/Cura/gui/configWizard.py +++ b/Cura/gui/configWizard.py @@ -259,25 +259,25 @@ class FirstInfoPage(InfoPage): class PrintrbotPage(InfoPage): def __init__(self, parent): self._printer_info = [ - # X, Y, Z, Filament Diameter, PrintTemperature, Print Speed, Travel Speed, Retract speed, Retract amount - ("Simple Metal", 150, 150, 150, 1.75, 208, 40, 70, 30, 1), - ("Metal Plus", 250, 250, 250, 1.75, 208, 40, 70, 30, 1), - ("Simple Makers Kit", 100, 100, 100, 1.75, 208, 40, 70, 30, 1), + # X, Y, Z, Nozzle Size, Filament Diameter, PrintTemperature, Print Speed, Travel Speed, Retract speed, Retract amount, use bed level sensor + ("Simple Metal", 150, 150, 150, 0.4, 1.75, 208, 40, 70, 30, 1, True), + ("Metal Plus", 250, 250, 250, 0.4, 1.75, 208, 40, 70, 30, 1, True), + ("Simple Makers Kit", 100, 100, 100, 0.4, 1.75, 208, 40, 70, 30, 1, True), (":" + _("Older models"),), - ("Original", 130, 130, 130, 2.95, 208, 40, 70, 30, 1), - ("Simple Maker's Edition v1", 100, 100, 100, 1.75, 208, 40, 70, 30, 1), - ("Simple Maker's Edition v2 (2013 Printrbot Simple)", 100, 100, 100, 1.75, 208, 40, 70, 30, 1), - ("Simple Maker's Edition v3 (2014 Printrbot Simple)", 100, 100, 100, 1.75, 208, 40, 70, 30, 1), - ("Simple Maker's Edition v4 (Model 1405)", 100, 100, 100, 1.75, 208, 40, 70, 30, 1), - ("Jr v1", 150, 100, 80, 1.75, 208, 40, 70, 30, 1), - ("Jr v2", 150, 150, 150, 1.75, 208, 40, 70, 30, 1), - ("LC v2", 150, 150, 150, 1.75, 208, 40, 70, 30, 1), - ("Plus v2", 200, 200, 200, 1.75, 208, 40, 70, 30, 1), - ("Plus v2.1", 200, 200, 200, 1.75, 208, 40, 70, 30, 1), - ("Plus v2.2 (Model 1404/140422)", 250, 250, 250, 1.75, 208, 40, 70, 30, 1), - ("Plus v2.3 (Model 140501)", 250, 250, 250, 1.75, 208, 40, 70, 30, 1), - ("Plus v2.4 (Model 140507)", 250, 250, 250, 1.75, 208, 40, 70, 30, 1), - ("Go v2 Large", 609, 305, 305, 1.75, 208, 35, 70, 30, 1), + ("Original", 130, 130, 130, 0.5, 2.95, 208, 40, 70, 30, 1, False), + ("Simple Maker's Edition v1", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Simple Maker's Edition v2 (2013 Printrbot Simple)", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Simple Maker's Edition v3 (2014 Printrbot Simple)", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Simple Maker's Edition v4 (Model 1405)", 100, 100, 100, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Jr v1", 150, 100, 80, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Jr v2", 150, 150, 150, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("LC v2", 150, 150, 150, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Plus v2", 200, 200, 200, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Plus v2.1", 200, 200, 200, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Plus v2.2 (Model 1404/140422)", 250, 250, 250, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Plus v2.3 (Model 140501)", 250, 250, 250, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Plus v2.4 (Model 140507)", 250, 250, 250, 0.5, 1.75, 208, 40, 70, 30, 1, False), + ("Go v2 Large", 609, 305, 305, 0.5, 1.75, 208, 35, 70, 30, 1, False), ] super(PrintrbotPage, self).__init__(parent, _("Printrbot Selection")) @@ -302,13 +302,13 @@ class PrintrbotPage(InfoPage): profile.putMachineSetting('machine_width', data[0]) profile.putMachineSetting('machine_depth', data[1]) profile.putMachineSetting('machine_height', data[2]) - profile.putProfileSetting('nozzle_size', '0.5') - profile.putProfileSetting('filament_diameter', data[3]) - profile.putProfileSetting('print_temperature', data[4]) - profile.putProfileSetting('print_speed', data[5]) - profile.putProfileSetting('travel_speed', data[6]) - profile.putProfileSetting('retraction_speed', data[7]) - profile.putProfileSetting('retraction_amount', data[8]) + profile.putProfileSetting('nozzle_size', data[3]) + profile.putProfileSetting('filament_diameter', data[4]) + profile.putProfileSetting('print_temperature', data[5]) + profile.putProfileSetting('print_speed', data[6]) + profile.putProfileSetting('travel_speed', data[7]) + profile.putProfileSetting('retraction_speed', data[8]) + profile.putProfileSetting('retraction_amount', data[9]) profile.putProfileSetting('wall_thickness', float(profile.getProfileSettingFloat('nozzle_size')) * 2) profile.putMachineSetting('has_heated_bed', 'False') profile.putMachineSetting('machine_center_is_zero', 'False') @@ -317,6 +317,32 @@ class PrintrbotPage(InfoPage): profile.putMachineSetting('extruder_head_size_max_x', '0') profile.putMachineSetting('extruder_head_size_max_y', '0') profile.putMachineSetting('extruder_head_size_height', '0') + if data[10]: + profile.setAlterationFile('start.gcode', """;Sliced at: {day} {date} {time} +;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} +;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line +;M109 S{print_temperature} ;Uncomment to add your own temperature line +G21 ;metric values +G90 ;absolute positioning +M82 ;set extruder to absolute mode +M107 ;start with the fan off + +G28 X0 Y0 ;move X/Y to min endstops +G28 Z0 ;move Z to min endstops +G29 ;Run the auto bed leveling + +G1 Z15.0 F{travel_speed} ;move the platform down 15mm + +G92 E0 ;zero the extruded length +G1 F200 E3 ;extrude 3mm of feed stock +G92 E0 ;zero the extruded length again +G1 F{travel_speed} +;Put printing message on LCD screen +M117 Printing... +""") class OtherMachineSelectPage(InfoPage): def __init__(self, parent):