From 82282519a9bdbffce46a0d82767968ef92e74ff2 Mon Sep 17 00:00:00 2001 From: Sarita-Ultimaker <58853962+Sarita-Ultimaker@users.noreply.github.com> Date: Mon, 29 Jun 2020 13:47:29 +0200 Subject: [PATCH 1/4] Initial layer Horizontal Expansion for AA0.4 and AA0.25 print core To compensate elephant foot -> initial layer horizontal expansion setting is modeified for engineering and AA0.25 core profile for UMS5 and for UM3 for AA0.4 and AA0.25 cores. --- .../ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 1 + .../um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 1 + .../um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 1 + .../um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 1 + .../um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 1 + .../um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 1 + .../um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 1 + resources/variants/ultimaker3_aa0.25.inst.cfg | 1 + resources/variants/ultimaker3_aa04.inst.cfg | 1 + resources/variants/ultimaker_s5_aa0.25.inst.cfg | 1 + 17 files changed, 17 insertions(+) diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 68d114d29b..142b1441b6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 5ecf7ff924..bbb81a0662 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 93c04c7243..4e91704dab 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index e9329e4426..2860db6d5c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index f77b857e31..8d21a36b94 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index dfbd4ea42b..b38575cc6f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 5cdcfd5f4f..f9f126e9ba 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index f1041c2a35..322df3a084 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index cc58bd5f18..e584746bab 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index de1d4b0b85..e362ec749e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 4e6fd537cf..8265315610 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 75036fc04d..5164b3ad4f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index b067425470..97b54330ca 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index d5911a37fb..d90b898642 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -32,3 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 +xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index be75cbaf0b..367e7a57a8 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -48,3 +48,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 +xy_offset_layer_0 = = (-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index 39701aad25..0dd54b8c8f 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -40,3 +40,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = 1.3 +xy_offset_layer_0 = = (-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 3ef06dee82..f7b1c2a2c6 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -48,3 +48,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 +xy_offset_layer_0 = = (-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset From b33cb519ffa191f343495d4e85f8f63fe47154a7 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 29 Jun 2020 14:30:58 +0200 Subject: [PATCH 2/4] Code style: No extra spaces Contributes to issue CURA-7537. --- .../ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 2 +- resources/variants/ultimaker3_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker3_aa04.inst.cfg | 2 +- resources/variants/ultimaker_s5_aa0.25.inst.cfg | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 142b1441b6..85045c0b7e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index bbb81a0662..c430b635f4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 4e91704dab..bf099ce446 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index 2860db6d5c..5841186f1e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index 8d21a36b94..635560e948 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index b38575cc6f..170dc470ff 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index f9f126e9ba..81870061f3 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 322df3a084..0676ed72d1 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index e584746bab..b942772937 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index e362ec749e..bd3d239844 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 8265315610..05578b603d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 5164b3ad4f..bb8865e8dc 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 97b54330ca..44b6db7bee 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index d90b898642..ca9e072668 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = = ((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index 367e7a57a8..cf6a93eee6 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -48,4 +48,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 -xy_offset_layer_0 = = (-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index 0dd54b8c8f..fee3573c76 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -40,4 +40,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = 1.3 -xy_offset_layer_0 = = (-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index f7b1c2a2c6..b2424160ba 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -48,4 +48,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 -xy_offset_layer_0 = = (-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset From 2a62ff053bede313d148f740f7ce1f144e2f3d97 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 29 Jun 2020 14:33:13 +0200 Subject: [PATCH 3/4] Also apply initial layer horizontal expansion to UM3E The settings for the Ultimaker 3 and Ultimaker 3 Extended should remain the same. The two share their quality profiles and intent profiles, but not their nozzle profiles so this must be copied. --- resources/variants/ultimaker3_aa0.25.inst.cfg | 2 +- resources/variants/ultimaker3_aa04.inst.cfg | 2 +- resources/variants/ultimaker3_extended_aa0.25.inst.cfg | 1 + resources/variants/ultimaker3_extended_aa04.inst.cfg | 1 + resources/variants/ultimaker_s5_aa0.25.inst.cfg | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index cf6a93eee6..db6a9de1d8 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -48,4 +48,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 -xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index fee3573c76..94b0d91f92 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -40,4 +40,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = 1.3 -xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index 9bb3c49a31..b8d6f60b83 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -48,3 +48,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index 9331726f29..e2132d36dc 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -40,3 +40,4 @@ switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_thickness = 1.3 +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset \ No newline at end of file diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index b2424160ba..e810263baa 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -48,4 +48,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 -xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset From ee1b5a27dc1f0a7b3b864bb05b47a4668f7b88c6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 29 Jun 2020 14:41:44 +0200 Subject: [PATCH 4/4] Fix sign of compensation for default horizontal expansion We wanted it to end up on 0.2mm by default but still scale with any customised horizontal expansion. To do that we need to add the default horizontal expansion here, rather than subtract it, since the horizontal expansion is negative. Contributes to issue CURA-7537. --- .../ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg | 2 +- .../ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg | 2 +- .../um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 85045c0b7e..fac7354979 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index c430b635f4..a05880f63f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index bf099ce446..36353212d2 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index 5841186f1e..5caa355e5e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index 635560e948..95d8bb5b00 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 170dc470ff..8c5f36852f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 81870061f3..0effc02fe4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 0676ed72d1..189ffa9cb6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index b942772937..d5312732eb 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index bd3d239844..cfa4ccbc8f 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -32,5 +32,5 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 05578b603d..447094860c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index bb8865e8dc..b960ad5acf 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 44b6db7bee..213646fa03 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index ca9e072668..c80131fe4a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -32,4 +32,4 @@ top_bottom_thickness = =wall_thickness wall_line_width_x = =line_width wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 -xy_offset_layer_0 = =((-0.2 - layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset +xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset