Merge remote-tracking branch 'upstream/1.1.3' into development

This commit is contained in:
gregory-diaz 2014-09-02 16:35:09 -07:00
commit 60512e7667
28 changed files with 248 additions and 124 deletions

View file

@ -0,0 +1 @@
Calibration - Box.stl

View file

@ -0,0 +1 @@
Calibration - Box.stl

View file

@ -0,0 +1 @@
Calibration - Box.stl

View file

@ -1,23 +1,25 @@
avoid_crossing_perimeters = 1
bed_shape = circular
bed_size = 260,260
bed_temperature = 90
bottom_solid_layers = 5
bed_size = 150,150
bed_temperature = 50
bottom_clip_amount = 0
bottom_solid_layers = 3
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
bridge_speed = 60
bridge_speed = 50
brim_width = 0
build_height = 228
build_height = 240
cancel_gcode =
center_part_on_bed = 1
complete_objects = 0
cool_extruder_lift = 0
cooling = 1
create_raft = 0
default_acceleration = 0
disable_fan_first_layers = 1
duplicate = 1
duplicate_distance = 6
duplicate_grid = 1,1
disable_fan_first_layers = 2
end_gcode = M104 S0 ; turn off temperature\nM140 S0\nG91\nG1 Z10 E-10.0\nG90\nG28 \nM84 ; disable motors
external_perimeter_speed = 30
external_perimeter_speed = 40
external_perimeters_first = 0
extra_perimeters = 1
extruder_clearance_height = 20
@ -32,57 +34,73 @@ filament_diameter = 1.75
fill_angle = 0
fill_density = 0.2
fill_pattern = rectilinear
first_layer_acceleration = 0
first_layer_bed_temperature = 90
first_layer_extrusion_width = 0.6
first_layer_extrusion_width = 0.4
first_layer_height = 0.35
first_layer_speed = 40%
first_layer_speed = 15
first_layer_temperature = 230
g0 = 0
gap_fill_speed = 30
gcode_arcs = 0
gcode_comments = 0
gcode_flavor = reprap
gcode_output_type = REPRAP
has_fan = 1
has_heated_bed = 1
has_sd_card_reader = 1
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1
infill_extrusion_width = 0.6
infill_first =
infill_only_where_needed = 0
infill_speed = 30
infill_overlap_perimeter = .06
infill_speed = 40
infill_type = TRIANGLES
layer_gcode =
layer_height = 0.2
max_fan_speed = 100
min_fan_speed = 35
min_print_speed = 8
min_extrusion_before_retract = 1
min_fan_speed = 100
min_print_speed = 5
min_skirt_length = 0
notes =
nozzle_diameter = 0.5
only_retract_when_crossing_perimeters = 1
ooze_prevention = 0
output_filename_format = [input_filename_base].gcode
overhangs = 1
pause_gcode =
perimeter_acceleration = 0
perimeter_extruder = 1
perimeter_extrusion_width = 0.6
perimeter_speed = 30
perimeters = 1
perimeter_speed = 40
perimeters = 2
post_process =
print_center = 0,0
raft_air_gap = .2
raft_extra_distance_around_part = 5
raft_layers = 0
randomize_start =
repair_outlines_extensive_stitching = 1
repair_outlines_keep_open = 1
repair_overlaps_reverse_orientation = 0
repair_overlaps_union_all_together = 0
resolution = 0
resume_gcode =
retract_before_travel = 3
retract_layer_change = 0
retract_length = 7.0
retract_length_toolchange = 10
retract_length = 4.5
retract_length_tool_change = 10
retract_lift = 0.2
retract_restart_extra = 0.1
retract_restart_extra_toolchange = 0
retract_speed = 80
rotate = 0
scale = 1
skirt_distance = 3
retract_speed = 110
skirt_distance = 2
skirt_height = 1
skirts = 3
slowdown_below_layer_time = 20
skirts = 2
slowdown_below_layer_time = 40
small_perimeter_speed = 30
solid_fill_pattern = rectilinear
solid_infill_below_area = 20
@ -90,26 +108,40 @@ solid_infill_every_layers = 0
solid_infill_extrusion_width = 0.6
solid_infill_speed = 30
spiral_vase = 0
standby_temperature_delta = -5
start_gcode = G28 ; home all axes
start_perimeters_at_concave_points = 0
start_perimeters_at_non_overhang = 0
support_material = 0
support_material_angle = 0
support_material_create_internal_support = 0
support_material_enforce_layers = 0
support_material_extruder = 1
support_material_extrusion_width = 0.6
support_material_infill_angle = 45
support_material_interface_extruder = 1
support_material_interface_layers = 0
support_material_interface_spacing = 0
support_material_pattern = rectilinear
support_material_spacing = 2.5
support_material_speed = 3
support_material_speed = 40
support_material_threshold = 0
temperature = 230
support_material_xy_distance = 0.7
support_material_z_distance = 0.15
support_material_z_gap_layers = 1
support_type = LINES
temperature = 218
thin_walls = 1
threads = 4
toolchange_gcode =
top_infill_extrusion_width = 0.6
top_solid_infill_speed = 30
top_solid_layers = 5
travel_speed = 200
top_solid_layers = 3
travel_speed = 300
use_firmware_retraction = 0
use_relative_e_distances = 0
vibration_limit = 0
wipe = 0
wipe_shield_distance = 0
z_can_be_negative = 1
z_offset = 0

