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] 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":
         {