Update PR with latest changes from main.

PP-490
Ultimaker · Jul 4, 2024 · c771424 · c771424
1 parent 6523cd5
commit c771424
Show file tree

Hide file tree

Showing 49 changed files with 224 additions and 12 deletions.
diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
@@ -4372,6 +4372,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.0,
+                    "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))",
                     "minimum_value": "machine_width / -2 if machine_center_is_zero else 0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,
@@ -4384,6 +4385,7 @@
                     "unit": "mm",
                     "type": "float",
                     "default_value": 0.0,
+                    "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))",
                     "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true,

diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
@@ -70,8 +70,6 @@
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
-        "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
-        "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
         "machine_acceleration": { "default_value": 3000 },
         "machine_depth": { "default_value": 215 },
         "machine_disallowed_areas":

diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json
@@ -358,6 +358,7 @@
         "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_monotonic": { "value": true },
         "raft_surface_wall_count": { "value": "raft_wall_count" },
         "retract_at_layer_change": { "value": true },
         "retraction_amount": { "value": 0.75 },
@@ -372,6 +373,7 @@
         "retraction_prime_speed": { "value": "retraction_speed" },
         "retraction_speed": { "value": 5 },
         "roofing_layer_count": { "value": 2 },
+        "roofing_material_flow": { "value": "material_flow" },
         "roofing_monotonic": { "value": true },
         "skin_material_flow": { "value": "material_flow" },
         "skin_material_flow_layer_0": { "value": "material_flow" },
@@ -402,7 +404,7 @@
         "support_conical_min_width": { "value": 10 },
         "support_enable": { "value": true },
         "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" },
-        "support_fan_enable": { "value": "extruder_nr == support_extruder_nr" },
+        "support_fan_enable": { "value": "true if extruder_nr == support_extruder_nr else false" },
         "support_infill_rate": { "value": 20.0 },
         "support_infill_sparse_thickness": { "value": "layer_height" },
         "support_interface_enable": { "value": true },
@@ -419,7 +421,6 @@
         "support_top_distance": { "value": "support_z_distance" },
         "support_wall_count": { "value": "2 if support_conical_enabled or support_structure == 'tree' else 0" },
         "support_xy_distance": { "value": 0.2 },
-        "support_z_distance": { "value": 0 },
         "switch_extruder_retraction_amount": { "value": 0.5 },
         "switch_extruder_retraction_speeds": { "value": "retraction_speed" },
         "top_bottom_thickness": { "value": "5*layer_height" },

diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
@@ -70,8 +70,6 @@
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
-        "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
-        "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
         "machine_acceleration": { "default_value": 3000 },
         "machine_depth": { "default_value": 190 },
         "machine_end_gcode": { "default_value": "" },

diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
@@ -74,8 +74,6 @@
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
-        "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
-        "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
         "machine_acceleration": { "default_value": 3000 },
         "machine_depth": { "default_value": 240 },
         "machine_end_gcode": { "default_value": "" },

diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg
@@ -12,8 +12,10 @@ type = intent
 variant = AA 0.4
 
 [values]
+build_volume_temperature = 35
 jerk_print = 30
-material_print_temperature = =default_material_print_temperature + 10
+material_bed_temperature = =default_material_bed_temperature + 5
+material_print_temperature = =default_material_print_temperature + 15
 speed_print = 80
 wall_thickness = =line_width * 3
 
diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_cffcpe
+quality_type = draft
+setting_version = 23
+type = intent
+variant = CC 0.4
+
+[values]
+jerk_print = 30
+speed_print = 80
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_gffcpe
+quality_type = draft
+setting_version = 23
+type = intent
+variant = CC 0.4
+
+[values]
+jerk_print = 30
+speed_print = 80
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_cffcpe
+quality_type = draft
+setting_version = 23
+type = intent
+variant = CC 0.6
+
+[values]
+jerk_print = 30
+speed_print = 80
+wall_thickness = =line_width * 3
+
diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Accurate
+version = 4
+
+[metadata]
+intent_category = engineering
+material = generic_gffcpe
+quality_type = draft
+setting_version = 23
+type = intent
+variant = CC 0.6
+
+[values]
+jerk_print = 30
+speed_print = 80
+wall_thickness = =line_width * 3
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg
@@ -16,11 +16,11 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0
 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
 _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_heat_up_speed = 1.56
