Skip to content

Commit

Permalink
Merge branch '2.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ghostkeeper committed Apr 12, 2017
2 parents cc2d0d3 + 35fd58f commit 6d266d2
Show file tree
Hide file tree
Showing 28 changed files with 871 additions and 1,790 deletions.
145 changes: 50 additions & 95 deletions resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg
Original file line number Diff line number Diff line change
@@ -1,95 +1,50 @@
[general]
version = 2
name = Draft Print
definition = ultimaker3

[metadata]
type = quality
quality_type = draft
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = -2

[values]
acceleration_enabled = True
acceleration_infill = =acceleration_print
acceleration_layer_0 = =acceleration_topbottom
acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
acceleration_print = 4000
acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
acceleration_support_infill = =acceleration_support
acceleration_support_interface = =acceleration_topbottom
acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
acceleration_wall_x = =acceleration_wall
adhesion_type = brim
brim_width = 7
cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed = 1
cool_fan_speed_max = 80
cool_min_layer_time = 5
cool_min_speed = 5
infill_line_width = =round(line_width * 0.35 / 0.35, 2)
infill_overlap = 0
infill_pattern = triangles
infill_sparse_density = 20
infill_wipe_dist = 0
jerk_enabled = True
jerk_infill = =jerk_print
jerk_layer_0 = =jerk_topbottom
jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
jerk_print = 25
jerk_support = =math.ceil(jerk_print * 15 / 25)
jerk_support_infill = =jerk_support
jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
jerk_wall_x = =jerk_wall
layer_height = 0.2
layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
line_width = =machine_nozzle_size * 0.875
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_bed_temperature = 107
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature + 10
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_size = 17
prime_tower_wipe_enabled = True
retraction_amount = 7
retraction_combing = off
retraction_count_max = 25
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False
retraction_hop_only_when_collides = True
skin_overlap = 20
speed_infill = =speed_print
speed_layer_0 = 20
speed_prime_tower = =speed_topbottom
speed_print = 50
speed_support = =speed_wall_0
speed_support_interface = =speed_topbottom
speed_topbottom = =math.ceil(speed_print * 65 / 50)
speed_travel = 250
speed_wall = =math.ceil(speed_print * 50 / 50)
speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
speed_wall_x = =speed_wall
support_angle = 60
support_bottom_distance = =support_z_distance
support_top_distance = =support_z_distance
support_xy_distance = =wall_line_width_0 * 2.5
support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height
top_bottom_thickness = 1.2
travel_avoid_distance = 3
travel_compensate_overlapping_walls_enabled = True
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.3 / 0.35, 2)
wall_thickness = 1
[general]
version = 2
name = Draft Print
definition = ultimaker3

[metadata]
type = quality
quality_type = draft
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 4000
cool_fan_speed_max = 80
cool_min_speed = 5
infill_line_width = =round(line_width * 0.35 / 0.35, 2)
infill_overlap = 0
infill_pattern = triangles
infill_wipe_dist = 0
jerk_enabled = True
jerk_print = 25
layer_height = 0.2
machine_min_cool_heat_time_window = 15
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 10
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_size = 17
prime_tower_wipe_enabled = True
retraction_combing = off
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False
retraction_hop_only_when_collides = True
skin_overlap = 20
speed_layer_0 = 20
speed_print = 50
speed_topbottom = =math.ceil(speed_print * 65 / 50)
speed_travel = 250
speed_wall = =math.ceil(speed_print * 50 / 50)
speed_wall_0 = =math.ceil(speed_wall * 40 / 50)
support_bottom_distance = =support_z_distance
support_z_distance = =layer_height
travel_avoid_distance = 3
wall_0_inset = 0
wall_thickness = 1
144 changes: 49 additions & 95 deletions resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg
Original file line number Diff line number Diff line change
@@ -1,95 +1,49 @@
[general]
version = 2
name = Fast Print
definition = ultimaker3

[metadata]
type = quality
quality_type = fast
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = -1

