From 426d5a4eb628f8fd173778b2fb46ca4e22041cd0 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 27 Feb 2024 13:40:14 +0100 Subject: [PATCH 01/10] Replace setting brim_outside_only by brim_location CURA-9838 --- resources/definitions/fdmprinter.def.json | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1d453456a8..c6fb8fbb0e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6069,12 +6069,18 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "brim_outside_only": + "brim_location": { - "label": "Brim Only on Outside", - "description": "Only print the brim on the outside of the model. This reduces the amount of brim you need to remove afterwards, while it doesn't reduce the bed adhesion that much.", - "type": "bool", - "default_value": true, + "label": "Brim Location", + "description": "Print a brim on the outside of the model, inside, or both. Depending on the model, this helps reducing the amount of brim you need to remove afterwards, while ensuring a proper bed adhesion.", + "type": "enum", + "options": + { + "outside": "Outside Only", + "inside": "Inside Only", + "everywhere": "Everywhere" + }, + "default_value": "outside", "enabled": "resolveOrValue('adhesion_type') == 'brim'", "limit_to_extruder": "skirt_brim_extruder_nr", "settable_per_mesh": false, From 57c57edb7d4f0e5a8d85c9a194f838e41a243299 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 29 Feb 2024 11:21:16 +0100 Subject: [PATCH 02/10] Change brim margin setting desc because its use has been extended CURA-9838 --- resources/definitions/fdmprinter.def.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c6fb8fbb0e..580a624224 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6088,13 +6088,14 @@ }, "brim_inside_margin": { - "label": "Brim Inside Avoid Margin", - "description": "A part fully enclosed inside another part can generate an outer brim that touches the inside of the other part. This removes all brim within this distance from internal holes.", + "label": "Brim Avoid Margin", + "description": "When growing the brim around a surface, it may touch an other surface where brim is not expected. This removes all brim within this distance from clean surfaces.", "unit": "mm", "type": "float", - "default_value": 2.5, + "value": "line_width * 4", + "default_value": "1.6", "minimum_value": "0", - "enabled": "resolveOrValue('adhesion_type') == 'brim' and any(extruderValues('brim_outside_only'))", + "enabled": "resolveOrValue('adhesion_type') == 'brim'", "limit_to_extruder": "skirt_brim_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true From d7dbd13034e8e934ae15e103b15e0c3f000539e9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 29 Feb 2024 12:00:28 +0100 Subject: [PATCH 03/10] Finalized changing brim_outside_only to briml_location CURA-9838 --- plugins/3MFWriter/SettingsExportModel.py | 2 +- resources/definitions/erzay3d.def.json | 2 +- resources/definitions/inat_base.def.json | 2 +- .../Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg | 2 +- .../Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg | 2 +- resources/setting_visibility/advanced.cfg | 2 +- resources/setting_visibility/expert.cfg | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/3MFWriter/SettingsExportModel.py b/plugins/3MFWriter/SettingsExportModel.py index 3b034236c8..9769302f4f 100644 --- a/plugins/3MFWriter/SettingsExportModel.py +++ b/plugins/3MFWriter/SettingsExportModel.py @@ -39,7 +39,7 @@ class SettingsExportModel(QObject): 'adaptive_layer_height_enabled', 'brim_gap', 'support_offset', - 'brim_outside_only', + 'brim_location', 'magic_spiralize', 'slicing_tolerance', 'outer_inset_first', diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 28884a894a..5baadf32e4 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -14,7 +14,7 @@ { "acceleration_print": { "default_value": 1000 }, "adhesion_type": { "default_value": "skirt" }, - "brim_outside_only": { "default_value": false }, + "brim_location": { "default_value": "everywhere" }, "default_material_print_temperature": { "default_value": 220 }, "infill_sparse_density": { "default_value": 20 }, "ironing_flow": { "default_value": 7.0 }, diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 554b188b82..1d95bbbde4 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -113,7 +113,7 @@ "minimum_value_warning": "100" }, "adhesion_type": { "value": "'skirt'" }, - "brim_outside_only": { "value": false }, + "brim_location": { "value": "everywhere" }, "cool_fan_speed_min": { "value": "0.5*cool_fan_speed" }, "cool_min_layer_time_fan_speed_max": { "value": 10 }, "default_material_bed_temperature": { "maximum_value": "150" }, diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index f4da80ded9..59fec06a3e 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] adhesion_type = brim brim_line_count = 14 -brim_outside_only = True +brim_location = outside brim_width = 8 connect_infill_polygons = True cool_fan_enabled = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index a052562cd3..549c24a6c6 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] adhesion_type = brim brim_line_count = 14 -brim_outside_only = True +brim_location = outside brim_width = 8 connect_infill_polygons = True cool_fan_enabled = True diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 55a36075be..652f33b4a4 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -124,7 +124,7 @@ adhesion_extruder_nr skirt_line_count brim_width brim_line_count -brim_outside_only +brim_location [dual] prime_tower_enable diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 130b2580a4..ce5b78c76c 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -327,7 +327,7 @@ skirt_brim_minimal_length brim_width brim_gap brim_line_count -brim_outside_only +brim_location brim_smart_ordering raft_margin raft_smoothing From 709e362ffad376888ad4174f950ac7b8f902289c Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 1 Mar 2024 09:46:29 +0100 Subject: [PATCH 04/10] Cleanup and extention of exclude lists. Protection of PEI flex plate against high probe and first layer temperature. Relates to PP-441 --- resources/definitions/ultimaker.def.json | 4 +- resources/definitions/ultimaker2.def.json | 29 +++++++------- .../definitions/ultimaker2_plus.def.json | 39 ++++--------------- .../ultimaker2_plus_connect.def.json | 18 ++++----- resources/definitions/ultimaker3.def.json | 6 +-- .../definitions/ultimaker_original.def.json | 39 ++++--------------- .../ultimaker_original_dual.def.json | 39 ++++--------------- resources/definitions/ultimaker_s3.def.json | 4 +- resources/definitions/ultimaker_s5.def.json | 4 ++ resources/definitions/ultimaker_s7.def.json | 4 +- 10 files changed, 59 insertions(+), 127 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 9f99b878be..ef7fc7b1cb 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -8,8 +8,8 @@ "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", "exclude_materials": [ - "generic_hips", - "structur3d_dap100silicone" + "structur3d_*", + "generic_hips" ] }, "overrides": diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index def26c9b6f..0609cfabf9 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -10,23 +10,20 @@ "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "exclude_materials": [ + "structur3d_*", "generic_hips", - "generic_petg", - "structur3d_dap100silicone", - "ultimaker_petg_red", - "ultimaker_petg_blue", - "ultimaker_petg_grey", - "ultimaker_petg_black", - "ultimaker_petg_green", - "ultimaker_petg_white", - "ultimaker_petg_orange", - "ultimaker_petg_silver", - "ultimaker_petg_yellow", - "ultimaker_petg_transparent", - "ultimaker_petg_red_translucent", - "ultimaker_petg_blue_translucent", - "ultimaker_petg_green_translucent", - "ultimaker_petg_yellow_fluorescent" + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "generic_pekk", + "generic_pva", + "generic_tough_pla", + "ultimaker_bam", + "ultimaker_pva", + "ultimaker_tough_pla_*", + "ultimaker_petg_*", + "ultimaker_petcf_*" ], "firmware_file": "MarlinUltimaker2.hex", "has_machine_quality": true, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 1b3ddcc953..61dd8cae45 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -9,43 +9,20 @@ "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "exclude_materials": [ + "structur3d_*", "generic_hips", - "generic_petg", - "generic_bam", - "ultimaker_bam", - "generic_pva", - "ultimaker_pva", - "generic_tough_pla", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tough_pla_blue", - "ultimaker_tough_pla_gray", - "ultimaker_tough_pla_yellow", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "generic_petcf", - "structur3d_dap100silicone", - "ultimaker_petg_red", - "ultimaker_petg_blue", - "ultimaker_petg_grey", - "ultimaker_petg_black", - "ultimaker_petg_green", - "ultimaker_petg_white", - "ultimaker_petg_orange", - "ultimaker_petg_silver", - "ultimaker_petg_yellow", - "ultimaker_petg_transparent", - "ultimaker_petg_red_translucent", - "ultimaker_petg_blue_translucent", - "ultimaker_petg_green_translucent", - "ultimaker_petg_yellow_fluorescent", - "ultimaker_petcf_black", - "ultimaker_petcf_blue", - "ultimaker_petcf_gray" + "generic_pva", + "generic_tough_pla", + "ultimaker_bam", + "ultimaker_pva", + "ultimaker_tough_pla_*", + "ultimaker_petg_*", + "ultimaker_petcf_*" ], "firmware_file": "MarlinUltimaker2plus.hex", "first_start_actions": [], diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 20e914284f..b434b86a32 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -9,20 +9,20 @@ "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker2_plus_connect_platform.obj", "exclude_materials": [ + "structur3d_*", "generic_hips", - "generic_bam", - "ultimaker_bam", - "generic_pva", - "ultimaker_pva", - "ultimaker_petcf_black", - "ultimaker_petcf_blue", - "ultimaker_petcf_gray", - "generic_petcf", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", - "structur3d_dap100silicone" + "generic_petcf", + "generic_pva", + "generic_tough_pla", + "ultimaker_bam", + "ultimaker_pva", + "ultimaker_tough_pla_*", + "ultimaker_petg_*", + "ultimaker_petcf_*" ], "first_start_actions": [], "has_machine_materials": true, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 17a4b6045e..f5f1b386c0 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -13,16 +13,14 @@ 9066 ], "exclude_materials": [ + "structur3d_*", "generic_hips", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "generic_petcf", - "ultimaker_petcf_black", - "ultimaker_petcf_blue", - "ultimaker_petcf_gray", - "structur3d_dap100silicone" + "ultimaker_petcf_*" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 00f4615971..4729df90b3 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -10,43 +10,20 @@ "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", "exclude_materials": [ + "structur3d_*", "generic_hips", - "generic_petg", - "generic_bam", - "ultimaker_bam", - "generic_pva", - "ultimaker_pva", - "generic_tough_pla", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tough_pla_blue", - "ultimaker_tough_pla_gray", - "ultimaker_tough_pla_yellow", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "generic_petcf", - "structur3d_dap100silicone", - "ultimaker_petg_blue", - "ultimaker_petg_grey", - "ultimaker_petg_black", - "ultimaker_petg_green", - "ultimaker_petg_white", - "ultimaker_petg_orange", - "ultimaker_petg_silver", - "ultimaker_petg_yellow", - "ultimaker_petg_transparent", - "ultimaker_petg_red_translucent", - "ultimaker_petg_blue_translucent", - "ultimaker_petg_green_translucent", - "ultimaker_petg_yellow_fluorescent", - "ultimaker_petg_red", - "ultimaker_petcf_black", - "ultimaker_petcf_blue", - "ultimaker_petcf_gray" + "generic_pva", + "generic_tough_pla", + "ultimaker_bam", + "ultimaker_pva", + "ultimaker_tough_pla_*", + "ultimaker_petg_*", + "ultimaker_petcf_*" ], "firmware_file": "MarlinUltimaker-{baudrate}.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index a4cd6bfdf0..ce7baee8cc 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -10,43 +10,20 @@ "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", "exclude_materials": [ + "structur3d_*", "generic_hips", - "generic_petg", - "generic_bam", - "ultimaker_bam", - "generic_pva", - "ultimaker_pva", - "generic_tough_pla", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tough_pla_blue", - "ultimaker_tough_pla_gray", - "ultimaker_tough_pla_yellow", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "generic_petcf", - "structur3d_dap100silicone", - "ultimaker_petg_blue", - "ultimaker_petg_grey", - "ultimaker_petg_black", - "ultimaker_petg_green", - "ultimaker_petg_white", - "ultimaker_petg_orange", - "ultimaker_petg_silver", - "ultimaker_petg_yellow", - "ultimaker_petg_transparent", - "ultimaker_petg_red_translucent", - "ultimaker_petg_blue_translucent", - "ultimaker_petg_green_translucent", - "ultimaker_petg_yellow_fluorescent", - "ultimaker_petg_red", - "ultimaker_petcf_black", - "ultimaker_petcf_blue", - "ultimaker_petcf_gray" + "generic_pva", + "generic_tough_pla", + "ultimaker_bam", + "ultimaker_pva", + "ultimaker_tough_pla_*", + "ultimaker_petg_*", + "ultimaker_petcf_*" ], "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 483825df5a..28b5f77a50 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -15,8 +15,8 @@ 213484 ], "exclude_materials": [ - "generic_hips", - "structur3d_dap100silicone" + "structur3d_*", + "generic_hips" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index cd48c4fd38..2a46649157 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -15,6 +15,10 @@ 214476, 214477 ], + "exclude_materials": [ + "structur3d_*", + "generic_hips" + ], "firmware_update_info": { "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], diff --git a/resources/definitions/ultimaker_s7.def.json b/resources/definitions/ultimaker_s7.def.json index f7b45aa0e7..bb3f5a938d 100644 --- a/resources/definitions/ultimaker_s7.def.json +++ b/resources/definitions/ultimaker_s7.def.json @@ -44,6 +44,8 @@ }, "overrides": { - "machine_name": { "default_value": "Ultimaker S7" } + "default_material_print_temperature": { "maximum_value_warning": "320" }, + "machine_name": { "default_value": "Ultimaker S7" }, + "material_print_temperature_layer_0": { "maximum_value_warning": "320" } } } \ No newline at end of file From a2dcce9d5084129badadfe860d14d34e3eec1823 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 1 Mar 2024 14:46:13 +0100 Subject: [PATCH 05/10] Cleanup exclude lists. Relates to PP-441 --- resources/definitions/ultimaker2.def.json | 18 ++++++++++++------ resources/definitions/ultimaker2_plus.def.json | 16 +++++++++++----- .../ultimaker2_plus_connect.def.json | 15 +++++++-------- resources/definitions/ultimaker3.def.json | 6 ++++-- .../definitions/ultimaker_original.def.json | 15 ++++++++++----- .../ultimaker_original_dual.def.json | 15 ++++++++++----- resources/definitions/ultimaker_s3.def.json | 5 +++-- resources/definitions/ultimaker_s5.def.json | 5 +++-- 8 files changed, 60 insertions(+), 35 deletions(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 0609cfabf9..2dd168fd09 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -10,20 +10,26 @@ "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "exclude_materials": [ - "structur3d_*", - "generic_hips", + "generic_bam", "generic_cffcpe", "generic_cffpa", + "generic_flexible", "generic_gffcpe", "generic_gffpa", - "generic_pekk", + "generic_hips", + "generic_petcf", + "generic_petg", "generic_pva", "generic_tough_pla", + "structur3d_*", "ultimaker_bam", - "ultimaker_pva", - "ultimaker_tough_pla_*", + "ultimaker_petcf", + "ultimaker_petcf_*", + "ultimaker_petg", "ultimaker_petg_*", - "ultimaker_petcf_*" + "ultimaker_pva", + "ultimaker_tough_pla", + "ultimaker_tough_pla_*" ], "firmware_file": "MarlinUltimaker2.hex", "has_machine_quality": true, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 61dd8cae45..6ddd402927 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -9,20 +9,26 @@ "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", "exclude_materials": [ - "structur3d_*", - "generic_hips", + "generic_bam", "generic_cffcpe", "generic_cffpa", + "generic_flexible", "generic_gffcpe", "generic_gffpa", + "generic_hips", "generic_petcf", + "generic_petg", "generic_pva", "generic_tough_pla", + "structur3d_*", "ultimaker_bam", - "ultimaker_pva", - "ultimaker_tough_pla_*", + "ultimaker_petcf", + "ultimaker_petcf_*", + "ultimaker_petg", "ultimaker_petg_*", - "ultimaker_petcf_*" + "ultimaker_pva", + "ultimaker_tough_pla", + "ultimaker_tough_pla_*" ], "firmware_file": "MarlinUltimaker2plus.hex", "first_start_actions": [], diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index b434b86a32..564fee957b 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -9,20 +9,19 @@ "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker2_plus_connect_platform.obj", "exclude_materials": [ - "structur3d_*", - "generic_hips", + "generic_bam", "generic_cffcpe", "generic_cffpa", + "generic_flexible", "generic_gffcpe", "generic_gffpa", - "generic_petcf", + "generic_hips", "generic_pva", - "generic_tough_pla", + "structur3d_*", "ultimaker_bam", - "ultimaker_pva", - "ultimaker_tough_pla_*", - "ultimaker_petg_*", - "ultimaker_petcf_*" + "ultimaker_petcf", + "ultimaker_petcf_*", + "ultimaker_pva" ], "first_start_actions": [], "has_machine_materials": true, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index f5f1b386c0..7eba795a45 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -13,13 +13,15 @@ 9066 ], "exclude_materials": [ - "structur3d_*", - "generic_hips", "generic_cffcpe", "generic_cffpa", + "generic_flexible", "generic_gffcpe", "generic_gffpa", + "generic_hips", "generic_petcf", + "structur3d_*", + "ultimaker_petcf", "ultimaker_petcf_*" ], "firmware_update_info": diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 4729df90b3..684c30691f 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -10,20 +10,25 @@ "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", "exclude_materials": [ - "structur3d_*", - "generic_hips", "generic_cffcpe", "generic_cffpa", + "generic_flexible", "generic_gffcpe", "generic_gffpa", + "generic_hips", "generic_petcf", + "generic_petg", "generic_pva", "generic_tough_pla", + "structur3d_*", "ultimaker_bam", - "ultimaker_pva", - "ultimaker_tough_pla_*", + "ultimaker_petcf", + "ultimaker_petcf_*", + "ultimaker_petg", "ultimaker_petg_*", - "ultimaker_petcf_*" + "ultimaker_pva", + "ultimaker_tough_pla", + "ultimaker_tough_pla_*" ], "firmware_file": "MarlinUltimaker-{baudrate}.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index ce7baee8cc..777e1f4c2b 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -10,20 +10,25 @@ "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", "exclude_materials": [ - "structur3d_*", - "generic_hips", "generic_cffcpe", "generic_cffpa", + "generic_flexible", "generic_gffcpe", "generic_gffpa", + "generic_hips", "generic_petcf", + "generic_petg", "generic_pva", "generic_tough_pla", + "structur3d_*", "ultimaker_bam", - "ultimaker_pva", - "ultimaker_tough_pla_*", + "ultimaker_petcf", + "ultimaker_petcf_*", + "ultimaker_petg", "ultimaker_petg_*", - "ultimaker_petcf_*" + "ultimaker_pva", + "ultimaker_tough_pla", + "ultimaker_tough_pla_*" ], "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 28b5f77a50..a9f0bae259 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -15,8 +15,9 @@ 213484 ], "exclude_materials": [ - "structur3d_*", - "generic_hips" + "generic_hips", + "generic_flexible", + "structur3d_*" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 2a46649157..2732c59893 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -16,8 +16,9 @@ 214477 ], "exclude_materials": [ - "structur3d_*", - "generic_hips" + "generic_hips", + "generic_flexible", + "structur3d_*" ], "firmware_update_info": { From 66aeb3b46524f889aa283c14eac08c3758e1ea2f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 7 Mar 2024 11:48:09 +0100 Subject: [PATCH 06/10] Apply suggested description simplification CURA-9838 Co-authored-by: Casper Lamboo --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 142d4317e1..784b223500 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6089,7 +6089,7 @@ "brim_inside_margin": { "label": "Brim Avoid Margin", - "description": "When growing the brim around a surface, it may touch an other surface where brim is not expected. This removes all brim within this distance from clean surfaces.", + "description": "A brim around a surface may touch an other surface where brim is not expected. This removes all brim within this distance from brimless surfaces.", "unit": "mm", "type": "float", "value": "line_width * 4", From 8e61996ced4fcaa8d44017bcc410b540780b48e4 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Thu, 7 Mar 2024 16:07:15 +0100 Subject: [PATCH 07/10] Remove wildcards from definition files --- resources/definitions/ultimaker.def.json | 2 +- resources/definitions/ultimaker2.def.json | 7 ++----- resources/definitions/ultimaker2_plus.def.json | 5 +---- resources/definitions/ultimaker2_plus_connect.def.json | 3 +-- resources/definitions/ultimaker3.def.json | 5 ++--- resources/definitions/ultimaker_original.def.json | 7 ++----- resources/definitions/ultimaker_original_dual.def.json | 7 ++----- resources/definitions/ultimaker_s3.def.json | 2 +- resources/definitions/ultimaker_s5.def.json | 2 +- 9 files changed, 13 insertions(+), 27 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index ef7fc7b1cb..3821fdefd6 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -8,7 +8,7 @@ "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", "exclude_materials": [ - "structur3d_*", + "structur3d_", "generic_hips" ] }, diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 2dd168fd09..8c0e066cd1 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -21,15 +21,12 @@ "generic_petg", "generic_pva", "generic_tough_pla", - "structur3d_*", + "structur3d_", "ultimaker_bam", "ultimaker_petcf", - "ultimaker_petcf_*", "ultimaker_petg", - "ultimaker_petg_*", "ultimaker_pva", - "ultimaker_tough_pla", - "ultimaker_tough_pla_*" + "ultimaker_tough_pla" ], "firmware_file": "MarlinUltimaker2.hex", "has_machine_quality": true, diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 6ddd402927..3a97c38520 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -20,15 +20,12 @@ "generic_petg", "generic_pva", "generic_tough_pla", - "structur3d_*", + "structur3d_", "ultimaker_bam", "ultimaker_petcf", - "ultimaker_petcf_*", "ultimaker_petg", - "ultimaker_petg_*", "ultimaker_pva", "ultimaker_tough_pla", - "ultimaker_tough_pla_*" ], "firmware_file": "MarlinUltimaker2plus.hex", "first_start_actions": [], diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 564fee957b..90e7d6f794 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -17,10 +17,9 @@ "generic_gffpa", "generic_hips", "generic_pva", - "structur3d_*", + "structur3d_", "ultimaker_bam", "ultimaker_petcf", - "ultimaker_petcf_*", "ultimaker_pva" ], "first_start_actions": [], diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 7eba795a45..173fbdb524 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -20,9 +20,8 @@ "generic_gffpa", "generic_hips", "generic_petcf", - "structur3d_*", - "ultimaker_petcf", - "ultimaker_petcf_*" + "structur3d_", + "ultimaker_petcf" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 684c30691f..6848cb3c86 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -20,15 +20,12 @@ "generic_petg", "generic_pva", "generic_tough_pla", - "structur3d_*", + "structur3d_", "ultimaker_bam", "ultimaker_petcf", - "ultimaker_petcf_*", "ultimaker_petg", - "ultimaker_petg_*", "ultimaker_pva", - "ultimaker_tough_pla", - "ultimaker_tough_pla_*" + "ultimaker_tough_pla" ], "firmware_file": "MarlinUltimaker-{baudrate}.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 777e1f4c2b..65fca17df7 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -20,15 +20,12 @@ "generic_petg", "generic_pva", "generic_tough_pla", - "structur3d_*", + "structur3d_", "ultimaker_bam", "ultimaker_petcf", - "ultimaker_petcf_*", "ultimaker_petg", - "ultimaker_petg_*", "ultimaker_pva", - "ultimaker_tough_pla", - "ultimaker_tough_pla_*" + "ultimaker_tough_pla" ], "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index a9f0bae259..3750b83553 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -17,7 +17,7 @@ "exclude_materials": [ "generic_hips", "generic_flexible", - "structur3d_*" + "structur3d_" ], "firmware_update_info": { diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 2732c59893..eb3984510e 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -18,7 +18,7 @@ "exclude_materials": [ "generic_hips", "generic_flexible", - "structur3d_*" + "structur3d_" ], "firmware_update_info": { From 2c033b7adc0cd581fd467c1143d3830961f33c41 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 7 Mar 2024 16:15:35 +0100 Subject: [PATCH 08/10] Remove incorrect space --- resources/definitions/ultimaker2_plus.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 3a97c38520..b5ad30bb8d 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -25,7 +25,7 @@ "ultimaker_petcf", "ultimaker_petg", "ultimaker_pva", - "ultimaker_tough_pla", + "ultimaker_tough_pla" ], "firmware_file": "MarlinUltimaker2plus.hex", "first_start_actions": [], From 47a3d4ddbd660d4eca7bd854490a5c4d6a060bcf Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Thu, 7 Mar 2024 17:27:07 +0100 Subject: [PATCH 09/10] Improve top layer quality of TPU Recommited from Paul's changes to resolve conflicts --- .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg | 7 ++++++- .../quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg | 7 ++++++- 12 files changed, 72 insertions(+), 12 deletions(-) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg index 601886a065..008a119dd2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.4 weight = -1 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 gradual_infill_step_height = =5 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' @@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 0.7 +top_bottom_thickness = =layer_height * 6 travel_avoid_distance = 1.5 wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg index bb303eeb33..2b585a73ba 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.4 weight = 0 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 gradual_infill_step_height = =5 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' @@ -42,7 +47,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 0.7 +top_bottom_thickness = =layer_height * 6 travel_avoid_distance = 1.5 wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg index 85c37d439d..1932cf7213 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.4 weight = -2 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 gradual_infill_step_height = =5 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' @@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 0.7 +top_bottom_thickness = =layer_height * 6 travel_avoid_distance = 1.5 wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg index 5d6ce58f7c..c2e0ba68af 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.2mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.8 weight = -2 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 @@ -36,7 +41,7 @@ support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.2 +top_bottom_thickness = =layer_height * 6 top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg index 1b69ada75d..156d645694 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.3mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.8 weight = -3 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 @@ -37,7 +42,7 @@ support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.2 +top_bottom_thickness = =layer_height * 6 top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg index d678d7e178..0f1e8357b3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_tpu_0.4mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.8 weight = -4 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 @@ -37,7 +42,7 @@ support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.2 +top_bottom_thickness = =layer_height * 6 top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg index db01865cf8..d718e44a02 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.4 weight = -1 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 gradual_infill_step_height = =5 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' @@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 0.7 +top_bottom_thickness = =layer_height * 6 travel_avoid_distance = 1.5 wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg index 27a8bb863b..55a724e260 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.4 weight = 0 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 gradual_infill_step_height = =5 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' @@ -42,7 +47,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 0.7 +top_bottom_thickness = =layer_height * 6 travel_avoid_distance = 1.5 wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg index cf3069ee0f..591e8e91bd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.4 weight = -2 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 gradual_infill_step_height = =5 * layer_height infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' @@ -41,7 +46,7 @@ support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 -top_bottom_thickness = 0.7 +top_bottom_thickness = =layer_height * 6 travel_avoid_distance = 1.5 wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg index 2491d0ed88..941bfb3736 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.2mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.8 weight = -2 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 @@ -36,7 +41,7 @@ support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.2 +top_bottom_thickness = =layer_height * 6 top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg index e975175ce0..11db9e5a62 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.3mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.8 weight = -3 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 @@ -37,7 +42,7 @@ support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.2 +top_bottom_thickness = =layer_height * 6 top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg index 5334fac1f0..ac2049daae 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_tpu_0.4mm.inst.cfg @@ -12,6 +12,11 @@ variant = AA 0.8 weight = -4 [values] +bridge_skin_material_flow = 200 +bridge_skin_speed = =bridge_wall_speed +bridge_sparse_infill_max_density = 50 +bridge_wall_material_flow = =bridge_skin_material_flow +bridge_wall_speed = 10 brim_width = 8.75 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 @@ -36,7 +41,7 @@ support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 -top_bottom_thickness = 1.2 +top_bottom_thickness = =layer_height * 6 top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 From 077ac06e841b0cdeb6af6d48bf4b60e78f2c4381 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 8 Mar 2024 10:44:31 +0100 Subject: [PATCH 10/10] Added the generic_petcf Generic petcf was dropped during clean up. After confirmation with Frederic added it back to the exclude list --- resources/definitions/ultimaker2_plus_connect.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 90e7d6f794..8aae2d4c19 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -16,6 +16,7 @@ "generic_gffcpe", "generic_gffpa", "generic_hips", + "generic_petcf", "generic_pva", "structur3d_", "ultimaker_bam",