-material_print_temperature = =default_material_print_temperature - 5
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_material_flow = =material_flow * 0.965
-speed_print = 60
 support_angle = 45
 support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
 support_interface_density = =min(extruderValues('material_surface_energy'))

diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg
@@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0
 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
 _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_heat_up_speed = 1.56
 material_print_temperature = =default_material_print_temperature - 5
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100

diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg
@@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0
 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
 _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_heat_up_speed = 1.56
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_material_flow = =material_flow * 0.965

diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg
@@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0
 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True
 _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_heat_up_speed = 1.56
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100
 skin_material_flow = =material_flow * 0.965

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg
@@ -18,9 +18,12 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
+initial_layer_line_width_factor = 150
+minimum_support_area = 4
 prime_tower_min_volume = 15
 skin_material_flow = =material_flow * 0.93
-speed_print = 50
 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_offset = 1
 support_offset = 3

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 initial_layer_line_width_factor = 150
 minimum_support_area = 4
 prime_tower_min_volume = 15

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 initial_layer_line_width_factor = 150
 minimum_support_area = 4
 prime_tower_min_volume = 15

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 initial_layer_line_width_factor = 150
 minimum_support_area = 4
 prime_tower_min_volume = 15

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 initial_layer_line_width_factor = 150
 minimum_support_area = 4
 prime_tower_min_volume = 15

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 initial_layer_line_width_factor = 150
 minimum_support_area = 4
 prime_tower_min_volume = 15

diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg
@@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1
 acceleration_support_bottom = 100
 acceleration_support_interface = 1500
 brim_replaces_support = False
+build_volume_temperature = =40 if extruders_enabled_count > 1 else 35
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 initial_layer_line_width_factor = 150
 minimum_support_area = 4
 prime_tower_min_volume = 15

diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Fast
+version = 4
+
+[metadata]
+material = generic_cffcpe
+quality_type = draft
+setting_version = 23
+type = quality
+variant = CC 0.4
+weight = -2
+
+[values]
+support_bottom_distance = =support_z_distance / 2
+support_top_distance = =support_z_distance
+support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Fast
+version = 4
+
+[metadata]
+material = generic_gffcpe
+quality_type = draft
+setting_version = 23
+type = quality
+variant = CC 0.4
+weight = -2
+
+[values]
+support_bottom_distance = =support_z_distance / 2
+support_top_distance = =support_z_distance
+support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Fast
+version = 4
+
+[metadata]
+material = generic_cffcpe
+quality_type = draft
+setting_version = 23
+type = quality
+variant = CC 0.6
+weight = -2
+
+[values]
+support_bottom_distance = =support_z_distance / 2
+support_top_distance = =support_z_distance
+support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg
@@ -0,0 +1,18 @@
+[general]
+definition = ultimaker_factor4
+name = Fast
+version = 4
+
+[metadata]
+material = generic_gffcpe
+quality_type = draft
+setting_version = 23
+type = quality
+variant = CC 0.6
+weight = -2
+
+[values]
+support_bottom_distance = =support_z_distance / 2
+support_top_distance = =support_z_distance
+support_z_distance = =layer_height * 2
+
diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg
@@ -13,6 +13,8 @@ weight = -1
 
 [values]
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 24
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg
@@ -13,6 +13,8 @@ weight = 0
 
 [values]
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 24
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg
@@ -13,6 +13,8 @@ weight = -2
 
 [values]
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 24
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 5

diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg
@@ -14,6 +14,8 @@ weight = -3
 
 [values]
 brim_replaces_support = False
+build_volume_temperature = =50 if extruders_enabled_count > 1 else 24
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 machine_nozzle_cool_down_speed = 0.75
 machine_nozzle_heat_up_speed = 1.6
 material_print_temperature = =default_material_print_temperature + 5

diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg
@@ -14,7 +14,9 @@ weight = 1
 [values]
 acceleration_prime_tower = 1500
 brim_replaces_support = False
+build_volume_temperature = =70 if extruders_enabled_count > 1 else 35
 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr))
+default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60
 initial_layer_line_width_factor = 150
 material_print_temperature = =default_material_print_temperature - 5
 minimum_support_area = 4