From ed939d31fa3ade51fe5c4ec1f247a1c78ee5a914 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Mon, 22 Jan 2018 12:20:08 +0100 Subject: [PATCH] Add hardware_type = nozzle for nozzle variants CURA-4461 --- resources/qml/Preferences/ProfilesPage.qml | 4 ++-- resources/variants/cartesio_0.25.inst.cfg | 1 + resources/variants/cartesio_0.4.inst.cfg | 1 + resources/variants/cartesio_0.8.inst.cfg | 1 + resources/variants/fabtotum_hyb35.inst.cfg | 1 + resources/variants/fabtotum_lite04.inst.cfg | 1 + resources/variants/fabtotum_lite06.inst.cfg | 1 + resources/variants/fabtotum_pro02.inst.cfg | 1 + resources/variants/fabtotum_pro04.inst.cfg | 1 + resources/variants/fabtotum_pro06.inst.cfg | 1 + resources/variants/fabtotum_pro08.inst.cfg | 1 + resources/variants/imade3d_jellybox_0.4.inst.cfg | 1 + resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg | 1 + resources/variants/ultimaker2_0.25.inst.cfg | 1 + resources/variants/ultimaker2_0.4.inst.cfg | 1 + resources/variants/ultimaker2_0.6.inst.cfg | 1 + resources/variants/ultimaker2_0.8.inst.cfg | 1 + resources/variants/ultimaker2_extended_0.25.inst.cfg | 1 + resources/variants/ultimaker2_extended_0.4.inst.cfg | 1 + resources/variants/ultimaker2_extended_0.6.inst.cfg | 1 + resources/variants/ultimaker2_extended_0.8.inst.cfg | 1 + resources/variants/ultimaker2_extended_plus_0.25.inst.cfg | 1 + resources/variants/ultimaker2_extended_plus_0.4.inst.cfg | 1 + resources/variants/ultimaker2_extended_plus_0.6.inst.cfg | 1 + resources/variants/ultimaker2_extended_plus_0.8.inst.cfg | 1 + resources/variants/ultimaker2_plus_0.25.inst.cfg | 1 + resources/variants/ultimaker2_plus_0.4.inst.cfg | 1 + resources/variants/ultimaker2_plus_0.6.inst.cfg | 1 + resources/variants/ultimaker2_plus_0.8.inst.cfg | 1 + resources/variants/ultimaker3_aa0.25.inst.cfg | 1 + resources/variants/ultimaker3_aa0.8.inst.cfg | 1 + resources/variants/ultimaker3_aa04.inst.cfg | 1 + resources/variants/ultimaker3_bb0.8.inst.cfg | 1 + resources/variants/ultimaker3_bb04.inst.cfg | 1 + resources/variants/ultimaker3_extended_aa0.25.inst.cfg | 1 + resources/variants/ultimaker3_extended_aa0.8.inst.cfg | 1 + resources/variants/ultimaker3_extended_aa04.inst.cfg | 1 + resources/variants/ultimaker3_extended_bb0.8.inst.cfg | 1 + resources/variants/ultimaker3_extended_bb04.inst.cfg | 1 + 39 files changed, 40 insertions(+), 2 deletions(-) diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml index 5e040cdba2..e3ba9b23a4 100644 --- a/resources/qml/Preferences/ProfilesPage.qml +++ b/resources/qml/Preferences/ProfilesPage.qml @@ -213,8 +213,8 @@ UM.ManagementPage ProfileTab { title: catalog.i18nc("@title:tab", "Global Settings"); - quality: Cura.MachineManager.activeMachine.qualityChanges.id - material: Cura.MachineManager.activeMachine.material.id + quality: base.currentItem != null ? base.currentItem.id : ""; + material: Cura.MachineManager.allActiveMaterialIds[Cura.MachineManager.activeMachineId] } Repeater diff --git a/resources/variants/cartesio_0.25.inst.cfg b/resources/variants/cartesio_0.25.inst.cfg index 0e082e5afa..0cc01093f2 100644 --- a/resources/variants/cartesio_0.25.inst.cfg +++ b/resources/variants/cartesio_0.25.inst.cfg @@ -7,6 +7,7 @@ definition = cartesio author = Cartesio type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.25 diff --git a/resources/variants/cartesio_0.4.inst.cfg b/resources/variants/cartesio_0.4.inst.cfg index 27d07c0328..9920e699f5 100644 --- a/resources/variants/cartesio_0.4.inst.cfg +++ b/resources/variants/cartesio_0.4.inst.cfg @@ -7,6 +7,7 @@ definition = cartesio author = Cartesio type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/cartesio_0.8.inst.cfg b/resources/variants/cartesio_0.8.inst.cfg index e96c78d922..8031a9fa31 100644 --- a/resources/variants/cartesio_0.8.inst.cfg +++ b/resources/variants/cartesio_0.8.inst.cfg @@ -7,6 +7,7 @@ definition = cartesio author = Cartesio type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.8 diff --git a/resources/variants/fabtotum_hyb35.inst.cfg b/resources/variants/fabtotum_hyb35.inst.cfg index 01e94728da..e8fa13cc0d 100644 --- a/resources/variants/fabtotum_hyb35.inst.cfg +++ b/resources/variants/fabtotum_hyb35.inst.cfg @@ -7,6 +7,7 @@ definition = fabtotum author = FABtotum type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.35 diff --git a/resources/variants/fabtotum_lite04.inst.cfg b/resources/variants/fabtotum_lite04.inst.cfg index ee270a9ead..7264abbdda 100644 --- a/resources/variants/fabtotum_lite04.inst.cfg +++ b/resources/variants/fabtotum_lite04.inst.cfg @@ -7,6 +7,7 @@ definition = fabtotum author = FABtotum type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/fabtotum_lite06.inst.cfg b/resources/variants/fabtotum_lite06.inst.cfg index 49722a50d1..0ad33ca332 100644 --- a/resources/variants/fabtotum_lite06.inst.cfg +++ b/resources/variants/fabtotum_lite06.inst.cfg @@ -7,6 +7,7 @@ definition = fabtotum author = FABtotum type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.6 diff --git a/resources/variants/fabtotum_pro02.inst.cfg b/resources/variants/fabtotum_pro02.inst.cfg index 376588fe71..d83618b712 100644 --- a/resources/variants/fabtotum_pro02.inst.cfg +++ b/resources/variants/fabtotum_pro02.inst.cfg @@ -7,6 +7,7 @@ definition = fabtotum author = FABtotum type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.2 diff --git a/resources/variants/fabtotum_pro04.inst.cfg b/resources/variants/fabtotum_pro04.inst.cfg index 54294c572c..4f2a622887 100644 --- a/resources/variants/fabtotum_pro04.inst.cfg +++ b/resources/variants/fabtotum_pro04.inst.cfg @@ -7,6 +7,7 @@ definition = fabtotum author = FABtotum type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/fabtotum_pro06.inst.cfg b/resources/variants/fabtotum_pro06.inst.cfg index f1055b6ade..aa44e762ba 100644 --- a/resources/variants/fabtotum_pro06.inst.cfg +++ b/resources/variants/fabtotum_pro06.inst.cfg @@ -7,6 +7,7 @@ definition = fabtotum author = FABtotum type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.6 diff --git a/resources/variants/fabtotum_pro08.inst.cfg b/resources/variants/fabtotum_pro08.inst.cfg index ef7eb172be..597d23275e 100644 --- a/resources/variants/fabtotum_pro08.inst.cfg +++ b/resources/variants/fabtotum_pro08.inst.cfg @@ -7,6 +7,7 @@ definition = fabtotum author = FABtotum type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.8 diff --git a/resources/variants/imade3d_jellybox_0.4.inst.cfg b/resources/variants/imade3d_jellybox_0.4.inst.cfg index ce9e82e59a..c37a2ecabf 100644 --- a/resources/variants/imade3d_jellybox_0.4.inst.cfg +++ b/resources/variants/imade3d_jellybox_0.4.inst.cfg @@ -7,6 +7,7 @@ definition = imade3d_jellybox author = IMADE3D type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg b/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg index 60f9793b2a..c3e63aab34 100644 --- a/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg +++ b/resources/variants/imade3d_jellybox_0.4_2-fans.inst.cfg @@ -7,6 +7,7 @@ definition = imade3d_jellybox author = IMADE3D type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/ultimaker2_0.25.inst.cfg b/resources/variants/ultimaker2_0.25.inst.cfg index 04084867dd..aee83e2483 100644 --- a/resources/variants/ultimaker2_0.25.inst.cfg +++ b/resources/variants/ultimaker2_0.25.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2 author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.25 diff --git a/resources/variants/ultimaker2_0.4.inst.cfg b/resources/variants/ultimaker2_0.4.inst.cfg index f21d85e258..fe128137d9 100644 --- a/resources/variants/ultimaker2_0.4.inst.cfg +++ b/resources/variants/ultimaker2_0.4.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2 author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/ultimaker2_0.6.inst.cfg b/resources/variants/ultimaker2_0.6.inst.cfg index 04128cc297..7fea2fbb22 100644 --- a/resources/variants/ultimaker2_0.6.inst.cfg +++ b/resources/variants/ultimaker2_0.6.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2 author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.6 diff --git a/resources/variants/ultimaker2_0.8.inst.cfg b/resources/variants/ultimaker2_0.8.inst.cfg index 400069d60b..5f1176b7ec 100644 --- a/resources/variants/ultimaker2_0.8.inst.cfg +++ b/resources/variants/ultimaker2_0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2 author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.8 diff --git a/resources/variants/ultimaker2_extended_0.25.inst.cfg b/resources/variants/ultimaker2_extended_0.25.inst.cfg index bdff9a5795..e705327cf8 100644 --- a/resources/variants/ultimaker2_extended_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.25.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.25 diff --git a/resources/variants/ultimaker2_extended_0.4.inst.cfg b/resources/variants/ultimaker2_extended_0.4.inst.cfg index 2af9a75024..d486ed4f4e 100644 --- a/resources/variants/ultimaker2_extended_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.4.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/ultimaker2_extended_0.6.inst.cfg b/resources/variants/ultimaker2_extended_0.6.inst.cfg index e0753f1c28..f9dd4d4e69 100644 --- a/resources/variants/ultimaker2_extended_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.6.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.6 diff --git a/resources/variants/ultimaker2_extended_0.8.inst.cfg b/resources/variants/ultimaker2_extended_0.8.inst.cfg index 43c033b799..ee56b6d194 100644 --- a/resources/variants/ultimaker2_extended_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.8 diff --git a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg index 7f1bff4b0c..f23406fec3 100644 --- a/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.25.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.25 diff --git a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg index f6747d059d..c0b1c6ab79 100644 --- a/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.4.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg index 706e4b8aa6..6ef64bed5f 100644 --- a/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.6.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.6 diff --git a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg index 287c3155b8..2f890d0827 100644 --- a/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_extended_plus_0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_extended_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.8 diff --git a/resources/variants/ultimaker2_plus_0.25.inst.cfg b/resources/variants/ultimaker2_plus_0.25.inst.cfg index 1d4617c86b..1c4688568d 100644 --- a/resources/variants/ultimaker2_plus_0.25.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.25.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] coasting_min_volume = 0.17 diff --git a/resources/variants/ultimaker2_plus_0.4.inst.cfg b/resources/variants/ultimaker2_plus_0.4.inst.cfg index 75a665ad95..00a4ef47dd 100644 --- a/resources/variants/ultimaker2_plus_0.4.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.4.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.4 diff --git a/resources/variants/ultimaker2_plus_0.6.inst.cfg b/resources/variants/ultimaker2_plus_0.6.inst.cfg index 60bbbaa049..4dceab70d0 100644 --- a/resources/variants/ultimaker2_plus_0.6.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.6.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.6 diff --git a/resources/variants/ultimaker2_plus_0.8.inst.cfg b/resources/variants/ultimaker2_plus_0.8.inst.cfg index 339b320af3..e1bbddb823 100644 --- a/resources/variants/ultimaker2_plus_0.8.inst.cfg +++ b/resources/variants/ultimaker2_plus_0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker2_plus author = Ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] machine_nozzle_size = 0.8 diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index e6f852c02c..2d2d893202 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3 author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] brim_width = 7 diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index de7dfcc364..402190c357 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3 author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] acceleration_enabled = True diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index 289ae185b0..0163024fa4 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3 author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] brim_width = 7 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 2cb3103dcf..017da649a0 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3 author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] acceleration_enabled = True diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 5dc0b2832a..93b2025031 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3 author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index 631768346e..04d7a7990a 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3_extended author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] brim_width = 7 diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index b2ad86ff01..3e1b3ed3de 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3_extended author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] acceleration_enabled = True diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index fdea4de08c..94bee65b5d 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3_extended author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] brim_width = 7 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 6ab16c4f10..e1086535ec 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3_extended author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] acceleration_enabled = True diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index ee2f138754..a995acf77c 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -7,6 +7,7 @@ definition = ultimaker3_extended author = ultimaker type = variant setting_version = 4 +hardware_type = nozzle [values] acceleration_support = =math.ceil(acceleration_print * 2000 / 4000)