Skip to content

Commit

Permalink
Corrected formulas based on comments Jaime.
Browse files Browse the repository at this point in the history
  • Loading branch information
pkuiper-ultimaker committed Jul 11, 2024
1 parent 6627881 commit 41b8173
Show file tree
Hide file tree
Showing 40 changed files with 94 additions and 119 deletions.
2 changes: 1 addition & 1 deletion resources/definitions/ultimaker_method.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
},
"overrides":
{
"build_volume_temperature": { "maximum_value_warning": "67" },
"build_volume_temperature": { "maximum_value": "67" },
"machine_depth": { "default_value": 236.48 },
"machine_disallowed_areas":
{
Expand Down
25 changes: 12 additions & 13 deletions resources/definitions/ultimaker_method_base.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@
"raft_smoothing": { "value": 9.5 },
"raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" },
"raft_surface_fan_speed": { "value": 0 },
"raft_surface_wall_count": { "value": "raft_wall_count" },
"raft_wall_count": { "value": 2 },
"retract_at_layer_change": { "value": true },
"retraction_amount": { "value": 0.75 },
Expand All @@ -365,7 +364,7 @@
"retraction_hop": { "value": 0.4 },
"retraction_hop_enabled": { "value": true },
"retraction_hop_only_when_collides": { "value": false },
"retraction_min_travel": { "value": "0.6 if extruder_nr == support_extruder_nr else 5" },
"retraction_min_travel": { "value": "0.6 if material_is_support_material else 5" },
"retraction_prime_speed": { "value": "retraction_speed" },
"retraction_speed": { "value": 5 },
"roofing_layer_count": { "value": 2 },
Expand All @@ -392,34 +391,34 @@
"speed_wall_0": { "value": "speed_wall * 30/40" },
"speed_wall_x": { "value": "speed_wall" },
"support_angle": { "value": 40 },
"support_bottom_distance": { "value": "layer_height if extruder_nr == support_extruder_nr else support_z_distance" },
"support_bottom_enable": { "value": "extruder_nr != support_extruder_nr" },
"support_bottom_distance": { "value": "layer_height if material_is_support_material else support_z_distance" },
"support_bottom_enable": { "value": "not(material_is_support_material)" },
"support_bottom_height": { "value": "2*support_infill_sparse_thickness" },
"support_bottom_material_flow": { "value": "material_flow" },
"support_bottom_wall_count": { "value": "0 if extruder_nr == support_extruder_nr else support_wall_count" },
"support_bottom_wall_count": { "value": "0 if material_is_support_material else support_wall_count" },
"support_brim_enable": { "value": false },
"support_conical_min_width": { "value": 10 },
"support_enable": { "value": true },
"support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" },
"support_fan_enable": { "value": "extruder_nr == support_extruder_nr" },
"support_fan_enable": { "value": "material_is_support_material" },
"support_infill_rate": { "value": 20.0 },
"support_infill_sparse_thickness": { "value": "layer_height" },
"support_interface_enable": { "value": true },
"support_interface_height": { "value": "4*support_infill_sparse_thickness" },
"support_interface_material_flow": { "value": "material_flow" },
"support_interface_offset": { "value": "1 if extruder_nr == support_extruder_nr else 0.8" },
"support_interface_offset": { "value": "1 if material_is_support_material else 0.8" },
"support_interface_pattern": { "value": "'lines'" },
"support_interface_wall_count": { "value": "1 if extruder_nr == support_extruder_nr else 2" },
"support_interface_wall_count": { "value": "1 if material_is_support_material else 2" },
"support_material_flow": { "value": "material_flow" },
"support_offset": { "value": "1.8 if extruder_nr == support_extruder_nr else 0.8" },
"support_offset": { "value": "1.8 if material_is_support_material else 0.8" },
"support_pattern": { "value": "'lines'" },
"support_roof_height": { "value": "4*layer_height if extruder_nr == support_extruder_nr else 5*layer_height" },
"support_roof_height": { "value": "4*layer_height if material_is_support_material else 5*layer_height" },
"support_roof_material_flow": { "value": "material_flow" },
"support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" },
"support_top_distance": { "value": "0.25 if extruder_nr == support_extruder_nr else support_z_distance" },
"support_top_distance": { "value": "0.25 if material_is_support_material else support_z_distance" },
"support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" },
"support_xy_distance": { "value": "0.3 if extruder_nr == support_extruder_nr else 0.2" },
"support_xy_distance_overhang": { "value": "0.3 if extruder_nr == support_extruder_nr else 0.2" },
"support_xy_distance": { "value": "0.3 if material_is_support_material else 0.2" },
"support_xy_distance_overhang": { "value": "support_xy_distance" },
"switch_extruder_retraction_amount": { "value": 0.5 },
"switch_extruder_retraction_speeds": { "value": "retraction_speed" },
"top_bottom_thickness": { "value": "5*layer_height" },
Expand Down
2 changes: 1 addition & 1 deletion resources/definitions/ultimaker_methodx.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
},
"overrides":
{
"build_volume_temperature": { "maximum_value_warning": "107" },
"build_volume_temperature": { "maximum_value": "107" },
"machine_depth": { "default_value": 236.48 },
"machine_disallowed_areas":
{
Expand Down
2 changes: 1 addition & 1 deletion resources/definitions/ultimaker_methodxl.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
},
"overrides":
{
"build_volume_temperature": { "maximum_value_warning": "100" },
"build_volume_temperature": { "maximum_value": "100" },
"machine_depth": { "default_value": 320 },
"machine_disallowed_areas":
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
min_bead_width = =line_width * 0.75
min_wall_line_width = =line_width * 0.75
raft_airgap = 0.18
raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
raft_base_speed = 15
raft_base_thickness = 0.6
raft_interface_infill_overlap = 25
Expand Down Expand Up @@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.8
support_offset = 3
support_roof_density = =support_interface_density
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.3
support_xy_overrides_z = xy_overrides_z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ support_bottom_line_width = 0.6
support_bottom_stair_step_height = 0
support_infill_rate = 12.0
support_line_width = =line_width * 0.75
support_roof_density = =85 if extruder_nr == support_extruder_nr else 97
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_roof_density = 85
support_use_towers = True
support_z_distance = 0.25

Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
min_bead_width = =line_width * 0.75
min_wall_line_width = =line_width * 0.75
raft_airgap = 0.18
raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
raft_base_speed = 15
raft_base_thickness = 0.6
raft_interface_infill_overlap = 25
Expand Down Expand Up @@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.8
support_offset = 3
support_roof_density = =support_interface_density
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.3
support_xy_overrides_z = xy_overrides_z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ support_infill_rate = 12
support_pattern = grid
support_roof_density = 95
support_roof_height = =layer_height*8
support_roof_line_width = 0.25
support_xy_distance = 0.2
switch_extruder_extra_prime_amount = 1
switch_extruder_retraction_amount = 2.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ support_bottom_line_width = 0.6
support_bottom_stair_step_height = 0
support_infill_rate = 12.0
support_line_width = =line_width * 0.75
support_roof_density = =85 if extruder_nr == support_extruder_nr else 97
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_roof_density = 85
support_use_towers = True
support_z_distance = 0.25

Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
min_bead_width = =line_width * 0.75
min_wall_line_width = =line_width * 0.75
raft_airgap = 0.18
raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
raft_base_speed = 15
raft_base_thickness = 0.6
raft_interface_infill_overlap = 25
Expand Down Expand Up @@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.8
support_offset = 3
support_roof_density = =support_interface_density
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.3
support_xy_overrides_z = xy_overrides_z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
min_bead_width = =line_width * 0.75
min_wall_line_width = =line_width * 0.75
raft_airgap = 0.18
raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
raft_base_speed = 15
raft_base_thickness = 0.6
raft_interface_infill_overlap = 25
Expand Down Expand Up @@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.8
support_offset = 3
support_roof_density = =support_interface_density
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.3
support_xy_overrides_z = xy_overrides_z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variant = 1C
weight = -2

[values]
cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False
cool_fan_enabled = =extruder_nr == support_extruder_nr
cool_fan_full_layer = 3
cool_fan_speed = 0
cool_fan_speed_0 = 0
Expand Down Expand Up @@ -48,10 +48,9 @@ support_interface_offset = 1.2
support_line_width = 0.35
support_material_flow = 90
support_roof_density = 82
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_use_towers = True
support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2
support_xy_distance_overhang = =0.25 if extruder_nr == support_extruder_nr else 0.15
support_xy_distance = 0.3
support_xy_distance_overhang = 0.25
support_z_distance = 0.15
wall_overhang_angle = 30
wall_overhang_speed_factor = 50
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variant = 1C
weight = -2

[values]
cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False
cool_fan_enabled = =extruder_nr == support_extruder_nr
cool_fan_full_layer = 3
cool_fan_speed = 75
cool_fan_speed_0 = 0
Expand All @@ -21,9 +21,9 @@ cool_min_layer_time = 10
cool_min_layer_time_fan_speed_max = 8
cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)
cool_min_temperature = 250
material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10)
material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10)
material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature
raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0
raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8
raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50
Expand All @@ -50,12 +50,11 @@ support_interface_pattern = lines
support_line_width = 0.3
support_material_flow = 85
support_roof_density = 85
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_roof_wall_count = 1
support_supported_skin_fan_speed = 60.0
support_top_distance = =support_z_distance
support_use_towers = False
support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2
support_xy_distance = 0.35
support_xy_distance_overhang = 0.25
support_xy_overrides_z = xy_overrides_z
support_z_distance = 0.15
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ variant = 1C
weight = -2