View file

@ -1,2 +1,3 @@
baud_rate = 250000
default_material_presets = PLA
default_material_presets = PLA
default_movement_speeds = x,3000,y,3000,z,3000,e0,3000

View file

@ -0,0 +1 @@
Calibration - Box.stl

View file

@ -1,113 +1,147 @@
avoid_crossing_perimeters = 1
bed_shape = circular
bed_size = 280,280
bed_temperature = 80
bed_size = 275,275
bed_temperature = 50
bottom_clip_amount = 0
bottom_solid_layers = 3
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
bridge_speed = 20
bridge_speed = 50
brim_width = 0
build_height = 374
build_height = 350
cancel_gcode =
center_part_on_bed = 1
complete_objects = 0
cool_extruder_lift = 0
cooling = 1
create_raft = 0
raft_extra_distance_around_part = 5
raft_air_gap = .2
default_acceleration = 0
disable_fan_first_layers = 1
duplicate = 1
duplicate_distance = 6
duplicate_grid = 1,1
end_gcode = M104 S0 ; turn off temperature\nM140 S0 ; TURN OFF BED\nG91 ; incremental mode\nG1 Z10. E-10. F9000. ; move up 10mm and retract filament \nG90 ; absolute mode \nG1 X0 Y0 Z340 F60000 ; move up fast to almost home position\nG28 ; home the machine to the endstops\nM84 ; turn off stepper motors
external_perimeter_speed = 80%
disable_fan_first_layers = 2
end_gcode = M104 S0 ; turn off temperature\nM140 S0\nG91\nG1 Z10 E-10.0\nG90\nG28 \nM84 ; disable motors
external_perimeter_speed = 40
external_perimeters_first = 0
extra_perimeters = 1
extruder_clearance_height = 20
extruder_clearance_radius = 20
extruder_offset = 0x0
extrusion_axis = E
extrusion_multiplier = 0.96
extrusion_multiplier = 1.0
extrusion_width = 0.6
fan_always_on = 0
fan_below_layer_time = 60
filament_diameter = 1.75
fill_angle = 0
fill_density = 0
fill_density = 0.2
fill_pattern = rectilinear
first_layer_bed_temperature = 80
first_layer_extrusion_width = 0.6
first_layer_acceleration = 0
first_layer_bed_temperature = 90
first_layer_extrusion_width = 0.4
first_layer_height = 0.35
first_layer_speed = 40%
first_layer_speed = 15
first_layer_temperature = 230
g0 = 0
gap_fill_speed = 20
gap_fill_speed = 30
gcode_arcs = 0
gcode_comments = 0
gcode_flavor = reprap
gcode_output_type = REPRAP
has_fan = 1
has_heated_bed = 1
has_sd_card_reader = 1
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1
infill_extrusion_width = 0.6
infill_first = 1
infill_first =
infill_only_where_needed = 0
infill_overlap_perimeter = .06
infill_speed = 40
infill_type = TRIANGLES
layer_gcode =
layer_height = 0.2
min_extrusion_before_retract = 1
max_fan_speed = 100
min_fan_speed = 35
min_fan_speed = 100
min_print_speed = 5
min_skirt_length = 0
notes = Sliced on the MAC w/0.9.9
notes =
nozzle_diameter = 0.5
only_retract_when_crossing_perimeters = 1
ooze_prevention = 0
output_filename_format = [input_filename_base].gcode
overhangs = 1
pause_gcode =
perimeter_acceleration = 0
perimeter_extruder = 1
perimeter_extrusion_width = 0.6
perimeter_speed = 40
perimeters = 3
perimeters = 2
post_process =
print_center = 0,0
raft_layers = 0
randomize_start =
repair_outlines_extensive_stitching = 1
repair_outlines_keep_open = 1
repair_overlaps_reverse_orientation = 0
repair_overlaps_union_all_together = 0
resolution = 0
retract_before_travel = 2
retract_layer_change =
retract_length = 1.4
retract_length_toolchange = 10
retract_lift = 5.0
retract_restart_extra = 0.22
resume_gcode =
retract_before_travel = 3
retract_layer_change = 0
retract_length = 5.6
retract_length_tool_change = 10
retract_lift = 0.2
retract_restart_extra = 0.1
retract_restart_extra_toolchange = 0
retract_speed = 20
rotate = 0
scale = 1
skirt_distance = 3
retract_speed = 110
skirt_distance = 2
skirt_height = 1
skirts = 3
slowdown_below_layer_time = 25
small_perimeter_speed = 40
skirts = 2
slowdown_below_layer_time = 40
small_perimeter_speed = 30
solid_fill_pattern = rectilinear
solid_infill_below_area = 20
solid_infill_every_layers = 0
solid_infill_extrusion_width = 0.6
solid_infill_speed = 40
start_gcode = G28 \nG1 Z300 F9000
solid_infill_speed = 30
spiral_vase = 0
standby_temperature_delta = -5
start_gcode = G28 ; home all axes
start_perimeters_at_concave_points = 0
start_perimeters_at_non_overhang = 0
support_material = 0
support_material_angle = 0
support_material_infill_angle = 45
support_material_create_internal_support = 0
support_material_enforce_layers = 0
support_material_extruder = 1
support_material_extrusion_width = 0.6
support_material_interface_extruder = 1
support_material_interface_layers = 0
support_material_interface_spacing = 0
support_material_pattern = rectilinear
support_material_spacing = 2.5
support_material_speed = 40
support_material_threshold = 0
temperature = 230
support_material_xy_distance = 0.7
support_material_z_distance = 0.15
support_material_z_gap_layers = 1
support_type = LINES
temperature = 218
thin_walls = 1
threads = 4
toolchange_gcode =
top_infill_extrusion_width = 0.6
top_solid_infill_speed = 40
top_solid_layers = 0
travel_speed = 150
top_solid_infill_speed = 30
top_solid_layers = 3
travel_speed = 300
use_firmware_retraction = 0
use_relative_e_distances = 0
vibration_limit = 0
z_offset = 0
wipe = 0
wipe_shield_distance = 0
z_can_be_negative = 1
z_offset = 0

View file

@ -1,2 +1,3 @@
baud_rate = 250000
default_material_presets = PLA
default_material_presets = PLA
default_movement_speeds = x,3000,y,3000,z,3000,e0,3000

View file

@ -2564,3 +2564,6 @@ Translated:Z Can Be Negative
English:Export as X3G
Translated:Export as X3G
English:Select an Image
Translated:Select an Image