From 8a84ac503cfb9f3a28736e8cd15f9c0fe124ab3a Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 24 Nov 2023 16:48:47 +0100 Subject: [PATCH 1/6] Clean up bot LUT We had a lot of Look up Tables scattered around in the cura repository. This can be solved by adding a `bot_id` entry to metadata of the various makerbot extruders/materials/definitions --- generic_abs_175.xml.fdm_material | 1 + generic_asa_175.xml.fdm_material | 1 + generic_nylon_175.xml.fdm_material | 1 + generic_pc_175.xml.fdm_material | 1 + generic_petg_175.xml.fdm_material | 1 + generic_pla_175.xml.fdm_material | 1 + generic_pva_175.xml.fdm_material | 1 + ultimaker_abscf_175.xml.fdm_material | 1 + ultimaker_absr_175.xml.fdm_material | 1 + ultimaker_rapidrinse_175.xml.fdm_material | 5 +++-- 10 files changed, 12 insertions(+), 2 deletions(-) diff --git a/generic_abs_175.xml.fdm_material b/generic_abs_175.xml.fdm_material index 6186df70e..7b68d8119 100644 --- a/generic_abs_175.xml.fdm_material +++ b/generic_abs_175.xml.fdm_material @@ -11,6 +11,7 @@ Generic ABS 1.75mm profile. The data in this file may not be correct for your sp 2780b345-577b-4a24-a2c5-12e6aad3e690 11 + abs #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. No glue needed diff --git a/generic_asa_175.xml.fdm_material b/generic_asa_175.xml.fdm_material index 8d1da82a2..a0160a204 100644 --- a/generic_asa_175.xml.fdm_material +++ b/generic_asa_175.xml.fdm_material @@ -10,6 +10,7 @@ Generic ASA 1.75mm profile. The data in this file may not be correct for your sp Generic 416eead4-0d8e-4f0b-8bfc-a91a519befa5 + asa 5 #ffe92a ASA combines the qualities of ABS with the added benefit of UV resistance and additional moisture resistance making it ideal for equipment exposed to sunlight and rain over long periods of time – such as products for the agriculture, transportation, and power and utility industries. diff --git a/generic_nylon_175.xml.fdm_material b/generic_nylon_175.xml.fdm_material index 7a5588749..f85c0e8dc 100644 --- a/generic_nylon_175.xml.fdm_material +++ b/generic_nylon_175.xml.fdm_material @@ -10,6 +10,7 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your Generic 283d439a-3490-4481-920c-c51d8cdecf9c + nylon 7 #3DF266 Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. diff --git a/generic_pc_175.xml.fdm_material b/generic_pc_175.xml.fdm_material index 42aee1cfd..4dc5d4294 100644 --- a/generic_pc_175.xml.fdm_material +++ b/generic_pc_175.xml.fdm_material @@ -10,6 +10,7 @@ Generic PC 1.75mm profile. The data in this file may not be correct for your spe Generic 62414577-94d1-490d-b1e4-7ef3ec40db02 + pc 6 #F29030 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. diff --git a/generic_petg_175.xml.fdm_material b/generic_petg_175.xml.fdm_material index 4bd4adc7d..c91933ad5 100644 --- a/generic_petg_175.xml.fdm_material +++ b/generic_petg_175.xml.fdm_material @@ -10,6 +10,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s Generic 69386c85-5b6c-421a-bec5-aeb1fb33f060 + petg 6 #f3a112 Generic PETG profile. The data in this file may not be correct for your specific machine. diff --git a/generic_pla_175.xml.fdm_material b/generic_pla_175.xml.fdm_material index 1f2fe1aa2..5b747183f 100644 --- a/generic_pla_175.xml.fdm_material +++ b/generic_pla_175.xml.fdm_material @@ -10,6 +10,7 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp Generic 0ff92885-617b-4144-a03c-9989872454bc + pla 11 #ffc924 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. diff --git a/generic_pva_175.xml.fdm_material b/generic_pva_175.xml.fdm_material index 0335d60bf..cdf2cc891 100644 --- a/generic_pva_175.xml.fdm_material +++ b/generic_pva_175.xml.fdm_material @@ -10,6 +10,7 @@ Generic PVA 1.75mm profile. The data in this file may not be correct for your sp Generic a4255da2-cb2a-4042-be49-4a83957a2f9a + pva 10 #a32bcc Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon. diff --git a/ultimaker_abscf_175.xml.fdm_material b/ultimaker_abscf_175.xml.fdm_material index b202b4903..fab1ff9c5 100644 --- a/ultimaker_abscf_175.xml.fdm_material +++ b/ultimaker_abscf_175.xml.fdm_material @@ -7,6 +7,7 @@ Generic 495a0ce5-9daf-4a16-b7b2-06856d82394d + abs-cf10 4 #0e0e10 The performance of carbon fiber with the reliability of ABS diff --git a/ultimaker_absr_175.xml.fdm_material b/ultimaker_absr_175.xml.fdm_material index 00e6fbe55..2b751c66c 100644 --- a/ultimaker_absr_175.xml.fdm_material +++ b/ultimaker_absr_175.xml.fdm_material @@ -7,6 +7,7 @@ Generic 88c8919c-6a09-471a-b7b6-e801263d862d + abs-wss1 4 #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. diff --git a/ultimaker_rapidrinse_175.xml.fdm_material b/ultimaker_rapidrinse_175.xml.fdm_material index b43a4f6f6..90ce97d71 100644 --- a/ultimaker_rapidrinse_175.xml.fdm_material +++ b/ultimaker_rapidrinse_175.xml.fdm_material @@ -7,7 +7,8 @@ Generic a140ef8f-4f26-4e73-abe0-cfc29d6d1024 - 5 + wss1 + 4 #f5f2d1 Water soluble support material for ABS-R. Use the same temperatures and adhesion method as your build material(s). @@ -28,7 +29,7 @@ True - =extruder_nr==support_extruder_nr + =extruder_nr==support_extruder_nr and support_enable True From 997b8fbf70eafc257dcdf02567bed616bb9b1bf7 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 27 Nov 2023 15:30:50 +0100 Subject: [PATCH 2/6] Change `bot_id` to `bot_material_id` --- generic_abs_175.xml.fdm_material | 2 +- generic_asa_175.xml.fdm_material | 2 +- generic_nylon_175.xml.fdm_material | 2 +- generic_pc_175.xml.fdm_material | 2 +- generic_petg_175.xml.fdm_material | 2 +- generic_pla_175.xml.fdm_material | 2 +- generic_pva_175.xml.fdm_material | 2 +- ultimaker_abscf_175.xml.fdm_material | 2 +- ultimaker_absr_175.xml.fdm_material | 2 +- ultimaker_rapidrinse_175.xml.fdm_material | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/generic_abs_175.xml.fdm_material b/generic_abs_175.xml.fdm_material index 7b68d8119..fc0019a42 100644 --- a/generic_abs_175.xml.fdm_material +++ b/generic_abs_175.xml.fdm_material @@ -11,7 +11,7 @@ Generic ABS 1.75mm profile. The data in this file may not be correct for your sp 2780b345-577b-4a24-a2c5-12e6aad3e690 11 - abs + abs #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. No glue needed diff --git a/generic_asa_175.xml.fdm_material b/generic_asa_175.xml.fdm_material index a0160a204..75000b2ca 100644 --- a/generic_asa_175.xml.fdm_material +++ b/generic_asa_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic ASA 1.75mm profile. The data in this file may not be correct for your sp Generic 416eead4-0d8e-4f0b-8bfc-a91a519befa5 - asa + asa 5 #ffe92a ASA combines the qualities of ABS with the added benefit of UV resistance and additional moisture resistance making it ideal for equipment exposed to sunlight and rain over long periods of time – such as products for the agriculture, transportation, and power and utility industries. diff --git a/generic_nylon_175.xml.fdm_material b/generic_nylon_175.xml.fdm_material index f85c0e8dc..051560c3b 100644 --- a/generic_nylon_175.xml.fdm_material +++ b/generic_nylon_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your Generic 283d439a-3490-4481-920c-c51d8cdecf9c - nylon + nylon 7 #3DF266 Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. diff --git a/generic_pc_175.xml.fdm_material b/generic_pc_175.xml.fdm_material index 4dc5d4294..ab5cfab5d 100644 --- a/generic_pc_175.xml.fdm_material +++ b/generic_pc_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PC 1.75mm profile. The data in this file may not be correct for your spe Generic 62414577-94d1-490d-b1e4-7ef3ec40db02 - pc + pc 6 #F29030 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. diff --git a/generic_petg_175.xml.fdm_material b/generic_petg_175.xml.fdm_material index c91933ad5..0b629da98 100644 --- a/generic_petg_175.xml.fdm_material +++ b/generic_petg_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s Generic 69386c85-5b6c-421a-bec5-aeb1fb33f060 - petg + petg 6 #f3a112 Generic PETG profile. The data in this file may not be correct for your specific machine. diff --git a/generic_pla_175.xml.fdm_material b/generic_pla_175.xml.fdm_material index 5b747183f..5a53981e0 100644 --- a/generic_pla_175.xml.fdm_material +++ b/generic_pla_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp Generic 0ff92885-617b-4144-a03c-9989872454bc - pla + pla 11 #ffc924 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. diff --git a/generic_pva_175.xml.fdm_material b/generic_pva_175.xml.fdm_material index cdf2cc891..e7d7c2640 100644 --- a/generic_pva_175.xml.fdm_material +++ b/generic_pva_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PVA 1.75mm profile. The data in this file may not be correct for your sp Generic a4255da2-cb2a-4042-be49-4a83957a2f9a - pva + pva 10 #a32bcc Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon. diff --git a/ultimaker_abscf_175.xml.fdm_material b/ultimaker_abscf_175.xml.fdm_material index fab1ff9c5..71f334a2b 100644 --- a/ultimaker_abscf_175.xml.fdm_material +++ b/ultimaker_abscf_175.xml.fdm_material @@ -7,7 +7,7 @@ Generic 495a0ce5-9daf-4a16-b7b2-06856d82394d - abs-cf10 + abs-cf10 4 #0e0e10 The performance of carbon fiber with the reliability of ABS diff --git a/ultimaker_absr_175.xml.fdm_material b/ultimaker_absr_175.xml.fdm_material index 2b751c66c..695830539 100644 --- a/ultimaker_absr_175.xml.fdm_material +++ b/ultimaker_absr_175.xml.fdm_material @@ -7,7 +7,7 @@ Generic 88c8919c-6a09-471a-b7b6-e801263d862d - abs-wss1 + abs-wss1 4 #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. diff --git a/ultimaker_rapidrinse_175.xml.fdm_material b/ultimaker_rapidrinse_175.xml.fdm_material index 90ce97d71..fe690d2a0 100644 --- a/ultimaker_rapidrinse_175.xml.fdm_material +++ b/ultimaker_rapidrinse_175.xml.fdm_material @@ -7,7 +7,7 @@ Generic a140ef8f-4f26-4e73-abe0-cfc29d6d1024 - wss1 + wss1 4 #f5f2d1 Water soluble support material for ABS-R. From db50d93345acd45c1519cfbb4adb0da02e0ed94b Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 27 Nov 2023 15:36:07 +0100 Subject: [PATCH 3/6] fix copy paste error --- ultimaker_rapidrinse_175.xml.fdm_material | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ultimaker_rapidrinse_175.xml.fdm_material b/ultimaker_rapidrinse_175.xml.fdm_material index fe690d2a0..56e05d1a2 100644 --- a/ultimaker_rapidrinse_175.xml.fdm_material +++ b/ultimaker_rapidrinse_175.xml.fdm_material @@ -8,7 +8,7 @@ a140ef8f-4f26-4e73-abe0-cfc29d6d1024 wss1 - 4 + 5 #f5f2d1 Water soluble support material for ABS-R. Use the same temperatures and adhesion method as your build material(s). @@ -29,7 +29,7 @@ True - =extruder_nr==support_extruder_nr and support_enable + =extruder_nr==support_extruder_nr True From 124c2f3c6e955eceae3c4340fc82e49c6aa27889 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 27 Nov 2023 15:41:55 +0100 Subject: [PATCH 4/6] Update `fdmmaterial.xsd` with `material_bot_id` --- scripts/fdmmaterial.xsd | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/fdmmaterial.xsd b/scripts/fdmmaterial.xsd index 8584c120b..768337ccb 100644 --- a/scripts/fdmmaterial.xsd +++ b/scripts/fdmmaterial.xsd @@ -34,6 +34,14 @@ + + + + + + + + From 0183355218a6a412d272e599aceae4a17f13b79b Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 29 Nov 2023 12:25:41 +0100 Subject: [PATCH 5/6] Update `bot` to `reference` --- generic_abs_175.xml.fdm_material | 2 +- generic_asa_175.xml.fdm_material | 2 +- generic_nylon_175.xml.fdm_material | 2 +- generic_pc_175.xml.fdm_material | 2 +- generic_petg_175.xml.fdm_material | 2 +- generic_pla_175.xml.fdm_material | 2 +- generic_pva_175.xml.fdm_material | 2 +- scripts/fdmmaterial.xsd | 2 +- ultimaker_abscf_175.xml.fdm_material | 2 +- ultimaker_absr_175.xml.fdm_material | 2 +- ultimaker_rapidrinse_175.xml.fdm_material | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/generic_abs_175.xml.fdm_material b/generic_abs_175.xml.fdm_material index fc0019a42..bec05d481 100644 --- a/generic_abs_175.xml.fdm_material +++ b/generic_abs_175.xml.fdm_material @@ -11,7 +11,7 @@ Generic ABS 1.75mm profile. The data in this file may not be correct for your sp 2780b345-577b-4a24-a2c5-12e6aad3e690 11 - abs + abs #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. No glue needed diff --git a/generic_asa_175.xml.fdm_material b/generic_asa_175.xml.fdm_material index 75000b2ca..7a1228cd8 100644 --- a/generic_asa_175.xml.fdm_material +++ b/generic_asa_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic ASA 1.75mm profile. The data in this file may not be correct for your sp Generic 416eead4-0d8e-4f0b-8bfc-a91a519befa5 - asa + asa 5 #ffe92a ASA combines the qualities of ABS with the added benefit of UV resistance and additional moisture resistance making it ideal for equipment exposed to sunlight and rain over long periods of time – such as products for the agriculture, transportation, and power and utility industries. diff --git a/generic_nylon_175.xml.fdm_material b/generic_nylon_175.xml.fdm_material index 051560c3b..ed17a628a 100644 --- a/generic_nylon_175.xml.fdm_material +++ b/generic_nylon_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic Nylon 1.75mm profile. The data in this file may not be correct for your Generic 283d439a-3490-4481-920c-c51d8cdecf9c - nylon + nylon 7 #3DF266 Nylon is strong, abrasion-resistant, durable and engineered for low moisture sensitivity. diff --git a/generic_pc_175.xml.fdm_material b/generic_pc_175.xml.fdm_material index ab5cfab5d..57616ee63 100644 --- a/generic_pc_175.xml.fdm_material +++ b/generic_pc_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PC 1.75mm profile. The data in this file may not be correct for your spe Generic 62414577-94d1-490d-b1e4-7ef3ec40db02 - pc + pc 6 #F29030 Strong, tough and temperature resistant. PC offers a great print quality, heat resistance up to 110ºC, mechanical strength and toughness. diff --git a/generic_petg_175.xml.fdm_material b/generic_petg_175.xml.fdm_material index 0b629da98..4ecf6f44e 100644 --- a/generic_petg_175.xml.fdm_material +++ b/generic_petg_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PETG 1.75mm profile. The data in this file may not be correct for your s Generic 69386c85-5b6c-421a-bec5-aeb1fb33f060 - petg + petg 6 #f3a112 Generic PETG profile. The data in this file may not be correct for your specific machine. diff --git a/generic_pla_175.xml.fdm_material b/generic_pla_175.xml.fdm_material index 5a53981e0..d2490e0b6 100644 --- a/generic_pla_175.xml.fdm_material +++ b/generic_pla_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PLA 1.75mm profile. The data in this file may not be correct for your sp Generic 0ff92885-617b-4144-a03c-9989872454bc - pla + pla 11 #ffc924 Fast, safe and reliable printing. PLA is ideal for the fast and reliable printing of parts and prototypes with a great surface quality. diff --git a/generic_pva_175.xml.fdm_material b/generic_pva_175.xml.fdm_material index e7d7c2640..a4ab11121 100644 --- a/generic_pva_175.xml.fdm_material +++ b/generic_pva_175.xml.fdm_material @@ -10,7 +10,7 @@ Generic PVA 1.75mm profile. The data in this file may not be correct for your sp Generic a4255da2-cb2a-4042-be49-4a83957a2f9a - pva + pva 10 #a32bcc Water soluble support material. PVA is a matching support material for PLA, CPE and Nylon. diff --git a/scripts/fdmmaterial.xsd b/scripts/fdmmaterial.xsd index 768337ccb..14e88936b 100644 --- a/scripts/fdmmaterial.xsd +++ b/scripts/fdmmaterial.xsd @@ -34,7 +34,7 @@ - + diff --git a/ultimaker_abscf_175.xml.fdm_material b/ultimaker_abscf_175.xml.fdm_material index 71f334a2b..2c977557b 100644 --- a/ultimaker_abscf_175.xml.fdm_material +++ b/ultimaker_abscf_175.xml.fdm_material @@ -7,7 +7,7 @@ Generic 495a0ce5-9daf-4a16-b7b2-06856d82394d - abs-cf10 + abs-cf10 4 #0e0e10 The performance of carbon fiber with the reliability of ABS diff --git a/ultimaker_absr_175.xml.fdm_material b/ultimaker_absr_175.xml.fdm_material index 695830539..c9b14e63a 100644 --- a/ultimaker_absr_175.xml.fdm_material +++ b/ultimaker_absr_175.xml.fdm_material @@ -7,7 +7,7 @@ Generic 88c8919c-6a09-471a-b7b6-e801263d862d - abs-wss1 + abs-wss1 4 #8cb219 Tough and durable. ABS is good for mechanical parts. It is impact resistant, dimensionally stable and handles temperatures up to 85ºC. diff --git a/ultimaker_rapidrinse_175.xml.fdm_material b/ultimaker_rapidrinse_175.xml.fdm_material index 56e05d1a2..ffcf141de 100644 --- a/ultimaker_rapidrinse_175.xml.fdm_material +++ b/ultimaker_rapidrinse_175.xml.fdm_material @@ -7,7 +7,7 @@ Generic a140ef8f-4f26-4e73-abe0-cfc29d6d1024 - wss1 + wss1 5 #f5f2d1 Water soluble support material for ABS-R. From e742ddea3bc680ae41841d348f425fcefa968d74 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 29 Nov 2023 14:50:48 +0100 Subject: [PATCH 6/6] Make `reference_material_id` optional --- scripts/fdmmaterial.xsd | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/scripts/fdmmaterial.xsd b/scripts/fdmmaterial.xsd index 14e88936b..f66ed5b5a 100644 --- a/scripts/fdmmaterial.xsd +++ b/scripts/fdmmaterial.xsd @@ -34,14 +34,6 @@ - - - - - - - - @@ -64,6 +56,7 @@ +