Browse Source

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.
Ghostkeeper 6 years ago
parent
commit
ec00e5b721

+ 0 - 1
resources/definitions/builder_premium_large.def.json

@@ -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 },
 

+ 0 - 1
resources/definitions/builder_premium_medium.def.json

@@ -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 },
 

+ 0 - 1
resources/definitions/builder_premium_small.def.json

@@ -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 },
 

+ 1 - 1
resources/definitions/cartesio.def.json

@@ -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 },

+ 1 - 2
resources/definitions/fdmprinter.def.json

@@ -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')",

+ 1 - 1
resources/quality/gmax15plus/gmax15plus_pla_dual_normal.inst.cfg

@@ -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
 

+ 1 - 1
resources/quality/gmax15plus/gmax15plus_pla_dual_thick.inst.cfg

@@ -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
 

+ 1 - 1
resources/quality/gmax15plus/gmax15plus_pla_dual_thin.inst.cfg

@@ -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
 

+ 1 - 1
resources/quality/gmax15plus/gmax15plus_pla_dual_very_thick.inst.cfg

@@ -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
 

+ 1 - 2
resources/quality/ultimaker3/um3_aa0.25_ABS_Normal_Quality.inst.cfg

@@ -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

Some files were not shown because too many files changed in this diff