Merge remote-tracking branch 'origin/1.5.1'

Conflicts:
	StaticData/PrinterSettings/IRA3D/Poetry Infinity/config.ini
This commit is contained in:
Lars Brubaker 2016-03-25 10:06:34 -07:00
commit adaea31ee8
2 changed files with 20 additions and 20 deletions

View file

@ -20,11 +20,11 @@ print_leveling_method = Manual
print_leveling_required_to_print = 0
manual_probe_paper_width = .1
cooling = 1
create_raft = 1
create_raft = 0
default_acceleration = 0
disable_fan_first_layers = 2
end_gcode = M207 S300.0 F2400 Z0.075\nG28 X0 Y0\nG1 E-3.0 F5.0\nM104 S0\nM140 S0\nM84 ; disable motors
external_perimeter_speed = 100%
end_gcode = T0\nM109 T0 S200\nG92 E0\nG1 E-10 F150\nG28 X0 Y0\nT1\nM109 T1 S200\nG92 E0\nG1 E-10 F150\nG28 X0 Y0\nM104 S0\nM140 S0\nM84 ; disable motors
external_perimeter_speed = 85%
external_perimeters_first = 0
extra_perimeters = 1
extruder_clearance_height = 20
@ -40,12 +40,12 @@ fan_always_on = 0
fan_below_layer_time = 60
filament_diameter = 1.75
fill_angle = 60
fill_density = 15%
fill_density = 45%
fill_pattern = honeycomb
first_layer_acceleration = 0
first_layer_bed_temperature = 75
first_layer_extrusion_width = 100%
first_layer_height = 0.24
first_layer_height = 0.25
first_layer_speed = 25
first_layer_temperature = 205
g0 = 0
@ -68,9 +68,10 @@ infill_extrusion_width = 0
infill_first = 0
infill_only_where_needed = 0
infill_overlap_perimeter = 0.08
infill_speed = 35
infill_speed = 45
infill_type = LINES
layer_height = 0.08
layer_gcode =
layer_height = 0.15
layer_to_pause =
max_fan_speed = 90
min_extrusion_before_retract = 0.1
@ -78,7 +79,7 @@ min_fan_speed = 50
min_print_speed = 10
min_skirt_length = 20
notes =
nozzle_diameter = 0.4
nozzle_diameter = 0.25
only_retract_when_crossing_perimeters = 1
ooze_prevention = 0
output_filename_format = [input_filename_base].gcode
@ -88,7 +89,7 @@ perimeter_acceleration = 0
perimeter_extruder = 1
perimeter_extrusion_width = 0
external_perimeter_extrusion_width = 100%
perimeter_speed = 25
perimeter_speed = 35
perimeters = 2
post_process =
print_center = 131,120
@ -97,7 +98,7 @@ raft_extruder = 1
raft_extra_distance_around_part = 7
raft_fan_speed_percent = 50
raft_layers = 0
raft_print_speed = 25
raft_print_speed = 30
bed_remove_part_temperature = 0
randomize_start = 0
repair_outlines_extensive_stitching = 0
@ -126,13 +127,13 @@ solid_infill_speed = 60
solid_shell = 0
spiral_vase = 0
standby_temperature_delta = -5
start_gcode = G28 ; home all axes \nG1 Z45.0 F70 ;move the platform down 15mmG1 E90 F250\nG1 E90 F250\nG92 E0\nG0 Z5 F5000 ;set warming position\n\n
start_gcode = G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F[travel_speed];move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E10 ;extrude 10mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F[travel_speed]\n;Put printing message on LCD screen\nM117 Printing...\n\n
start_perimeters_at_concave_points = 0
start_perimeters_at_non_overhang = 0
support_air_gap = .3
support_material = 0
support_material_angle = 45
support_material_percent = 5
support_material_percent = 2
support_material_create_internal_support = 0
support_material_create_perimeter = 1
support_material_enforce_layers = 0
@ -143,7 +144,7 @@ support_material_interface_extruder = 1
support_material_interface_layers = .9mm
support_material_interface_spacing = 0
support_material_pattern = honeycomb
support_material_spacing = 1
support_material_spacing = 3
support_material_speed = 40
support_material_threshold = 60
support_material_xy_distance = 0.7
@ -157,7 +158,7 @@ toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 100%
top_solid_layers = 1mm
travel_speed = 70
travel_speed = 150
use_firmware_retraction = 0
use_relative_e_distances = 0
vibration_limit = 0
@ -165,4 +166,4 @@ wipe = 0
wipe_shield_distance = 0
wipe_tower_size = 0
z_can_be_negative = 0
z_offset = 0
z_offset = 0

View file

@ -6,7 +6,7 @@ bed_temperature = 30
bed_remove_part_temperature = 0
retract_length = 3
retract_length_tool_change = 10
retract_speed = 40
retract_speed = 5
retract_lift = 0
retract_restart_extra = 0
retract_before_travel = 10
@ -21,8 +21,7 @@ disable_fan_first_layers = 5
slowdown_below_layer_time = 5
min_print_speed = 10
cool_extruder_lift = 0
infill_speed = 45
perimeter_speed = 45
infill_speed = 35
perimeter_speed = 35
create_raft = 0
skirt_distance = 2
support_material_spacing = 2.5
skirt_distance = 2