From a444e5c883d4a87d934658e38da333e059233e5e Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 16 Oct 2017 15:55:46 +0200 Subject: [PATCH 01/12] update material xml parser to support psp values - CURA-4253 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 6 ++++-- resources/definitions/fdmprinter.def.json | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index c67c7eae6c..607018d88f 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -676,13 +676,15 @@ 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", + "support interface density": "support_interface_density" } __unmapped_settings = [ "hardware compatible" ] __material_properties_setting_map = { - "diameter": "material_diameter" + "diameter": "material_diameter", + "adhesion_tendency": "material_adhesion_tendency" } __material_metadata_setting_map = { "GUID": "material_guid" diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ca424dfd2f..8b8f4fc8d2 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3469,7 +3469,7 @@ "default_value": 0.1, "type": "float", "enabled": "support_enable", - "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", + "value": "round(extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'material_adhesion_tendency') / 2 if (layer_height >= 0.2) 1) * layer_height", "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr", "settable_per_mesh": true }, @@ -3481,7 +3481,7 @@ "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", "default_value": 0.1, - "value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0", + "value": "round(extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'material_adhesion_tendency') / 2) * layer_height", "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr", "type": "float", "enabled": "support_enable and resolveOrValue('support_type') == 'everywhere'", From 69d6ca986dcf941648198df8fea996d34764a3c1 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 16 Oct 2017 16:48:49 +0200 Subject: [PATCH 02/12] Update FDM printer definition to calculate PSP - CURA-4248 --- resources/definitions/fdmprinter.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 8b8f4fc8d2..1b3d0ac79e 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3469,7 +3469,7 @@ "default_value": 0.1, "type": "float", "enabled": "support_enable", - "value": "round(extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'material_adhesion_tendency') / 2 if (layer_height >= 0.2) 1) * layer_height", + "value": "min(math.ceil(extruderValues('material_adhesion_tendency')) / (2 if (layer_height >= 0.2) else 1)) * layer_height", "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr", "settable_per_mesh": true }, @@ -3481,7 +3481,7 @@ "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", "default_value": 0.1, - "value": "round(extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'material_adhesion_tendency') / 2) * layer_height", + "value": "min(math.ceil(extruderValues('material_adhesion_tendency')) / 2) * layer_height", "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr", "type": "float", "enabled": "support_enable and resolveOrValue('support_type') == 'everywhere'", From 5f12b5ac6adfd8a172de5c0f699533f11854319d Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Mon, 16 Oct 2017 17:13:29 +0200 Subject: [PATCH 03/12] set support interface pattern depending on density - CURA-4248 --- resources/definitions/fdmprinter.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1b3d0ac79e..d7ea7740c2 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3816,6 +3816,7 @@ "zigzag": "Zig Zag" }, "default_value": "concentric", + "value": "'lines' if support_interface_density < 100 else 'concentric'", "limit_to_extruder": "support_interface_extruder_nr", "enabled": "support_interface_enable and support_enable", "settable_per_mesh": false, From d426c259d01c34fd26e1d97fe27a4f2dcf14916f Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Tue, 17 Oct 2017 12:39:26 +0200 Subject: [PATCH 04/12] Add material adhesion tendency setting, update support top and bottom distance values - CURA-4248 --- .gitignore | 1 + resources/definitions/fdmprinter.def.json | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 570c932d28..97ee2841f9 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ resources/i18n/en_7S resources/i18n/x-test resources/firmware resources/materials +resources/quality/bam CuraEngine.exe LC_MESSAGES .cache diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d7ea7740c2..2710c1fb9b 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1850,6 +1850,18 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "material_adhesion_tendency": + { + "label": "Adhesion Tendency", + "description": "Surface adhesion tendency.", + "unit": "%", + "type": "int", + "default_value": 0, + "minimum_value": 0, + "maximum_value": 100, + "settable_per_mesh": false, + "settable_per_extruder": true + }, "material_flow": { "label": "Flow", @@ -3469,7 +3481,7 @@ "default_value": 0.1, "type": "float", "enabled": "support_enable", - "value": "min(math.ceil(extruderValues('material_adhesion_tendency')) / (2 if (layer_height >= 0.2) else 1)) * layer_height", + "value": "math.ceil(min(extruderValues('material_adhesion_tendency')) / 2 if (layer_height >= 0.2) else 1) * layer_height", "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr", "settable_per_mesh": true }, @@ -3481,7 +3493,7 @@ "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", "default_value": 0.1, - "value": "min(math.ceil(extruderValues('material_adhesion_tendency')) / 2) * layer_height", + "value": "math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height", "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr", "type": "float", "enabled": "support_enable and resolveOrValue('support_type') == 'everywhere'", From 91589ed29d673e262e2d7cd87b24284b33403204 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Tue, 17 Oct 2017 13:03:29 +0200 Subject: [PATCH 05/12] Add surface energy property to get correct behaviour - CURA-4248 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 6 +++--- resources/definitions/fdmprinter.def.json | 13 ++++++++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 607018d88f..10509c5653 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -676,15 +676,15 @@ class XmlMaterialProfile(InstanceContainer): "processing temperature graph": "material_flow_temp_graph", "print cooling": "cool_fan_speed", "retraction amount": "retraction_amount", - "retraction speed": "retraction_speed", - "support interface density": "support_interface_density" + "retraction speed": "retraction_speed" } __unmapped_settings = [ "hardware compatible" ] __material_properties_setting_map = { "diameter": "material_diameter", - "adhesion_tendency": "material_adhesion_tendency" + "adhesion_tendency": "material_adhesion_tendency", + "surface_energy": "material_surface_energy" } __material_metadata_setting_map = { "GUID": "material_guid" diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2710c1fb9b..4974d481ce 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1854,10 +1854,21 @@ { "label": "Adhesion Tendency", "description": "Surface adhesion tendency.", - "unit": "%", "type": "int", "default_value": 0, "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 From 4b6f04604cfbc0da256a6795c58d67c351c68d8a Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Tue, 17 Oct 2017 17:21:40 +0200 Subject: [PATCH 06/12] Set values for support interface density and pattern depending on BAM settings - CURA-4248 --- resources/definitions/fdmprinter.def.json | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4974d481ce..d4ae66ed06 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1855,9 +1855,9 @@ "label": "Adhesion Tendency", "description": "Surface adhesion tendency.", "type": "int", - "default_value": 0, - "minimum_value": 0, - "maximum_value": 10, + "default_value": 10, + "minimum_value": "0", + "maximum_value": "10", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -1868,8 +1868,8 @@ "unit": "%", "type": "int", "default_value": 100, - "minimum_value": 0, - "maximum_value": 100, + "minimum_value": "0", + "maximum_value": "100", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -3748,6 +3748,7 @@ "unit": "%", "type": "float", "default_value": 100, + "value": "min(extruderValues('material_surface_energy'))", "minimum_value": "0", "maximum_value_warning": "100", "limit_to_extruder": "support_interface_extruder_nr", @@ -3839,7 +3840,7 @@ "zigzag": "Zig Zag" }, "default_value": "concentric", - "value": "'lines' if support_interface_density < 100 else 'concentric'", + "value": "'lines' if support_interface_density < 100 and extruderValue(support_interface_extruder_nr, 'material_adhesion_tendency') < 10 else 'concentric'", "limit_to_extruder": "support_interface_extruder_nr", "enabled": "support_interface_enable and support_enable", "settable_per_mesh": false, From 78ba3c3aa0c130cc8d39205e468f8ca85794c411 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 18 Oct 2017 13:51:06 +0200 Subject: [PATCH 07/12] Move BAM equations to BAM quality profiles as they are very specific - CURA-4248 --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 8 ++++---- resources/definitions/fdmprinter.def.json | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 10509c5653..de3b3fb71f 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -676,15 +676,15 @@ 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" ] __material_properties_setting_map = { - "diameter": "material_diameter", - "adhesion_tendency": "material_adhesion_tendency", - "surface_energy": "material_surface_energy" + "diameter": "material_diameter" } __material_metadata_setting_map = { "GUID": "material_guid" diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d4ae66ed06..e2176a8009 100755 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -3492,7 +3492,7 @@ "default_value": 0.1, "type": "float", "enabled": "support_enable", - "value": "math.ceil(min(extruderValues('material_adhesion_tendency')) / 2 if (layer_height >= 0.2) else 1) * layer_height", + "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')", "limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr", "settable_per_mesh": true }, @@ -3504,7 +3504,7 @@ "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", "default_value": 0.1, - "value": "math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height", + "value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0", "limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr", "type": "float", "enabled": "support_enable and resolveOrValue('support_type') == 'everywhere'", @@ -3748,7 +3748,6 @@ "unit": "%", "type": "float", "default_value": 100, - "value": "min(extruderValues('material_surface_energy'))", "minimum_value": "0", "maximum_value_warning": "100", "limit_to_extruder": "support_interface_extruder_nr", @@ -3840,7 +3839,6 @@ "zigzag": "Zig Zag" }, "default_value": "concentric", - "value": "'lines' if support_interface_density < 100 and extruderValue(support_interface_extruder_nr, 'material_adhesion_tendency') < 10 else 'concentric'", "limit_to_extruder": "support_interface_extruder_nr", "enabled": "support_interface_enable and support_enable", "settable_per_mesh": false, From 5580f7ecbba0db25f91719958c1fa228fd24ea3a Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 18 Oct 2017 14:08:09 +0200 Subject: [PATCH 08/12] Add BAM quality profiles --- .../um3_aa0.4_BAM_Draft_Print.inst.cfg | 32 +++++++++++++++++++ .../um3_aa0.4_BAM_Fast_Print.inst.cfg | 32 +++++++++++++++++++ .../um3_aa0.4_BAM_Normal_Quality.inst.cfg | 30 +++++++++++++++++ 3 files changed, 94 insertions(+) create mode 100644 resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg create mode 100644 resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg create mode 100644 resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg new file mode 100644 index 0000000000..2be3c0fdbc --- /dev/null +++ b/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 if (layer_height >= 0.2) else 1) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg new file mode 100644 index 0000000000..d8cefa0bcd --- /dev/null +++ b/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')) / 2 if (layer_height >= 0.2) else 1) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..9b967121e1 --- /dev/null +++ b/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')) / 2 if (layer_height >= 0.2) else 1) * layer_height +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height From 49af7a56433d2fca19dce6b713842c0927267bc7 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 18 Oct 2017 14:18:29 +0200 Subject: [PATCH 09/12] Update BAM qualities - CURA-4248 --- .../quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg | 6 +++--- .../quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg | 2 +- .../ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 2be3c0fdbc..ed3ed15e91 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker3 type = quality quality_type = draft material = generic_bam_ultimaker3_AA_0.4 -weight = -2 +weight = -1 setting_version = 3 [values] @@ -28,5 +28,5 @@ 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 if (layer_height >= 0.2) else 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height \ No newline at end of file +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 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index d8cefa0bcd..f002f276c3 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -28,5 +28,5 @@ 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 if (layer_height >= 0.2) else 1) * layer_height +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 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 9b967121e1..3804ccb873 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -26,5 +26,5 @@ 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 if (layer_height >= 0.2) else 1) * layer_height +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 From 7d582085072ef30ca183d7aee3d023e9cb56a4d2 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 18 Oct 2017 14:19:11 +0200 Subject: [PATCH 10/12] Fix BAM draft quality weight - CURA-4248 --- resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index ed3ed15e91..9d2b603d08 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -7,7 +7,7 @@ definition = ultimaker3 type = quality quality_type = draft material = generic_bam_ultimaker3_AA_0.4 -weight = -1 +weight = -2 setting_version = 3 [values] From f07c5ab470027fcade4a8a4f1d3e7f9fe2cf0166 Mon Sep 17 00:00:00 2001 From: ChrisTerBeke Date: Wed, 18 Oct 2017 14:31:03 +0200 Subject: [PATCH 11/12] remove unused ignore --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 97ee2841f9..570c932d28 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,6 @@ resources/i18n/en_7S resources/i18n/x-test resources/firmware resources/materials -resources/quality/bam CuraEngine.exe LC_MESSAGES .cache From 0e74f9d8818397aff865548aac7fb7e13205cc37 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 19 Oct 2017 13:54:10 +0200 Subject: [PATCH 12/12] CURA-4248 - Fix some mistakes in the formulas in quality profiles --- resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg | 2 +- .../quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg index 9d2b603d08..9721a87270 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Draft_Print.inst.cfg @@ -28,5 +28,5 @@ 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_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 diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 3804ccb873..2d2416078f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -26,5 +26,5 @@ 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_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