Merge pull request #19719 from Ultimaker/Update-exclude-material-list

Excluded material from certain machines (e.g. PPS-CF and Nylon)
2025-05-24 13:39:05 +08:00 · 2024-10-07 14:28:05 +02:00 · 2024-10-07 14:28:05 +02:00 · d7d51313ba
commit d7d51313ba
parent 094ce230c4 baefd3e4b6
7 changed files with 19 additions and 5 deletions
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@ -26,7 +26,9 @@
            "ultimaker_petcf",
            "ultimaker_petg",
            "ultimaker_pva",
-            "ultimaker_tough_pla"
+            "ultimaker_tough_pla",
+            "generic_cffpps",
+            "ultimaker_ppscf"
        ],
        "firmware_file": "MarlinUltimaker2.hex",
        "has_machine_quality": true,
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@ -21,7 +21,9 @@
            "generic_hips",
            "generic_petcf",
            "structur3d_",
-            "ultimaker_petcf"
+            "ultimaker_petcf",
+            "generic_cffpps",
+            "ultimaker_ppscf"
        ],
        "firmware_update_info":
        {
--- a/resources/definitions/ultimaker_method.def.json
+++ b/resources/definitions/ultimaker_method.def.json
@ -44,6 +44,7 @@
            "ultimaker_bvoh_175",
            "ultimaker_cffpa_175",
            "ultimaker_cpe_175",
+            "ultimaker_nylon_175",
            "ultimaker_hips_175",
            "ultimaker_pc_175",
            "ultimaker_tpu_175",
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@ -25,7 +25,9 @@
            "ultimaker_petcf",
            "ultimaker_petg",
            "ultimaker_pva",
-            "ultimaker_tough_pla"
+            "ultimaker_tough_pla",
+            "generic_cffpps",
+            "ultimaker_ppscf"
        ],
        "firmware_file": "MarlinUltimaker-{baudrate}.hex",
        "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex",
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@ -17,7 +17,9 @@
        "exclude_materials": [
            "generic_hips",
            "generic_flexible",
-            "structur3d_"
+            "generic_cffpps",
+            "structur3d_",
+            "ultimaker_ppscf"
        ],
        "firmware_update_info":
        {
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@ -18,7 +18,9 @@
        "exclude_materials": [
            "generic_hips",
            "generic_flexible",
-            "structur3d_"
+            "generic_cffpps",
+            "structur3d_",
+            "ultimaker_ppscf"
        ],
        "firmware_update_info":
        {
--- a/resources/definitions/ultimaker_sketch_sprint.def.json
+++ b/resources/definitions/ultimaker_sketch_sprint.def.json
@ -43,6 +43,9 @@
            "octofiber_",
            "fiberlogy_",
            "generic_",
+            "basf_",
+            "jabil_",
+            "polymaker_",
            "ultimaker_asa",
            "ultimaker_abs",
            "ultimaker_nylon",