Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion plugins/3MFWriter/SettingsExportModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class SettingsExportModel(QObject):
'brim_smart_ordering',
'ooze_shield_enabled',
'bottom_skin_preshrink',
'skin_edge_support_thickness',
'alternate_carve_order',
'top_skin_preshrink',
'interlocking_enable'}
Expand Down
125 changes: 74 additions & 51 deletions resources/definitions/fdmprinter.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -2455,52 +2455,86 @@
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
"skin_edge_support_thickness":
"skin_support":
{
"label": "Skin Edge Support Thickness",
"description": "The thickness of the extra infill that supports skin edges.",
"unit": "mm",
"default_value": 0,
"label": "Infill Skin Support",
"description": "Print a solid infill pattern just below skin to avoid printing the skin over air.",
"type": "bool",
"default_value": true,
"value": "infill_sparse_density < 50",
"enabled": "infill_sparse_density > 0 and top_layers > 0",
"settable_per_mesh": true,
"settable_per_extruder": true
},
"skin_support_speed":
{
"label": "Skin Support Speed",
"description": "The speed at which skin support regions are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0",
"maximum_value": "machine_height",
"maximum_value_warning": "resolveOrValue('infill_sparse_thickness') * 10",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "300",
"default_value": 15,
"value": "bridge_skin_speed",
"enabled": "skin_support",
"settable_per_mesh": true,
"settable_per_extruder": true
},
"skin_support_material_flow":
{
"label": "Skin Support Flow",
"description": "When printing skin support regions, the amount of material extruded is multiplied by this value.",
"unit": "%",
"default_value": 60,
"value": "bridge_skin_material_flow",
"type": "float",
"value": "0",
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_sparse_density > 0",
"minimum_value": "5",
"minimum_value_warning": "50",
"maximum_value_warning": "250",
"enabled": "skin_support",
"settable_per_mesh": true,
"children":
{
"skin_edge_support_layers":
{
"label": "Skin Edge Support Layers",
"description": "The number of infill layers that supports skin edges.",
"default_value": 0,
"minimum_value": "0",
"maximum_value_warning": "10",
"type": "int",
"maximum_value": "999999",
"value": "math.ceil(round(skin_edge_support_thickness / resolveOrValue('infill_sparse_thickness'), 4))",
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_sparse_density > 0",
"settable_per_mesh": true
}
}
"settable_per_extruder": true
},
"extra_infill_lines_to_support_skins":
"skin_support_density":
{
"label": "Extra Infill Lines To Support Skins",
"description": "Add extra lines into the infill pattern to support skins above. This option prevents holes or plastic blobs that sometime show in complex shaped skins due to the infill below not correctly supporting the skin layer being printed above. 'Walls' supports just the outlines of the skin, whereas 'Walls and Lines' also supports the ends of the lines that make up the skin.",
"type": "enum",
"options":
{
"walls_and_lines": "Walls and Lines",
"walls": "Walls Only",
"none": "None"
},
"default_value": "walls_and_lines",
"value": "'none' if infill_sparse_density > 50 else 'walls' if skin_edge_support_thickness > 0 else 'walls_and_lines'",
"enabled": "infill_sparse_density > 0 and infill_pattern not in ('lightning', 'concentric', 'cross','cross_3d') and wall_line_count > 0 and top_layers > 0"
"label": "Skin Support Density",
"description": "The density of the skin support layer. Values less than 100 will increase the gaps between the lines.",
"unit": "%",
"default_value": 100,
"value": "bridge_skin_density",
"type": "float",
"minimum_value": "5",
"minimum_value_warning": "20",
"maximum_value_warning": "100",
"enabled": "skin_support",
"settable_per_mesh": true,
"settable_per_extruder": true
},
"skin_support_fan_speed":
{
"label": "Skin Support Fan Speed",
"description": "Percentage fan speed to use when printing skin support.",
"unit": "%",
"minimum_value": "0",
"maximum_value": "100",
"default_value": 100,
"value": "bridge_fan_speed",
"type": "float",
"enabled": "skin_support",
"settable_per_mesh": true,
"settable_per_extruder": true
},
"skin_support_interlace_lines":
{
"label": "Interlace Skin Support Lines",
"description": "When enabled, skin support lines will be printed interlaced, i.e. in 2 monotonic passes so that adjacent lines won't be printed just after each other. The lines of the first pass then have more time to cool down and are stronger when the second pass is added.",
"default_value": false,
"value": "bridge_interlace_lines",
"type": "bool",
"enabled": "skin_support",
"settable_per_mesh": true,
"settable_per_extruder": true
},
"lightning_infill_support_angle":
{
Expand Down Expand Up @@ -8922,17 +8956,6 @@
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_sparse_infill_max_density":
{
"label": "Bridge Sparse Infill Max Density",
"description": "Maximum density of infill considered to be sparse. Skin over sparse infill is considered to be unsupported and so may be treated as a bridge skin.",
"unit": "%",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
"bridge_wall_coast":
{
"label": "Bridge Wall Coasting",
Expand Down
2 changes: 0 additions & 2 deletions resources/definitions/skriware_2.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,6 @@
"retraction_speed": { "default_value": 30 },
"roofing_layer_count": { "value": "1" },
"roofing_material_flow": { "value": "99" },
"skin_edge_support_layers": { "value": "0" },
"skin_edge_support_thickness": { "value": "0" },
"skin_material_flow": { "value": "99" },
"skin_no_small_gaps_heuristic": { "default_value": true },
"skin_outline_count": { "value": 0 },
Expand Down
3 changes: 0 additions & 3 deletions resources/definitions/ultimaker.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"bridge_skin_speed_2": { "value": "speed_topbottom" },
"bridge_skin_speed_3": { "value": "speed_topbottom" },
"bridge_skin_support_threshold": { "value": 50 },
"bridge_sparse_infill_max_density": { "value": 0 },
"bridge_wall_coast": { "value": 0 },
"bridge_wall_material_flow": { "value": "wall_material_flow" },
"bridge_wall_speed": { "value": "bridge_skin_speed" },
Expand All @@ -41,7 +40,6 @@
"cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" },
"cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" },
"cool_min_temperature": { "value": "max([material_final_print_temperature, material_initial_print_temperature, material_print_temperature - 15])" },
"extra_infill_lines_to_support_skins": { "value": "'none'" },
"gradual_support_infill_step_height": { "value": "4 * layer_height" },
"gradual_support_infill_steps": { "value": "2 if support_interface_enable and support_structure != 'tree' else 0" },
"infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" },
Expand Down Expand Up @@ -197,7 +195,6 @@
"roofing_layer_count": { "value": "1" },
"roofing_material_flow": { "value": "material_flow" },
"skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" },
"skin_edge_support_thickness": { "value": "4 * layer_height if infill_sparse_density < 30 else 0" },
"skin_material_flow": { "value": "0.95 * material_flow" },
"skin_material_flow_layer_0": { "value": "95" },
"skin_monotonic": { "value": "roofing_layer_count == 0" },
Expand Down
1 change: 0 additions & 1 deletion resources/definitions/ultimaker_factor4.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@
"bridge_skin_material_flow": { "maximum_value": "100" },
"bridge_skin_material_flow_2": { "maximum_value": "100" },
"bridge_skin_material_flow_3": { "maximum_value": "100" },
"bridge_sparse_infill_max_density": { "value": "50" },
"bridge_wall_material_flow": { "maximum_value": "100" },
"bridge_wall_speed": { "value": "speed_wall" },
"brim_width": { "value": "5" },
Expand Down
1 change: 0 additions & 1 deletion resources/definitions/ultimaker_method_base.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,6 @@
"bridge_skin_speed": { "value": "speed_topbottom" },
"bridge_skin_speed_2": { "value": "speed_topbottom" },
"bridge_skin_speed_3": { "value": "speed_topbottom" },
"bridge_sparse_infill_max_density": { "value": 50 },
"bridge_wall_coast": { "value": 0 },
"bridge_wall_material_flow": { "value": "material_flow" },
"bridge_wall_speed": { "value": "speed_wall" },
Expand Down
3 changes: 0 additions & 3 deletions resources/definitions/ultimaker_s8.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@
},
"bridge_skin_speed_2": { "value": "speed_print*2/3" },
"bridge_skin_support_threshold": { "value": 20 },
"bridge_sparse_infill_max_density": { "value": 20 },
"bridge_wall_material_flow": { "value": 200 },
"bridge_wall_min_length": { "value": 2 },
"bridge_wall_speed": { "value": 50 },
Expand All @@ -232,7 +231,6 @@
"value": "material_print_temperature-15"
},
"default_material_print_temperature": { "maximum_value_warning": 320 },
"extra_infill_lines_to_support_skins": { "value": "'walls_and_lines'" },
"flooring_layer_count": { "value": 1 },
"flooring_material_flow": { "value": "skin_material_flow * 110/93" },
"flooring_monotonic": { "value": false },
Expand Down Expand Up @@ -455,7 +453,6 @@
"roofing_expansion": { "value": 1.2 },
"roofing_pattern": { "value": "'lines'" },
"seam_overhang_angle": { "value": 35 },
"skin_edge_support_thickness": { "value": 0.8 },
"skin_material_flow": { "value": 93 },
"skin_outline_count": { "value": 0 },
"skin_overlap": { "value": 20 },
Expand Down
2 changes: 0 additions & 2 deletions resources/definitions/ultimaker_sketch_sprint.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@
"bridge_skin_speed": { "value": 50 },
"bridge_skin_speed_2": { "value": 50 },
"bridge_skin_speed_3": { "value": 50 },
"bridge_sparse_infill_max_density": { "value": 15 },
"bridge_wall_min_length": { "value": 2.4 },
"bridge_wall_speed": { "value": 20 },
"brim_gap": { "value": 0.32 },
Expand Down Expand Up @@ -223,7 +222,6 @@
"retraction_prime_speed": { "value": "35" },
"retraction_speed": { "value": "35" },
"seam_overhang_angle": { "value": 30 },
"skin_edge_support_thickness": { "value": 0 },
"skin_material_flow": { "value": "material_flow" },
"skin_material_flow_layer_0": { "value": "material_flow * 0.95" },
"skin_monotonic": { "value": true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_fan_speed_0 = 0
cool_min_layer_time = 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 6
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 6
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ weight = -1
[values]
bridge_skin_material_flow = 200
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_material_flow = =bridge_skin_material_flow
bridge_wall_speed = 10
brim_width = 8.75
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ weight = 0
[values]
bridge_skin_material_flow = 200
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_material_flow = =bridge_skin_material_flow
bridge_wall_speed = 10
brim_width = 8.75
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ weight = -2
[values]
bridge_skin_material_flow = 200
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_material_flow = =bridge_skin_material_flow
bridge_wall_speed = 10
brim_width = 8.75
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 4
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 6
gradual_flow_discretisation_step_size = 0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ acceleration_wall = =acceleration_infill
acceleration_wall_0 = 1500
acceleration_wall_x = =acceleration_wall
bridge_skin_speed = =bridge_wall_speed
bridge_sparse_infill_max_density = 50
bridge_wall_speed = 30
cool_min_layer_time = 6
gradual_flow_discretisation_step_size = 0.2
Expand Down
Loading
Loading