Remove references to deleted settings

Also convert the values for prime_tower_min_volume to make it behave similar to what the minimum volume used to be. This feature fixed a bug with the computation from volume to thickness. Now it's correct but we have to correct the old values to be still the same (approximately) as what used to be the end result.

Contributes to issue CURA-5457.
This commit is contained in:
Ghostkeeper 2018-07-05 13:22:17 +02:00
parent 8f8c515438
commit ec00e5b721
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
47 changed files with 34 additions and 66 deletions

View file

@ -54,7 +54,6 @@
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 },
"dual_pre_wipe": { "default_value": false },
"prime_blob_enable": { "enabled": true },

View file

@ -54,7 +54,6 @@
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 },
"dual_pre_wipe": { "default_value": false },
"prime_blob_enable": { "enabled": true },

View file

@ -53,7 +53,6 @@
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 },
"dual_pre_wipe": { "default_value": false },
"prime_blob_enable": { "enabled": true },

View file

@ -44,7 +44,7 @@
"material_print_temp_wait": { "default_value": false },
"material_bed_temp_wait": { "default_value": false },
"prime_tower_enable": { "default_value": false },
"prime_tower_wall_thickness": { "resolve": 0.7 },
"prime_tower_min_volume": { "value": "0.7" },
"prime_tower_size": { "value": 24.0 },
"prime_tower_position_x": { "value": 125 },
"prime_tower_position_y": { "value": 70 },

View file

@ -4992,8 +4992,7 @@
"description": "The minimum volume for each layer of the prime tower in order to purge enough material.",
"unit": "mm³",
"type": "float",
"default_value": 10,
"value": "8.48 if prime_tower_circular else 10",
"default_value": 5,
"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",
"enabled": "resolveOrValue('prime_tower_enable')",

View file

@ -64,7 +64,7 @@ ooze_shield_enabled = True
prime_tower_enable = False
prime_tower_position_x = 350
prime_tower_position_y = 350
prime_tower_wall_thickness = 2
prime_tower_min_volume = 18
switch_extruder_retraction_amount = 6
switch_extruder_retraction_speeds = 60

View file

@ -64,7 +64,7 @@ ooze_shield_enabled = True
prime_tower_enable = False
prime_tower_position_x = 350
prime_tower_position_y = 350
prime_tower_wall_thickness = 2
prime_tower_min_volume = 18
switch_extruder_retraction_amount = 6
switch_extruder_retraction_speeds = 60

View file

@ -64,7 +64,7 @@ ooze_shield_enabled = True
prime_tower_enable = False
prime_tower_position_x = 350
prime_tower_position_y = 350
prime_tower_wall_thickness = 2
prime_tower_min_volume = 18
switch_extruder_retraction_amount = 6
switch_extruder_retraction_speeds = 60

View file

@ -63,7 +63,7 @@ ooze_shield_enabled = True
prime_tower_enable = False
prime_tower_position_x = 350
prime_tower_position_y = 350
prime_tower_wall_thickness = 2
prime_tower_min_volume = 18
switch_extruder_retraction_amount = 6
switch_extruder_retraction_speeds = 60

View file

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

View file

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

View file

@ -16,7 +16,6 @@ material_print_temperature = =default_material_print_temperature + 10
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_purge_volume = 1
skin_overlap = 20
speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60)

View file

@ -17,7 +17,6 @@ material_print_temperature = =default_material_print_temperature + 5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_purge_volume = 1
speed_print = 60
speed_layer_0 = =math.ceil(speed_print * 20 / 60)
speed_topbottom = =math.ceil(speed_print * 30 / 60)

View file

@ -19,7 +19,6 @@ material_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_purge_volume = 1
speed_print = 50
speed_layer_0 = =math.ceil(speed_print * 20 / 50)
speed_topbottom = =math.ceil(speed_print * 30 / 50)

View file

@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.5
material_initial_print_temperature = =material_print_temperature - 5
material_final_print_temperature = =material_print_temperature - 10
material_standby_temperature = 100
prime_tower_purge_volume = 1
speed_print = 55
speed_layer_0 = =math.ceil(speed_print * 20 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)

View file

@ -17,7 +17,6 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature + 15
material_standby_temperature = 100
prime_tower_enable = True
prime_tower_purge_volume = 1
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)

View file

