Merge branch '2.5'

This commit is contained in:
Ghostkeeper 2017-04-13 09:50:27 +02:00
commit f35124400b
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
6 changed files with 149 additions and 146 deletions

View file

@ -10,15 +10,15 @@ type = variant
[values]
acceleration_enabled = True
acceleration_print = 4000
brim_line_count = 7
brim_width = 7
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed = 100
cool_fan_speed = 7
cool_fan_speed_max = 100
cool_min_speed = 5
default_material_print_temperature = 200
infill_before_walls = False
infill_line_width = =round(line_width * 0.6 / 0.7, 2)
infill_overlap = 0
infill_pattern = cubic
infill_pattern = triangles
infill_wipe_dist = 0
jerk_enabled = True
jerk_print = 25
@ -26,17 +26,20 @@ jerk_topbottom = =math.ceil(jerk_print * 25 / 25)
jerk_wall = =math.ceil(jerk_print * 25 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25)
layer_height = 0.2
line_width = =machine_nozzle_size
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_size = 0.8
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
material_standby_temperature = 100
multiple_mesh_overlap = 0
ooze_shield_angle = 40
raft_acceleration = =acceleration_layer_0
raft_margin = 10
prime_tower_enable = False
prime_tower_size = 16
prime_tower_wipe_enabled = True
retract_at_layer_change = True
retraction_amount = 6.5
retraction_count_max = 25
retraction_extrusion_window = 1
retraction_hop = 2
@ -48,17 +51,14 @@ speed_layer_0 = 20
speed_print = 35
speed_topbottom = =math.ceil(speed_print * 25 / 35)
speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
support_angle = 70
support_angle = 60
support_bottom_distance = =support_z_distance / 2
support_line_width = =line_width * 0.75
support_pattern = zigzag
support_top_distance = =support_z_distance
support_xy_distance = =wall_line_width_0 * 1.5
support_z_distance = =layer_height * 2
switch_extruder_prime_speed = 30
switch_extruder_retraction_amount = 16.5
top_bottom_thickness = 1.4
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_line_width_x = =wall_line_width
wall_thickness = 2

View file

@ -28,6 +28,8 @@ machine_nozzle_size = 0.8
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0
raft_airgap = 0
raft_base_speed = 20
@ -41,6 +43,7 @@ raft_speed = 25
raft_surface_layers = 1
retraction_amount = 4.5
retraction_count_max = 15
retraction_extrusion_window = =retraction_amount
retraction_hop = 2
retraction_hop_enabled = True
retraction_hop_only_when_collides = True
@ -70,5 +73,5 @@ switch_extruder_retraction_amount = 12
top_bottom_thickness = 1
travel_avoid_distance = 3
wall_0_inset = 0
wall_line_width_x = =wall_line_width
wall_thickness = 1