Make Metallic PLA a color option rather than an intent profile, hide Metallic PLA on Method bots

PP-534

resources/definitions/ultimaker_method.def.json

@@ -50,7 +50,7 @@
             "ultimaker_tpu_175",
             "ultimaker_rapidrinse_175",
             "ultimaker_sr30",
-            "ultimaker_metallic_pla_175",
+            "ultimaker_pla_175_metallic",
             "verbatim_",
             "Vertex_",
             "volumic_",

resources/definitions/ultimaker_methodx.def.json

@@ -44,7 +44,7 @@
             "octofiber_",
             "fiberlogy_",
             "ultimaker_nylon_175",
-            "ultimaker_metallic_pla_175"
+            "ultimaker_pla_175_metallic"
         ],
         "has_machine_materials": true,
         "has_machine_quality": true,

resources/definitions/ultimaker_methodxl.def.json

@@ -45,7 +45,7 @@
             "fiberlogy_",
             "basf_ultrafuse_316l_175",
             "ultimaker_nylon_175",
-            "ultimaker_metallic_pla_175"
+            "ultimaker_pla_175_metallic"
         ],
         "has_machine_materials": true,
         "has_machine_quality": true,

resources/definitions/ultimaker_sketch.def.json

@@ -51,15 +51,13 @@
             "ultimaker_rapidrinse",
             "ultimaker_sr30",
             "ultimaker_petg",
-            "ultimaker_metallic_pla",
             "basf_",
             "jabil_",
             "polymaker_",
             "ultimaker_rapidrinse",
             "ultimaker_sr30",
             "ultimaker_petg",
-            "ultimaker_pva",
+            "ultimaker_pva"
-            "ultimaker_metallic_pla"
         ],
         "has_machine_quality": true,
         "has_materials": true,
@@ -126,8 +124,23 @@
         "machine_nozzle_heat_up_speed": { "default_value": 1.4 },
         "machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" },
         "machine_width": { "default_value": 150 },
+        "material_bed_temperature":
+        {
+            "maximum_value": 100,
+            "maximum_value_warning": 70
+        },
+        "material_bed_temperature_layer_0":
+        {
+            "maximum_value": 100,
+            "maximum_value_warning": 70
+        },
         "material_diameter": { "default_value": 1.75 },
         "material_flow": { "default_value": 100 },
+        "material_print_temperature":
+        {
+            "maximum_value": 240,
+            "maximum_value_warning": 230
+        },
         "min_bead_width":
         {
             "minimum_value": "line_width * 0.5",
@@ -148,6 +161,7 @@
             "enabled": true,
             "value": "resolveOrValue('print_sequence') != 'one_at_a_time'"
         },
+        "print_sequence": { "enabled": false },
         "raft_margin": { "value": "5" },
         "retract_at_layer_change": { "value": true },
         "retraction_amount":

resources/definitions/ultimaker_sketch_sprint.def.json

@@ -52,8 +52,7 @@
             "ultimaker_pva",
             "ultimaker_rapidrinse",
             "ultimaker_sr30",
-            "ultimaker_petg",
+            "ultimaker_petg"
-            "ultimaker_metallic_pla"
         ],
         "has_machine_quality": true,
         "has_materials": true,
@@ -132,7 +131,7 @@
         "infill_pattern": { "value": "'lines'" },
         "infill_sparse_density": { "value": 15 },
         "infill_wipe_dist": { "value": 0 },
-        "initial_layer_line_width_factor": { "value": 150 },
+        "initial_layer_line_width_factor": { "value": "100 if adhesion_type == 'raft' else 150" },
         "inset_direction": { "value": "'inside_out'" },
         "jerk_enabled":
         {
@@ -140,7 +139,13 @@
             "value": false
         },
         "jerk_travel_enabled": { "enabled": false },
-        "layer_height_0": { "value": "layer_height if adhesion_type == 'raft' else layer_height * 1.25" },
+        "layer_height":
+        {
+            "maximum_value": 0.4,
+            "maximum_value_warning": 0.2,
+            "value": 0.2
+        },
+        "layer_height_0": { "value": "layer_height if adhesion_type == 'raft' else 0.25" },
         "line_width": { "value": 0.42 },
         "machine_center_is_zero": { "default_value": true },
         "machine_depth": { "default_value": 221.5 },
@@ -171,37 +176,45 @@
         "material_flow": { "default_value": 100 },
         "material_print_temperature":
         {
-            "maximum_value": 280,
+            "maximum_value": 260,
             "maximum_value_warning": 240
         },
         "min_bead_width": { "value": 0.3 },
         "multiple_mesh_overlap": { "value": "0" },
-        "raft_airgap": { "value": 0.35 },
+        "print_sequence": { "enabled": false },
+        "raft_airgap": { "value": 0.2 },
         "raft_base_acceleration": { "value": "acceleration_layer_0" },
         "raft_base_speed":
         {
             "maximum_value": "raft_speed",
-            "maximum_value_warning": "raft_speed * 1/2",
+            "maximum_value_warning": "raft_speed * 0.6",
-            "value": "raft_speed * 1/4"
+            "value": "raft_speed * 0.35"
         },
         "raft_interface_acceleration": { "value": "acceleration_print * 0.2" },