@ -18,7 +18,6 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature + 20
material_standby_temperature = 100
prime_tower_enable = True
prime_tower_purge_volume = 1
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 30 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)

View file

@ -18,7 +18,6 @@ line_width = =machine_nozzle_size * 0.875
material_print_temperature = =default_material_print_temperature + 17
material_standby_temperature = 100
prime_tower_enable = True
prime_tower_purge_volume = 1
speed_print = 40
speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)

View file

@ -29,7 +29,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 10
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -29,7 +29,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 20
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -29,7 +29,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 15
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -35,7 +35,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 10
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -36,7 +36,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 15
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -35,7 +35,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 20
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

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

View file

@ -13,10 +13,9 @@ variant = AA 0.25
[values]
prime_tower_size = 12
prime_tower_wall_thickness = 0.9
prime_tower_min_volume = 2
retraction_extrusion_window = 0.5
speed_infill = =math.ceil(speed_print * 40 / 55)
speed_topbottom = =math.ceil(speed_print * 30 / 55)
top_bottom_thickness = 0.8
wall_thickness = 0.92
prime_tower_purge_volume = 1

View file

@ -26,4 +26,3 @@ wall_thickness = 1
infill_pattern = zigzag
speed_infill = =math.ceil(speed_print * 50 / 60)
prime_tower_purge_volume = 1

View file

@ -24,4 +24,3 @@ speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
infill_pattern = zigzag
speed_infill = =math.ceil(speed_print * 50 / 60)
prime_tower_purge_volume = 1

View file

@ -25,4 +25,3 @@ speed_wall = =math.ceil(speed_print * 30 / 50)
infill_pattern = zigzag
speed_infill = =math.ceil(speed_print * 40 / 50)
prime_tower_purge_volume = 1

View file

@ -23,4 +23,3 @@ speed_wall = =math.ceil(speed_print * 30 / 55)
infill_pattern = zigzag
speed_infill = =math.ceil(speed_print * 45 / 55)
prime_tower_purge_volume = 1

View file

@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
jerk_travel = 50
prime_tower_purge_volume = 1

View file

@ -23,4 +23,3 @@ speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
jerk_travel = 50
prime_tower_purge_volume = 1

View file

@ -22,4 +22,3 @@ speed_topbottom = =math.ceil(speed_print * 25 / 40)
speed_wall = =math.ceil(speed_print * 30 / 40)
jerk_travel = 50
prime_tower_purge_volume = 1

View file

@ -29,7 +29,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 10
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -29,7 +29,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 20
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -28,7 +28,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 15
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -33,7 +33,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 10
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

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

View file

@ -33,7 +33,7 @@ material_standby_temperature = 100
multiple_mesh_overlap = 0.2
prime_tower_enable = True
prime_tower_flow = 100
prime_tower_wall_thickness = =prime_tower_line_width * 2
prime_tower_min_volume = 15
retract_at_layer_change = False
retraction_count_max = 12
retraction_extra_prime_amount = 0.5

View file

@ -123,7 +123,6 @@ brim_outside_only
prime_tower_enable
prime_tower_position_x
prime_tower_position_y
prime_tower_purge_volume
[meshfix]

View file

@ -291,13 +291,10 @@ prime_tower_enable
prime_tower_circular
prime_tower_size
prime_tower_min_volume
prime_tower_wall_thickness
prime_tower_position_x
prime_tower_position_y
prime_tower_flow
prime_tower_wipe_enabled
dual_pre_wipe
prime_tower_purge_volume
ooze_shield_enabled
ooze_shield_angle
ooze_shield_dist

View file

@ -40,8 +40,7 @@ material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_purge_volume = 2
prime_tower_wall_thickness = 2.2
prime_tower_min_volume = 20
prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0
raft_airgap = 0

View file

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

View file

@ -40,8 +40,7 @@ material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_purge_volume = 2
prime_tower_wall_thickness = 2.2
prime_tower_min_volume = 20
prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0
raft_airgap = 0

View file

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

View file

@ -40,8 +40,7 @@ material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
multiple_mesh_overlap = 0
prime_tower_enable = False
prime_tower_purge_volume = 2
prime_tower_wall_thickness = 2.2
prime_tower_min_volume = 20
prime_tower_wipe_enabled = True
raft_acceleration = =acceleration_layer_0
raft_airgap = 0

View file

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