From d86750942b40f48391c1d6380ff28bdfec2e5cd9 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:10:10 +0200 Subject: [PATCH 1/2] Various corrections to the profile. PP-488 was lost in one of the merges. This is now restored. Cleanup of unused global quality files and removal of infill_pattern in the solid intent profiles (redundant). Added fan number to Method extruders. --- .../ultimaker_method_extruder_left.def.json | 1 + .../ultimaker_method_extruder_right.def.json | 1 + ..._f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg | 4 +--- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...thod_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...od_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ...um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 1 - .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 1 - .../um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...hodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...m_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...dx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ...m_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...odxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ...um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 1 - ...m_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg | 1 - ..._methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg | 1 - ...xl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 1 - ..._methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 1 - .../um_method_global_Normal_Quality.inst.cfg | 15 --------------- 25 files changed, 3 insertions(+), 39 deletions(-) delete mode 100644 resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index cb8e86a33b9..44680a34682 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": 1 }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 520d8abae83..75eb50bdd8b 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": 1 }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, 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 index 9dd0190dbc2..0aa1fc3d6d6 100644 --- 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,10 +12,8 @@ type = intent variant = AA 0.4 [values] -build_volume_temperature = 35 jerk_print = 30 -material_bed_temperature = =default_material_bed_temperature + 5 -material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature = =default_material_print_temperature + 10 speed_print = 80 wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 09767ce8a7a..fdfbe77c338 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1A [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 17b29cbbefd..231cf74ea37 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d5fa82b7ad..87cc96fb5aa 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1C [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index fe2f11dac9a..4a05977a4e2 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 05a61d6b82a..6c9d832805c 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = LABS [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 5375e81138d..2087c38cbae 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1A [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg index aa04992d122..3a1c0340faf 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 2a6f009282d..021e1de2e19 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 7164ec03e8f..330811df734 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = 1C [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg index 7d1ead2caf0..f4029c6c1d3 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1XA [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg index 9020c8fdccd..0a10d33053a 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 13ff5b5b670..224e85f1afb 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 271a651e20f..2a672307bb0 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ variant = LABS [values] build_volume_temperature = 47 -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index ce3c938e8c7..52b091486e4 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -13,7 +13,6 @@ variant = 1A [values] build_volume_temperature = 45 -infill_pattern = lines infill_sparse_density = 100 material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg index e5ad1ab92ca..c0d0816b3d4 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 1f6aad371a4..0440ceb055b 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = 1C [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 2ac7cdd32ae..ce45abad854 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -13,7 +13,6 @@ variant = 1C [values] build_volume_temperature = 45 -infill_pattern = lines infill_sparse_density = 100 material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg index 5dd7ea0eb8c..c0f3cce2278 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1xa_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = 1XA [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg index 3655b78cf16..bbad6fef505 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-asa-175_0.2mm_solid.inst.cfg @@ -13,6 +13,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 0322b30164d..4fa2252da37 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -12,6 +12,5 @@ type = intent variant = LABS [values] -infill_pattern = lines infill_sparse_density = 100 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index 242d166473e..d5ea2ac7f01 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -13,7 +13,6 @@ variant = LABS [values] build_volume_temperature = 45 -infill_pattern = lines infill_sparse_density = 100 material_bed_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg deleted file mode 100644 index b1304e3b14c..00000000000 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -definition = ultimaker_method -name = Fine -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 23 -type = quality -weight = 0 - -[values] -layer_height = 0.1 - From 9146304e9a7b450ea0d1d8d2c532b95206847648 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 9 Jul 2024 10:38:24 +0200 Subject: [PATCH 2/2] Set z_seam on vertex to false (allow on mid vertex). Results in a better seam quality. Also prevent seams on overhangs by default. PP-495 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 64196b9f8bf..045bec05a40 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1347,7 +1347,7 @@ "label": "Z Seam On Vertex", "description": "Place the z-seam on a polygon vertex. Switching this off can place the seam between vertices as well. (Keep in mind that this won't override the restrictions on placing the seam on an unsupported overhang.)", "type": "bool", - "default_value": true, + "default_value": false, "settable_per_mesh": true, "enabled": "z_seam_type == 'back' or z_seam_type == 'shortest'" }, @@ -8275,7 +8275,7 @@ "minimum_value_warning": "2", "maximum_value": "90", "default_value": 90, - "value": "wall_overhang_angle", + "value": "support_angle", "settable_per_mesh": true }, "wall_overhang_speed_factor":