Merge pull request #4184 from Ultimaker/CURA-5570_beyond_comprehension

CURA-5570 More decision points in material and quality lookup!

resources/definitions/fdmprinter.def.json

@@ -2127,6 +2127,7 @@
                     "type": "float",
                     "default_value": 60,
                     "value": "default_material_bed_temperature",
+                    "resolve": "max(extruderValues('material_bed_temperature'))",
                     "minimum_value": "-273.15",
                     "minimum_value_warning": "0",
                     "maximum_value_warning": "130",

resources/qml/Cura.qml

@@ -231,8 +231,8 @@ UM.MainWindow
                     onObjectRemoved: settingsMenu.removeItem(object)
                 }
 
-                // TODO Temporary hidden, add back again when feature ready
-//                BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: Cura.MachineManager.hasVariantBuildplates }
+                // TODO Only show in dev mode. Remove check when feature ready
+                BuildplateMenu { title: catalog.i18nc("@title:menu", "&Build plate"); visible: CuraSDKVersion == "dev" ? Cura.MachineManager.hasVariantBuildplates : false }
                 ProfileMenu { title: catalog.i18nc("@title:menu", "&Profile"); }
 
                 MenuSeparator { }

resources/qml/SidebarHeader.qml

@@ -476,8 +476,8 @@ Column
     {
         id: buildplateRow
         height: UM.Theme.getSize("sidebar_setup").height
-        // TODO Temporary hidden, add back again when feature ready
-        visible: false //Cura.MachineManager.hasVariantBuildplates && !sidebar.hideSettings
+        // TODO Only show in dev mode. Remove check when feature ready
+        visible: CuraSDKVersion == "dev" ? Cura.MachineManager.hasVariantBuildplates && !sidebar.hideSettings : false
 
         anchors
         {

resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_ABS_High_Quality.inst.cfg

@@ -0,0 +1,34 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = high
+weight = 1
+material = generic_abs
+variant = AA 0.4
+buildplate = Aluminum
+
+[values]
+cool_min_speed = 12
+layer_height_0 = 0.17
+machine_nozzle_cool_down_speed = 0.8
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 90
+material_bed_temperature_layer_0 = 100
+material_print_temperature = =default_material_print_temperature + 5
+material_initial_print_temperature = =material_print_temperature - 15
+material_final_print_temperature = =material_print_temperature - 20
+prime_blob_enable = False
+prime_tower_enable = False
+speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
+speed_topbottom = =math.ceil(speed_print * 30 / 50)
+speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+speed_infill = =math.ceil(speed_print * 40 / 50)
+

resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPEP_High_Quality.inst.cfg

@@ -0,0 +1,53 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = high
+weight = 1
+material = generic_cpe_plus
+variant = AA 0.4
+buildplate = Aluminum
+
+[values]
+acceleration_enabled = True
+acceleration_print = 4000
+cool_fan_speed_max = 50
+cool_min_speed = 5
+infill_line_width = =round(line_width * 0.35 / 0.35, 2)
+infill_overlap = 0
+infill_wipe_dist = 0
+jerk_enabled = True
+jerk_print = 25
+layer_height_0 = 0.17
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 105
+material_bed_temperature_layer_0 = 115
+material_final_print_temperature = =material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_print_temperature = =default_material_print_temperature + 2
+material_print_temperature_layer_0 = =material_print_temperature
+multiple_mesh_overlap = 0
+prime_blob_enable = False
+prime_tower_enable = True
+prime_tower_wipe_enabled = True
+retraction_combing = off
+retraction_extrusion_window = 1
+retraction_hop = 0.2
+retraction_hop_enabled = False
+retraction_hop_only_when_collides = True
+skin_overlap = 20
+speed_layer_0 = =math.ceil(speed_print * 20 / 40)
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 30 / 35)
+
+speed_wall = =math.ceil(speed_print * 35 / 40)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 35)
+support_bottom_distance = =support_z_distance
+support_z_distance = =layer_height
+wall_0_inset = 0

resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_CPE_High_Quality.inst.cfg

@@ -0,0 +1,32 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = high
+weight = 1
+material = generic_cpe
+variant = AA 0.4
+buildplate = Aluminum
+
+[values]
+cool_min_speed = 12
+layer_height_0 = 0.17
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 80
+material_bed_temperature_layer_0 = 90
+material_print_temperature = =default_material_print_temperature - 5
+material_initial_print_temperature = =material_print_temperature - 5
+material_final_print_temperature = =material_print_temperature - 10
+prime_blob_enable = False
+speed_print = 50
+speed_layer_0 = =math.ceil(speed_print * 20 / 50)
+speed_topbottom = =math.ceil(speed_print * 30 / 50)
+speed_wall = =math.ceil(speed_print * 30 / 50)
+
+infill_pattern = zigzag
+speed_infill = =math.ceil(speed_print * 40 / 50)

