restructure raft airgap

No values are changed, but the settings are restructured. The PVA airgap is moved to fdm_materials. Inconsistent use of equations is also resolved. PP-243
2025-08-12 06:39:04 +08:00 · 2022-09-13 11:59:34 +02:00 · 2022-09-13 11:59:34 +02:00 · 4712c6abc3
commit 4712c6abc3
parent 48c59099c8
38 changed files with 19 additions and 38 deletions
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@ -111,7 +111,6 @@
        "multiple_mesh_overlap": { "value": "0" },
        "optimize_wall_printing_order": { "value": "True" },
        "prime_tower_enable": { "default_value": true },
-        "raft_airgap": { "value": "0" },
        "retraction_amount": { "value": "6.5" },
        "retraction_hop": { "value": "2" },
        "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@ -100,7 +100,6 @@
        "multiple_mesh_overlap": { "value": "0" },
        "optimize_wall_printing_order": { "value": "True" },
        "prime_tower_enable": { "value": "True" },
-        "raft_airgap": { "value": "0" },
        "retraction_amount": { "value": "6.5" },
        "retraction_hop": { "value": "2" },
        "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@ -101,7 +101,6 @@
        "default_material_print_temperature": { "value": "200" },
        "multiple_mesh_overlap": { "value": "0" },
        "prime_tower_enable": { "value": "True" },
-        "raft_airgap": { "value": "0" },
        "retraction_amount": { "value": "6.5" },
        "retraction_combing": { "value": "'no_outer_surfaces'"},
        "retraction_hop": { "value": "2" },
--- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg
@ -17,7 +17,7 @@ cool_min_speed = 12
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.15
 retraction_min_travel = 5
 skin_overlap = 50
 speed_print = 70
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg
@ -19,7 +19,7 @@ material_print_temperature = =default_material_print_temperature + 10
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg
@ -19,7 +19,7 @@ material_print_temperature = =default_material_print_temperature + 5
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg
@ -18,7 +18,7 @@ cool_min_speed = 15
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
--- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg
@ -18,7 +18,7 @@ cool_min_speed = 12
 material_initial_print_temperature = =material_print_temperature - 5
 material_final_print_temperature = =material_print_temperature - 10
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.25
 skin_overlap = 50
 speed_layer_0 = =math.ceil(speed_print * 20 / 70)
 switch_extruder_prime_speed = 30
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg
@ -19,7 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@ -20,7 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@ -20,7 +20,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg
@ -34,5 +34,5 @@ top_bottom_thickness = 0.9

 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'

-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
--- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@ -34,5 +34,5 @@ top_bottom_thickness = 1.2

 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'

-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg
@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg
@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg
@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg
@ -18,7 +18,7 @@ cool_min_speed = 12
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.15
 retraction_min_travel = 5
 skin_overlap = 50
 speed_print = 70
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg
@ -35,5 +35,5 @@ top_bottom_thickness = 0.9

 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'

-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
--- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg
@ -34,5 +34,5 @@ top_bottom_thickness = 1.2

 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles'

-raft_airgap = =0.25
+raft_airgap = 0.25
 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25)
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg
@ -19,7 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg
@ -19,7 +19,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg
@ -21,7 +21,7 @@ machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_heat_up_speed = 1.4
 ooze_shield_angle = 40
 prime_tower_enable = True
-raft_airgap = =round(layer_height_0 * 0.85, 2)
+raft_airgap = 0.45
 support_angle = 70
 switch_extruder_prime_speed = 30
 switch_extruder_retraction_amount = 30
--- a/resources/variants/ultimaker3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_aa0.25.inst.cfg
@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
--- a/resources/variants/ultimaker3_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_aa04.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
--- a/resources/variants/ultimaker3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_bb0.8.inst.cfg
@ -31,7 +31,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
--- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg
@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
--- a/resources/variants/ultimaker3_extended_aa04.inst.cfg
+++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
--- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@ -31,7 +31,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
--- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg
@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
--- a/resources/variants/ultimaker_s3_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s3_aa04.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
--- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@ -30,7 +30,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
--- a/resources/variants/ultimaker_s3_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc04.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.4
 machine_nozzle_size = 0.4
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
--- a/resources/variants/ultimaker_s3_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s3_cc06.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.6
 machine_nozzle_size = 0.6
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
--- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg
@ -18,7 +18,6 @@ machine_nozzle_size = 0.25
 machine_nozzle_tip_outer_diameter = 0.65
 material_final_print_temperature = =material_print_temperature - 10
 material_initial_print_temperature = =material_print_temperature - 5
-raft_airgap = 0.3
 retraction_min_travel = 0.7
 retraction_prime_speed = =retraction_speed
 skin_overlap = 15
--- a/resources/variants/ultimaker_s5_aa04.inst.cfg
+++ b/resources/variants/ultimaker_s5_aa04.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = AA 0.4
 machine_nozzle_tip_outer_diameter = 1.0
-raft_airgap = 0.3
 retraction_amount = 6.5
 retraction_min_travel = =line_width * 2
 skin_overlap = 15
--- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg
+++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@ -30,7 +30,6 @@ material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
 prime_tower_enable = False
 prime_tower_wipe_enabled = True
-raft_airgap = 0
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
--- a/resources/variants/ultimaker_s5_cc04.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc04.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.4
 machine_nozzle_size = 0.4
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print
--- a/resources/variants/ultimaker_s5_cc06.inst.cfg
+++ b/resources/variants/ultimaker_s5_cc06.inst.cfg
@ -13,7 +13,6 @@ brim_width = 7
 machine_nozzle_cool_down_speed = 0.9
 machine_nozzle_id = CC 0.6
 machine_nozzle_size = 0.6
-raft_airgap = 0.3
 retraction_min_travel = =line_width * 2
 retraction_prime_speed = =retraction_speed
 speed_infill = =speed_print