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