From b9872cc2698843e120b4aa7389f6883597631395 Mon Sep 17 00:00:00 2001 From: Kristel88 Date: Mon, 30 Apr 2018 16:28:25 +0200 Subject: [PATCH 1/8] PP formula based temperature fixes S5 --- .../ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg | 10 +++++----- .../ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg | 10 +++++----- .../um_s5_aa0.4_PP_Normal_Quality.inst.cfg | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index 0d3e855d4b..1c6acb608c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -29,11 +29,11 @@ line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_bed_temperature_layer_0 = 95 -material_final_print_temperature = 205 -material_initial_print_temperature = 210 -material_print_temperature = 215 -material_print_temperature_layer_0 = 220 +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature - 5 +material_print_temperature_layer_0 = =material_print_temperature + 5 material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index d42d809ea9..a78e0a64e4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -29,11 +29,11 @@ line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_bed_temperature_layer_0 = 95 -material_final_print_temperature = 195 -material_initial_print_temperature = 205 -material_print_temperature = 207 -material_print_temperature_layer_0 = 210 +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_final_print_temperature = =material_print_temperature - 12 +material_initial_print_temperature = =material_print_temperature - 2 +material_print_temperature = =default_material_print_temperature - 13 +material_print_temperature_layer_0 = =material_print_temperature + 3 material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index 4687bf4a99..e6c767fe71 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -29,11 +29,11 @@ line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_bed_temperature_layer_0 = 95 -material_final_print_temperature = 195 -material_initial_print_temperature = 200 -material_print_temperature = 205 -material_print_temperature_layer_0 = 208 +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature - 15 +material_print_temperature_layer_0 = =material_print_temperature + 3 material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False From c1b5d940bac8b2c64b2ede234160bbccb5b5cc61 Mon Sep 17 00:00:00 2001 From: Kristel88 Date: Tue, 1 May 2018 13:41:52 +0200 Subject: [PATCH 2/8] 0.25 PP temperature formula S5 In line with UM3 --- .../um_s5_aa0.25_PP_Normal_Quality.inst.cfg | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index f70f7e5ed1..2ca5fc0407 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -25,11 +25,11 @@ jerk_enabled = True jerk_print = 25 line_width = =machine_nozzle_size * 0.92 machine_min_cool_heat_time_window = 15 -material_bed_temperature_layer_0 = 90 -material_final_print_temperature = 195 -material_initial_print_temperature = 200 -material_print_temperature = 205 -material_print_temperature_layer_0 = 208 +material_bed_temperature_layer_0 = =material_bed_temperature + 5 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature - 15 +material_print_temperature_layer_0 = =material_print_temperature + 3 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 From 352cb9184cecb02d8263877b2c3b41fd0e3f07b9 Mon Sep 17 00:00:00 2001 From: Kristel88 Date: Wed, 2 May 2018 10:52:20 +0200 Subject: [PATCH 3/8] S5 profile updates More formulas en more in line with UM3 --- .../um_s5_aa0.4_ABS_Draft_Print.inst.cfg | 5 +++-- .../um_s5_aa0.4_ABS_Fast_Print.inst.cfg | 5 +++-- .../um_s5_aa0.4_ABS_High_Quality.inst.cfg | 5 +++-- .../um_s5_aa0.4_ABS_Normal_Quality.inst.cfg | 4 ++-- .../um_s5_aa0.4_CPE_Draft_Print.inst.cfg | 4 ++-- .../um_s5_aa0.4_CPE_Fast_Print.inst.cfg | 5 ++--- .../um_s5_aa0.4_CPE_High_Quality.inst.cfg | 3 ++- .../um_s5_aa0.4_CPE_Normal_Quality.inst.cfg | 5 ++--- .../um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 3 +-- .../um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 2 +- .../um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 2 +- .../um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 13 +++++++------ .../um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg | 14 ++++++++------ .../um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg | 14 ++++++++------ 14 files changed, 45 insertions(+), 39 deletions(-) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index 21ce503633..76489dd60c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -26,5 +26,6 @@ speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) wall_thickness = 1 -infill_line_width = 0.4 -speed_infill = 50 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +speed_infill = =math.ceil(speed_print * 50 / 60) + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index 1ca4533188..451ef4b830 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -25,5 +25,6 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -infill_line_width = 0.4 -speed_infill = 45 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +speed_infill = =math.ceil(speed_print * 45 / 60) + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index 1d3541435a..ebe73bc54d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -24,5 +24,6 @@ speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) -infill_line_width = 0.4 -speed_infill = 40 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +speed_infill = =math.ceil(speed_print * 40 / 50) + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index 0fe89a30eb..df8b4e9251 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -23,5 +23,5 @@ speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) -infill_line_width = 0.4 -speed_infill = 40 +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +speed_infill = =math.ceil(speed_print * 40 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index b2cb1394d3..16cc836dc4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -15,6 +15,7 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_standby_temperature = 100 skin_overlap = 20 speed_print = 60 speed_layer_0 = 20 @@ -23,8 +24,7 @@ speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) wall_thickness = 1 -jerk_travel = 50 infill_pattern = zigzag -speed_infill = 50 +speed_infill = =math.ceil(speed_print * 50 / 60) prime_tower_purge_volume = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index 7de22070f3..c7aa532422 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -16,14 +16,13 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_standby_temperature = 100 speed_print = 60 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -jerk_travel = 50 - infill_pattern = zigzag -speed_infill = 50 +speed_infill = =math.ceil(speed_print * 50 / 60) prime_tower_purge_volume = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index d1ee4756e8..597dbe7fed 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -18,6 +18,7 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_standby_temperature = 100 speed_print = 50 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 50) @@ -26,5 +27,5 @@ speed_wall = =math.ceil(speed_print * 30 / 50) jerk_travel = 50 infill_pattern = zigzag -speed_infill = 40 +speed_infill = =math.ceil(speed_print * 40 / 50) prime_tower_purge_volume = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index 53a4451114..acd8ed5bf4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -16,13 +16,12 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_standby_temperature = 100 speed_print = 55 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) -jerk_travel = 50 - infill_pattern = zigzag -speed_infill = 45 +speed_infill = =math.ceil(speed_print * 45 / 55) prime_tower_purge_volume = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index b4679f6a06..b53cdd4249 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -18,6 +18,7 @@ brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 +gradual_infill_step_height = =5 * layer_height infill_line_width = =round(line_width * 0.38 / 0.38, 2) infill_overlap = 0 infill_pattern = cross_3d @@ -61,5 +62,3 @@ travel_avoid_distance = 1.5 wall_0_inset = 0 wall_line_width_x = =line_width wall_thickness = 0.76 - -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index 025dd45ee7..e5e3b44e91 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -18,6 +18,7 @@ brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 +gradual_infill_step_height = =5 * layer_height infill_line_width = =round(line_width * 0.38 / 0.38, 2) infill_overlap = 0 infill_pattern = cross_3d @@ -62,4 +63,3 @@ wall_0_inset = 0 wall_line_width_x = =line_width wall_thickness = 0.76 -jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index 81a3a23ae1..263de9078a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -18,6 +18,7 @@ brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 +gradual_infill_step_height = =5 * layer_height infill_line_width = =round(line_width * 0.38 / 0.38, 2) infill_overlap = 0 infill_pattern = cross_3d @@ -61,4 +62,3 @@ wall_0_inset = 0 wall_line_width_x = =line_width wall_thickness = 0.76 -jerk_travel = 50 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 430b1a92a3..ed4855d4bd 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 @@ -16,7 +16,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_pattern = triangles = =round(line_width * 0.65 / 0.75, 2) infill_pattern = cubic line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 @@ -24,10 +24,10 @@ 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 -prime_tower_enable = False +material_standby_temperature = 100 +prime_tower_enable = True support_angle = 70 support_line_width = =line_width * 0.75 -support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) @@ -36,8 +36,9 @@ wall_thickness = =wall_line_width_0 + wall_line_width_x retract_at_layer_change = False speed_print = 45 -speed_wall = =round(speed_print * 40 / 45) -speed_wall_0 = =round(speed_print * 35 / 45) -speed_topbottom = =round(speed_print * 35 / 45) +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) infill_sparse_density = 15 layer_height_0 = 0.4 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 c500c5173c..5a7ad493d6 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 @@ -17,18 +17,19 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) -infill_pattern = cubic +infill_pattern = triangles +layer_height = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 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 -prime_tower_enable = False +material_standby_temperature = 100 +prime_tower_enable = True raft_margin = 10 support_angle = 70 support_line_width = =line_width * 0.75 -support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) @@ -36,8 +37,9 @@ wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x retract_at_layer_change = False speed_print = 45 -speed_wall = =round(speed_print * 40 / 45) -speed_wall_0 = =round(speed_print * 35 / 45) -speed_topbottom = =round(speed_print * 35 / 45) +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) infill_sparse_density = 15 layer_height_0 = 0.4 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 bc99237cba..c06478acfc 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 @@ -17,17 +17,18 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) -infill_pattern = cubic +infill_pattern = triangles +layer_height = 0.3 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 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 -prime_tower_enable = False +material_standby_temperature = 100 +prime_tower_enable = True support_angle = 70 support_line_width = =line_width * 0.75 -support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 wall_line_width = =round(line_width * 0.75 / 0.75, 2) @@ -35,8 +36,9 @@ wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x retract_at_layer_change = False speed_print = 45 -speed_wall = =round(speed_print * 40 / 45) -speed_wall_0 = =round(speed_print * 35 / 45) -speed_topbottom = =round(speed_print * 35 / 45) +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_x = =speed_wall +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) infill_sparse_density = 15 layer_height_0 = 0.4 From 367129686054498034ee380387cad2ae7b2c8ff2 Mon Sep 17 00:00:00 2001 From: Kristel88 Date: Thu, 3 May 2018 14:39:06 +0200 Subject: [PATCH 4/8] Updates PLA 0.8 S5 2 mistakes in previous pull request --- .../ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg | 2 -- .../quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 597dbe7fed..05323e1ec1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -24,8 +24,6 @@ speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) -jerk_travel = 50 - infill_pattern = zigzag speed_infill = =math.ceil(speed_print * 40 / 50) prime_tower_purge_volume = 1 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 ed4855d4bd..13294045fe 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 @@ -16,8 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_pattern = triangles = =round(line_width * 0.65 / 0.75, 2) -infill_pattern = cubic +infill_line_width = =round(line_width * 0.65 / 0.75, 2) +infill_pattern = triangles line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 From cf84adfb7318f3bdf1cf9a19ebbbe55c409fb27c Mon Sep 17 00:00:00 2001 From: Kristel88 Date: Mon, 14 May 2018 11:25:55 +0200 Subject: [PATCH 5/8] S5 dimensions were incorrect See Jira: CURA-5331 --- resources/definitions/ultimaker_s5.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index a69e10e343..2197ff2d91 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -37,7 +37,7 @@ "overrides": { "machine_name": { "default_value": "Ultimaker S5" }, "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 245 }, + "machine_depth": { "default_value": 240 }, "machine_height": { "default_value": 300 }, "machine_heated_bed": { "default_value": true }, "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, From 1dadc7d1b291c43ebc316993fe76c82b306e729d Mon Sep 17 00:00:00 2001 From: Kristel88 Date: Mon, 14 May 2018 12:09:40 +0200 Subject: [PATCH 6/8] S5 global settings fixes Fixes as suggested by Diego --- .../quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg | 1 - .../ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg | 2 -- .../ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg | 3 --- .../ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg | 3 --- 10 files changed, 15 deletions(-) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index 16cc836dc4..1604bc2bc9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 skin_overlap = 20 speed_print = 60 speed_layer_0 = 20 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index c7aa532422..7a138ce2d7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -16,7 +16,6 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 speed_print = 60 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 05323e1ec1..fa0438d951 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 speed_print = 50 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index acd8ed5bf4..42fac1ea25 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -16,7 +16,6 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 speed_print = 55 speed_layer_0 = 20 speed_topbottom = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index b53cdd4249..35840f2e04 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -41,7 +41,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 12 retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 -retraction_hop = 1.5 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index e5e3b44e91..d6217ad73c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -41,7 +41,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 12 retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 -retraction_hop = 1.5 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index 263de9078a..2b75d59259 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -40,7 +40,6 @@ prime_tower_wipe_enabled = True retraction_count_max = 12 retraction_extra_prime_amount = 0.8 retraction_extrusion_window = 1 -retraction_hop = 1.5 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 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 13294045fe..d0fa29b61d 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 @@ -17,14 +17,12 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) -infill_pattern = triangles line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 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_standby_temperature = 100 prime_tower_enable = True support_angle = 70 support_line_width = =line_width * 0.75 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 5a7ad493d6..79585fa096 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 @@ -17,15 +17,12 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) -infill_pattern = triangles -layer_height = 0.4 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 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_standby_temperature = 100 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 c06478acfc..dc09e5d5f5 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 @@ -17,15 +17,12 @@ cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height infill_line_width = =round(line_width * 0.65 / 0.75, 2) -infill_pattern = triangles -layer_height = 0.3 line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 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_standby_temperature = 100 prime_tower_enable = True support_angle = 70 support_line_width = =line_width * 0.75 From 757824ae93f200c1075db2e6865cf3528cfad1c3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 14 May 2018 12:54:26 +0200 Subject: [PATCH 7/8] Move deleteAll to Uranium Because it's used by WorkspaceFileHandler. Contributes to issue CURA-5330. --- cura/CuraApplication.py | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index c8adfbc93b..6b2664debb 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1153,39 +1153,6 @@ class CuraApplication(QtApplication): Selection.add(node) - ## Delete all nodes containing mesh data in the scene. - # \param only_selectable. Set this to False to delete objects from all build plates - @pyqtSlot() - def deleteAll(self, only_selectable = True): - Logger.log("i", "Clearing scene") - if not self.getController().getToolsEnabled(): - return - - nodes = [] - for node in DepthFirstIterator(self.getController().getScene().getRoot()): - if not isinstance(node, SceneNode): - continue - if (not node.getMeshData() and not node.callDecoration("getLayerData")) and not node.callDecoration("isGroup"): - continue # Node that doesnt have a mesh and is not a group. - if only_selectable and not node.isSelectable(): - continue - if not node.callDecoration("isSliceable") and not node.callDecoration("getLayerData") and not node.callDecoration("isGroup"): - continue # Only remove nodes that are selectable. - if node.getParent() and node.getParent().callDecoration("isGroup"): - continue # Grouped nodes don't need resetting as their parent (the group) is resetted) - nodes.append(node) - if nodes: - op = GroupedOperation() - - for node in nodes: - op.addOperation(RemoveSceneNodeOperation(node)) - - # Reset the print information - self.getController().getScene().sceneChanged.emit(node) - - op.push() - Selection.clear() - ## Reset all translation on nodes with mesh data. @pyqtSlot() def resetAllTranslation(self): From dd14a8e685997b98394d09ff48bff8591ab4a477 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Mon, 14 May 2018 14:44:40 +0200 Subject: [PATCH 8/8] CURA-5296 Better finding for packages.json --- cura/CuraApplication.py | 4 +++- cura/CuraPackageManager.py | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 6b2664debb..4888837fdf 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -151,7 +151,9 @@ class CuraApplication(QtApplication): Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura", "resources")) if not hasattr(sys, "frozen"): - Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources")) + resource_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "resources") + Resources.addSearchPath(resource_path) + Resources.setBundledResourcesPath(resource_path) self._use_gui = True self._open_file_queue = [] # Files to open when plug-ins are loaded. diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 04175edeb6..2b91081e4d 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -30,9 +30,7 @@ class CuraPackageManager(QObject): # JSON file that keeps track of all installed packages. self._bundled_package_management_file_path = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "..", - "resources", + os.path.abspath(Resources.getBundledResourcesPath()), "packages.json" ) self._user_package_management_file_path = os.path.join(