[values]
acceleration_enabled = True
acceleration_infill = =acceleration_print
acceleration_layer_0 = =acceleration_topbottom
acceleration_prime_tower = =math.ceil(acceleration_print * 2000 / 4000)
acceleration_print = 4000
acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)
acceleration_support_infill = =acceleration_support
acceleration_support_interface = =acceleration_topbottom
acceleration_topbottom = =math.ceil(acceleration_print * 500 / 4000)
acceleration_wall = =math.ceil(acceleration_print * 1000 / 4000)
acceleration_wall_0 = =math.ceil(acceleration_wall * 500 / 1000)
acceleration_wall_x = =acceleration_wall
adhesion_type = brim
brim_width = 7
cool_fan_full_at_height = =layer_height_0 + 4 * layer_height
cool_fan_speed = 1
cool_fan_speed_max = 80
cool_min_layer_time = 5
cool_min_speed = 6
infill_line_width = =round(line_width * 0.35 / 0.35, 2)
infill_overlap = 0
infill_pattern = triangles
infill_sparse_density = 20
infill_wipe_dist = 0
jerk_enabled = True
jerk_infill = =jerk_print
jerk_layer_0 = =jerk_topbottom
jerk_prime_tower = =math.ceil(jerk_print * 15 / 25)
jerk_print = 25
jerk_support = =math.ceil(jerk_print * 15 / 25)
jerk_support_infill = =jerk_support
jerk_support_interface = =jerk_topbottom
jerk_topbottom = =math.ceil(jerk_print * 5 / 25)
jerk_wall = =math.ceil(jerk_print * 10 / 25)
jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10)
jerk_wall_x = =jerk_wall
layer_height = 0.15
layer_height_0 = =round(machine_nozzle_size / 1.5, 2)
line_width = =machine_nozzle_size * 0.875
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_heat_up_speed = 1.4
material_bed_temperature = 107
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature + 10
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_size = 17
prime_tower_wipe_enabled = True
retraction_amount = 7
retraction_combing = off
retraction_count_max = 25
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False
retraction_hop_only_when_collides = True
skin_overlap = 20
speed_infill = =speed_print
speed_layer_0 = 20
speed_prime_tower = =speed_topbottom
speed_print = 45
speed_support = =speed_wall_0
speed_support_interface = =speed_topbottom
speed_topbottom = =math.ceil(speed_print * 55 / 45)
speed_travel = 250
speed_wall = =math.ceil(speed_print * 45 / 45)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
speed_wall_x = =speed_wall
support_angle = 60
support_bottom_distance = =support_z_distance
support_top_distance = =support_z_distance
support_xy_distance = =wall_line_width_0 * 2.5
support_xy_distance_overhang = =wall_line_width_0
support_z_distance = =layer_height
top_bottom_thickness = 1.2
travel_avoid_distance = 3
travel_compensate_overlapping_walls_enabled = True
wall_0_inset = 0
wall_line_width_x = =round(line_width * 0.3 / 0.35, 2)
wall_thickness = 1.3
[general]
version = 2
name = Fast Print
definition = ultimaker3

[metadata]
type = quality
quality_type = fast
material = generic_cpe_plus_ultimaker3_AA_0.4
weight = -1

[values]
acceleration_enabled = True
acceleration_print = 4000
cool_fan_speed_max = 80
cool_min_speed = 6
infill_line_width = =round(line_width * 0.35 / 0.35, 2)
infill_overlap = 0
infill_pattern = triangles
infill_wipe_dist = 0
jerk_enabled = True
jerk_print = 25
layer_height = 0.15
machine_min_cool_heat_time_window = 15
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 5
material_print_temperature = =default_material_print_temperature + 10
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = True
prime_tower_size = 17
prime_tower_wipe_enabled = True
retraction_combing = off
retraction_extrusion_window = 1
retraction_hop = 0.2
retraction_hop_enabled = False
retraction_hop_only_when_collides = True
skin_overlap = 20
speed_layer_0 = 20
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 55 / 45)
speed_travel = 250
speed_wall = =math.ceil(speed_print * 45 / 45)
speed_wall_0 = =math.ceil(speed_wall * 35 / 45)
support_bottom_distance = =support_z_distance
support_z_distance = =layer_height
travel_avoid_distance = 3
wall_0_inset = 0
Loading

0 comments on commit 6d266d2

Please sign in to comment.