diff --git a/plugins/XmlMaterialProfile/product_to_id.json b/plugins/XmlMaterialProfile/product_to_id.json index 7f37a2e2b4..5349360d6a 100644 --- a/plugins/XmlMaterialProfile/product_to_id.json +++ b/plugins/XmlMaterialProfile/product_to_id.json @@ -13,5 +13,10 @@ "DUAL600": "strateo3d", "IDEX420": "strateo3d_IDEX420", "IDEX420 Duplicate": "strateo3d_IDEX420_duplicate", - "IDEX420 Mirror": "strateo3d_IDEX420_mirror" -} + "IDEX420 Mirror": "strateo3d_IDEX420_mirror", + "UltiMaker Method": "ultimaker_method", + "UltiMaker Method X": "ultimaker_methodx", + "UltiMaker Method XL": "ultimaker_methodxl", + "UltiMaker Sketch": "ultimaker_sketch", + "UltiMaker Sketch Large": "ultimaker_sketch_large" +} \ No newline at end of file diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4527339494..abb765b389 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7839,7 +7839,7 @@ "type": "float", "minimum_value": "5", "minimum_value_warning": "50", - "maximum_value_warning": "150", + "maximum_value_warning": "250", "enabled": "bridge_settings_enabled", "settable_per_mesh": true }, @@ -7866,7 +7866,7 @@ "type": "float", "minimum_value": "5", "minimum_value_warning": "50", - "maximum_value_warning": "150", + "maximum_value_warning": "250", "enabled": "bridge_settings_enabled", "settable_per_mesh": true }, diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 77d0cb37fc..9aeb21ffc1 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -321,19 +321,16 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, - "machine_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, "machine_extruder_count": { "default_value": 2 }, "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_heated_bed": { "default_value": false }, "machine_heated_build_volume": { "default_value": true }, - "machine_height": { "default_value": 196 }, "machine_min_cool_heat_time_window": { "value": 15 }, "machine_name": { "default_value": "UltiMaker Method" }, "machine_nozzle_cool_down_speed": { "value": 0.8 }, "machine_nozzle_heat_up_speed": { "value": 3.5 }, "machine_start_gcode": { "default_value": "" }, - "machine_width": { "default_value": 150 }, "material_bed_temperature": { "enabled": "machine_heated_bed" }, "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, "material_final_print_temperature": { "value": "material_print_temperature-10" }, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 8d8e4bd4bd..0bdc8cdb9c 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -69,7 +69,7 @@ "platform_offset": [ 0, 0, - 0 + 16 ], "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", @@ -83,6 +83,40 @@ }, "overrides": { - "machine_name": { "default_value": "UltiMaker Method X" } + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -95], + [-141.65, -95] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 95], + [-141.65, 95] + ], + [ + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] + ], + [ + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] + ] + ] + }, + "machine_height": { "default_value": 196 }, + "machine_name": { "default_value": "UltiMaker Method X" }, + "machine_width": { "default_value": 283.3 }, + "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)" } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 837432f029..c03eae2ae3 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -32,12 +32,43 @@ }, "overrides": { - "machine_depth": { "default_value": 305 }, + "machine_depth": { "default_value": 320 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-204, -160], + [204, -160], + [204, -152.5], + [-204, -152.5] + ], + [ + [-204, 160], + [204, 160], + [204, 152.5], + [-204, 152.5] + ], + [ + [-205, -160], + [-152.5, -160], + [-152.5, 160], + [-205, 160] + ], + [ + [152.5, -160], + [205, -160], + [205, 160], + [152.5, 160] + ] + ] + }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 317 }, "machine_name": { "default_value": "UltiMaker Method XL" }, - "machine_width": { "default_value": 305 }, + "machine_width": { "default_value": 410 }, "material_shrinkage_percentage_z": { "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))" }, + "prime_tower_position_x": { "value": "(305 - (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)) - (305 / 2)" }, + "prime_tower_position_y": { "value": "305 - 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) - (305 / 2)" }, "speed_travel": { "value": 500 } } } \ No newline at end of file diff --git a/resources/intent/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg index 45c6ddfa53..a7e099e431 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm_solid.inst.cfg @@ -9,7 +9,7 @@ material = ultimaker_abscf_175 quality_type = draft setting_version = 22 type = intent -variant = Lab +variant = LABS [values] infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg index 30353ab97e..80c26ac0b4 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm_solid.inst.cfg @@ -9,7 +9,7 @@ material = ultimaker_absr_175 quality_type = draft setting_version = 22 type = intent -variant = Lab +variant = LABS [values] infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg index b277fe82c6..82735775a6 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm_solid.inst.cfg @@ -9,7 +9,7 @@ material = ultimaker_abscf_175 quality_type = draft setting_version = 22 type = intent -variant = Lab +variant = LABS [values] infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg similarity index 93% rename from resources/intent/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg rename to resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg index 0acc11121c..87e0495be7 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm_solid.inst.cfg @@ -9,7 +9,7 @@ material = ultimaker_absr_175 quality_type = draft setting_version = 22 type = intent -variant = Lab +variant = LABS [values] infill_sparse_density = 100 diff --git a/resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg index 4ede69a5f4..da9564ae9d 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_lab_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-abscf-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_abscf_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg index 13f2325424..b3107e14a3 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_lab_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-absr-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_absr_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg index f0407d43fe..5becec44d9 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-abscf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-abscf-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_abscf_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg similarity index 98% rename from resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg index 59890d0568..2114be0ff4 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_lab_um-absr-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-absr-175_0.2mm.inst.cfg @@ -8,7 +8,7 @@ material = ultimaker_absr_175 quality_type = draft setting_version = 22 type = quality -variant = Lab +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg index 58503dfcd9..e62880cf41 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-petg_0.2mm.inst.cfg @@ -24,10 +24,10 @@ acceleration_topbottom = =acceleration_wall acceleration_wall = =acceleration_infill acceleration_wall_0 = 1500 acceleration_wall_x = =acceleration_wall -bridge_skin_material_flow = 100 +bridge_skin_material_flow = 200 bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 -bridge_wall_material_flow = 100 +bridge_wall_material_flow = 200 bridge_wall_speed = 20 cool_min_layer_time = 4 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg index e74b8444f0..a144394b5a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-petg_0.2mm.inst.cfg @@ -24,10 +24,10 @@ acceleration_topbottom = =acceleration_wall acceleration_wall = =acceleration_infill acceleration_wall_0 = 1500 acceleration_wall_x = =acceleration_wall -bridge_skin_material_flow = 100 +bridge_skin_material_flow = 200 bridge_skin_speed = =bridge_wall_speed bridge_sparse_infill_max_density = 50 -bridge_wall_material_flow = 100 +bridge_wall_material_flow = 200 bridge_wall_speed = 20 cool_min_layer_time = 4 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' diff --git a/resources/variants/ultimaker_methodx_LAB.inst.cfg b/resources/variants/ultimaker_methodx_LABS.inst.cfg similarity index 81% rename from resources/variants/ultimaker_methodx_LAB.inst.cfg rename to resources/variants/ultimaker_methodx_LABS.inst.cfg index a4d66495c0..a5232706b9 100644 --- a/resources/variants/ultimaker_methodx_LAB.inst.cfg +++ b/resources/variants/ultimaker_methodx_LABS.inst.cfg @@ -1,6 +1,6 @@ [general] definition = ultimaker_methodx -name = Lab +name = LABS version = 4 [metadata] @@ -9,6 +9,6 @@ setting_version = 22 type = variant [values] -machine_nozzle_id = Lab +machine_nozzle_id = LABS machine_nozzle_size = 0.4 diff --git a/resources/variants/ultimaker_methodxl_LAB.inst.cfg b/resources/variants/ultimaker_methodxl_LABS.inst.cfg similarity index 81% rename from resources/variants/ultimaker_methodxl_LAB.inst.cfg rename to resources/variants/ultimaker_methodxl_LABS.inst.cfg index 7e7b6d466f..3c6e538c19 100644 --- a/resources/variants/ultimaker_methodxl_LAB.inst.cfg +++ b/resources/variants/ultimaker_methodxl_LABS.inst.cfg @@ -1,6 +1,6 @@ [general] definition = ultimaker_methodxl -name = Lab +name = LABS version = 4 [metadata] @@ -9,6 +9,6 @@ setting_version = 22 type = variant [values] -machine_nozzle_id = Lab +machine_nozzle_id = LABS machine_nozzle_size = 0.4