From f9faf215e61d4378ef2b4b4016c4a5841409489e Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 26 Jun 2023 16:52:48 +0200 Subject: [PATCH] restore some exclude materials CURA-10709 --- resources/definitions/alya3dp.def.json | 18 ++++++- resources/definitions/alyanx3dp.def.json | 18 ++++++- resources/definitions/artillery_base.def.json | 36 +++++++++----- .../atmat_signal_pro_base.def.json | 36 ++++++++------ resources/definitions/fusion3.def.json | 48 ++++++++++++++----- resources/definitions/kupido.def.json | 43 +++++++++++------ .../definitions/leapfrog_bolt_pro.def.json | 46 ++++++++++++------ resources/definitions/tizyx_evy.def.json | 46 ++++++++++++------ resources/definitions/tizyx_evy_dual.def.json | 42 ++++++++++------ resources/definitions/tizyx_k25.def.json | 19 +++++++- 10 files changed, 250 insertions(+), 102 deletions(-) diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 3eacad0640..c39db43cbe 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -9,10 +9,26 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_platform.3mf", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pva", + "generic_tpu", + "innofill_innoflex60", + "verbatim_bvoh" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, - "machine_extruder_trains": { "0": "alya3dp_extruder_0" }, + "machine_extruder_trains": { + "0": "alya3dp_extruder_0" + }, "platform_offset": [ -60, -45, diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 0a44471df1..6607ddb04b 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -9,10 +9,26 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.3mf", + "exclude_materials": [ + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "generic_abs_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "generic_tpu_175", + "innofill_innoflex60_175", + "verbatim_bvoh_175" + ], "has_machine_quality": true, "has_materials": true, "has_variants": false, - "machine_extruder_trains": { "0": "alya3dp_extruder_0" }, + "machine_extruder_trains": { + "0": "alya3dp_extruder_0" + }, "platform_offset": [ -104, 0, diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index 970ab208a5..af50593f12 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -4,19 +4,29 @@ "inherits": "fdmprinter", "metadata": { - "visible": false, - "author": "3D-Nexus.com, cataclism, Wondro", - "manufacturer": "Artillery", - "file_formats": "text/x-gcode", - "first_start_actions": [ "MachineSettingsAction" ], - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { "0": "artillery_base_extruder_0" }, - "preferred_material": "generic_pla", - "preferred_quality_type": "standard", - "preferred_variant_name": "0.4mm Nozzle", - "variants_name": "Nozzle Size" + "visible": false, + "author": "3D-Nexus.com, cataclism, Wondro", + "manufacturer": "Artillery", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "innofill_innoflex60_175", + "verbatim_bvoh_175" + ], + "first_start_actions": [ + "MachineSettingsAction" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "artillery_base_extruder_0" + }, + "preferred_material": "generic_pla", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" }, "overrides": { diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index b4cb7dc090..9a0d0c37f7 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -4,20 +4,28 @@ "inherits": "fdmprinter", "metadata": { - "visible": false, - "author": "ATMAT", - "manufacturer": "ATMAT sp. z o.o.", - "file_formats": "text/x-gcode", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "atmat_signal_pro_extruder_left", - "1": "atmat_signal_pro_extruder_right" - }, - "preferred_material": "generic_pla_175", - "preferred_quality_type": "fast", + "visible": false, + "author": "ATMAT", + "manufacturer": "ATMAT sp. z o.o.", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_cpe", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "atmat_signal_pro_extruder_left", + "1": "atmat_signal_pro_extruder_right" + }, + "preferred_material": "generic_pla_175", + "preferred_quality_type": "fast", "preferred_variant_name": "V6 0.40mm", "supports_network_connection": false, "supports_usb_connection": false, diff --git a/resources/definitions/fusion3.def.json b/resources/definitions/fusion3.def.json index ccf8360804..b3f7b8dac6 100644 --- a/resources/definitions/fusion3.def.json +++ b/resources/definitions/fusion3.def.json @@ -4,18 +4,40 @@ "inherits": "fdmprinter", "metadata": { - "visible": false, - "author": "Keith Varin", - "manufacturer": "Fusion3Design", - "file_formats": "text/x-gcode", - "first_start_actions": [ "MachineSettingsAction" ], - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { "0": "fusion3_extruder_0" }, - "preferred_material": "generic_abs", - "preferred_quality_type": "normal", - "preferred_variant_name": "0.4mm Nozzle", - "variants_name": "Nozzle Size" + "visible": false, + "author": "Keith Varin", + "manufacturer": "Fusion3Design", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "Extrudr_GreenTECPro_Anthracite", + "Extrudr_GreenTECPro_Black", + "Extrudr_GreenTECPro_Blue", + "Extrudr_GreenTECPro_Nature", + "Extrudr_GreenTECPro_Red", + "Extrudr_GreenTECPro_Silver", + "Extrudr_GreenTECPro_White", + "generic_bvoh", + "generic_hips", + "generic_pva", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "first_start_actions": [ + "MachineSettingsAction" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "fusion3_extruder_0" + }, + "preferred_material": "generic_abs", + "preferred_quality_type": "normal", + "preferred_variant_name": "0.4mm Nozzle", + "variants_name": "Nozzle Size" } } \ No newline at end of file diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index f5d8cb0017..5468d5c818 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -4,20 +4,35 @@ "inherits": "fdmprinter", "metadata": { - "visible": true, - "author": "Kupido", - "manufacturer": "Kati Hal ARGE", - "file_formats": "text/x-gcode", - "has_machine_quality": true, - "has_materials": true, - "has_variants": false, - "machine_extruder_trains": { "0": "kupido_extruder_0" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "preferred_material": "generic_pla", + "visible": true, + "author": "Kupido", + "manufacturer": "Kati Hal ARGE", + "file_formats": "text/x-gcode", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pva", + "generic_tpu", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { + "0": "kupido_extruder_0" + }, + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "generic_pla", "supports_usb_connection": false }, "overrides": diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index 4bd12c7948..f7dfad2d4c 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -4,21 +4,37 @@ "inherits": "fdmprinter", "metadata": { - "visible": true, - "author": "Karan and Vincent 20191104", - "manufacturer": "Leapfrog B.V.", - "file_formats": "text/x-gcode", - "platform": "leapfrog_bolt_pro_platform.3mf", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "leapfrog_bolt_pro_extruder_right", - "1": "leapfrog_bolt_pro_extruder_left" - }, - "platform_offset": [ - 0, + "visible": true, + "author": "Karan and Vincent 20191104", + "manufacturer": "Leapfrog B.V.", + "file_formats": "text/x-gcode", + "platform": "leapfrog_bolt_pro_platform.3mf", + "exclude_materials": [ + "generic_pla", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pva", + "generic_tpu", + "dsm_arnitel2045", + "dsm_novamid1070", + "imade3d_petg", + "imade3d_pla", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "leapfrog_bolt_pro_extruder_right", + "1": "leapfrog_bolt_pro_extruder_left" + }, + "platform_offset": [ + 0, 0, -14 ], diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 3050be9dfc..b76b780388 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -4,21 +4,37 @@ "inherits": "fdmprinter", "metadata": { - "visible": true, - "author": "Tizyx", - "manufacturer": "Tizyx", - "file_formats": "text/x-gcode", - "platform": "tizyx_k25_platform.3mf", - "first_start_actions": [ "MachineSettingsAction" ], - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { "0": "tizyx_evy_extruder_0" }, - "platform_offset": [ - 0, - -4, - 0 - ], + "visible": true, + "author": "Tizyx", + "manufacturer": "Tizyx", + "file_formats": "text/x-gcode", + "platform": "tizyx_k25_platform.3mf", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_pva", + "generic_tpu", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "first_start_actions": [ + "MachineSettingsAction" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "tizyx_evy_extruder_0" + }, + "platform_offset": [ + 0, + -4, + 0 + ], "preferred_material": "tizyx_pla", "preferred_quality_type": "normal", "preferred_variant_name": "0.4mm", diff --git a/resources/definitions/tizyx_evy_dual.def.json b/resources/definitions/tizyx_evy_dual.def.json index 0464f92af7..3aec7ba12a 100644 --- a/resources/definitions/tizyx_evy_dual.def.json +++ b/resources/definitions/tizyx_evy_dual.def.json @@ -4,21 +4,33 @@ "inherits": "fdmprinter", "metadata": { - "visible": true, - "author": "Tizyx", - "manufacturer": "Tizyx", - "file_formats": "text/x-gcode", - "platform": "tizyx_k25_platform.3mf", - "first_start_actions": [ "MachineSettingsAction" ], - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "tizyx_evy_dual_extruder_0", - "1": "tizyx_evy_dual_extruder_1" - }, - "platform_offset": [ + "visible": true, + "author": "Tizyx", + "manufacturer": "Tizyx", + "file_formats": "text/x-gcode", + "platform": "tizyx_k25_platform.3mf", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_pva", + "innofill_innoflex60", + "verbatim_bvoh" + ], + "first_start_actions": [ + "MachineSettingsAction" + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "tizyx_evy_dual_extruder_0", + "1": "tizyx_evy_dual_extruder_1" + }, + "platform_offset": [ 0, -4, 0 diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index f150dc46d6..58c6777f49 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -9,10 +9,27 @@ "manufacturer": "Tizyx", "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", + "exclude_materials": [ + "dsm_arnitel2045", + "dsm_novamid1070", + "generic_abs", + "generic_cpe", + "generic_hips", + "generic_nylon", + "generic_pc", + "generic_petg", + "generic_pla", + "generic_pva", + "generic_tpu", + "innofill_innoflex60", + "verbatim_bvoh" + ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "machine_extruder_trains": { "0": "tizyx_k25_extruder_0" }, + "machine_extruder_trains": { + "0": "tizyx_k25_extruder_0" + }, "platform_offset": [ 0, -4,