Merge pull request #19358 from Ultimaker/PP-502-Method-Corrections

[PP-502] Method profile corrections

cura/PrinterOutput/Models/ExtruderConfigurationModel.py

@@ -50,7 +50,8 @@ class ExtruderConfigurationModel(QObject):
             "mk14_hot_s":"2XA",
             "mk14_c":"1C",
             "mk14":"1A",
-            "mk14_s":"2A"
+            "mk14_s":"2A",
+            "mk14_e": "LABS"
         }
         if hotendId in _EXTRUDER_NAME_MAP:
             return _EXTRUDER_NAME_MAP[hotendId]

resources/definitions/ultimaker_method.def.json

@@ -97,6 +97,7 @@
     },
     "overrides":
     {
+        "build_volume_temperature": { "maximum_value": "67" },
         "machine_depth": { "default_value": 236.48 },
         "machine_disallowed_areas":
         {

resources/definitions/ultimaker_method_base.def.json

@@ -191,6 +191,7 @@
         "bridge_wall_material_flow": { "value": "material_flow" },
         "bridge_wall_speed": { "value": "speed_wall" },
         "brim_width": { "value": 5 },
+        "default_material_bed_temperature": { "resolve": "min(extruderValues('default_material_bed_temperature'))" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gradual_support_infill_steps": { "value": 0 },
         "infill_before_walls": { "value": false },
@@ -316,7 +317,7 @@
         "machine_nozzle_cool_down_speed": { "value": 0.8 },
         "machine_nozzle_heat_up_speed": { "value": 3.5 },
         "machine_scale_fan_speed_zero_to_one": { "value": true },
-        "machine_start_gcode": { "default_value": "" },
+        "machine_start_gcode": { "default_value": "G0 Z20" },
         "material_bed_temperature": { "enabled": "machine_heated_bed" },
         "material_flow": { "value": 100 },
         "material_initial_print_temperature": { "value": "material_print_temperature-10" },
@@ -341,6 +342,7 @@
         "raft_base_line_width": { "value": 1.4 },
         "raft_base_speed": { "value": 10 },
         "raft_base_thickness": { "value": 0.8 },
+        "raft_base_wall_count": { "value": "raft_wall_count" },
         "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" },
         "raft_interface_fan_speed": { "value": 0 },
         "raft_interface_layers": { "value": 2 },
@@ -352,8 +354,8 @@
         "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" },
+        "raft_wall_count": { "value": 2 },
         "retract_at_layer_change": { "value": true },
         "retraction_amount": { "value": 0.75 },
         "retraction_combing": { "value": "'off'" },
@@ -363,7 +365,7 @@
         "retraction_hop": { "value": 0.4 },
         "retraction_hop_enabled": { "value": true },
         "retraction_hop_only_when_collides": { "value": false },
-        "retraction_min_travel": { "value": "0.6 if extruder_nr == support_extruder_nr else 5" },
+        "retraction_min_travel": { "value": "0.6" },
         "retraction_prime_speed": { "value": "retraction_speed" },
         "retraction_speed": { "value": 5 },
         "roofing_layer_count": { "value": 2 },
@@ -390,31 +392,30 @@
         "speed_wall_0": { "value": "speed_wall * 30/40" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": 40 },
-        "support_bottom_distance": { "value": "layer_height if extruder_nr == support_extruder_nr else 0" },
-        "support_bottom_enable": { "value": "false if extruder_nr == support_extruder_nr else true" },
+        "support_bottom_height": { "value": "2*support_infill_sparse_thickness" },
         "support_bottom_material_flow": { "value": "material_flow" },
-        "support_bottom_wall_count": { "value": "0 if extruder_nr == support_extruder_nr else support_wall_count" },
+        "support_bottom_wall_count": { "value": "0" },
         "support_brim_enable": { "value": false },
         "support_conical_min_width": { "value": 10 },
         "support_enable": { "value": true },
         "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" },
-        "support_fan_enable": { "value": "true if extruder_nr == support_extruder_nr else false" },
+        "support_fan_enable": { "value": "True" },
         "support_infill_rate": { "value": 20.0 },
         "support_infill_sparse_thickness": { "value": "layer_height" },
         "support_interface_enable": { "value": true },
+        "support_interface_height": { "value": "4*support_infill_sparse_thickness" },
         "support_interface_material_flow": { "value": "material_flow" },
-        "support_interface_offset": { "value": "1 if extruder_nr == support_extruder_nr else 0" },
         "support_interface_pattern": { "value": "'lines'" },
-        "support_interface_wall_count": { "value": "1 if extruder_nr == support_extruder_nr else 2" },
+        "support_interface_wall_count": { "value": "1" },
         "support_material_flow": { "value": "material_flow" },
-        "support_offset": { "value": "1.8 if extruder_nr == support_extruder_nr else 0.8" },
+        "support_offset": { "value": "1.8" },
         "support_pattern": { "value": "'lines'" },
-        "support_roof_height": { "value": "4*layer_height if extruder_nr == support_extruder_nr else 5*layer_height" },
+        "support_roof_height": { "value": "4*layer_height" },
         "support_roof_material_flow": { "value": "material_flow" },
         "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" },
-        "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_xy_distance_overhang": { "value": "support_xy_distance" },
         "switch_extruder_retraction_amount": { "value": 0.5 },
         "switch_extruder_retraction_speeds": { "value": "retraction_speed" },
         "top_bottom_thickness": { "value": "5*layer_height" },

resources/definitions/ultimaker_methodx.def.json

@@ -71,6 +71,7 @@
     },
     "overrides":
     {
+        "build_volume_temperature": { "maximum_value": "107" },
         "machine_depth": { "default_value": 236.48 },
         "machine_disallowed_areas":
         {
@@ -104,9 +105,7 @@
         "machine_height": { "default_value": 196 },
         "machine_name": { "default_value": "UltiMaker Method X" },
         "machine_width": { "default_value": 283.3 },
-        "material_flow": { "value": 97 },
         "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (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('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)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" },
-        "prime_tower_position_y": { "value": "190 - 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('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) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" },
-        "skin_material_flow": { "value": "0.95*material_flow" }
+        "prime_tower_position_y": { "value": "190 - 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('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) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }
     }
 }

resources/definitions/ultimaker_methodxl.def.json

@@ -27,6 +27,7 @@
     },
     "overrides":
     {
+        "build_volume_temperature": { "maximum_value": "100" },
         "machine_depth": { "default_value": 320 },
         "machine_disallowed_areas":
         {

resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg

@@ -5,7 +5,6 @@ version = 4
 
 [metadata]
 intent_category = solid
-is_experimental = True
 material = ultimaker_asa_175
 quality_type = draft
 setting_version = 23

resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg

@@ -5,7 +5,6 @@ version = 4
 
 [metadata]
 intent_category = solid
-is_experimental = True
 material = ultimaker_asa_175
 quality_type = draft
 setting_version = 23

resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg

@@ -5,7 +5,6 @@ version = 4
 
 [metadata]
 intent_category = solid
-is_experimental = True
 material = ultimaker_asa_175
 quality_type = draft
 setting_version = 23

resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg

@@ -5,7 +5,6 @@ version = 4
 
 [metadata]
 intent_category = solid
-is_experimental = True
 material = ultimaker_asa_175
 quality_type = draft
 setting_version = 23

resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg

@@ -5,7 +5,6 @@ version = 4
 
 [metadata]
 intent_category = solid
-is_experimental = True
 material = ultimaker_asa_175
 quality_type = draft
 setting_version = 23