Merge branch 'CURA-4248_BAM'

plugins/XmlMaterialProfile/XmlMaterialProfile.py

@@ -676,7 +676,9 @@ class XmlMaterialProfile(InstanceContainer):
         "processing temperature graph": "material_flow_temp_graph",
         "print cooling": "cool_fan_speed",
         "retraction amount": "retraction_amount",
-        "retraction speed": "retraction_speed"
+        "retraction speed": "retraction_speed",
+        "adhesion tendency": "material_adhesion_tendency",
+        "surface energy": "material_surface_energy"
     }
     __unmapped_settings = [
         "hardware compatible"

resources/definitions/fdmprinter.def.json

@@ -1850,6 +1850,29 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
+                "material_adhesion_tendency":
+                {
+                    "label": "Adhesion Tendency",
+                    "description": "Surface adhesion tendency.",
+                    "type": "int",
+                    "default_value": 10,
+                    "minimum_value": "0",
+                    "maximum_value": "10",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
+                "material_surface_energy":
+                {
+                    "label": "Surface Energy",
+                    "description": "Surface energy.",
+                    "unit": "%",
+                    "type": "int",
+                    "default_value": 100,
+                    "minimum_value": "0",
+                    "maximum_value": "100",
+                    "settable_per_mesh": false,
+                    "settable_per_extruder": true
+                },
                 "material_flow":
                 {
                     "label": "Flow",

resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg

@@ -0,0 +1,32 @@
+[general]
+version = 2
+name = Fast
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = draft
+material = generic_bam_ultimaker3_AA_0.4
+weight = -2
+setting_version = 3
+
+[values]
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_print_temperature = =230
+material_standby_temperature = 100
+prime_tower_enable = False
+skin_overlap = 20
+speed_layer_0 = 20
+speed_topbottom = =math.ceil(speed_print * 35 / 70)
+speed_wall = =math.ceil(speed_print * 50 / 70)
+speed_wall_0 = =math.ceil(speed_wall * 35 / 50)
+top_bottom_thickness = 1
+wall_thickness = 1
+support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
+support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric'
+support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height

resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg

@@ -0,0 +1,32 @@
+[general]
+version = 2
+name = Normal
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = fast
+material = generic_bam_ultimaker3_AA_0.4
+weight = -1
+setting_version = 3
+
+[values]
+default_material_print_temperature = 225
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_standby_temperature = 100
+prime_tower_enable = False
+speed_print = 80
+speed_layer_0 = 20
+speed_topbottom = =math.ceil(speed_print * 30 / 80)
+speed_wall = =math.ceil(speed_print * 40 / 80)
+speed_wall_0 = =math.ceil(speed_wall * 30 / 40)
+top_bottom_thickness = 1
+wall_thickness = 1
+support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
+support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric'
+support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height

resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg

@@ -0,0 +1,30 @@
+[general]
+version = 2
+name = Fine
+definition = ultimaker3
+
+[metadata]
+type = quality
+quality_type = normal
+material = generic_bam_ultimaker3_AA_0.4
+weight = 0
+setting_version = 3
+
+[values]
+default_material_print_temperature = 225
+cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
+cool_fan_speed_max = =cool_fan_speed
+cool_min_speed = 7
+machine_nozzle_cool_down_speed = 0.75
+machine_nozzle_heat_up_speed = 1.6
+material_standby_temperature = 100
+prime_tower_enable = False
+skin_overlap = 10
+speed_layer_0 = 20
+top_bottom_thickness = 1
+wall_thickness = 1
+support_interface_enable = True
+support_interface_density = =min(extruderValues('material_surface_energy'))
+support_interface_pattern = ='lines' if support_interface_density < 100 else 'concentric'
+support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height
+support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height