[values]
cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False
cool_fan_enabled = =extruder_nr == support_extruder_nr
cool_fan_full_layer = 3
cool_fan_speed = 85.0
cool_fan_speed_0 = 0
Expand Down Expand Up @@ -49,7 +49,6 @@ support_infill_rate = 15.0
support_line_width = 0.3
support_material_flow = =0.85*material_flow
support_roof_density = 85
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_supported_skin_fan_speed = 60.0
support_top_distance = =support_z_distance
support_use_towers = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ support_bottom_line_width = 0.6
support_bottom_stair_step_height = 0
support_infill_rate = 12.0
support_line_width = =line_width * 0.75
support_roof_density = =85 if extruder_nr == support_extruder_nr else 97
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_roof_density = 85
support_use_towers = True
support_z_distance = 0.25

Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ material_print_temperature_layer_0 = 225
min_bead_width = =line_width * 0.75
min_wall_line_width = =line_width * 0.75
raft_airgap = 0.18
raft_base_line_spacing = =4 if extruder_nr == raft_interface_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1.4
raft_base_line_spacing = =4 if extruder_nr == support_extruder_nr else 2.8
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1.4
raft_base_speed = 15
raft_base_thickness = 0.6
raft_interface_infill_overlap = 25
Expand Down Expand Up @@ -61,7 +61,6 @@ support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.8
support_offset = 3
support_roof_density = =support_interface_density
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.3
support_xy_overrides_z = xy_overrides_z
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variant = 1XA
weight = -2

