Merge branch 'development' of https://github.com/MatterHackers/MatterControl into development

This commit is contained in:
Matt Moening 2015-07-01 16:13:51 -07:00
commit 62a6e01a28
18 changed files with 9 additions and 206 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 KiB

View file

@ -1 +0,0 @@
{"ActualBedInImage":{"Left":48,"Bottom":48,"Right":974,"Top":974}}

View file

@ -1,144 +0,0 @@
avoid_crossing_perimeters = 1
bed_shape = rectangular
bed_size = 228,254
bed_temperature = 90
bottom_clip_amount = 0
bottom_solid_layers = 1mm
bridge_acceleration = 0
bridge_fan_speed = 100
bridge_flow_ratio = 1
bridge_speed = 60
brim_width = 0
build_height = 200
cancel_gcode = G28 X0\n
center_part_on_bed = 1
complete_objects = 0
cool_extruder_lift = 0
cooling = 0
create_raft = 0
raft_extra_distance_around_part = 5
raft_air_gap = .2
default_acceleration = 0
disable_fan_first_layers = 0
end_gcode = M104 S0 ; turn off temperature\nG1 X10 Y200\nM84 ; disable motors
external_perimeter_speed = 50
external_perimeters_first = 0
extra_perimeters = 1
extruder_clearance_height = 20
extruder_clearance_radius = 20
extruder_offset = 0x0
extrusion_axis = E
extrusion_multiplier = 1
extrusion_width = 0
fan_always_on = 0
fan_below_layer_time = 60
filament_diameter = 1.75
fill_angle = 45
fill_density = 0.25
fill_pattern = rectilinear
first_layer_acceleration = 0
first_layer_bed_temperature = 90
first_layer_extrusion_width = 1
first_layer_height = 0.4
first_layer_speed = 30%
first_layer_temperature = 225
g0 = 0
gap_fill_speed = 20
gcode_arcs = 0
gcode_comments = 0
gcode_flavor = reprap
gcode_output_type = REPRAP
has_sd_card_reader = 1
has_hardware_leveling = 1
infill_acceleration = 0
infill_every_layers = 1
infill_extruder = 1
infill_extrusion_width = 0
infill_first = 0
infill_only_where_needed = 0
infill_overlap_perimeter = .06
infill_speed = 60
infill_type = GRID
layer_gcode =
layer_height = 0.1
min_extrusion_before_retract = 0
max_fan_speed = 100
min_fan_speed = 100
min_print_speed = 10
min_skirt_length = 5
notes =
nozzle_diameter = 0.4
only_retract_when_crossing_perimeters = 0
ooze_prevention = 0
output_filename_format = [input_filename_base].gcode
overhangs = 1
pause_gcode =
perimeter_acceleration = 0
perimeter_extruder = 1
perimeter_extrusion_width = 0
perimeter_speed = 60
perimeters = 2
post_process =
print_center = 114,127
raft_layers = 0
randomize_start = 1
repair_outlines_extensive_stitching = 0
repair_outlines_keep_open = 0
repair_overlaps_reverse_orientation = 0
repair_overlaps_union_all_together = 0
resolution = 0
resume_gcode =
retract_before_travel = 20
retract_layer_change = 1
retract_length = 1
retract_length_tool_change = 10
retract_lift = .5
retract_restart_extra = 0
retract_restart_extra_toolchange = 0
retract_speed = 30
skirt_distance = 6
skirt_height = 1
skirts = 2
slowdown_below_layer_time = 10
small_perimeter_speed = 35
solid_fill_pattern = rectilinear
solid_infill_below_area = 70
solid_infill_every_layers = 0
solid_infill_extrusion_width = 0
solid_infill_speed = 60
spiral_vase = 0
standby_temperature_delta = -5
start_gcode = G28 X0 Y0 Z0 ; home all axes\nG1 Z5 F5000 ; lift nozzle\nM109 S[temperature] ; set the extruder temp and wait\nG28 X0 Y0 Z0 ; Home Z again in case there was filament on nozzle\nG29 ; probe the bed
start_perimeters_at_concave_points = 0
start_perimeters_at_non_overhang = 0
support_material = 1
support_material_angle = 0
support_material_create_internal_support = 0
support_material_enforce_layers = 0
support_material_extruder = 1
support_material_extrusion_width = 0
support_material_interface_extruder = 1
support_material_interface_layers = 3
support_material_interface_spacing = 0
support_material_pattern = rectilinear
support_material_spacing = 3
support_material_speed = 60
support_material_threshold = 40
support_material_xy_distance = 0.7
support_material_z_distance = 0.15
support_material_z_gap_layers = 1
support_type = LINES
temperature = 215
thin_walls = 1
threads = 2
toolchange_gcode =
top_infill_extrusion_width = 0
top_solid_infill_speed = 50
top_solid_layers = 1mm
travel_speed = 150
use_firmware_retraction = 0
use_relative_e_distances = 0
vibration_limit = 0
wipe = 0
wipe_shield_distance = 0
z_offset = 0

View file

@ -1,8 +0,0 @@
bed_temperature = 80
disable_fan_first_layers = 0
fan_always_on = 0
first_layer_bed_temperature = 80
first_layer_temperature = 235
retract_length = 1
temperature = 235
retract_speed = 30

View file

@ -1,7 +0,0 @@
bed_temperature = 50
disable_fan_first_layers = 2
fan_always_on = 1
first_layer_bed_temperature = 55
first_layer_temperature = 210
retract_length = 3
temperature = 210

View file

@ -1,5 +0,0 @@
layer_height = 0.1
first_layer_height = 0.3
perimeters = 2
fill_density = 0.25
top_solid_layers = 8

View file

@ -1,9 +0,0 @@
layer_height = 0.3
first_layer_height = 0.3
bottom_clip_amount = 0
perimeters = 2
top_solid_layers = 3
fill_density = 0.2
fill_pattern = rectilinear
solid_infill_below_area = 40
infill_speed = 60

View file

@ -1,4 +0,0 @@
layer_height = 0.2
first_layer_height = 0.3
perimeters = 2
fill_density = 0.25

View file

@ -1,6 +0,0 @@
baud_rate = 250000
windows_driver = MHSerial.inf
default_material_presets = PLA
default_quality_preset = Medium
default_macros = Offset 0.8, Offset 0.9,Offset 1,Offset 1.1,Offset 1.2