From ba39864af2a9ffd4021598901ce7a82fbdd3f3a6 Mon Sep 17 00:00:00 2001
From: Ghostkeeper <ghost_keeper+github@hotmail.com>
Date: Tue, 23 Feb 2016 16:06:39 +0100
Subject: [PATCH] Add new PLA profiles

These were designed through rigorous testing by the test team.

Contributes to issue CURA-892.
---
 .../ultimaker2+/pla_0.25_high.curaprofile     | 48 -------------
 .../ultimaker2+/pla_0.25_normal.curaprofile   | 35 ++++++++++
 .../ultimaker2+/pla_0.4_fast.curaprofile      | 67 ++++++++-----------
 .../ultimaker2+/pla_0.4_high.curaprofile      | 65 +++++++-----------
 .../ultimaker2+/pla_0.4_normal.curaprofile    | 60 +++++++----------
 .../ultimaker2+/pla_0.4_ulti.curaprofile      | 35 ++++++++++
 .../ultimaker2+/pla_0.6_normal.curaprofile    | 64 +++++++-----------
 .../ultimaker2+/pla_0.8_fast.curaprofile      | 47 -------------
 .../ultimaker2+/pla_0.8_normal.curaprofile    | 35 ++++++++++
 9 files changed, 211 insertions(+), 245 deletions(-)
 delete mode 100644 resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
 create mode 100644 resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
 create mode 100644 resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
 delete mode 100644 resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
 create mode 100644 resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile

diff --git a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
deleted file mode 100644
index db552e3f82..0000000000
--- a/resources/profiles/ultimaker2+/pla_0.25_high.curaprofile
+++ /dev/null
@@ -1,48 +0,0 @@
-[general]
-version = 1
-name = High Quality
-machine_type = ultimaker2plus
-machine_variant = 0.25 mm
-material = PLA
-
-[settings]
-retraction_combing = All
-top_thickness = 0.72
-speed_layer_0 = 20
-speed_print = 20
-speed_wall_0 = 20
-raft_interface_line_spacing = 3.0
-shell_thickness = 0.88
-infill_overlap = 15
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.06
-brim_line_count = 36
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-layer_height_0 = 0.15
-infill_sparse_density = 22
-material_flow = 100.0
-cool_fan_speed_min = 100
-top_bottom_thickness = 0.72
-cool_fan_speed_max = 100
-speed_infill = 30
-magic_mesh_surface_mode = False
-bottom_thickness = 0.72
-speed_wall_x = 25
-machine_nozzle_size = 0.22
-raft_surface_line_spacing = 3.0
-support_enable = False
-
diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
new file mode 100644
index 0000000000..6ef1b1b74b
--- /dev/null
+++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile
@@ -0,0 +1,35 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.25 mm
+material = PLA
+
+[settings]
+machine_nozzle_size = 0.22
+layer_height = 0.06
+layer_height_0 = 0.15
+shell_thickness = 0.88
+top_bottom_thickness = 0.72
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
+infill_sparse_density = 22
+infill_overlap = 0.022
+infill_wipe_dist = 0.1
+retraction_amount = 6
+retraction_min_travel = 0.5
+retraction_count_max = 30
+retraction_extrusion_window = 6
+speed_infill = 30
+speed_wall_0 = 20
+speed_wall_x = 25
+speed_topbottom = 20
+speed_layer_0 = 25
+skirt_speed = 25
+speed_slowdown_layers = 2
+travel_avoid_distance = 1
+cool_fan_full_layer = 2
+cool_min_layer_time_fan_speed_max = 15
+adhesion_type = brim
+brim_width = 7
diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
index b13bfc075f..928355e936 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile
@@ -1,47 +1,36 @@
 [general]
 version = 1
-name = Fast Prints
+name = Fast Print
 machine_type = ultimaker2plus
 machine_variant = 0.4 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-top_thickness = 0.75
-speed_print = 40
-speed_wall_0 = 40
-raft_surface_line_spacing = 3.0
-shell_thickness = 0.7
-infill_sparse_density = 18
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.15
-brim_line_count = 22
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-infill_overlap = 15
-raft_interface_line_width = 0.4
-speed_topbottom = 30
-support_pattern = lines
-layer_height_0 = 0.26
-raft_interface_line_spacing = 3.0
-material_flow = 100.0
-cool_fan_speed_min = 100
-cool_fan_speed_max = 100
-speed_travel = 150
-skirt_gap = 3.0
-magic_mesh_surface_mode = False
-bottom_thickness = 0.75
-speed_wall_x = 50
 machine_nozzle_size = 0.35