-        "raft_interface_line_width": { "value": 0.7 },
+        "raft_interface_line_width": { "value": 0.5 },
         "raft_interface_speed":
         {
-            "maximum_value": 300,
+            "maximum_value": "speed_print",
-            "maximum_value_warning": 275,
+            "maximum_value_warning": "speed_print * 22/25",
-            "value": "raft_speed * 3/4"
+            "value": "raft_speed * 0.9"
         },
         "raft_interface_wall_count": { "value": "raft_wall_count" },
         "raft_margin": { "value": "1.5" },
         "raft_smoothing": { "value": "9.5" },
-        "raft_speed": { "value": 200 },
+        "raft_speed":
+        {
+            "maximum_value": "speed_print",
+            "maximum_value_warning": "speed_print * 24/25",
+            "value": "speed_print * 4/5"
+        },
         "raft_surface_acceleration": { "value": "acceleration_print * 0.5" },
+        "raft_surface_infill_overlap": { "value": 50 },
         "raft_surface_line_width": { "value": 0.4 },
         "raft_surface_speed":
         {
-            "maximum_value": 300,
+            "maximum_value": "speed_print",
-            "maximum_value_warning": 275
+            "maximum_value_warning": "speed_print * 24/25",
+            "value": "raft_speed"
         },
         "raft_surface_wall_count": { "value": "raft_wall_count" },
         "raft_wall_count": { "value": 2 },
@@ -217,10 +230,13 @@
         "retraction_min_travel": { "value": 0.8 },
         "retraction_prime_speed": { "value": "35" },
         "retraction_speed": { "value": "35" },
+        "scarf_joint_seam_length": { "value": 3 },
+        "scarf_joint_seam_start_height_ratio": { "value": 25 },
+        "scarf_split_distance": { "value": 0.1 },
         "seam_overhang_angle": { "value": 30 },
         "skin_edge_support_thickness": { "value": 0 },
         "skin_material_flow": { "value": "material_flow" },
-        "skin_material_flow_layer_0": { "value": "material_flow * 0.95" },
+        "skin_material_flow_layer_0": { "value": "material_flow if adhesion_type == 'raft' else material_flow * 0.95" },
         "skin_monotonic": { "value": true },
         "skin_outline_count": { "value": 0 },
         "skin_overlap": { "value": 10 },
@@ -372,7 +388,7 @@
         "travel_avoid_distance": { "value": 0.625 },
         "travel_avoid_supports": { "value": true },
         "wall_0_inset": { "value": "0" },
-        "wall_0_material_flow_layer_0": { "value": "material_flow * 0.95" },
+        "wall_0_material_flow_layer_0": { "value": "skin_material_flow_layer_0" },
         "wall_0_wipe_dist": { "value": 0.2 },
         "wall_line_width_x": { "value": 0.58 },
         "wall_overhang_angle": { "value": 35 },
@@ -384,7 +400,7 @@
         "wall_thickness": { "value": 1 },
         "wall_x_material_flow_layer_0": { "value": "material_flow" },
         "xy_offset": { "value": 0 },
-        "xy_offset_layer_0": { "value": -0.1 },
+        "xy_offset_layer_0": { "value": "0 if adhesion_type == 'raft' else -0.1" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
         "z_seam_position": { "value": "'backleft'" },
         "z_seam_type": { "value": "'sharpest_corner'" },

resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175-metallic_0.2mm.inst.cfg

@@ -0,0 +1,20 @@
+[general]
+definition = ultimaker_sketch
+name = Fast
+version = 4
+
+[metadata]
+material = ultimaker_pla_175_metallic
+quality_type = draft
+setting_version = 24
+type = quality
+variant = 0.4mm
+weight = -2
+
+[values]
+cool_min_temperature = 230
+material_final_print_temperature = 230
+material_initial_print_temperature = 230
+material_print_temperature = 230
+material_print_temperature_layer_0 = 235
+

resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175-metallic_0.2mm.inst.cfg

@@ -0,0 +1,20 @@
+[general]
+definition = ultimaker_sketch_large
+name = Fast
+version = 4
+
+[metadata]
+material = ultimaker_pla_175_metallic
+quality_type = draft
+setting_version = 24
+type = quality
+variant = 0.4mm
+weight = -2
+
+[values]
+cool_min_temperature = 230
+material_final_print_temperature = 230
+material_initial_print_temperature = 230
+material_print_temperature = 230
+material_print_temperature_layer_0 = 235
+

resources/quality/ultimaker_sketch_sprint/um_sketch_sprint_0.4mm_um-pla-175-metallic_0.2mm.inst.cfg

@@ -0,0 +1,30 @@
+[general]
+definition = ultimaker_sketch_sprint
+name = Fast
+version = 4
+
+[metadata]
+material = ultimaker_pla_175_metallic
+quality_type = draft
+setting_version = 24
+type = quality
+variant = 0.4mm
+weight = -2
+
+[values]
+cool_min_temperature = 230
+infill_angles = [135,135,135,135,135, 45,45,45,45,45]
+material_final_print_temperature = 230
+material_initial_print_temperature = 230
+material_print_temperature = 230
+material_print_temperature_layer_0 = 235
+speed_print = 125
+speed_roofing = =speed_topbottom
+speed_support_bottom = =speed_support * 4/5
+speed_support_interface = =speed_support
+speed_topbottom = =speed_print * 4/5
+speed_wall = =speed_print * 3/5
+speed_wall_x = =speed_print * 4/5
+support_material_flow = 92
+wall_overhang_speed_factor = 23
+