From e8db51844b49a6755fa45edeba15cc0425943a51 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 28 Jun 2023 08:47:13 +0200 Subject: [PATCH 1/5] Remove PET-CF from UMO/UM2 --- resources/definitions/ultimaker2_plus.def.json | 6 +++++- resources/definitions/ultimaker2_plus_connect.def.json | 4 ++++ resources/definitions/ultimaker_original.def.json | 6 +++++- resources/definitions/ultimaker_original_dual.def.json | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 18b377813a..3aac522b99 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -24,6 +24,7 @@ "generic_cffpa", "generic_gffcpe", "generic_gffpa", + "generic_petcf", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", @@ -38,7 +39,10 @@ "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", - "ultimaker_petg_yellow_fluorescent" + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petcf_black", + "ultimaker_petcf_blue", + "ultimaker_petcf_gray" ], "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 dc55d8febf..dd66d7d795 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -23,6 +23,10 @@ "ultimaker_tough_pla_blue", "ultimaker_tough_pla_gray", "ultimaker_tough_pla_yellow", + "ultimaker_petcf_black", + "ultimaker_petcf_blue", + "ultimaker_petcf_gray", + "generic_petcf", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index c34dd4aadf..9b2f6e7d46 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -25,6 +25,7 @@ "generic_cffpa", "generic_gffcpe", "generic_gffpa", + "generic_petcf", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", @@ -39,7 +40,10 @@ "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", - "ultimaker_petg_red" + "ultimaker_petg_red", + "ultimaker_petcf_black", + "ultimaker_petcf_blue", + "ultimaker_petcf_gray" ], "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 59bc4fb8bb..4bfde2e92c 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -25,6 +25,7 @@ "generic_cffpa", "generic_gffcpe", "generic_gffpa", + "generic_petcf", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", @@ -39,7 +40,10 @@ "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", - "ultimaker_petg_red" + "ultimaker_petg_red", + "ultimaker_petcf_black", + "ultimaker_petcf_blue", + "ultimaker_petcf_gray" ], "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", From 7357ebaba6d609ebe344f8764a7bd18728d9402b Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 28 Jun 2023 09:55:57 +0200 Subject: [PATCH 2/5] Exclude 3 new(ish) TPLA colors on UM2/UMO --- resources/definitions/ultimaker2_plus.def.json | 3 +++ resources/definitions/ultimaker_original.def.json | 3 +++ resources/definitions/ultimaker_original_dual.def.json | 3 +++ 3 files changed, 9 insertions(+) diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 3aac522b99..1b3ddcc953 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -20,6 +20,9 @@ "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", diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 9b2f6e7d46..00f4615971 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -21,6 +21,9 @@ "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", diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index 4bfde2e92c..ee024dcf0d 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -21,6 +21,9 @@ "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", From df4d988b4b78e4fe8becc76182b08f3f88647b50 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:00:16 +0200 Subject: [PATCH 3/5] Don't exclude TPLA on UM2C --- resources/definitions/ultimaker2_plus_connect.def.json | 9 --------- 1 file changed, 9 deletions(-) diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index dd66d7d795..20e914284f 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -10,19 +10,10 @@ "platform": "ultimaker2_plus_connect_platform.obj", "exclude_materials": [ "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", "ultimaker_petcf_black", "ultimaker_petcf_blue", "ultimaker_petcf_gray", From d5de1d696c17172de2538959d753acb15ac62c19 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:07:13 +0200 Subject: [PATCH 4/5] Don't exclude generic_petg on S3 --- resources/definitions/ultimaker_s3.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 238df96300..10aaabd6a7 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -16,7 +16,6 @@ ], "exclude_materials": [ "generic_hips", - "generic_petg", "structur3d_dap100silicone" ], "firmware_update_info": From f9e49d32f19c7467a71c8e7bfee24da4cd93e103 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Wed, 28 Jun 2023 10:33:02 +0200 Subject: [PATCH 5/5] Exclude PET-CF on UM3 There is are CC cores defined for the UM3 --- resources/definitions/ultimaker3.def.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index a929e28258..af8fc07122 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -18,6 +18,10 @@ "generic_cffpa", "generic_gffcpe", "generic_gffpa", + "generic_petcf", + "ultimaker_petcf_black", + "ultimaker_petcf_blue", + "ultimaker_petcf_gray", "structur3d_dap100silicone" ], "firmware_update_info":