Add hardware_type = nozzle for nozzle variants

CURA-4461
2025-08-11 02:49:03 +08:00 · 2018-01-22 12:20:08 +01:00 · 2018-01-22 12:20:08 +01:00 · ed939d31fa
commit ed939d31fa
parent 48c369f3e3
39 changed files with 40 additions and 2 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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)