Skip to content

Commit

Permalink
Remove experimental tag from ASA and SR30.
Browse files Browse the repository at this point in the history
Map mk14_e to LABS extruder.

PP-502
  • Loading branch information
pkuiper-ultimaker committed Jul 11, 2024
1 parent 452e1dd commit adc873e
Show file tree
Hide file tree
Showing 35 changed files with 85 additions and 95 deletions.
3 changes: 2 additions & 1 deletion cura/PrinterOutput/Models/ExtruderConfigurationModel.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ def applyNameMappingHotend(hotendId) -> str:
"mk14_hot_s":"2XA",
"mk14_c":"1C",
"mk14":"1A",
"mk14_s":"2A"
"mk14_s":"2A",
"mk14_e": "LABS"
}
if hotendId in _EXTRUDER_NAME_MAP:
return _EXTRUDER_NAME_MAP[hotendId]
Expand Down
26 changes: 12 additions & 14 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,35 +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": "False if extruder_nr == support_extruder_nr else True" },
"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": "true if extruder_nr == support_extruder_nr else false" },
"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 },
"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_infill_extruder_nr else 0.2" },
"support_xy_distance_overhang": { "value": "0.3 if extruder_nr == support_infill_extruder_nr else 0.2" },
"support_z_distance": { "value": 0 },
"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
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = 4

[metadata]
intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = 4

[metadata]
intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = 4

[metadata]
intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = 4

[metadata]
intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = 4

[metadata]
intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ version = 4

[metadata]
intent_category = solid
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ cool_min_layer_time = 10
cool_min_speed = 5
cool_min_temperature = 205
infill_sparse_density = 15
material_print_temperature_layer_0 = 225
material_final_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =default_material_print_temperature +15
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_thickness = 0.6
raft_interface_infill_overlap = 25
raft_interface_layers = 1
Expand Down Expand Up @@ -58,7 +60,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 @@ -16,10 +16,10 @@ cool_fan_enabled = False
material_final_print_temperature = =default_material_print_temperature-5
material_initial_print_temperature = =default_material_print_temperature-5
raft_airgap = 0.3
raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1
raft_base_line_spacing = =3 if extruder_nr == support_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1
raft_base_speed = 10
raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5
raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4
retraction_amount = 0.5
retraction_min_travel = 3.2
small_skin_width = 3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ cool_min_layer_time = 10
cool_min_speed = 5
cool_min_temperature = 205
infill_sparse_density = 15
material_print_temperature_layer_0 = 225
material_final_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =default_material_print_temperature +15
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_thickness = 0.6
raft_interface_infill_overlap = 25
raft_interface_layers = 1
Expand Down Expand Up @@ -58,7 +60,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 @@ -16,10 +16,10 @@ cool_fan_enabled = False
material_final_print_temperature = =default_material_print_temperature-5
material_initial_print_temperature = =default_material_print_temperature-5
raft_airgap = 0.3
raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1
raft_base_line_spacing = =3 if extruder_nr == support_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1
raft_base_speed = 10
raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5
raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4
retraction_amount = 0.5
retraction_min_travel = 3.2
small_skin_width = 3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ cool_min_layer_time = 10
cool_min_speed = 5
cool_min_temperature = 205
infill_sparse_density = 15
material_print_temperature_layer_0 = 225
material_final_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =default_material_print_temperature +15
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_thickness = 0.6
raft_interface_infill_overlap = 25
raft_interface_layers = 1
Expand Down Expand Up @@ -58,7 +60,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 @@ -21,12 +21,14 @@ cool_min_layer_time = 10
cool_min_speed = 5
cool_min_temperature = 205
infill_sparse_density = 15
material_print_temperature_layer_0 = 225
material_final_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =default_material_print_temperature +15
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_thickness = 0.6
raft_interface_infill_overlap = 25
raft_interface_layers = 1
Expand Down Expand Up @@ -58,7 +60,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 @@ -48,7 +48,6 @@ support_interface_offset = 1.2
support_line_width = 0.35
support_material_flow = 90
support_roof_density = 82
support_roof_line_width = 0.4
support_use_towers = True
support_xy_distance = 0.3
support_xy_distance_overhang = 0.25
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[general]
definition = ultimaker_methodx
name = Fast - Experimental
name = Fast
version = 4

[metadata]
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ cool_fan_enabled = False
material_final_print_temperature = =default_material_print_temperature-5
material_initial_print_temperature = =default_material_print_temperature-5
raft_airgap = 0.3
raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1
raft_base_line_spacing = =3 if extruder_nr == support_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1
raft_base_speed = 10
raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5
raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4
retraction_amount = 0.5
retraction_min_travel = 3.2
small_skin_width = 3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ cool_min_layer_time = 10
cool_min_speed = 5
cool_min_temperature = 205
infill_sparse_density = 15
material_print_temperature_layer_0 = 225
material_final_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =default_material_print_temperature +15
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_thickness = 0.6
raft_interface_infill_overlap = 25
raft_interface_layers = 1
Expand Down Expand Up @@ -58,7 +60,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
@@ -1,10 +1,9 @@
[general]
definition = ultimaker_methodx
name = Fast - Experimental
name = Fast
version = 4

[metadata]
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[general]
definition = ultimaker_methodx
name = Fast - Experimental
name = Fast
version = 4

[metadata]
is_experimental = True
material = ultimaker_sr30_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ support_interface_offset = 1.2
support_line_width = 0.35
support_material_flow = 90
support_roof_density = 82
support_roof_line_width = 0.4
support_use_towers = True
support_xy_distance = 0.3
support_xy_distance_overhang = 0.25
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
[general]
definition = ultimaker_methodx
name = Fast - Experimental
name = Fast
version = 4

[metadata]
is_experimental = True
material = ultimaker_asa_175
quality_type = draft
setting_version = 23
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ cool_fan_enabled = False
material_final_print_temperature = =default_material_print_temperature-5
material_initial_print_temperature = =default_material_print_temperature-5
raft_airgap = 0.3
raft_base_line_spacing = =3 if extruder_nr == raft_interface_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == raft_interface_extruder_nr else 1
raft_base_line_spacing = =3 if extruder_nr == support_extruder_nr else 2
raft_base_line_width = =1.2 if extruder_nr == support_extruder_nr else 1
raft_base_speed = 10
raft_base_thickness = =0.6 if extruder_nr == raft_interface_extruder_nr else 0.5
raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.4
retraction_amount = 0.5
retraction_min_travel = 3.2
small_skin_width = 3.6
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ cool_min_layer_time = 10
cool_min_speed = 5
cool_min_temperature = 205
infill_sparse_density = 15
material_print_temperature_layer_0 = 225
material_final_print_temperature = =default_material_print_temperature - 5
material_initial_print_temperature = =default_material_print_temperature - 5
material_print_temperature_layer_0 = =default_material_print_temperature +15
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_thickness = 0.6
raft_interface_infill_overlap = 25
raft_interface_layers = 1
Expand Down Expand Up @@ -58,7 +60,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
Loading

0 comments on commit adc873e

Please sign in to comment.