-top_bottom_thickness = 0.75
-support_enable = False
-
+layer_height = 0.15
+layer_height_0 = 0.26
+shell_thickness = 0.7
+top_bottom_thickness = 0.6
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
+infill_sparse_density = 18
+infill_overlap = 0.035
+infill_wipe_dist = 0.2
+retraction_amount = 5.5
+retraction_min_travel = 0.5
+retraction_count_max = 30
+retraction_extrusion_window = 6
+speed_infill = 60
+speed_wall_0 = 40
+speed_wall_x = 50
+speed_topbottom = 30
+speed_travel = 150
+speed_layer_0 = 25
+skirt_speed = 25
+speed_slowdown_layers = 2
+travel_avoid_distance = 1
+cool_fan_full_layer = 2
+cool_min_layer_time_fan_speed_max = 15
+adhesion_type = brim
+brim_width = 8
diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
index baf1848efb..4fe6278913 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile
@@ -6,43 +6,30 @@ machine_variant = 0.4 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-top_thickness = 0.72
-speed_layer_0 = 20
-speed_print = 30
-speed_wall_0 = 30
-raft_interface_line_spacing = 3.0
-shell_thickness = 1.05
-infill_overlap = 15
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.06
-brim_line_count = 22
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-layer_height_0 = 0.26
-infill_sparse_density = 22
-material_flow = 100.0
-cool_fan_speed_min = 100
-top_bottom_thickness = 0.72
-cool_fan_speed_max = 100
-speed_infill = 50
-magic_mesh_surface_mode = False
-bottom_thickness = 0.72
-speed_wall_x = 40
 machine_nozzle_size = 0.35
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+layer_height = 0.06
+layer_height_0 = 0.26
+shell_thickness = 1.05
+top_bottom_thickness = 0.84
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
+infill_sparse_density = 22
+infill_overlap = 0.035
+infill_wipe_dist = 0.2
+retraction_amount = 5.5
+retraction_min_travel = 0.5
+retraction_count_max = 30
+retraction_extrusion_window = 6
+speed_infill = 50
+speed_wall_0 = 30
+speed_wall_x = 40
+speed_topbottom = 20
+speed_layer_0 = 25
+skirt_speed = 25
+speed_slowdown_layers = 2
+travel_avoid_distance = 1
+cool_fan_full_layer = 2
+cool_min_layer_time_fan_speed_max = 15
+adhesion_type = brim
+brim_width = 8
diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
index db5ea4fd44..8dd527ba73 100644
--- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile
@@ -6,38 +6,30 @@ machine_variant = 0.4 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-shell_thickness = 1.05
-speed_print = 30
-speed_wall_0 = 30
-raft_interface_line_spacing = 3.0
-speed_layer_0 = 20
-layer_height_0 = 0.26
-retraction_hop = 0.0
-material_bed_temperature = 70
-skirt_gap = 3.0
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-brim_line_count = 22
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-infill_overlap = 15
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-speed_infill = 50
-material_flow = 100.0
-cool_fan_speed_min = 100
-cool_fan_speed_max = 100
-skin_no_small_gaps_heuristic = False
-magic_mesh_surface_mode = False
-speed_wall_x = 40
 machine_nozzle_size = 0.35
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+layer_height = 0.1
+layer_height_0 = 0.26
+shell_thickness = 1.05
+top_bottom_thickness = 0.8
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
+infill_sparse_density = 20
+infill_overlap = 0.035
+infill_wipe_dist = 0.2
+retraction_amount = 5.5
+retraction_min_travel = 0.5
+retraction_count_max = 30
+retraction_extrusion_window = 6
+speed_infill = 50
+speed_wall_0 = 30
+speed_wall_x = 40
+speed_topbottom = 20
+speed_layer_0 = 25
+skirt_speed = 25
+speed_slowdown_layers = 2
+travel_avoid_distance = 1
+cool_fan_full_layer = 2
+cool_min_layer_time_fan_speed_max = 15
+adhesion_type = brim
+brim_width = 8
diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
new file mode 100644
index 0000000000..611c416bdc
--- /dev/null
+++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile
@@ -0,0 +1,35 @@
+[general]
+version = 1
+name = Ulti Quality
+machine_type = ultimaker2plus
+machine_variant = 0.4 mm
+material = PLA
+
+[settings]
+machine_nozzle_size = 0.35
+layer_height = 0.04
+layer_height_0 = 0.26
+shell_thickness = 1.4
+top_bottom_thickness = 1.12
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
+infill_sparse_density = 25
+infill_overlap = 0.035
+infill_wipe_dist = 0.2
+retraction_amount = 5.5
+retraction_min_travel = 0.5
+retraction_count_max = 30
+retraction_extrusion_window = 6
+speed_infill = 50
+speed_wall_0 = 30
+speed_wall_x = 40
+speed_topbottom = 20
+speed_layer_0 = 25
+skirt_speed = 25
+speed_slowdown_layers = 2
+travel_avoid_distance = 1
+cool_fan_full_layer = 2
+cool_min_layer_time_fan_speed_max = 15
+adhesion_type = brim
+brim_width = 8
diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
index 09d1061880..3257c79446 100644
--- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
+++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile
@@ -6,42 +6,30 @@ machine_variant = 0.6 mm
 material = PLA
 
 [settings]
