Merge pull request #14098 from Ultimaker/PP-300_a_tree_by_xmas

Settings update from PP&M
Ultimaker · Dec 20, 2022 · f07420a · f07420a
2 parents 901cda7 + 695b766
commit f07420a
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 158 deletions.
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -41,6 +41,7 @@ on:
         branches:
             - main
             - 'CURA-*'
+            - 'PP-*'
             - '[1-9].[0-9]'
             - '[1-9].[0-9][0-9]'
         tags:

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
@@ -6,7 +6,10 @@
         "author": "Ultimaker",
         "manufacturer": "Ultimaker B.V.",
         "visible": false,
-        "exclude_materials": [ "generic_hips", "structur3d_dap100silicone" ]
+        "exclude_materials": [
+            "generic_hips",
+            "structur3d_dap100silicone"
+        ]
     },
     "overrides": {
         "machine_max_feedrate_e": {
@@ -19,26 +22,22 @@
             "minimum_value": "0",
             "maximum_value_warning": "125"
         },
-        "material_bed_temperature_layer_0":
-        {
+        "material_bed_temperature_layer_0": {
             "maximum_value_warning": "125"
         },
         "material_standby_temperature": {
             "value": "material_print_temperature - 100",
             "minimum_value": "0"
         },
-        "extruder_prime_pos_y":
-        {
+        "extruder_prime_pos_y": {
             "minimum_value": "0",
             "maximum_value": "machine_depth"
         },
-        "extruder_prime_pos_x":
-        {
+        "extruder_prime_pos_x": {
             "minimum_value": "0",
             "maximum_value": "machine_width"
         },
-        "relative_extrusion":
-        {
+        "relative_extrusion": {
             "value": false,
             "enabled": false
         },
@@ -78,7 +77,7 @@
         "support_interface_material_flow": {
             "value": "skin_material_flow"
         },
-        "skin_monotonic" : {
+        "skin_monotonic": {
             "value": "roofing_layer_count == 0"
         },
         "speed_equalize_flow_width_factor": {
@@ -139,7 +138,7 @@
             "value": "80"
         },
         "bridge_fan_speed": {
-             "value": "cool_fan_speed_max"
+            "value": "cool_fan_speed_max"
         },
         "bridge_enable_more_layers": {
             "value": false
@@ -157,16 +156,16 @@
             "value": "cool_fan_speed_min"
         },
         "bridge_skin_speed_3": {
-             "value": "speed_topbottom"
+            "value": "speed_topbottom"
         },
         "bridge_skin_material_flow_3": {
             "value": "skin_material_flow"
         },
         "bridge_skin_density_3": {
-             "value": 100
+            "value": 100
         },
         "bridge_fan_speed_3": {
-             "value": "cool_fan_speed_min"
+            "value": "cool_fan_speed_min"
         },
         "jerk_print": {
             "value": "20",
@@ -267,7 +266,7 @@
             "value": "2 * layer_height"
         },
         "support_offset": {
-            "value": "support_xy_distance if support_interface_enable else 0"
+            "value": "support_xy_distance if (support_interface_enable and support_structure != 'tree') else 0"
         },
         "support_xy_distance": {
             "value": "1"
@@ -294,4 +293,4 @@
             "value": "0"
         }
     }
-}
+}
diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg
@@ -29,16 +29,17 @@ machine_nozzle_size = 0.8
 machine_nozzle_tip_outer_diameter = 2.0
 material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
-prime_tower_enable = False
+prime_tower_enable = True
 prime_tower_wipe_enabled = True
+prime_tower_min_volume = 20
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 3
 retraction_prime_speed = 15
 skin_overlap = 5
 speed_layer_0 = 20
-speed_prime_tower = =math.ceil(speed_print * 7 / 35)
+speed_prime_tower = =speed_support
 speed_print = 35
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)

diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg
@@ -17,9 +17,11 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
+prime_tower_enable = False
+prime_tower_min_volume = 20
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
-speed_prime_tower = =math.ceil(speed_print * 10 / 35)
+speed_prime_tower = =speed_support
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)

diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg
@@ -29,16 +29,17 @@ machine_nozzle_size = 0.8
 machine_nozzle_tip_outer_diameter = 2.0
 material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
-prime_tower_enable = False
+prime_tower_enable = True
 prime_tower_wipe_enabled = True
+prime_tower_min_volume = 20
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
 retraction_min_travel = =line_width * 3
 retraction_prime_speed = 15
 skin_overlap = 5
 speed_layer_0 = 20
-speed_prime_tower = =math.ceil(speed_print * 7 / 35)
+speed_prime_tower = =speed_support
 speed_print = 35
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)

diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg
@@ -17,9 +17,11 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
+prime_tower_enable = True
+prime_tower_min_volume = 20
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
-speed_prime_tower = =math.ceil(speed_print * 10 / 35)
+speed_prime_tower = =speed_support
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)

diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg
@@ -28,8 +28,9 @@ machine_nozzle_size = 0.8
 machine_nozzle_tip_outer_diameter = 2.0
 material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
-prime_tower_enable = False
+prime_tower_enable = True
 prime_tower_wipe_enabled = True
+prime_tower_min_volume = 20
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
@@ -41,7 +42,7 @@ speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
-speed_prime_tower = =math.ceil(speed_print * 7 / 35)
+speed_prime_tower = =speed_support
 support_angle = 60
 support_bottom_height = =layer_height * 2
 support_interface_enable = True

diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg
@@ -17,9 +17,11 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
+prime_tower_enable = True
+prime_tower_min_volume = 20
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
-speed_prime_tower = =math.ceil(speed_print * 10 / 35)
+speed_prime_tower = =speed_support
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)

diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg
@@ -28,8 +28,9 @@ machine_nozzle_size = 0.8
 machine_nozzle_tip_outer_diameter = 2.0
 material_print_temperature = =default_material_print_temperature + 10
 multiple_mesh_overlap = 0
-prime_tower_enable = False
+prime_tower_enable = True
 prime_tower_wipe_enabled = True
+prime_tower_min_volume = 20
 raft_surface_layers = 1
 retraction_hop = 2
 retraction_hop_only_when_collides = True
@@ -41,7 +42,7 @@ speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)
 speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
-speed_prime_tower = =math.ceil(speed_print * 7 / 35)
+speed_prime_tower = =speed_support
 support_angle = 60
 support_z_distance = 0
 switch_extruder_prime_speed = 15

diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg
@@ -17,9 +17,11 @@ cool_fan_speed_max = =cool_fan_speed
 machine_nozzle_heat_up_speed = 1.5
 machine_nozzle_id = BB 0.4
 machine_nozzle_tip_outer_diameter = 1.0
+prime_tower_enable = True
+prime_tower_min_volume = 20
 retraction_min_travel = =3 * line_width
 speed_layer_0 = 20
-speed_prime_tower = =math.ceil(speed_print * 10 / 35)
+speed_prime_tower = =speed_support
 speed_support = =math.ceil(speed_print * 25 / 35)
 speed_support_interface = =math.ceil(speed_support * 20 / 25)
 speed_support_bottom = =math.ceil(speed_support_interface * 10 / 20)