[values]
cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False
cool_fan_enabled = =extruder_nr == support_extruder_nr
cool_fan_full_layer = 3
cool_fan_speed = 75
cool_fan_speed_0 = 0
Expand All @@ -21,9 +21,9 @@ cool_min_layer_time = 10
cool_min_layer_time_fan_speed_max = 8
cool_min_speed = =round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)
cool_min_temperature = 250
material_final_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10)
material_initial_print_temperature = =material_print_temperature if extruder_nr == support_extruder_nr else (material_print_temperature - 10)
material_print_temperature = =255 if extruder_nr == support_extruder_nr else 260
material_final_print_temperature = =material_print_temperature - 10
material_initial_print_temperature = =material_print_temperature - 10
material_print_temperature = =default_material_print_temperature-5 if extruder_nr == support_extruder_nr else default_material_print_temperature
raft_airgap = =0.16 if extruder_nr == support_extruder_nr else 0
raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.8
raft_surface_speed = =90 if extruder_nr == support_extruder_nr else 50
Expand All @@ -50,12 +50,11 @@ support_interface_pattern = lines
support_line_width = 0.3
support_material_flow = 85
support_roof_density = 85
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_roof_wall_count = 1
support_supported_skin_fan_speed = 60.0
support_top_distance = =support_z_distance
support_use_towers = False
support_xy_distance = =0.35 if extruder_nr == support_extruder_nr else 0.2
support_xy_distance = 0.35
support_xy_distance_overhang = 0.25
support_xy_overrides_z = xy_overrides_z
support_z_distance = 0.15
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ variant = 1XA
weight = -2

[values]
cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False
cool_fan_enabled = =extruder_nr == support_extruder_nr
cool_fan_full_layer = 3
cool_fan_speed = 85.0
cool_fan_speed_0 = 0
Expand Down Expand Up @@ -49,7 +49,6 @@ support_infill_rate = 15.0
support_line_width = 0.3
support_material_flow = =0.85*material_flow
support_roof_density = 85
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_supported_skin_fan_speed = 60.0
support_top_distance = =support_z_distance
support_use_towers = False
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ support_infill_rate = 12
support_pattern = grid
support_roof_density = 95
support_roof_height = =layer_height*8
support_roof_line_width = 0.25
support_xy_distance = 0.2
switch_extruder_extra_prime_amount = 1
switch_extruder_retraction_amount = 2.5
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@ support_conical_angle = 20
support_conical_enabled = True
support_conical_min_width = 20
support_fan_enable = False
support_roof_line_width = 0.25
support_xy_distance = 0.2
support_xy_distance_overhang = 0.15

Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variant = LABS
weight = -2

[values]
cool_fan_enabled = =True if extruder_nr == support_extruder_nr else False
cool_fan_enabled = =extruder_nr == support_extruder_nr
cool_fan_full_layer = 3
cool_fan_speed = 0
cool_fan_speed_0 = 0
Expand Down Expand Up @@ -48,10 +48,9 @@ support_interface_offset = 1.2
support_line_width = 0.35
support_material_flow = 90
support_roof_density = 82
support_roof_line_width = =0.4 if extruder_nr == support_extruder_nr else 0.25
support_use_towers = True
support_xy_distance = =0.3 if extruder_nr == support_extruder_nr else 0.2
support_xy_distance_overhang = =0.25 if extruder_nr == support_extruder_nr else 0.15
support_xy_distance = 0.3
support_xy_distance_overhang = 0.25
support_z_distance = 0.15
wall_overhang_angle = 30
wall_overhang_speed_factor = 50
Expand Down
Loading

0 comments on commit 41b8173

Please sign in to comment.