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 1/4] 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 2/4] 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 8e61996ced4fcaa8d44017bcc410b540780b48e4 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Thu, 7 Mar 2024 16:07:15 +0100 Subject: [PATCH 3/4] 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 4/4] 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": [],