From 860dbaa4fe450c06c4990182d0ea2e4ddfa0c59f Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Tue, 13 Feb 2024 11:32:58 +0100
Subject: [PATCH 1/8] Added experimental print profiles for the Method X and
XL: ASA, Nylon12-CF and SR-30 support material.
PP-393
---
.../definitions/ultimaker_methodx.def.json | 1 -
...methodx_1c_um-asa-175_0.2mm_solid.inst.cfg | 18 +++++++
..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 18 +++++++
...ethodx_1xa_um-asa-175_0.2mm_solid.inst.cfg | 18 +++++++
...thodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg | 17 ++++++
...thodx_labs_um-asa-175_0.2mm_solid.inst.cfg | 18 +++++++
...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 18 +++++++
...ethodxl_1c_um-asa-175_0.2mm_solid.inst.cfg | 18 +++++++
..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 18 +++++++
...thodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg | 18 +++++++
...hodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg | 17 ++++++
...hodxl_labs_um-asa-175_0.2mm_solid.inst.cfg | 18 +++++++
...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 18 +++++++
.../um_methodx_1c_um-asa-175_0.2mm.inst.cfg | 50 +++++++++++++++++
...ethodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 53 +++++++++++++++++++
.../um_methodx_1xa_um-asa-175_0.2mm.inst.cfg | 50 +++++++++++++++++
.../um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg | 41 ++++++++++++++
.../um_methodx_labs_um-asa-175_0.2mm.inst.cfg | 50 +++++++++++++++++
...hodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 53 +++++++++++++++++++
.../um_methodxl_1c_um-absr-175_0.2mm.inst.cfg | 2 -
.../um_methodxl_1c_um-asa-175_0.2mm.inst.cfg | 51 ++++++++++++++++++
...thodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 53 +++++++++++++++++++
...um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg | 2 -
.../um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg | 51 ++++++++++++++++++
...um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg | 41 ++++++++++++++
...m_methodxl_labs_um-absr-175_0.2mm.inst.cfg | 2 -
...um_methodxl_labs_um-asa-175_0.2mm.inst.cfg | 51 ++++++++++++++++++
...odxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 53 +++++++++++++++++++
.../um_s3_aa0.25_um-abs_0.1mm.inst.cfg | 1 +
.../um_s5_aa0.25_um-abs_0.1mm.inst.cfg | 1 +
30 files changed, 813 insertions(+), 7 deletions(-)
create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg
create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg
create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg
diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json
index a6708a0421..9828ba96f2 100644
--- a/resources/definitions/ultimaker_methodx.def.json
+++ b/resources/definitions/ultimaker_methodx.def.json
@@ -35,7 +35,6 @@
"generic_nylon_175",
"generic_hips_175",
"generic_pc_175",
- "ultimaker_sr30_175",
"generic_tpu_175",
"goofoo_",
"ideagen3D_",
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..23c8807afd
--- /dev/null
+++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1C
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..cdff2f30ce
--- /dev/null
+++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1C
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..3a781b61aa
--- /dev/null
+++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1XA
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..a833556bd8
--- /dev/null
+++ b/resources/intent/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_sr30_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 2XA
+
+[values]
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..87823a01a6
--- /dev/null
+++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = LABS
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..bb76919888
--- /dev/null
+++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodx
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = LABS
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..12bc3f2708
--- /dev/null
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodxl
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1C
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..5533672636
--- /dev/null
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodxl
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1C
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..82aa8e9bad
--- /dev/null
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodxl
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 1XA
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..01a55c85a4
--- /dev/null
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,17 @@
+[general]
+definition = ultimaker_methodxl
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_sr30_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = 2XA
+
+[values]
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..ae7100bc86
--- /dev/null
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodxl
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = LABS
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
new file mode 100644
index 0000000000..af43c95cd2
--- /dev/null
+++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_methodxl
+name = Solid
+version = 4
+
+[metadata]
+intent_category = solid
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = intent
+variant = LABS
+
+[values]
+infill_pattern = lines
+infill_sparse_density = 100
+
diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..f0e0a4fded
--- /dev/null
+++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm.inst.cfg
@@ -0,0 +1,50 @@
+[general]
+definition = ultimaker_methodx
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 1C
+weight = -2
+
+[values]
+cool_fan_enabled = False
+material_print_temperature_layer_0 = =default_material_print_temperature+5
+raft_airgap = 0.3
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 98.0
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 250.0
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..32d64ed5b1
--- /dev/null
+++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg
@@ -0,0 +1,53 @@
+[general]
+definition = ultimaker_methodx
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 1C
+weight = -2
+
+[values]
+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
+raft_base_line_width = 1.2
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 100
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 250.0
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..e032e3a3b8
--- /dev/null
+++ b/resources/quality/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm.inst.cfg
@@ -0,0 +1,50 @@
+[general]
+definition = ultimaker_methodx
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 1XA
+weight = -2
+
+[values]
+cool_fan_enabled = False
+material_print_temperature_layer_0 = =default_material_print_temperature+5
+raft_airgap = 0.3
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 98.0
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 250.0
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..5ebc2b4560
--- /dev/null
+++ b/resources/quality/ultimaker_methodx/um_methodx_2xa_um-sr30-175_0.2mm.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = ultimaker_methodx
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_sr30_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 2XA
+weight = -2
+
+[values]
+brim_replaces_support = False
+cool_fan_enabled = False
+cool_min_temperature = =material_print_temperature
+raft_airgap = 0.0
+raft_interface_line_width = 0.7
+raft_interface_speed = 70
+raft_surface_speed = 90
+retract_at_layer_change = True
+retraction_amount = 0.5
+speed_prime_tower = 25.0
+speed_print = 50
+speed_roofing = 50
+speed_support = 50
+speed_support_bottom = 30
+speed_support_interface = 80
+speed_topbottom = 50
+speed_wall_0 = 50
+speed_wall_x = 50
+support_bottom_wall_count = 5
+support_fan_enable = False
+support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
+support_interface_enable = True
+support_wall_count = 1
+support_xy_distance = 0.2
+support_z_distance = 0
+
diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..3c9f4500fc
--- /dev/null
+++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm.inst.cfg
@@ -0,0 +1,50 @@
+[general]
+definition = ultimaker_methodx
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = LABS
+weight = -2
+
+[values]
+cool_fan_enabled = False
+material_print_temperature_layer_0 = =default_material_print_temperature+5
+raft_airgap = 0.3
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 98.0
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 250.0
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..7bb14d9107
--- /dev/null
+++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg
@@ -0,0 +1,53 @@
+[general]
+definition = ultimaker_methodx
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = LABS
+weight = -2
+
+[values]
+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
+raft_base_line_width = 1.2
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 100
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 250.0
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg
index 7b5daf0d20..2688d88ad3 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-absr-175_0.2mm.inst.cfg
@@ -12,9 +12,7 @@ variant = 1C
weight = -2
[values]
-build_volume_temperature = 85
cool_fan_enabled = False
-default_material_bed_temperature = 95
raft_airgap = 0.3
speed_prime_tower = 30.0
speed_print = 120.0
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..5aaee1f2c6
--- /dev/null
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm.inst.cfg
@@ -0,0 +1,51 @@
+[general]
+definition = ultimaker_methodxl
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 1C
+weight = -2
+
+[values]
+cool_fan_enabled = False
+material_print_temperature_layer_0 = =default_material_print_temperature+5
+raft_airgap = 0.3
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 98.0
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 500
+speed_travel_layer_0 = 250
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..575189deae
--- /dev/null
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg
@@ -0,0 +1,53 @@
+[general]
+definition = ultimaker_methodxl
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 1C
+weight = -2
+
+[values]
+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
+raft_base_line_width = 1.2
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 100
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 250.0
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg
index 7445bd2d42..fd224e8798 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-absr-175_0.2mm.inst.cfg
@@ -12,9 +12,7 @@ variant = 1XA
weight = -2
[values]
-build_volume_temperature = 85
cool_fan_enabled = False
-default_material_bed_temperature = 95
raft_airgap = 0.3
speed_prime_tower = 30.0
speed_print = 120.0
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..504ab8c10b
--- /dev/null
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm.inst.cfg
@@ -0,0 +1,51 @@
+[general]
+definition = ultimaker_methodxl
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 1XA
+weight = -2
+
+[values]
+cool_fan_enabled = False
+material_print_temperature_layer_0 = =default_material_print_temperature+5
+raft_airgap = 0.3
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 98.0
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 500
+speed_travel_layer_0 = 250
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..ebc6ecfe98
--- /dev/null
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_2xa_um-sr30-175_0.2mm.inst.cfg
@@ -0,0 +1,41 @@
+[general]
+definition = ultimaker_methodxl
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_sr30_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = 2XA
+weight = -2
+
+[values]
+brim_replaces_support = False
+cool_fan_enabled = False
+cool_min_temperature = =material_print_temperature
+raft_airgap = 0.0
+raft_interface_line_width = 0.7
+raft_interface_speed = 70
+raft_surface_speed = 90
+retract_at_layer_change = True
+retraction_amount = 0.5
+speed_prime_tower = 25.0
+speed_print = 50
+speed_roofing = 50
+speed_support = 50
+speed_support_bottom = 30
+speed_support_interface = 80
+speed_topbottom = 50
+speed_wall_0 = 50
+speed_wall_x = 50
+support_bottom_wall_count = 5
+support_fan_enable = False
+support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height
+support_interface_enable = True
+support_wall_count = 1
+support_xy_distance = 0.2
+support_z_distance = 0
+
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg
index 2114be0ff4..4af8230b24 100644
--- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg
@@ -12,9 +12,7 @@ variant = LABS
weight = -2
[values]
-build_volume_temperature = 85
cool_fan_enabled = False
-default_material_bed_temperature = 95
raft_airgap = 0.3
speed_prime_tower = 30.0
speed_print = 120.0
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..14c15fd3c5
--- /dev/null
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm.inst.cfg
@@ -0,0 +1,51 @@
+[general]
+definition = ultimaker_methodxl
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_asa_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = LABS
+weight = -2
+
+[values]
+cool_fan_enabled = False
+material_print_temperature_layer_0 = =default_material_print_temperature+5
+raft_airgap = 0.3
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 98.0
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 500
+speed_travel_layer_0 = 250
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg
new file mode 100644
index 0000000000..110fa5e4b5
--- /dev/null
+++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg
@@ -0,0 +1,53 @@
+[general]
+definition = ultimaker_methodxl
+name = Fast - Experimental
+version = 4
+
+[metadata]
+is_experimental = True
+material = ultimaker_nylon12-cf_175
+quality_type = draft
+setting_version = 22
+type = quality
+variant = LABS
+weight = -2
+
+[values]
+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
+raft_base_line_width = 1.2
+raft_base_speed = 10
+retract_at_layer_change = True
+retraction_amount = 0.5
+retraction_min_travel = 3.2
+roofing_material_flow = 100
+small_skin_width = 3.6
+speed_prime_tower = 30.0
+speed_print = 120.0
+speed_roofing = 55
+speed_topbottom = 55
+speed_travel = 250.0
+speed_wall_0 = 45
+speed_wall_x = 65
+support_angle = 50
+support_bottom_density = 24
+support_bottom_enable = False
+support_bottom_line_width = 0.6
+support_bottom_stair_step_height = 0
+support_fan_enable = False
+support_infill_rate = 12.0
+support_interface_enable = True
+support_interface_pattern = lines
+support_line_width = 0.3
+support_pattern = lines
+support_roof_density = 97
+support_roof_height = 1.015
+support_roof_line_width = 0.25
+support_use_towers = False
+support_xy_distance = 0.2
+support_xy_distance_overhang = 0.15
+support_z_distance = 0.25
+
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
index 24c5a1d9e6..f989bcc3f6 100644
--- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-abs_0.1mm.inst.cfg
@@ -27,6 +27,7 @@ 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
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
infill_sparse_density = 15
diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
index 7b14730a66..29057ff13b 100644
--- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
+++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-abs_0.1mm.inst.cfg
@@ -27,6 +27,7 @@ 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
infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid'
infill_sparse_density = 15
From f6c9936d1e4575749f1dcaa5913587baf37fe0d0 Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Tue, 20 Feb 2024 19:49:49 +0100
Subject: [PATCH 2/8] Remove SR-30 from exclude list
PP-393
---
resources/definitions/ultimaker_method_base.def.json | 1 -
1 file changed, 1 deletion(-)
diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
index 6e40f0bbf1..983af7ea27 100644
--- a/resources/definitions/ultimaker_method_base.def.json
+++ b/resources/definitions/ultimaker_method_base.def.json
@@ -28,7 +28,6 @@
"generic_hips_175",
"generic_pc_175",
"ultimaker_rapidrinse_175",
- "ultimaker_sr30_175",
"generic_tpu_175",
"goofoo_",
"ideagen3D_",
From 59a23231ccb518b0c12aed273a27e9871d0548ef Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Tue, 20 Feb 2024 20:13:27 +0100
Subject: [PATCH 3/8] Include prime tower mode
PP-393
---
resources/definitions/fdmprinter.def.json | 77 ++++++++++++++++-------
1 file changed, 56 insertions(+), 21 deletions(-)
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 20a8a698a2..1d453456a8 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -76,6 +76,22 @@
"type": "str",
"enabled": false
},
+ "material_type":
+ {
+ "label": "Material Type",
+ "description": "The type of material used.",
+ "default_value": "",
+ "type": "str",
+ "enabled": false
+ },
+ "material_brand":
+ {
+ "label": "Material Brand",
+ "description": "The brand of material used.",
+ "default_value": "",
+ "type": "str",
+ "enabled": false
+ },
"material_diameter":
{
"label": "Diameter",
@@ -963,7 +979,7 @@
"description": "Width of a single prime tower line.",
"type": "float",
"unit": "mm",
- "enabled": "resolveOrValue('prime_tower_enable')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 0.4,
"value": "line_width",
"minimum_value": "0.001",
@@ -3347,7 +3363,7 @@
"description": "The speed at which the prime tower is printed. Printing the prime tower slower can make it more stable when the adhesion between the different filaments is suboptimal.",
"type": "float",
"unit": "mm/s",
- "enabled": "resolveOrValue('prime_tower_enable')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 60,
"value": "speed_print",
"minimum_value": "0.1",
@@ -3725,7 +3741,7 @@
"maximum_value_warning": "10000",
"default_value": 3000,
"value": "acceleration_print",
- "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('acceleration_enabled')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('acceleration_enabled')",
"settable_per_mesh": false
}
}
@@ -4044,7 +4060,7 @@
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
- "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('jerk_enabled')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('jerk_enabled')",
"settable_per_mesh": false
}
}
@@ -5135,7 +5151,7 @@
"unit": "mm",
"type": "float",
"minimum_value": "0",
- "maximum_value_warning": "machine_nozzle_size",
+ "maximum_value_warning": "5*layer_height",
"default_value": 0.1,
"limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
"enabled": "support_enable or support_meshes_present",
@@ -6778,14 +6794,20 @@
"description": "Settings used for printing with multiple extruders.",
"children":
{
- "prime_tower_enable":
+ "prime_tower_mode":
{
- "label": "Enable Prime Tower",
- "description": "Print a tower next to the print which serves to prime the material after each nozzle switch.",
- "type": "bool",
+ "label": "Prime Tower",
+ "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Normal: generate a bucket in which secondary materials are primed
- Interleaved: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
+ "type": "enum",
+ "value": "'none' if (extruders_enabled_count < 2) else ('interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal')",
+ "options":
+ {
+ "none": "None",
+ "normal": "Normal",
+ "interleaved": "Interleaved"
+ },
+ "default_value": "none",
"enabled": "extruders_enabled_count > 1",
- "default_value": false,
- "resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable'))",
"settable_per_mesh": false,
"settable_per_extruder": false
},
@@ -6795,7 +6817,7 @@
"description": "The width of the prime tower.",
"type": "float",
"unit": "mm",
- "enabled": "resolveOrValue('prime_tower_enable')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 20,
"resolve": "max(extruderValues('prime_tower_size'))",
"minimum_value": "0",
@@ -6814,7 +6836,20 @@
"default_value": 6,
"minimum_value": "0",
"maximum_value_warning": "(resolveOrValue('prime_tower_size') * 0.5) ** 2 * 3.14159 * resolveOrValue('layer_height') - sum(extruderValues('prime_tower_min_volume')) + prime_tower_min_volume",
- "enabled": "resolveOrValue('prime_tower_enable')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
+ "settable_per_mesh": false,
+ "settable_per_extruder": true
+ },
+ "prime_tower_max_bridging_distance":
+ {
+ "label": "Prime Tower Maximum Bridging Distance",
+ "description": "The maximum length of the branches which may be printed over the air.",
+ "unit": "mm",
+ "type": "float",
+ "default_value": 5,
+ "minimum_value": "line_width",
+ "maximum_value_warning": "10.0",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"settable_per_mesh": false,
"settable_per_extruder": true
},
@@ -6824,7 +6859,7 @@
"description": "The x coordinate of the position of the prime tower.",
"type": "float",
"unit": "mm",
- "enabled": "resolveOrValue('prime_tower_enable')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 200,
"value": "(resolveOrValue('machine_width') / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (resolveOrValue('machine_width') - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_x')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (resolveOrValue('machine_width') / 2 if resolveOrValue('machine_center_is_zero') else 0)",
"maximum_value": "(machine_width / 2 if machine_center_is_zero else machine_width) - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0)",
@@ -6838,7 +6873,7 @@
"description": "The y coordinate of the position of the prime tower.",
"type": "float",
"unit": "mm",
- "enabled": "resolveOrValue('prime_tower_enable')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": 200,
"value": "machine_depth - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('machine_nozzle_offset_y')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (resolveOrValue('machine_depth') / 2 if resolveOrValue('machine_center_is_zero') else 0)",
"maximum_value": "(machine_depth / 2 - resolveOrValue('prime_tower_size') if machine_center_is_zero else machine_depth - resolveOrValue('prime_tower_size')) - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0)",
@@ -6851,7 +6886,7 @@
"label": "Wipe Inactive Nozzle on Prime Tower",
"description": "After printing the prime tower with one nozzle, wipe the oozed material from the other nozzle off on the prime tower.",
"type": "bool",
- "enabled": "resolveOrValue('prime_tower_enable')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"default_value": true,
"settable_per_mesh": false,
"settable_per_extruder": true
@@ -6862,7 +6897,7 @@
"label": "Prime Tower Base",
"description": "By enabling this setting, your prime-tower will get a brim, even if the model doesn't. If you want a sturdier base for a high tower, you can increase the base height.",
"type": "bool",
- "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('adhesion_type') != 'raft'",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('adhesion_type') != 'raft'",
"default_value": false,
"settable_per_mesh": false,
"settable_per_extruder": false
@@ -6874,7 +6909,7 @@
"description": "The width of the prime tower brim/base. A larger base enhances adhesion to the build plate, but also reduces the effective print area.",
"type": "float",
"unit": "mm",
- "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"default_value": 1.2,
"minimum_value": "0",
"maximum_value": "min(0.5 * machine_width, 0.5 * machine_depth)",
@@ -6888,7 +6923,7 @@
"description": "The height of the prime tower base. Increasing this value will result in a more sturdy prime tower because the base will be wider. If this setting is too low, the prime tower will not have a sturdy base.",
"type": "float",
"unit": "mm",
- "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"default_value": 0,
"minimum_value": "0",
"maximum_value": "machine_height",
@@ -6900,7 +6935,7 @@
"label": "Prime Tower Base Slope",
"description": "The magnitude factor used for the slope of the prime tower base. If you increase this value, the base will become slimmer. If you decrease it, the base will become thicker.",
"type": "float",
- "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none' and (resolveOrValue('prime_tower_brim_enable') or resolveOrValue('adhesion_type') == 'raft')",
"default_value": 4,
"minimum_value": "0",
"maximum_value": "10",
@@ -6918,7 +6953,7 @@
"minimum_value": "0",
"minimum_value_warning": "raft_base_line_width",
"maximum_value_warning": "100",
- "enabled": "resolveOrValue('prime_tower_enable') and resolveOrValue('adhesion_type') == 'raft'",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none' and resolveOrValue('adhesion_type') == 'raft'",
"settable_per_mesh": false,
"settable_per_extruder": true,
"limit_to_extruder": "raft_base_extruder_nr"
From 5f884c737b4d331627ee53b074419263b5a848e1 Mon Sep 17 00:00:00 2001
From: Remco Burema
Date: Wed, 21 Feb 2024 16:39:50 +0100
Subject: [PATCH 4/8] Fix build, prevent protobuf version mismatch.
---
conanfile.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/conanfile.py b/conanfile.py
index 3b48442fa0..ca6b4eabd0 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -350,6 +350,7 @@ class CuraConan(ConanFile):
self.requires("cpython/3.10.4@ultimaker/stable")
self.requires("clipper/6.4.2@ultimaker/stable")
self.requires("openssl/3.2.0")
+ self.requires("protobuf/3.21.12")
self.requires("boost/1.82.0")
self.requires("spdlog/1.12.0")
self.requires("fmt/10.1.1")
From b99762776ee6ce3fe0e8bba8724eba9ca68ec4c7 Mon Sep 17 00:00:00 2001
From: "c.lamboo"
Date: Thu, 22 Feb 2024 10:47:04 +0100
Subject: [PATCH 5/8] Revert "Enable prime tower mode according to materials
types"
This reverts commit 335a54c6d1c432e64784f95c69e77125bd0d57f1.
---
.../XmlMaterialProfile/XmlMaterialProfile.py | 9 +++----
resources/definitions/fdmprinter.def.json | 26 ++++---------------
2 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
index 98c0f95e10..41beb88419 100644
--- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py
+++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -579,9 +579,8 @@ class XmlMaterialProfile(InstanceContainer):
meta_data[tag_name] = entry.text
- for tag_name, value in meta_data.items():
- if tag_name in self.__material_metadata_setting_map:
- common_setting_values[self.__material_metadata_setting_map[tag_name]] = value
+ if tag_name in self.__material_metadata_setting_map:
+ common_setting_values[self.__material_metadata_setting_map[tag_name]] = entry.text
if "description" not in meta_data:
meta_data["description"] = ""
@@ -1223,9 +1222,7 @@ class XmlMaterialProfile(InstanceContainer):
"diameter": "material_diameter"
}
__material_metadata_setting_map = {
- "GUID": "material_guid",
- "material": "material_type",
- "brand": "material_brand",
+ "GUID": "material_guid"
}
# Map of recognised namespaces with a proper prefix.
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 1d453456a8..b532402993 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -76,22 +76,6 @@
"type": "str",
"enabled": false
},
- "material_type":
- {
- "label": "Material Type",
- "description": "The type of material used.",
- "default_value": "",
- "type": "str",
- "enabled": false
- },
- "material_brand":
- {
- "label": "Material Brand",
- "description": "The brand of material used.",
- "default_value": "",
- "type": "str",
- "enabled": false
- },
"material_diameter":
{
"label": "Diameter",
@@ -6797,14 +6781,14 @@
"prime_tower_mode":
{
"label": "Prime Tower",
- "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Normal: generate a bucket in which secondary materials are primed
- Interleaved: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
+ "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Bucket: generate a bucket in which secondary materials are primed
- Sparse: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
"type": "enum",
- "value": "'none' if (extruders_enabled_count < 2) else ('interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal')",
+ "value": "'optimized' if all(material_type == extruderValues('material_type')[0] for material_type in extruderValues('material_type')) else 'optimized_consistent'",
"options":
{
"none": "None",
- "normal": "Normal",
- "interleaved": "Interleaved"
+ "bucket": "Bucket",
+ "sparse": "Sparse"
},
"default_value": "none",
"enabled": "extruders_enabled_count > 1",
@@ -6849,7 +6833,7 @@
"default_value": 5,
"minimum_value": "line_width",
"maximum_value_warning": "10.0",
- "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
+ "enabled": "resolveOrValue('prime_tower_mode') == 'sparse' or resolveOrValue('prime_tower_mode') == 'bucket'",
"settable_per_mesh": false,
"settable_per_extruder": true
},
From 60c3f6f2cbf4751960726eacfbc0d766ed4f16c7 Mon Sep 17 00:00:00 2001
From: "c.lamboo"
Date: Thu, 22 Feb 2024 11:00:56 +0100
Subject: [PATCH 6/8] Restore prime tower options
---
resources/definitions/fdmprinter.def.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index b532402993..a176fe1004 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -6781,14 +6781,14 @@
"prime_tower_mode":
{
"label": "Prime Tower",
- "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Bucket: generate a bucket in which secondary materials are primed
- Sparse: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
+ "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Normal: generate a bucket in which secondary materials are primed
- Interleaved: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
"type": "enum",
- "value": "'optimized' if all(material_type == extruderValues('material_type')[0] for material_type in extruderValues('material_type')) else 'optimized_consistent'",
+ "value": "'none' if (extruders_enabled_count < 2) else 'normal'",
"options":
{
"none": "None",
- "bucket": "Bucket",
- "sparse": "Sparse"
+ "normal": "Normal",
+ "interleaved": "Interleaved"
},
"default_value": "none",
"enabled": "extruders_enabled_count > 1",
From d009839f9e96f697ead3cb76678c3d8ad7379a3a Mon Sep 17 00:00:00 2001
From: "c.lamboo"
Date: Thu, 22 Feb 2024 12:50:50 +0100
Subject: [PATCH 7/8] Revert "Restore prime tower options"
This reverts commit 60c3f6f2cbf4751960726eacfbc0d766ed4f16c7.
---
resources/definitions/fdmprinter.def.json | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index a176fe1004..b532402993 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -6781,14 +6781,14 @@
"prime_tower_mode":
{
"label": "Prime Tower",
- "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Normal: generate a bucket in which secondary materials are primed
- Interleaved: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
+ "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Bucket: generate a bucket in which secondary materials are primed
- Sparse: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
"type": "enum",
- "value": "'none' if (extruders_enabled_count < 2) else 'normal'",
+ "value": "'optimized' if all(material_type == extruderValues('material_type')[0] for material_type in extruderValues('material_type')) else 'optimized_consistent'",
"options":
{
"none": "None",
- "normal": "Normal",
- "interleaved": "Interleaved"
+ "bucket": "Bucket",
+ "sparse": "Sparse"
},
"default_value": "none",
"enabled": "extruders_enabled_count > 1",
From c8f9f179d9809641ee48a36d5cd4b26bd006f84d Mon Sep 17 00:00:00 2001
From: "c.lamboo"
Date: Thu, 22 Feb 2024 12:50:53 +0100
Subject: [PATCH 8/8] Revert "Revert "Enable prime tower mode according to
materials types""
This reverts commit b99762776ee6ce3fe0e8bba8724eba9ca68ec4c7.
---
.../XmlMaterialProfile/XmlMaterialProfile.py | 9 ++++---
resources/definitions/fdmprinter.def.json | 26 +++++++++++++++----
2 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
index 41beb88419..98c0f95e10 100644
--- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py
+++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py
@@ -579,8 +579,9 @@ class XmlMaterialProfile(InstanceContainer):
meta_data[tag_name] = entry.text
- if tag_name in self.__material_metadata_setting_map:
- common_setting_values[self.__material_metadata_setting_map[tag_name]] = entry.text
+ for tag_name, value in meta_data.items():
+ if tag_name in self.__material_metadata_setting_map:
+ common_setting_values[self.__material_metadata_setting_map[tag_name]] = value
if "description" not in meta_data:
meta_data["description"] = ""
@@ -1222,7 +1223,9 @@ class XmlMaterialProfile(InstanceContainer):
"diameter": "material_diameter"
}
__material_metadata_setting_map = {
- "GUID": "material_guid"
+ "GUID": "material_guid",
+ "material": "material_type",
+ "brand": "material_brand",
}
# Map of recognised namespaces with a proper prefix.
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index b532402993..1d453456a8 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -76,6 +76,22 @@
"type": "str",
"enabled": false
},
+ "material_type":
+ {
+ "label": "Material Type",
+ "description": "The type of material used.",
+ "default_value": "",
+ "type": "str",
+ "enabled": false
+ },
+ "material_brand":
+ {
+ "label": "Material Brand",
+ "description": "The brand of material used.",
+ "default_value": "",
+ "type": "str",
+ "enabled": false
+ },
"material_diameter":
{
"label": "Diameter",
@@ -6781,14 +6797,14 @@
"prime_tower_mode":
{
"label": "Prime Tower",
- "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Bucket: generate a bucket in which secondary materials are primed
- Sparse: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
+ "description": "Print a tower next to the model, which serves to prime the material after each nozzle switch.- None: do not generate a prime tower
- Normal: generate a bucket in which secondary materials are primed
- Interleaved: generate a prime tower as sparse as possible. This will save time and filament, but is only possible if the used materials adhere to each other.
",
"type": "enum",
- "value": "'optimized' if all(material_type == extruderValues('material_type')[0] for material_type in extruderValues('material_type')) else 'optimized_consistent'",
+ "value": "'none' if (extruders_enabled_count < 2) else ('interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal')",
"options":
{
"none": "None",
- "bucket": "Bucket",
- "sparse": "Sparse"
+ "normal": "Normal",
+ "interleaved": "Interleaved"
},
"default_value": "none",
"enabled": "extruders_enabled_count > 1",
@@ -6833,7 +6849,7 @@
"default_value": 5,
"minimum_value": "line_width",
"maximum_value_warning": "10.0",
- "enabled": "resolveOrValue('prime_tower_mode') == 'sparse' or resolveOrValue('prime_tower_mode') == 'bucket'",
+ "enabled": "resolveOrValue('prime_tower_mode') != 'none'",
"settable_per_mesh": false,
"settable_per_extruder": true
},