Merge branch 'CURA-5457_primetower_settings'

This commit is contained in:
Ghostkeeper 2018-08-07 09:12:39 +02:00
commit dfd4488573
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
17 changed files with 1 additions and 21 deletions

View File

@ -5057,7 +5057,7 @@
"description": "The minimum volume for each layer of the prime tower in order to purge enough material.", "description": "The minimum volume for each layer of the prime tower in order to purge enough material.",
"unit": "mm³", "unit": "mm³",
"type": "float", "type": "float",
"default_value": 5, "default_value": 6,
"minimum_value": "0", "minimum_value": "0",
"maximum_value_warning": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') if prime_tower_circular else resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')) - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume", "maximum_value_warning": "((resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') if prime_tower_circular else resolveOrValue('prime_tower_size') ** 2 * resolveOrValue('layer_height')) - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume",
"enabled": "resolveOrValue('prime_tower_enable')", "enabled": "resolveOrValue('prime_tower_enable')",

View File

@ -15,8 +15,6 @@ variant = AA 0.25
cool_fan_speed = 40 cool_fan_speed = 40
infill_overlap = 15 infill_overlap = 15
material_final_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 5
prime_tower_size = 12
prime_tower_min_volume = 2
retraction_prime_speed = 25 retraction_prime_speed = 25
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)
wall_thickness = 0.92 wall_thickness = 0.92

View File

@ -12,8 +12,6 @@ material = generic_cpe
variant = AA 0.25 variant = AA 0.25
[values] [values]
prime_tower_size = 12
prime_tower_min_volume = 2
retraction_extrusion_window = 0.5 retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55) speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)

View File

@ -34,7 +34,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2 multiple_mesh_overlap = 0.2
prime_tower_enable = True prime_tower_enable = True
prime_tower_flow = 100 prime_tower_flow = 100
prime_tower_min_volume = 10
retract_at_layer_change = False retract_at_layer_change = False
retraction_count_max = 12 retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5

View File

@ -35,7 +35,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2 multiple_mesh_overlap = 0.2
prime_tower_enable = True prime_tower_enable = True
prime_tower_flow = 100 prime_tower_flow = 100
prime_tower_min_volume = 15
retract_at_layer_change = False retract_at_layer_change = False
retraction_count_max = 12 retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5

View File

@ -34,7 +34,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2 multiple_mesh_overlap = 0.2
prime_tower_enable = True prime_tower_enable = True
prime_tower_flow = 100 prime_tower_flow = 100
prime_tower_min_volume = 20
retract_at_layer_change = False retract_at_layer_change = False
retraction_count_max = 12 retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5

View File

@ -15,8 +15,6 @@ variant = AA 0.25
cool_fan_speed = 40 cool_fan_speed = 40
infill_overlap = 15 infill_overlap = 15
material_final_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 5
prime_tower_size = 12
prime_tower_min_volume = 2
retraction_prime_speed = 25 retraction_prime_speed = 25
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)
wall_thickness = 0.92 wall_thickness = 0.92

View File

@ -12,8 +12,6 @@ material = generic_cpe
variant = AA 0.25 variant = AA 0.25
[values] [values]
prime_tower_size = 12
prime_tower_min_volume = 2
retraction_extrusion_window = 0.5 retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55) speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55)

View File

@ -32,7 +32,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2 multiple_mesh_overlap = 0.2
prime_tower_enable = True prime_tower_enable = True
prime_tower_flow = 100 prime_tower_flow = 100
prime_tower_min_volume = 10
retract_at_layer_change = False retract_at_layer_change = False
retraction_count_max = 12 retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5

View File

@ -33,7 +33,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2 multiple_mesh_overlap = 0.2
prime_tower_enable = True prime_tower_enable = True
prime_tower_flow = 100 prime_tower_flow = 100
prime_tower_min_volume = 20
retract_at_layer_change = False retract_at_layer_change = False
retraction_count_max = 12 retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5

View File

@ -32,7 +32,6 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2 multiple_mesh_overlap = 0.2
prime_tower_enable = True prime_tower_enable = True
prime_tower_flow = 100 prime_tower_flow = 100
prime_tower_min_volume = 15
retract_at_layer_change = False retract_at_layer_change = False
retraction_count_max = 12 retraction_count_max = 12
retraction_extra_prime_amount = 0.5 retraction_extra_prime_amount = 0.5

View File

@ -40,7 +40,6 @@ material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100 material_standby_temperature = 100
multiple_mesh_overlap = 0 multiple_mesh_overlap = 0
prime_tower_enable = False prime_tower_enable = False
prime_tower_min_volume = 20
prime_tower_wipe_enabled = True prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0 raft_acceleration = =acceleration_layer_0
raft_airgap = 0 raft_airgap = 0

View File

@ -22,7 +22,6 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
machine_nozzle_heat_up_speed = 1.5 machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4 machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0 machine_nozzle_tip_outer_diameter = 1.0
prime_tower_min_volume = 15
raft_base_speed = 20 raft_base_speed = 20
raft_interface_speed = 20 raft_interface_speed = 20
raft_speed = 25 raft_speed = 25

View File

@ -40,7 +40,6 @@ material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100 material_standby_temperature = 100
multiple_mesh_overlap = 0 multiple_mesh_overlap = 0
prime_tower_enable = False prime_tower_enable = False
prime_tower_min_volume = 20
prime_tower_wipe_enabled = True prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0 raft_acceleration = =acceleration_layer_0
raft_airgap = 0 raft_airgap = 0

View File

@ -22,7 +22,6 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
machine_nozzle_heat_up_speed = 1.5 machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4 machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0 machine_nozzle_tip_outer_diameter = 1.0
prime_tower_min_volume = 15
raft_base_speed = 20 raft_base_speed = 20
raft_interface_speed = 20 raft_interface_speed = 20
raft_speed = 25 raft_speed = 25

View File

@ -40,7 +40,6 @@ material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100 material_standby_temperature = 100
multiple_mesh_overlap = 0 multiple_mesh_overlap = 0
prime_tower_enable = False prime_tower_enable = False
prime_tower_min_volume = 20
prime_tower_wipe_enabled = True prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0 raft_acceleration = =acceleration_layer_0
raft_airgap = 0 raft_airgap = 0

View File

@ -22,7 +22,6 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
machine_nozzle_heat_up_speed = 1.5 machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = BB 0.4 machine_nozzle_id = BB 0.4
machine_nozzle_tip_outer_diameter = 1.0 machine_nozzle_tip_outer_diameter = 1.0
prime_tower_min_volume = 20
raft_base_speed = 20 raft_base_speed = 20
raft_interface_speed = 20 raft_interface_speed = 20
raft_speed = 25 raft_speed = 25