Change to use machine_nozzle_id

CURA-3872

We cannot assume that all nozzles will have IDs like "<type> <size>"
such as "AA 0.4", so we should use a complete string as the nozzle IDs.
This commit is contained in:
Lipu Fei 2017-06-22 13:58:42 +02:00
parent 46b6e5b0a1
commit 293c1690c6
10 changed files with 14 additions and 14 deletions

View File

@ -30,10 +30,10 @@
"settable_per_meshgroup": false,
"settable_globally": false
},
"machine_nozzle_type":
"machine_nozzle_id":
{
"label": "Nozzle Type",
"description": "The nozzle type for an extruder train, such as \"AA\" and \"BB\".",
"label": "Nozzle ID",
"description": "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\".",
"type": "str",
"default_value": "unknown",
"settable_per_mesh": false,

View File

@ -407,10 +407,10 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_nozzle_type":
"machine_nozzle_id":
{
"label": "Nozzle Type",
"description": "The nozzle type for an extruder train, such as \"AA\" and \"BB\".",
"label": "Nozzle ID",
"description": "The nozzle ID for an extruder train, such as \"AA 0.4\" and \"BB 0.8\".",
"type": "str",
"default_value": "unknown",
"settable_per_mesh": false,

View File

@ -31,7 +31,7 @@ line_width = =machine_nozzle_size
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_type = AA
machine_nozzle_id = AA 0.8
machine_nozzle_size = 0.8
machine_nozzle_tip_outer_diameter = 2.0
material_final_print_temperature = =material_print_temperature - 10

View File

@ -11,7 +11,7 @@ setting_version = 1
[values]
brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_type = AA
machine_nozzle_id = AA 0.4
raft_acceleration = =acceleration_print
raft_airgap = 0.3
raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2

View File

@ -29,7 +29,7 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
layer_height = 0.2
machine_min_cool_heat_time_window = 15
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_type = BB
machine_nozzle_id = BB 0.8
machine_nozzle_size = 0.8
machine_nozzle_tip_outer_diameter = 2.0
material_print_temperature = =default_material_print_temperature + 10

View File

@ -17,7 +17,7 @@ jerk_support = =math.ceil(jerk_print * 15 / 25)
jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_type = BB
machine_nozzle_id = BB 0.4
material_print_temperature = 215
raft_base_speed = 20
raft_interface_speed = 20

View File

@ -31,7 +31,7 @@ line_width = =machine_nozzle_size
machine_min_cool_heat_time_window = 15
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_type = AA
machine_nozzle_id = AA 0.8
machine_nozzle_size = 0.8
machine_nozzle_tip_outer_diameter = 2.0
material_final_print_temperature = =material_print_temperature - 10

View File

@ -11,7 +11,7 @@ setting_version = 1
[values]
brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_type = AA
machine_nozzle_id = AA 0.4
machine_nozzle_size = 0.4
raft_airgap = 0.3
raft_base_speed = 15

View File

@ -29,7 +29,7 @@ jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
layer_height = 0.2
machine_min_cool_heat_time_window = 15
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_type = BB
machine_nozzle_id = BB 0.8
machine_nozzle_size = 0.8
machine_nozzle_tip_outer_diameter = 2.0
material_print_temperature = =default_material_print_temperature + 10

View File

@ -17,7 +17,7 @@ jerk_support = =math.ceil(jerk_print * 15 / 25)
jerk_support_interface = =math.ceil(jerk_support * 10 / 15)
jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10)
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_type = BB
machine_nozzle_id = BB 0.4
material_print_temperature = 215
raft_base_speed = 20
raft_interface_speed = 20