Skip to content

Commit

Permalink
Merge pull request #19763 from Ultimaker/PP-533-Small-corrections-for…
Browse files Browse the repository at this point in the history
…-5.9-Stable

Small corrections for 5.9 Stable
  • Loading branch information
HellAholic authored Oct 21, 2024
2 parents d9cfd7f + d7d25d0 commit b98744c
Show file tree
Hide file tree
Showing 26 changed files with 50 additions and 45 deletions.
1 change: 1 addition & 0 deletions resources/definitions/ultimaker_method_base.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,7 @@
"multiple_mesh_overlap": { "value": 0 },
"optimize_wall_printing_order": { "value": true },
"prime_blob_enable": { "enabled": false },
"prime_tower_enable": { "default_value": true },
"prime_tower_flow": { "value": "material_flow" },
"prime_tower_line_width":
{
Expand Down
16 changes: 16 additions & 0 deletions resources/definitions/ultimaker_sketch.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,23 @@
"machine_nozzle_heat_up_speed": { "default_value": 1.4 },
"machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" },
"machine_width": { "default_value": 150 },
"material_bed_temperature":
{
"maximum_value": 100,
"maximum_value_warning": 70
},
"material_bed_temperature_layer_0":
{
"maximum_value": 100,
"maximum_value_warning": 70
},
"material_diameter": { "default_value": 1.75 },
"material_flow": { "default_value": 100 },
"material_print_temperature":
{
"maximum_value": 240,
"maximum_value_warning": 230
},
"min_bead_width":
{
"minimum_value": "line_width * 0.5",
Expand All @@ -148,6 +163,7 @@
"enabled": true,
"value": "resolveOrValue('print_sequence') != 'one_at_a_time'"
},
"print_sequence": { "enabled": false },
"raft_margin": { "value": "5" },
"retract_at_layer_change": { "value": true },
"retraction_amount":
Expand Down
3 changes: 2 additions & 1 deletion resources/definitions/ultimaker_sketch_sprint.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,12 @@
"material_flow": { "default_value": 100 },
"material_print_temperature":
{
"maximum_value": 280,
"maximum_value": 260,
"maximum_value_warning": 240
},
"min_bead_width": { "value": 0.3 },
"multiple_mesh_overlap": { "value": "0" },
"print_sequence": { "enabled": false },
"raft_airgap": { "value": 0.35 },
"raft_base_acceleration": { "value": "acceleration_layer_0" },
"raft_base_speed":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ initial_layer_line_width_factor = 110
layer_height_0 = =layer_height * 1.5
material_flow_layer_0 = 110
material_initial_print_temperature = 245
retraction_amount = 1.5
retraction_speed = 45
retraction_amount = 0.75
retraction_speed = 5
roofing_line_width = 0.4
skin_line_width = 0.45
skin_material_flow_layer_0 = 110
skin_overlap = 20.0
skirt_brim_line_width = 1
skirt_brim_minimal_length = 100.0
skirt_height = 3
speed_print = 25
support_enable = False
top_bottom_thickness = =layer_height * 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ weight = -2
[values]
infill_sparse_density = 50
raft_airgap = 0.22
raft_interface_flow = 110
raft_interface_infill_overlap = 25
raft_interface_speed = =speed_print * 1/2
raft_interface_z_offset = -0.1
raft_surface_flow = 110
raft_surface_infill_overlap = 50
raft_surface_speed = =speed_print * 1/2
raft_surface_z_offset = -0.075
speed_layer_0 = =speed_print * 1/4
speed_prime_tower = =speed_print * 3/4
speed_print = 40
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ initial_layer_line_width_factor = 110
layer_height_0 = =layer_height * 1.5
material_flow_layer_0 = 110
material_initial_print_temperature = 245
retraction_amount = 1.5
retraction_speed = 45
retraction_amount = 0.75
retraction_speed = 5
roofing_line_width = 0.4
skin_line_width = 0.45
skin_material_flow_layer_0 = 110
skin_overlap = 20.0
skirt_brim_line_width = 1
skirt_brim_minimal_length = 100.0
skirt_height = 3
speed_print = 25
support_enable = False
top_bottom_thickness = =layer_height * 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ weight = -2
[values]
infill_sparse_density = 50
raft_airgap = 0.22
raft_interface_flow = 110
raft_interface_infill_overlap = 25
raft_interface_speed = =speed_print * 1/2
raft_interface_z_offset = -0.1
raft_surface_flow = 110
raft_surface_infill_overlap = 50
raft_surface_speed = =speed_print * 1/2
raft_surface_z_offset = -0.075
speed_layer_0 = =speed_print * 1/4
speed_prime_tower = =speed_print * 3/4
speed_print = 40
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ weight = -2
[values]
infill_sparse_density = 50
raft_airgap = 0.22
raft_interface_flow = 110
raft_interface_infill_overlap = 25
raft_interface_speed = =speed_print * 1/2
raft_interface_z_offset = -0.1
raft_surface_flow = 110
raft_surface_infill_overlap = 50
raft_surface_speed = =speed_print * 1/2
raft_surface_z_offset = -0.075
speed_layer_0 = =speed_print * 1/4
speed_prime_tower = =speed_print * 3/4
speed_print = 40
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ raft_surface_infill_overlap = 25
raft_surface_line_spacing = 0.425
raft_surface_line_width = 0.4
raft_surface_speed = 40
raft_surface_wall_count = 2
skin_overlap = 10
speed_layer_0 = 15
speed_print = 60
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,14 @@ support_bottom_enable = False
support_infill_angles = [45 ]
support_infill_rate = 12
support_interface_density = 75
support_interface_height = =layer_height * 4
support_interface_material_flow = =material_flow * 0.9
support_interface_material_flow = =support_material_flow
support_interface_offset = 0.8
support_interface_pattern = zigzag
support_line_width = =line_width * 0.75
support_material_flow = =material_flow * 0.9
support_offset = 1
support_pattern = zigzag
support_roof_density = =support_interface_density
support_roof_height = =layer_height * 4
support_roof_line_width = =line_width
support_top_distance = =support_z_distance
support_xy_distance = 0.35
Expand Down

0 comments on commit b98744c

Please sign in to comment.