resources/quality/ultimaker_s5/um_s5_aa0.4_aluminum_PC_High_Quality.inst.cfg

@@ -0,0 +1,71 @@
+[general]
+version = 4
+name = Extra Fine
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = high
+weight = 1
+material = generic_pc
+variant = AA 0.4
+buildplate = Aluminum
+
+[values]
+acceleration_enabled = True
+acceleration_print = 4000
+adhesion_type = brim
+brim_width = 10
+cool_fan_full_at_height = =layer_height_0 + layer_height
+cool_fan_speed_max = 50
+cool_min_layer_time_fan_speed_max = 5
+cool_min_speed = 8
+infill_line_width = =round(line_width * 0.4 / 0.35, 2)
+infill_overlap = 0
+infill_overlap_mm = 0.05
+infill_pattern = triangles
+infill_wipe_dist = 0.1
+jerk_enabled = True
+jerk_print = 25
+layer_height_0 = 0.17
+machine_min_cool_heat_time_window = 15
+machine_nozzle_cool_down_speed = 0.85
+machine_nozzle_heat_up_speed = 1.5
+material_bed_temperature = 115
+material_bed_temperature_layer_0 = 125
+material_final_print_temperature = =material_print_temperature - 10
+material_initial_print_temperature = =material_print_temperature - 5
+material_print_temperature = =default_material_print_temperature - 10
+material_standby_temperature = 100
+multiple_mesh_overlap = 0
+ooze_shield_angle = 40
+prime_blob_enable = False
+prime_tower_enable = True
+prime_tower_wipe_enabled = True
+raft_airgap = 0.25
+raft_interface_thickness = =max(layer_height * 1.5, 0.225)
+retraction_count_max = 80
+retraction_extrusion_window = 1
+retraction_hop = 2
+retraction_hop_only_when_collides = True
+retraction_min_travel = 0.8
+retraction_prime_speed = 15
+skin_overlap = 30
+speed_layer_0 = =math.ceil(speed_print * 25 / 50)
+speed_print = 50
+speed_topbottom = =math.ceil(speed_print * 25 / 50)
+
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 25 / 40)
+support_bottom_distance = =support_z_distance
+support_interface_density = 87.5
+support_interface_pattern = lines
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 35
+wall_0_inset = 0
+wall_line_width_x = =round(line_width * 0.4 / 0.35, 2)
+wall_thickness = 1.2
+
+

resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_ABS_Draft_Print.inst.cfg

@@ -0,0 +1,27 @@
+[general]
+version = 4
+name = Fast
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_abs
+variant = AA 0.8
+buildplate = Aluminum
+
+[values]
+layer_height_0 = 0.3
+line_width = =machine_nozzle_size * 0.875
+material_bed_temperature = 90
+material_bed_temperature_layer_0 = 100
+material_print_temperature = =default_material_print_temperature + 20
+material_standby_temperature = 100
+prime_blob_enable = False
+speed_print = 50
+speed_topbottom = =math.ceil(speed_print * 30 / 50)
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+retract_at_layer_change = False

resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPEP_Fast_Print.inst.cfg

@@ -0,0 +1,43 @@
+[general]
+version = 4
+name = Fast - Experimental
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_cpe_plus
+variant = AA 0.8
+buildplate = Aluminum
+
+[values]
+brim_width = 14
+cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+infill_before_walls = True
+layer_height_0 = 0.3
+line_width = =machine_nozzle_size * 0.9375
+machine_nozzle_cool_down_speed = 0.9
+machine_nozzle_heat_up_speed = 1.4
+material_bed_temperature = 105
+material_bed_temperature_layer_0 = 115
+material_print_temperature = =default_material_print_temperature - 10
+material_print_temperature_layer_0 = =material_print_temperature
+material_standby_temperature = 100
+prime_blob_enable = False
+prime_tower_enable = True
+retraction_combing = off
+retraction_hop = 0.1
+retraction_hop_enabled = False
+skin_overlap = 0
+speed_layer_0 = =math.ceil(speed_print * 15 / 50)
+speed_print = 50
+speed_slowdown_layers = 15
+speed_topbottom = =math.ceil(speed_print * 35 / 50)
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
+support_bottom_distance = =support_z_distance
+support_line_width = =round(line_width * 0.6 / 0.7, 2)
+support_z_distance = =layer_height
+top_bottom_thickness = 1.2

resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_CPE_Draft_Print.inst.cfg

@@ -0,0 +1,29 @@
+[general]
+version = 4
+name = Fast
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_cpe
+variant = AA 0.8
+buildplate = Aluminum
+
+[values]
+brim_width = 15
+layer_height_0 = 0.3
+line_width = =machine_nozzle_size * 0.875
+material_bed_temperature = 80
+material_bed_temperature_layer_0 = 90
+material_print_temperature = =default_material_print_temperature + 15
+material_standby_temperature = 100
+prime_blob_enable = False
+prime_tower_enable = True
+speed_print = 40
+speed_topbottom = =math.ceil(speed_print * 25 / 40)
+speed_wall = =math.ceil(speed_print * 30 / 40)
+
+jerk_travel = 50

resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PC_Fast_Print.inst.cfg

@@ -0,0 +1,36 @@
+[general]
+version = 4
+name = Fast - Experimental
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = 0
+material = generic_pc
+variant = AA 0.8
+buildplate = Aluminum
+
+[values]
+brim_width = 10
+cool_fan_full_at_height = =layer_height_0 + 14 * layer_height
+infill_before_walls = True
+layer_height_0 = 0.3
+line_width = =machine_nozzle_size * 0.875
+material_bed_temperature = 115
+material_bed_temperature_layer_0 = 125
+material_print_temperature = =default_material_print_temperature - 5
+material_print_temperature_layer_0 = =material_print_temperature
+material_standby_temperature = 100
+prime_blob_enable = False
+raft_airgap = 0.5
+raft_margin = 15
+skin_overlap = 0
+speed_layer_0 = =math.ceil(speed_print * 15 / 50)
+speed_print = 50
+speed_slowdown_layers = 15
+speed_topbottom = =math.ceil(speed_print * 25 / 50)
+speed_wall = =math.ceil(speed_print * 40 / 50)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+support_line_width = =round(line_width * 0.6 / 0.7, 2)

resources/quality/ultimaker_s5/um_s5_aa0.8_aluminum_PP_Draft_Print.inst.cfg

@@ -0,0 +1,53 @@
+[general]
+version = 4
+name = Fast
+definition = ultimaker_s5
+
+[metadata]
+setting_version = 5
+type = quality
+quality_type = draft
+weight = -2
+material = generic_pp
+variant = AA 0.8
+buildplate = Aluminum
+
+[values]
+brim_width = 25
+cool_min_layer_time_fan_speed_max = 6
+cool_min_speed = 17
+top_skin_expand_distance = =line_width * 2
+infill_before_walls = True
+infill_line_width = =round(line_width * 0.7 / 0.8, 2)
+infill_pattern = tetrahedral
+jerk_prime_tower = =math.ceil(jerk_print * 25 / 25)
+jerk_support = =math.ceil(jerk_print * 25 / 25)
+jerk_wall_0 = =math.ceil(jerk_wall * 15 / 25)
+material_bed_temperature_layer_0 = =material_bed_temperature + 5
+material_print_temperature = =default_material_print_temperature - 2
+material_print_temperature_layer_0 = =default_material_print_temperature + 2
+material_standby_temperature = 100
+multiple_mesh_overlap = 0.2
+prime_tower_enable = True
+prime_tower_flow = 100
+prime_tower_min_volume = 10
+retract_at_layer_change = False
+retraction_count_max = 12
+retraction_extra_prime_amount = 0.5
+retraction_hop = 0.5
+retraction_min_travel = 1.5
+retraction_prime_speed = 15
+skin_line_width = =round(line_width * 0.78 / 0.8, 2)
+
+speed_wall_x = =math.ceil(speed_wall * 30 / 30)
+support_bottom_distance = =support_z_distance
+support_line_width = =round(line_width * 0.7 / 0.8, 2)
+support_offset = =line_width
+switch_extruder_prime_speed = 15
+switch_extruder_retraction_amount = 20
+switch_extruder_retraction_speeds = 45
+top_bottom_thickness = 1.6
+travel_compensate_overlapping_walls_0_enabled = False
+wall_0_wipe_dist = =line_width * 2
+wall_line_width_x = =round(line_width * 0.8 / 0.8, 2)
+wall_thickness = 1.6