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] 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 9f99b878be3..ef7fc7b1cb1 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 def26c9b6f1..0609cfabf95 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 1b3ddcc953e..61dd8cae45a 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 20e914284fc..b434b86a325 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 17a4b6045e1..f5f1b386c0f 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 00f46159717..4729df90b37 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 a4cd6bfdf04..ce7baee8cc7 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 483825df5a3..28b5f77a507 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 cd48c4fd38c..2a466491575 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 f7b45aa0e74..bb3f5a938db 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