From d6d4644a31f16f9d0f6470a8727ccf6c631a4c4f Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Thu, 31 Mar 2022 16:07:17 +0200 Subject: [PATCH 01/10] Set visibility of shrinkage settings to true. Enable visibility in advanced (xyz shrinkage only) and the expert display mode. New calculations to determine the average shrinkage when two materials are used. By default the material shrinkage is set to null (None). In that case the shrinkage of that material is not taken into account in the new averaging formula. Support materials such as PVA, BAM, Aquasys etc. should keep this setting to null. When two materials are used with a shrinkage percentage the average of these two materials will be used. Relates to PP-77 --- resources/definitions/fdmprinter.def.json | 18 +++++++++--------- resources/setting_visibility/advanced.cfg | 1 + resources/setting_visibility/expert.cfg | 3 +++ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4ab56d116c..1709330e24 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2533,14 +2533,14 @@ "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor.", "unit": "%", "type": "float", - "default_value": 100.0, - "enabled": false, + "default_value": null, + "enabled": true, "minimum_value": "0.001", "minimum_value_warning": "100", "maximum_value_warning": "120", "settable_per_mesh": false, "settable_per_extruder": false, - "resolve": "sum(extruderValues(\"material_shrinkage_percentage\")) / len(extruderValues(\"material_shrinkage_percentage\"))", + "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage'))", "children": { "material_shrinkage_percentage_xy": @@ -2549,14 +2549,14 @@ "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the XY-direction (horizontally).", "unit": "%", "type": "float", - "default_value": 100.0, - "enabled": false, + "default_value": null, + "enabled": true, "minimum_value": "0.001", "minimum_value_warning": "100", "maximum_value_warning": "120", "settable_per_mesh": false, "settable_per_extruder": false, - "resolve": "sum(extruderValues(\"material_shrinkage_percentage_xy\")) / len(extruderValues(\"material_shrinkage_percentage_xy\"))", + "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))", "value": "material_shrinkage_percentage" }, "material_shrinkage_percentage_z": @@ -2565,14 +2565,14 @@ "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the Z-direction (vertically).", "unit": "%", "type": "float", - "default_value": 100.0, - "enabled": false, + "default_value": null, + "enabled": true, "minimum_value": "0.001", "minimum_value_warning": "100", "maximum_value_warning": "120", "settable_per_mesh": false, "settable_per_extruder": false, - "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))", + "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))", "value": "material_shrinkage_percentage" } } diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 768dad20a5..53db1fc062 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -57,6 +57,7 @@ retract_at_layer_change retraction_amount retraction_speed material_standby_temperature +material_shrinkage_percentage [speed] speed_print diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index a4c8cd58bc..3318329b2f 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -133,6 +133,9 @@ prime_tower_flow material_flow_layer_0 material_standby_temperature material_alternate_walls +material_shrinkage_percentage +material_shrinkage_percentage_xy +material_shrinkage_percentage_z [speed] speed_print From 4bb79654d4e8d77dbb8ce0bac7694a653d3eee3e Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Thu, 31 Mar 2022 16:32:41 +0200 Subject: [PATCH 02/10] Updated the S3 and S5 PLA, T-PLA and PETG profiles to include the determined shrinkage compensation factor. PLA xy 100.2% z 100.1% TPLA xy 100.3% z 100.1% PETG xy 100.5% z 100.1% Relates to PP-77 --- .../ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg | 4 +++- .../ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 ++ .../ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg | 4 +++- .../ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg | 2 ++ .../ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg | 2 ++ .../quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg | 2 ++ resources/setting_visibility/advanced.cfg | 1 - 61 files changed, 122 insertions(+), 3 deletions(-) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg index 10d86c3a2f..516f24dec5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -19,4 +19,6 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 initial_layer_line_width_factor = 100 -material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file +material_print_temperature = =default_material_print_temperature - 5 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg index 6bef64658f..ef7623fe0a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PLA_Normal_Quality.inst.cfg @@ -22,6 +22,8 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = 190 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 retraction_hop = 0.2 skin_overlap = 5 speed_layer_0 = =speed_print diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index 61ec5d977d..a19b438a9a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -22,6 +22,8 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature - 15 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 30 / 30) speed_print = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg index e77195665a..aa1ba2ef27 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -15,6 +15,8 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature - 5 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 skin_overlap = 20 speed_print = 60 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg index 8117c60edc..7c2ad43944 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -16,6 +16,8 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg index 85a05b576a..5b65d2351b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -18,6 +18,8 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg index b75ab359b4..20b668ca51 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -17,6 +17,8 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index 06fecc3abc..1c2322a89a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -18,6 +18,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index dd13a94e1b..55d40e570c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -17,6 +17,8 @@ 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 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index fdd1bf57b4..57e6a36b1e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -19,6 +19,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index c25c15c030..0c1f8fdde9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -18,6 +18,8 @@ cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index 3e61e38cb5..22555472df 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -32,6 +32,8 @@ material_print_temperature = =default_material_print_temperature + 10 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index 3851a06c59..a9e32a5283 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -22,6 +22,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index 9c688e3995..3f08161091 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -19,6 +19,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index f6885552ba..1046c70272 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -19,6 +19,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg index 09146132d0..48443ce029 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -20,6 +20,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 680cf17e46..28d1483ea5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -32,6 +32,8 @@ material_print_temperature = =default_material_print_temperature - 5 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg index 9e4cace003..1cf749a436 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -16,6 +16,8 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg index 663253cf7b..4eb4c11298 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -16,6 +16,8 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg index 27521b1da4..157ec95d41 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -16,6 +16,8 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index cf5af207e0..8d54246f13 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -21,6 +21,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 support_xy_distance = =wall_line_width_0 * 1.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index b0b5c41bb0..f650f796bc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -21,6 +21,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True raft_margin = 10 support_angle = 70 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index 048a39bbcb..a9a14307f1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -21,6 +21,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 support_xy_distance = =wall_line_width_0 * 1.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index cfda526a6c..7551e2e39f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -23,6 +23,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index ed64488c93..bc1b444d93 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -23,6 +23,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False raft_margin = 10 retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 0bdda74982..4b6aa5629a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -25,6 +25,8 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg index eb3820387e..f015b749d2 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg index afc85cd4ed..88b079b388 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index c777af7195..8f6492f82d 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index 432770e611..b8e45c49fb 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg index cb11ec1809..7a3b50c550 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -19,4 +19,6 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 initial_layer_line_width_factor = 100 -material_print_temperature = =default_material_print_temperature - 5 \ No newline at end of file +material_print_temperature = =default_material_print_temperature - 5 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg index 6c82905859..d469288e35 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PLA_Normal_Quality.inst.cfg @@ -22,6 +22,8 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = 190 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 retraction_hop = 0.2 skin_overlap = 5 speed_layer_0 = =speed_print diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index 37a15aa1ba..1e0b4c0044 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -22,6 +22,8 @@ machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature - 15 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 skin_overlap = 5 speed_layer_0 = =math.ceil(speed_print * 30 / 30) speed_print = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg index 5b18b9c62d..78eda2718b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -15,6 +15,8 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature - 5 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 skin_overlap = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg index f9a8aa8915..2a6b354674 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -16,6 +16,8 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg index 289521bd01..2925e5ca6f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -18,6 +18,8 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg index 8129f66fc3..7dbca8a664 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -17,6 +17,8 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 retraction_combing_max_distance = 8 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index 42292a5786..d26fe8666b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -18,6 +18,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_edge_support_thickness = =0.8 if infill_sparse_density < 30 else 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index b9d31e9196..e9b8596f9b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -17,6 +17,8 @@ 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 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index ca57e66b8e..124bd93167 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -19,6 +19,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index 5053a62297..1d617734b4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -18,6 +18,8 @@ cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index ac348f3e70..780761d88f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -32,6 +32,8 @@ material_print_temperature = =default_material_print_temperature + 10 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index 53cc0ccc9c..e102ff7ac3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -22,6 +22,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index f1370caaf0..a2e585117b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -19,6 +19,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index 8f1158bcbc..def68b8525 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -19,6 +19,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index 6f46c9c441..5a55438f0e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -20,6 +20,8 @@ machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index af207733ef..bc542246ca 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -32,6 +32,8 @@ material_print_temperature = =default_material_print_temperature - 5 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg index 53b84c3a4f..6e181a16ff 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -16,6 +16,8 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg index a8182573d5..058c5f2581 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -16,6 +16,8 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg index 598b45268d..10c05f49f5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -16,6 +16,8 @@ brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.5 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index 5904532c52..4ad620367d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -21,6 +21,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 support_xy_distance = =wall_line_width_0 * 1.5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index 8aadfa2352..7acfa04a29 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -21,6 +21,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True raft_margin = 10 support_angle = 70 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index 0263adbe59..756316ed7f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -21,6 +21,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True support_angle = 70 support_xy_distance = =wall_line_width_0 * 1.5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index 3b598808dd..7587ebf336 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -23,6 +23,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index a5a64b28fe..b6cd8788b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -23,6 +23,8 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False raft_margin = 10 retract_at_layer_change = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index eff689b7fe..522cb974ce 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -25,6 +25,8 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.3 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = False retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg index f5d7301734..6a4115dd82 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg index 01929fe2cd..7392f4e6ee 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index 21a3cbe449..053b9399a5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index da60d4b054..9835e46e5d 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -24,6 +24,8 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 material_standby_temperature = 100 +material_shrinkage_percentage_xy = 100.2 +material_shrinkage_percentage_z = 100.1 prime_tower_enable = True retract_at_layer_change = False speed_print = 45 diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 53db1fc062..768dad20a5 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -57,7 +57,6 @@ retract_at_layer_change retraction_amount retraction_speed material_standby_temperature -material_shrinkage_percentage [speed] speed_print From 733447a2dd16ea4b036a34543e5ba40dc2d61ef0 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Fri, 1 Apr 2022 13:00:41 +0200 Subject: [PATCH 03/10] Removed the settings: "material_shrinkage_percentage" and update code that was using this parameter. material_shrinkage_percentage_xy and material_shrinkage_percentage_z cannot depend on material_shrinkage_percentage otherwise their resolve function will not execute properly. I noticed that the shrinkage factors do not get the correct value if a wrong nozzle is chosen for a material. However, in that case the slicer will also not slice, so in practice this is not an issue Relates to PP-77 --- cura/Scene/ConvexHullDecorator.py | 2 +- plugins/ModelChecker/ModelChecker.py | 2 +- resources/definitions/fdmprinter.def.json | 58 ++++++++--------------- resources/setting_visibility/expert.cfg | 6 +-- 4 files changed, 24 insertions(+), 44 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 36697b7c57..4545a49aa0 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -383,7 +383,7 @@ class ConvexHullDecorator(SceneNodeDecorator): # Shrinkage compensation. if not self._global_stack: # Should never happen. return convex_hull - scale_factor = self._global_stack.getProperty("material_shrinkage_percentage", "value") / 100.0 + scale_factor = self._global_stack.getProperty("material_shrinkage_percentage_xy", "value") / 100.0 result = convex_hull if scale_factor != 1.0 and not self.getNode().callDecoration("isGroup"): center = None diff --git a/plugins/ModelChecker/ModelChecker.py b/plugins/ModelChecker/ModelChecker.py index 321ce8d007..6d039545d7 100644 --- a/plugins/ModelChecker/ModelChecker.py +++ b/plugins/ModelChecker/ModelChecker.py @@ -139,4 +139,4 @@ class ModelChecker(QObject, Extension): global_container_stack = Application.getInstance().getGlobalContainerStack() if global_container_stack is None: return 100 - return global_container_stack.getProperty("material_shrinkage_percentage", "value") + return max(global_container_stack.getProperty("material_shrinkage_percentage_xy", "value"), global_container_stack.getProperty("material_shrinkage_percentage_z", "value")) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 1709330e24..7e20b9f732 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2527,10 +2527,10 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "material_shrinkage_percentage": + "material_shrinkage_percentage_xy": { - "label": "Scaling Factor Shrinkage Compensation", - "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor.", + "label": "Horizontal Scaling Factor Shrinkage Compensation", + "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the XY-direction (horizontally).", "unit": "%", "type": "float", "default_value": null, @@ -2540,42 +2540,22 @@ "maximum_value_warning": "120", "settable_per_mesh": false, "settable_per_extruder": false, - "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage'))", - "children": - { - "material_shrinkage_percentage_xy": - { - "label": "Horizontal Scaling Factor Shrinkage Compensation", - "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the XY-direction (horizontally).", - "unit": "%", - "type": "float", - "default_value": null, - "enabled": true, - "minimum_value": "0.001", - "minimum_value_warning": "100", - "maximum_value_warning": "120", - "settable_per_mesh": false, - "settable_per_extruder": false, - "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))", - "value": "material_shrinkage_percentage" - }, - "material_shrinkage_percentage_z": - { - "label": "Vertical Scaling Factor Shrinkage Compensation", - "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the Z-direction (vertically).", - "unit": "%", - "type": "float", - "default_value": null, - "enabled": true, - "minimum_value": "0.001", - "minimum_value_warning": "100", - "maximum_value_warning": "120", - "settable_per_mesh": false, - "settable_per_extruder": false, - "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))", - "value": "material_shrinkage_percentage" - } - } + "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))" + }, + "material_shrinkage_percentage_z": + { + "label": "Vertical Scaling Factor Shrinkage Compensation", + "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the Z-direction (vertically).", + "unit": "%", + "type": "float", + "default_value": null, + "enabled": true, + "minimum_value": "0.001", + "minimum_value_warning": "100", + "maximum_value_warning": "120", + "settable_per_mesh": false, + "settable_per_extruder": false, + "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))" }, "material_crystallinity": { diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 3318329b2f..50154a168c 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -117,6 +117,8 @@ material_bed_temperature material_bed_temperature_layer_0 material_adhesion_tendency material_surface_energy +material_shrinkage_percentage_xy +material_shrinkage_percentage_z material_flow wall_material_flow wall_0_material_flow @@ -133,9 +135,7 @@ prime_tower_flow material_flow_layer_0 material_standby_temperature material_alternate_walls -material_shrinkage_percentage -material_shrinkage_percentage_xy -material_shrinkage_percentage_z + [speed] speed_print From df72cd8da48fabf864e3d4469d361748effc43e4 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 4 Apr 2022 14:28:40 +0200 Subject: [PATCH 04/10] new default settings for ultimaker printers A higher resolution does not improve visual quality, a lower resolution means you need to improve firmware. PP-54 --- resources/definitions/ultimaker.def.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 978deeb7f4..437efda24f 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -70,6 +70,18 @@ }, "xy_offset": { "value": "-layer_height * 0.2" + }, + "meshfix_maximum_resolution": { + "value": "max(speed_wall_0 / 75, 0.5)" + }, + "meshfix_maximum_deviation": { + "value": "machine_nozzle_size / 10" + }, + "jerk_travel": { + "value": "jerk_print" + }, + "acceleration_travel": { + "value": "acceleration_wall" } } } From 44a33e0fed47571292612c3edbe23abb90f01ed1 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 4 Apr 2022 14:29:40 +0200 Subject: [PATCH 05/10] follow the defaults set in ultimaker.def.json Only UM2+C keeps his on resolution settings, since this printer has a lower segments per second performance, and we are not going to work on it. PP-54 --- resources/definitions/ultimaker3.def.json | 1 - resources/definitions/ultimaker_s3.def.json | 3 --- resources/definitions/ultimaker_s5.def.json | 3 --- .../ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg | 4 ---- .../ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg | 4 ---- .../ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg | 4 ---- .../ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg | 4 ---- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg | 2 -- .../quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg | 2 -- .../ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg | 2 -- .../ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg | 2 -- .../ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg | 4 ---- .../ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 4 ---- .../quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg | 2 -- .../ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 -- .../ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 -- .../ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg | 3 +-- .../ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg | 1 - .../ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg | 3 --- .../ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg | 3 --- .../ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg | 3 --- .../quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg | 2 -- .../quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg | 4 ---- .../ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 4 ---- .../quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg | 1 - 41 files changed, 1 insertion(+), 90 deletions(-) diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 48bb7b4362..fd21ab5271 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -111,7 +111,6 @@ "jerk_support_infill": {"minimum_value_warning": 20 }, "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_travel": {"minimum_value_warning": 20 }, "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_print_layer_0": {"minimum_value_warning": 20 }, "jerk_travel_layer_0": {"minimum_value_warning": 20 }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 83feb98eb2..640a062c6d 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -103,7 +103,6 @@ "jerk_support_infill": {"minimum_value_warning": 20 }, "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_travel": {"minimum_value_warning": 20 }, "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_print_layer_0": {"minimum_value_warning": 20 }, "jerk_travel_layer_0": {"minimum_value_warning": 20 }, @@ -159,8 +158,6 @@ "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, - "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index c4afee4e3a..0d5d7499cc 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -105,7 +105,6 @@ "jerk_support_infill": {"minimum_value_warning": 20 }, "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, - "jerk_travel": {"minimum_value_warning": 20 }, "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, "jerk_print_layer_0": {"minimum_value_warning": 20 }, "jerk_travel_layer_0": {"minimum_value_warning": 20 }, @@ -161,8 +160,6 @@ "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, - "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "optimize_wall_printing_order": { "value": "True" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index 5fb23190d1..ba2af050fc 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -34,8 +34,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - - -jerk_travel = 50 - raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index a46e184d05..1604c1a815 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -34,8 +34,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - - -jerk_travel = 50 - raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index 50d885b55f..7822926663 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -33,8 +33,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - - -jerk_travel = 50 - raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index 84aebaf798..bd8048528b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -33,8 +33,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - - -jerk_travel = 50 - raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index a4b3fb3380..bbb6b61202 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -26,8 +26,6 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 -jerk_travel = 50 - infill_sparse_density = 15 layer_height_0 = 0.2 acceleration_wall = 2000 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index 2f89be38f9..6b870c0af2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -25,8 +25,6 @@ speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 -jerk_travel = 50 - layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index d80d8427c9..fbfca15254 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -27,8 +27,6 @@ speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 -jerk_travel = 50 - layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index 20025a8c0b..4262e22ac8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -23,8 +23,6 @@ retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 -jerk_travel = 50 - layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index fd5e5a7217..7666860661 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -14,14 +14,10 @@ is_experimental = True [values] infill_sparse_density = 15 - -jerk_travel = 20 acceleration_print = 2000 acceleration_wall = 1500 acceleration_wall_0 = 1000 acceleration_topbottom = 1000 -acceleration_travel = 2000 - speed_print = 50 speed_wall = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 7a67e10783..6a7a43d808 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -14,14 +14,10 @@ is_experimental = True [values] infill_sparse_density = 15 - -jerk_travel = 20 acceleration_print = 2000 acceleration_wall = 1500 acceleration_wall_0 = 1000 acceleration_topbottom = 1000 -acceleration_travel = 2000 - speed_print = 50 speed_wall = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index 9e293db418..7410ebd8d6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -21,5 +21,3 @@ retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) - -jerk_travel = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 0062aa89f8..ab407a7dcb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -22,5 +22,3 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -jerk_travel = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index 86e7b2465e..8b537d4df0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -21,5 +21,3 @@ retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) - -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg index c34d5b281b..719fb8fce1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -21,6 +21,5 @@ retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg index 8940e53e23..8c57c89aa1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -22,6 +22,5 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -jerk_travel = 50 -cool_fan_speed = 20 +cool_fan_speed = 20 initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg index 56d72118c6..d00c906c2e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -21,7 +21,6 @@ retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -jerk_travel = 50 cool_fan_speed = 20 layer_height_0 = 0.27 initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index bc3464b305..40beaf4b56 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -47,4 +47,3 @@ switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index bbbc40dd0d..ea048cecfa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -48,4 +48,3 @@ switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index 1eb27c3e9a..e682ba9664 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -47,4 +47,3 @@ switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index 58d05433c0..3ae123e796 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -32,5 +32,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index 26a74aae03..55edc46a60 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -34,7 +34,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - - -jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index 8a6d7bdca2..80d9206f15 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -33,7 +33,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - - -jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 4976153044..66fac26eeb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -33,7 +33,4 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - - -jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index d057a8a057..c60839af84 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -27,8 +27,6 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 -jerk_travel = 50 - infill_sparse_density = 15 layer_height_0 = 0.2 acceleration_wall = 2000 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index 1ed844b4fc..a9b9c5cfc1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -25,7 +25,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 -jerk_travel = 50 - layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 2e69215798..e92bc85cac 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -27,7 +27,5 @@ speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 -jerk_travel = 50 - layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index 8939294b54..c389c1331f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -23,7 +23,5 @@ retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 -jerk_travel = 50 - layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index efccc3a347..093be3da66 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -14,14 +14,10 @@ is_experimental = True [values] infill_sparse_density = 15 - -jerk_travel = 20 acceleration_print = 2000 acceleration_wall = 1500 acceleration_wall_0 = 1000 acceleration_topbottom = 1000 -acceleration_travel = 2000 - speed_print = 50 speed_wall = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 54eb99d099..3e680302c1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -14,14 +14,10 @@ is_experimental = True [values] infill_sparse_density = 15 - -jerk_travel = 20 acceleration_print = 2000 acceleration_wall = 1500 acceleration_wall_0 = 1000 acceleration_topbottom = 1000 -acceleration_travel = 2000 - speed_print = 50 speed_wall = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index f7dbe85c00..c715ce4a70 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -21,5 +21,3 @@ retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) - -jerk_travel = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index 07e19b9ca3..8f5c87b04e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -22,5 +22,3 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -jerk_travel = 50 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index 350c99833c..d4677f4c29 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -21,5 +21,3 @@ retraction_combing_max_distance = 50 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) - -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg index 762b2ebca8..e26eb61536 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -21,6 +21,5 @@ retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg index 855a5ae292..9a1db6e901 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -22,7 +22,6 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg index 8b688debf0..294566bec4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -21,7 +21,6 @@ retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index 12b4734b7f..3712b9d477 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -47,4 +47,3 @@ switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index bb6520947b..32e2238da0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -47,4 +47,3 @@ switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index 847552d471..59f6c26784 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -47,4 +47,3 @@ switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 -jerk_travel = 50 From 7884ba4d5bd8df441f27b560590c5bd9b66629a9 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 4 Apr 2022 16:09:48 +0200 Subject: [PATCH 06/10] update minimum linewidth since these settings are new to cura, I think it is safe to update them in fdmprinters. PP-115 --- 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 1b8f942474..cf3f66f496 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1197,7 +1197,7 @@ "minimum_value_warning": ".5 * max(wall_line_width_0, wall_line_width_x)", "maximum_value_warning": "min(wall_line_width_0, wall_line_width_x)", "default_value": 0.3, - "value": "machine_nozzle_size * .75", + "value": "machine_nozzle_size * .85", "type": "float", "settable_per_mesh": true, "children": @@ -1281,7 +1281,7 @@ "label": "Minimum Thin Wall Line Width", "description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.", "unit": "mm", - "value": "machine_nozzle_size * .75", + "value": "min_wall_line_width", "default_value": 0.2, "minimum_value": "0.001", "minimum_value_warning": "min_feature_size", From 04d5d433725ae50644d878c6576cdd2a9e0f7d5a Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 4 Apr 2022 16:10:06 +0200 Subject: [PATCH 07/10] remove redundant overwrites PP-115 --- resources/definitions/ultimaker2_plus.def.json | 3 --- resources/definitions/ultimaker2_plus_connect.def.json | 1 - 2 files changed, 4 deletions(-) diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 7c0e81b428..0d4191383d 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -34,9 +34,6 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, - "line_width": { - "value": "machine_nozzle_size" - }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 186637b487..1effa1616f 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -60,7 +60,6 @@ "speed_infill": { "value": "speed_print" }, "speed_wall_x": { "value": "speed_wall" }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "speed_support": { "value": "speed_wall_0" }, From 86d9afe96c75008649c79bbdb3cdb1ed8f941124 Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 4 Apr 2022 16:10:47 +0200 Subject: [PATCH 08/10] increase outer wall linewidth when spiralize This is mainly benefitting the AA04 0.3mm profiles. PP-115 --- .../ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg | 1 + 4 files changed, 4 insertions(+) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index 3e61e38cb5..718f1050b4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -42,3 +42,4 @@ top_bottom_thickness = 0.9 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' raft_airgap = =0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 680cf17e46..f20c7b729a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -42,3 +42,4 @@ top_bottom_thickness = 1.2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' raft_airgap = =0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index ac348f3e70..17cc31bd8a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -42,3 +42,4 @@ top_bottom_thickness = 0.9 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' raft_airgap = =0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index af207733ef..3ebc15e8d6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -42,3 +42,4 @@ top_bottom_thickness = 1.2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' raft_airgap = =0.25 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file From 0a8ef5162e1261ab839531bd4804c0c8eeaaf52f Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 6 Apr 2022 13:28:55 +0200 Subject: [PATCH 09/10] Removed the rather hacky implementation of the shrinkage factor averaging. Issues with dual extrusion were the second extruder is not used should solved in a different way. Relates to PP-77 --- cura/Scene/ConvexHullDecorator.py | 2 +- plugins/ModelChecker/ModelChecker.py | 2 +- resources/definitions/fdmprinter.def.json | 60 +++++++++++++++-------- resources/setting_visibility/expert.cfg | 1 + 4 files changed, 43 insertions(+), 22 deletions(-) diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index 4545a49aa0..36697b7c57 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -383,7 +383,7 @@ class ConvexHullDecorator(SceneNodeDecorator): # Shrinkage compensation. if not self._global_stack: # Should never happen. return convex_hull - scale_factor = self._global_stack.getProperty("material_shrinkage_percentage_xy", "value") / 100.0 + scale_factor = self._global_stack.getProperty("material_shrinkage_percentage", "value") / 100.0 result = convex_hull if scale_factor != 1.0 and not self.getNode().callDecoration("isGroup"): center = None diff --git a/plugins/ModelChecker/ModelChecker.py b/plugins/ModelChecker/ModelChecker.py index 6d039545d7..321ce8d007 100644 --- a/plugins/ModelChecker/ModelChecker.py +++ b/plugins/ModelChecker/ModelChecker.py @@ -139,4 +139,4 @@ class ModelChecker(QObject, Extension): global_container_stack = Application.getInstance().getGlobalContainerStack() if global_container_stack is None: return 100 - return max(global_container_stack.getProperty("material_shrinkage_percentage_xy", "value"), global_container_stack.getProperty("material_shrinkage_percentage_z", "value")) + return global_container_stack.getProperty("material_shrinkage_percentage", "value") diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 7e20b9f732..58150f7b0d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2527,35 +2527,55 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "material_shrinkage_percentage_xy": + "material_shrinkage_percentage": { - "label": "Horizontal Scaling Factor Shrinkage Compensation", - "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the XY-direction (horizontally).", + "label": "Scaling Factor Shrinkage Compensation", + "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor.", "unit": "%", "type": "float", - "default_value": null, + "default_value": 100.0, "enabled": true, "minimum_value": "0.001", "minimum_value_warning": "100", "maximum_value_warning": "120", "settable_per_mesh": false, "settable_per_extruder": false, - "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_xy'))" - }, - "material_shrinkage_percentage_z": - { - "label": "Vertical Scaling Factor Shrinkage Compensation", - "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the Z-direction (vertically).", - "unit": "%", - "type": "float", - "default_value": null, - "enabled": true, - "minimum_value": "0.001", - "minimum_value_warning": "100", - "maximum_value_warning": "120", - "settable_per_mesh": false, - "settable_per_extruder": false, - "resolve": "100 if sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z')) == 0 else sum(s if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))/sum(1 if s != None else 0 for s in extruderValues('material_shrinkage_percentage_z'))" + "resolve": "sum(extruderValues(\"material_shrinkage_percentage\")) / len(extruderValues(\"material_shrinkage_percentage\"))", + "children": + { + "material_shrinkage_percentage_xy": + { + "label": "Horizontal Scaling Factor Shrinkage Compensation", + "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the XY-direction (horizontally).", + "unit": "%", + "type": "float", + "default_value": 100.0, + "enabled": true, + "minimum_value": "0.001", + "minimum_value_warning": "100", + "maximum_value_warning": "120", + "settable_per_mesh": false, + "settable_per_extruder": false, + "resolve": "sum(extruderValues(\"material_shrinkage_percentage_xy\")) / len(extruderValues(\"material_shrinkage_percentage_xy\"))", + "value": "material_shrinkage_percentage" + }, + "material_shrinkage_percentage_z": + { + "label": "Vertical Scaling Factor Shrinkage Compensation", + "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the Z-direction (vertically).", + "unit": "%", + "type": "float", + "default_value": 100.0, + "enabled": true, + "minimum_value": "0.001", + "minimum_value_warning": "100", + "maximum_value_warning": "120", + "settable_per_mesh": false, + "settable_per_extruder": false, + "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))", + "value": "material_shrinkage_percentage" + } + } }, "material_crystallinity": { diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 50154a168c..b5b1ab7b1a 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -117,6 +117,7 @@ material_bed_temperature material_bed_temperature_layer_0 material_adhesion_tendency material_surface_energy +material_shrinkage_percentage material_shrinkage_percentage_xy material_shrinkage_percentage_z material_flow From e24d2d15ae2dea87154b4106fdb95118626034c4 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 6 Apr 2022 13:56:28 +0200 Subject: [PATCH 10/10] Reduced horizontal expansion offset to the theoretically correct value of 0.1*layer_height if the correction is performed on both sides of the wall (then totals 0.2*layer_height). Relates to PP-154 --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index b3c01fc737..41593be8c2 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -81,7 +81,7 @@ "value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))" }, "xy_offset": { - "value": "-layer_height * 0.2" + "value": "-layer_height * 0.1" } } }