-retraction_combing = All
-top_thickness = 1.2
-speed_layer_0 = 20
-speed_print = 25
-speed_wall_0 = 25
-raft_interface_line_spacing = 3.0
-shell_thickness = 1.59
-infill_overlap = 15
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.15
-brim_line_count = 15
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-layer_height_0 = 0.39
-material_flow = 100.0
-cool_fan_speed_min = 100
-top_bottom_thickness = 1.2
-cool_fan_speed_max = 100
-speed_infill = 55
-magic_mesh_surface_mode = False
-bottom_thickness = 1.2
-speed_wall_x = 40
 machine_nozzle_size = 0.53
-raft_surface_line_spacing = 3.0
-support_enable = False
-
+layer_height = 0.15
+layer_height_0 = 0.4
+shell_thickness = 1.59
+top_bottom_thickness = 1.2
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
+infill_sparse_density = 20
+infill_overlap = 0.053
+infill_wipe_dist = 0.3
+retraction_amount = 6
+retraction_min_travel = 0.5
+retraction_count_max = 30
+retraction_extrusion_window = 6
+speed_infill = 55
+speed_wall_0 = 25
+speed_wall_x = 40
+speed_topbottom = 20
+speed_layer_0 = 25
+skirt_speed = 25
+speed_slowdown_layers = 2
+travel_avoid_distance = 1.2
+cool_fan_full_layer = 2
+cool_min_layer_time_fan_speed_max = 20
+adhesion_type = brim
+brim_width = 7
diff --git a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
deleted file mode 100644
index a3d4242072..0000000000
--- a/resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile
+++ /dev/null
@@ -1,47 +0,0 @@
-[general]
-version = 1
-name = Fast Prints
-machine_type = ultimaker2plus
-machine_variant = 0.8 mm
-material = PLA
-
-[settings]
-retraction_combing = All
-top_thickness = 1.2
-speed_layer_0 = 20
-speed_print = 20
-speed_wall_0 = 25
-raft_interface_line_spacing = 3.0
-shell_thickness = 2.1
-infill_overlap = 15
-retraction_hop = 0.0
-material_bed_temperature = 70
-skin_no_small_gaps_heuristic = False
-retraction_speed = 40.0
-raft_surface_line_width = 0.4
-raft_base_line_width = 1.0
-raft_margin = 5.0
-adhesion_type = brim
-skirt_minimal_length = 150.0
-layer_height = 0.2
-brim_line_count = 11
-infill_before_walls = False
-raft_surface_thickness = 0.27
-raft_airgap = 0.0
-skirt_gap = 3.0
-raft_interface_line_width = 0.4
-speed_topbottom = 20
-support_pattern = lines
-layer_height_0 = 0.5
-material_flow = 100.0
-cool_fan_speed_min = 100
-top_bottom_thickness = 1.2
-cool_fan_speed_max = 100
-speed_infill = 40
-magic_mesh_surface_mode = False
-bottom_thickness = 1.2
-speed_wall_x = 30
-machine_nozzle_size = 0.7
-raft_surface_line_spacing = 3.0
-support_enable = False
-
diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
new file mode 100644
index 0000000000..936c46b742
--- /dev/null
+++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile
@@ -0,0 +1,35 @@
+[general]
+version = 1
+name = Normal Quality
+machine_type = ultimaker2plus
+machine_variant = 0.8 mm
+material = PLA
+
+[settings]
+machine_nozzle_size = 0.7
+layer_height = 0.2
+layer_height_0 = 0.5
+shell_thickness = 2.1
+top_bottom_thickness = 1.6
+travel_compensate_overlapping_walls_enabled = True
+skin_no_small_gaps_heuristic = False
+top_bottom_pattern = lines
+infill_sparse_density = 20
+infill_overlap = 0.07
+infill_wipe_dist = 0.4
+retraction_amount = 6
+retraction_min_travel = 0.5
+retraction_count_max = 30
+retraction_extrusion_window = 6
+speed_infill = 40
+speed_wall_0 = 20
+speed_wall_x = 30
+speed_topbottom = 20
+speed_layer_0 = 25
+skirt_speed = 25
+speed_slowdown_layers = 2
+travel_avoid_distance = 1.6
+cool_fan_full_layer = 2
+cool_min_layer_time_fan_speed_max = 25
+adhesion_type = brim
+brim_width = 7