From 9c109040209883e85815c1b24ada64779d788a67 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 10:56:05 +0100
Subject: [PATCH 01/15] PP-60: Increasing the warning level for the Maximum
 Extrusion Area Deviation otherwise the default settings for Ultimaker
 machines would show a warning.

---
 resources/definitions/fdmprinter.def.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 17329552c3..799e6e7eb0 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -6305,7 +6305,7 @@
                     "default_value": 2000,
                     "minimum_value": "0",
                     "minimum_value_warning": "500",
-                    "maximum_value_warning": "5000",
+                    "maximum_value_warning": "50000",
                     "settable_per_mesh": true
                 }
             }

From d207d871a48b26458a71a596bc879aeacd58aa1f Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 10:59:19 +0100
Subject: [PATCH 02/15] PP-60: Increasing the warning level for the Middle line
 Threshold otherwise the default settings for Ultimaker machines would show a
 warning.

---
 resources/definitions/fdmprinter.def.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 799e6e7eb0..13cca9173e 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1098,7 +1098,7 @@
                     "default_value": 50,
                     "minimum_value": "1",
                     "minimum_value_warning": "min_bead_width / line_width * 100",
-                    "maximum_value_warning": "75",
+                    "maximum_value_warning": "90",
                     "maximum_value": "99",
                     "children":
                     {
@@ -1111,7 +1111,7 @@
                             "value": "wall_transition_threshold",
                             "minimum_value": "1",
                             "minimum_value_warning": "min_bead_width / line_width * 100",
-                            "maximum_value_warning": "75",
+                            "maximum_value_warning": "90",
                             "maximum_value": "99"
                         },
                         "wall_add_middle_threshold": {
@@ -1123,7 +1123,7 @@
                             "value": "wall_transition_threshold",
                             "minimum_value": "1",
                             "minimum_value_warning": "min_bead_width / line_width * 100",
-                            "maximum_value_warning": "75",
+                            "maximum_value_warning": "90",
                             "maximum_value": "99"
                         }
                     }

From 1585c98e05133770e21fd17ce448794c9750bb54 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 11:04:25 +0100
Subject: [PATCH 03/15] PP-60: Update UM2 machines to reflect the iteration 3
 setting changes

---
 resources/definitions/ultimaker2.def.json | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
index 51aff7708d..430b96a6e8 100644
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@@ -91,7 +91,16 @@
             "value": "False"
         },
         "speed_equalize_flow_width_factor": {
-            "value": "0.5"
+            "value": "1.1"
+        },
+        "wall_distribution_count": {
+            "value": "1"
+        },
+        "wall_transition_threshold": {
+            "value": 90
+        },
+        "wall_add_middle_threshold": {
+            "value": "wall_transition_threshold * 8/9"
         },
         "retraction_combing": {
             "value": "'no_outer_surfaces'"
@@ -100,16 +109,16 @@
             "value": true
         },
         "top_bottom_pattern" : {
-            "value":  "'zigzag'"
+            "value":  "'lines'"
         },
-                "fill_outline_gaps": {
+        "fill_outline_gaps": {
             "value": "True"
         },
         "min_feature_size": {
             "value": "wall_line_width_0 / 4"
         },
         "min_bead_width": {
-            "value": "wall_line_width_0 / 2"
+            "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200"
         },
         "meshfix_maximum_extrusion_area_deviation": {
             "value": "50000"

From 5be721c4f56459fa903d2b2905db972d580d2ca8 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 11:07:31 +0100
Subject: [PATCH 04/15] PP-60: top-bottom pattern "lines" is the default in fdm
 printers. Better to remove the override.

---
 resources/definitions/ultimaker2.def.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
index 430b96a6e8..ca580122a0 100644
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@@ -108,9 +108,6 @@
         "skin_monotonic" : {
             "value": true
         },
-        "top_bottom_pattern" : {
-            "value":  "'lines'"
-        },
         "fill_outline_gaps": {
             "value": "True"
         },

From 1eac809cda5f02c762624330024656fb74b2fb64 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 11:11:49 +0100
Subject: [PATCH 05/15] PP-60: Iteration 3 settings changes applied to the UM3
 machines

---
 resources/definitions/ultimaker3.def.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index deb5104e13..d388b970cc 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -98,7 +98,7 @@
         "cool_min_speed": { "value": "5" },
         "fill_outline_gaps": { "value": "True" },
         "min_feature_size": { "value": "wall_line_width_0 / 4" },
-        "min_bead_width": { "value": "wall_line_width_0 / 2" },
+        "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'triangles'" },
@@ -154,7 +154,7 @@
         "roofing_layer_count": { "value": "1" },
         "roofing_monotonic": { "value": "True" },
         "skin_overlap": { "value": "10" },
-        "speed_equalize_flow_width_factor": { "value": "0.5" },
+        "speed_equalize_flow_width_factor": { "value": "1.1" },
         "skin_monotonic" : { "value": true },
         "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
@@ -174,11 +174,13 @@
         "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
-        "top_bottom_pattern": { "value": "'zigzag'" },
         "top_bottom_thickness": { "value": "1" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
+        "wall_distribution_count": { "value": "1" },
         "wall_thickness": { "value": "1" },
+        "wall_transition_threshold": {"value": "90"},
+        "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"},
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
     }
 }

From 2db0a90ce469a141a81245c1221f9dadcbda9ba0 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 11:15:44 +0100
Subject: [PATCH 06/15] PP-60: Iteration 3 settings + 4.12 settings changes
 applied to the UM Original machine

---
 .../definitions/ultimaker_original.def.json   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json
index d209c28a07..21e83981da 100644
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@@ -59,6 +59,39 @@
         },
         "machine_end_gcode": {
             "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300  ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'"
+        },
+               "infill_before_walls": {
+            "value": "False"
+        },
+        "speed_equalize_flow_width_factor": {
+            "value": "1.1"
+        },
+        "wall_distribution_count": {
+            "value": "1"
+        },
+        "wall_transition_threshold": {
+            "value": 90
+        },
+        "wall_add_middle_threshold": {
+            "value": "wall_transition_threshold * 8/9"
+        },
+        "retraction_combing": {
+            "value": "'no_outer_surfaces'"
+        },
+        "skin_monotonic" : {
+            "value": true
+        },
+        "fill_outline_gaps": {
+            "value": "True"
+        },
+        "min_feature_size": {
+            "value": "wall_line_width_0 / 4"
+        },
+        "min_bead_width": {
+            "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200"
+        },
+        "meshfix_maximum_extrusion_area_deviation": {
+            "value": "50000"
         }
     }
 }

From 5e165cd990400d0f8361ae7d60cc19ca43cdcb13 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 11:21:23 +0100
Subject: [PATCH 07/15] PP-60: Iteration 3 settings + 4.12 settings changes
 applied to the S3 machine

---
 resources/definitions/ultimaker_s3.def.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 41bdbee4b8..86d1976987 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -93,6 +93,9 @@
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
+        "fill_outline_gaps": { "value": "True" },
+        "min_feature_size": { "value": "wall_line_width_0 / 4" },
+        "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" },
         "jerk_enabled": { "value": "True" },
         "jerk_print": { "value": "20", "minimum_value_warning": 20 },
         "jerk_infill": {"minimum_value_warning": 20 },
@@ -141,7 +144,7 @@
         "retraction_prime_speed": { "value": "15" },
         "skin_monotonic" : { "value": true },
         "skin_overlap": { "value": "10" },
-        "speed_equalize_flow_width_factor": { "value": "0.5" },
+        "speed_equalize_flow_width_factor": { "value": "1.1" },
         "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "35" },
@@ -159,12 +162,14 @@
         "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
-        "top_bottom_pattern": { "value": "'zigzag'" },
         "top_bottom_thickness": { "value": "1" },
         "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
+        "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"},
+        "wall_distribution_count": { "value": "1" },
         "wall_thickness": { "value": "1" },
+        "wall_transition_threshold": {"value": "90"},
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "meshfix_maximum_extrusion_area_deviation": { "value": "50000" },

From b477a9bf2a57f8a185e34e0945b965cbdc660c8b Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 11:25:32 +0100
Subject: [PATCH 08/15] PP-60: Iteration 3 settings + 4.12 settings changes
 applied to the S5 machine

---
 resources/definitions/ultimaker_s5.def.json | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 83d8523460..4886518896 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -95,6 +95,9 @@
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
+        "fill_outline_gaps": { "value": "True" },
+        "min_feature_size": { "value": "wall_line_width_0 / 4" },
+        "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" },
         "jerk_enabled": { "value": "True" },
         "jerk_print": { "value": "20", "minimum_value_warning": 20 },
         "jerk_infill": {"minimum_value_warning": 20 },
@@ -145,7 +148,7 @@
         "retraction_prime_speed": { "value": "15" },
         "skin_monotonic" : { "value": true },
         "skin_overlap": { "value": "10" },
-        "speed_equalize_flow_width_factor": { "value": "0.5" },
+        "speed_equalize_flow_width_factor": { "value": "1.1" },
         "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "35" },
@@ -163,12 +166,14 @@
         "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
-        "top_bottom_pattern": { "value": "'zigzag'" },
         "top_bottom_thickness": { "value": "1" },
         "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
+        "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"},
+        "wall_distribution_count": { "value": "1" },
         "wall_thickness": { "value": "1" },
+        "wall_transition_threshold": {"value": "90"},
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
         "meshfix_maximum_extrusion_area_deviation": { "value": "50000" },

From de04c7d79b38736abf99a6faa4a567229c439808 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Tue, 9 Nov 2021 12:13:02 +0100
Subject: [PATCH 09/15] PP-60: Major clean up. Moved all common (libArachne +
 4.12) settings to ultimaker.def.json from which all Ultimaker machines
 inherit their values

---
 resources/definitions/ultimaker.def.json      | 36 +++++++++++++++++++
 resources/definitions/ultimaker2.def.json     | 33 -----------------
 resources/definitions/ultimaker3.def.json     | 14 --------
 .../definitions/ultimaker_original.def.json   | 30 ----------------
 resources/definitions/ultimaker_s3.def.json   | 12 -------
 resources/definitions/ultimaker_s5.def.json   | 11 ------
 6 files changed, 36 insertions(+), 100 deletions(-)

diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 47a60fe51c..04e8834f19 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -40,6 +40,42 @@
         {
             "value": false,
             "enabled": false
+        },
+        "line_width": {
+            "value": "machine_nozzle_size"
+        },
+        "infill_before_walls": {
+            "value": "False"
+        },
+        "retraction_combing": {
+            "value": "'no_outer_surfaces'"
+        },
+        "skin_monotonic" : {
+            "value": true
+        },
+        "fill_outline_gaps": {
+            "value": "True"
+        },
+        "min_feature_size": {
+            "value": "wall_line_width_0 / 4"
+        },
+        "min_bead_width": {
+            "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200"
+        },
+        "speed_equalize_flow_width_factor": {
+            "value": "1.1"
+        },
+        "wall_transition_threshold": {
+            "value": "90"
+        },
+        "wall_add_middle_threshold": {
+            "value": "wall_transition_threshold * 8/9"
+        },
+        "wall_distribution_count": {
+            "value": "1"
+        },
+        "meshfix_maximum_extrusion_area_deviation": {
+            "value": "50000"
         }
     }
 }
diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
index ca580122a0..c028363239 100644
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@@ -86,39 +86,6 @@
         },
         "machine_acceleration": {
             "default_value": 3000
-        },
-        "infill_before_walls": {
-            "value": "False"
-        },
-        "speed_equalize_flow_width_factor": {
-            "value": "1.1"
-        },
-        "wall_distribution_count": {
-            "value": "1"
-        },
-        "wall_transition_threshold": {
-            "value": 90
-        },
-        "wall_add_middle_threshold": {
-            "value": "wall_transition_threshold * 8/9"
-        },
-        "retraction_combing": {
-            "value": "'no_outer_surfaces'"
-        },
-        "skin_monotonic" : {
-            "value": true
-        },
-        "fill_outline_gaps": {
-            "value": "True"
-        },
-        "min_feature_size": {
-            "value": "wall_line_width_0 / 4"
-        },
-        "min_bead_width": {
-            "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200"
-        },
-        "meshfix_maximum_extrusion_area_deviation": {
-            "value": "50000"
         }
     }
 }
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index d388b970cc..4743d1b77e 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -96,10 +96,6 @@
         "cool_fan_speed": { "value": "50" },
         "cool_fan_speed_max": { "value": "100" },
         "cool_min_speed": { "value": "5" },
-        "fill_outline_gaps": { "value": "True" },
-        "min_feature_size": { "value": "wall_line_width_0 / 4" },
-        "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" },
-        "infill_before_walls": { "value": false },
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
@@ -123,14 +119,12 @@
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
-        "line_width": { "value": "machine_nozzle_size" },
         "machine_min_cool_heat_time_window": { "value": "15" },
         "default_material_print_temperature": { "value": "200" },
         "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" },
         "material_bed_temperature": { "maximum_value": "115" },
         "material_bed_temperature_layer_0": { "maximum_value": "115" },
         "material_standby_temperature": { "value": "100" },
-        "meshfix_maximum_extrusion_area_deviation": { "value": "50000" },
         "multiple_mesh_overlap": { "value": "0" },
         "optimize_wall_printing_order": { "value": "True" },
         "prime_tower_enable": { "default_value": true },
@@ -143,7 +137,6 @@
         "raft_margin": { "value": "10" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_combing": {"value": "'no_outer_surfaces'"},
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
@@ -151,11 +144,7 @@
         "retraction_hop_only_when_collides": { "value": "True" },
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
-        "roofing_layer_count": { "value": "1" },
-        "roofing_monotonic": { "value": "True" },
         "skin_overlap": { "value": "10" },
-        "speed_equalize_flow_width_factor": { "value": "1.1" },
-        "skin_monotonic" : { "value": true },
         "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "35" },
@@ -177,10 +166,7 @@
         "top_bottom_thickness": { "value": "1" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
-        "wall_distribution_count": { "value": "1" },
         "wall_thickness": { "value": "1" },
-        "wall_transition_threshold": {"value": "90"},
-        "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"},
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
     }
 }
diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json
index 21e83981da..15b381f4da 100644
--- a/resources/definitions/ultimaker_original.def.json
+++ b/resources/definitions/ultimaker_original.def.json
@@ -62,36 +62,6 @@
         },
                "infill_before_walls": {
             "value": "False"
-        },
-        "speed_equalize_flow_width_factor": {
-            "value": "1.1"
-        },
-        "wall_distribution_count": {
-            "value": "1"
-        },
-        "wall_transition_threshold": {
-            "value": 90
-        },
-        "wall_add_middle_threshold": {
-            "value": "wall_transition_threshold * 8/9"
-        },
-        "retraction_combing": {
-            "value": "'no_outer_surfaces'"
-        },
-        "skin_monotonic" : {
-            "value": true
-        },
-        "fill_outline_gaps": {
-            "value": "True"
-        },
-        "min_feature_size": {
-            "value": "wall_line_width_0 / 4"
-        },
-        "min_bead_width": {
-            "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200"
-        },
-        "meshfix_maximum_extrusion_area_deviation": {
-            "value": "50000"
         }
     }
 }
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 86d1976987..17531c66a4 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -89,13 +89,9 @@
         "cool_fan_speed": { "value": "50" },
         "cool_fan_speed_max": { "value": "100" },
         "cool_min_speed": { "value": "5" },
-        "infill_before_walls": { "value": false },
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
-        "fill_outline_gaps": { "value": "True" },
-        "min_feature_size": { "value": "wall_line_width_0 / 4" },
-        "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" },
         "jerk_enabled": { "value": "True" },
         "jerk_print": { "value": "20", "minimum_value_warning": 20 },
         "jerk_infill": {"minimum_value_warning": 20 },
@@ -115,7 +111,6 @@
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
-        "line_width": { "value": "machine_nozzle_size" },
         "machine_min_cool_heat_time_window": { "value": "15" },
         "default_material_print_temperature": { "value": "200" },
         "material_standby_temperature": { "value": "100" },
@@ -134,7 +129,6 @@
         "raft_speed": { "value": "25" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_combing": { "value": "'no_outer_surfaces'"},
         "retraction_count_max": { "value": "10" },
         "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
@@ -142,9 +136,7 @@
         "retraction_hop_only_when_collides": { "value": "True" },
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
-        "skin_monotonic" : { "value": true },
         "skin_overlap": { "value": "10" },
-        "speed_equalize_flow_width_factor": { "value": "1.1" },
         "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "35" },
@@ -166,13 +158,9 @@
         "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
-        "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"},
-        "wall_distribution_count": { "value": "1" },
         "wall_thickness": { "value": "1" },
-        "wall_transition_threshold": {"value": "90"},
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
-        "meshfix_maximum_extrusion_area_deviation": { "value": "50000" },
         "initial_layer_line_width_factor": { "value": "120" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
     }
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 4886518896..5ad560a0c7 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -91,13 +91,9 @@
         "cool_fan_speed": { "value": "50" },
         "cool_fan_speed_max": { "value": "100" },
         "cool_min_speed": { "value": "5" },
-        "infill_before_walls": { "value": false },
         "infill_overlap": { "value": "0" },
         "infill_pattern": { "value": "'triangles'" },
         "infill_wipe_dist": { "value": "0" },
-        "fill_outline_gaps": { "value": "True" },
-        "min_feature_size": { "value": "wall_line_width_0 / 4" },
-        "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" },
         "jerk_enabled": { "value": "True" },
         "jerk_print": { "value": "20", "minimum_value_warning": 20 },
         "jerk_infill": {"minimum_value_warning": 20 },
@@ -117,7 +113,6 @@
         "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" },
         "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
         "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
-        "line_width": { "value": "machine_nozzle_size" },
         "machine_min_cool_heat_time_window": { "value": "15" },
         "default_material_print_temperature": { "value": "200" },
         "material_standby_temperature": { "value": "100" },
@@ -146,9 +141,7 @@
         "retraction_hop_only_when_collides": { "value": "True" },
         "retraction_min_travel": { "value": "5" },
         "retraction_prime_speed": { "value": "15" },
-        "skin_monotonic" : { "value": true },
         "skin_overlap": { "value": "10" },
-        "speed_equalize_flow_width_factor": { "value": "1.1" },
         "speed_layer_0": { "value": "20" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_print": { "value": "35" },
@@ -170,13 +163,9 @@
         "travel_avoid_supports": { "value": "True" },
         "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
         "wall_0_inset": { "value": "0" },
-        "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"},
-        "wall_distribution_count": { "value": "1" },
         "wall_thickness": { "value": "1" },
-        "wall_transition_threshold": {"value": "90"},
         "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" },
         "meshfix_maximum_deviation": { "value": "layer_height / 4" },
-        "meshfix_maximum_extrusion_area_deviation": { "value": "50000" },
         "optimize_wall_printing_order": { "value": "True" },
         "initial_layer_line_width_factor": { "value": "120" },
         "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },

From 3b0216a036020be0974a96396a920a6f23ab999c Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Wed, 10 Nov 2021 10:43:43 +0100
Subject: [PATCH 10/15] PP-60: Moved the libArachne setting changes and the
 thin wall settings from Ultimaker to All machines. So all third party
 machines will also get these settings.

---
 resources/definitions/fdmprinter.def.json | 13 ++++++-------
 resources/definitions/ultimaker.def.json  | 18 ------------------
 2 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 13cca9173e..8d1b27fdc3 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1095,10 +1095,9 @@
                     "description": "The smallest line width, as a factor of the normal line width, below which it will choose to use fewer, but wider lines to fill the available space the wall needs to occupy. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.",
                     "type": "float",
                     "unit": "%",
-                    "default_value": 50,
+                    "default_value": 90,
                     "minimum_value": "1",
                     "minimum_value_warning": "min_bead_width / line_width * 100",
-                    "maximum_value_warning": "90",
                     "maximum_value": "99",
                     "children":
                     {
@@ -1146,7 +1145,7 @@
                     "label": "Wall Distribution Count",
                     "description": "The number of walls, counted from the center, over which the variation needs to be spread. Lower values mean that the outer walls don't change in width.",
                     "type": "int",
-                    "default_value": 2,
+                    "default_value": 1,
                     "minimum_value": "1",
                     "enabled": "beading_strategy_type == 'inward_distributed'"
                 },
@@ -1243,7 +1242,7 @@
                     "label": "Print Thin Walls",
                     "description": "Print pieces of the model which are horizontally thinner than the nozzle size.",
                     "type": "bool",
-                    "default_value": false,
+                    "default_value": true,
                     "limit_to_extruder": "wall_0_extruder_nr",
                     "settable_per_mesh": true
                 },
@@ -1252,7 +1251,7 @@
                     "label": "Minimum Feature Size",
                     "description": "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width.",
                     "unit": "mm",
-                    "default_value": 0,
+                    "value": "wall_line_width_0 / 4",
                     "minimum_value": "0",
                     "maximum_value": "wall_line_width_0",
                     "type": "float",
@@ -1264,7 +1263,7 @@
                     "label": "Minimum Wall Line Width",
                     "description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.",
                     "unit": "mm",
-                    "value": "wall_line_width_0 / 2",
+                    "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200",
                     "default_value": "0.2",
                     "minimum_value": "0.001",
                     "minimum_value_warning": "min_feature_size",
@@ -3231,7 +3230,7 @@
                     "description": "Extrusion width based correction factor on the equalized flow. The target flow (in mm³/s) is reduced by the percentual difference in line width multiplied by this factor. A factor above zero means that thin lines are adjusted to be even faster than simple flow equalization would speed them up to. Conversely, wider lines are slowed down more. A positive value can help to compensate for the width depended back pressure the previous layer exterts on the line.",
                     "type": "float",
                     "unit": "mm³/s",
-                    "default_value": 0.0,
+                    "default_value": 1.0,
                     "minimum_value_warning": "0.0",
                     "maximum_value_warning": "3.0",
                     "settable_per_mesh": false,
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 04e8834f19..3dc3555266 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -53,27 +53,9 @@
         "skin_monotonic" : {
             "value": true
         },
-        "fill_outline_gaps": {
-            "value": "True"
-        },
-        "min_feature_size": {
-            "value": "wall_line_width_0 / 4"
-        },
-        "min_bead_width": {
-            "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200"
-        },
         "speed_equalize_flow_width_factor": {
             "value": "1.1"
         },
-        "wall_transition_threshold": {
-            "value": "90"
-        },
-        "wall_add_middle_threshold": {
-            "value": "wall_transition_threshold * 8/9"
-        },
-        "wall_distribution_count": {
-            "value": "1"
-        },
         "meshfix_maximum_extrusion_area_deviation": {
             "value": "50000"
         }

From ee9c2e0eb9f17b2e71b23c10deb64ae61be750c0 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Wed, 10 Nov 2021 11:04:56 +0100
Subject: [PATCH 11/15] PP-60: Set add middle line to 80% for all machines and
 remove the maximum warning limits.

---
 resources/definitions/fdmprinter.def.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 8d1b27fdc3..505263935c 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1110,7 +1110,6 @@
                             "value": "wall_transition_threshold",
                             "minimum_value": "1",
                             "minimum_value_warning": "min_bead_width / line_width * 100",
-                            "maximum_value_warning": "90",
                             "maximum_value": "99"
                         },
                         "wall_add_middle_threshold": {
@@ -1119,10 +1118,9 @@
                             "type": "float",
                             "unit": "%",
                             "default_value": 50,
-                            "value": "wall_transition_threshold",
+                            "value": "wall_transition_threshold * 8/9",
                             "minimum_value": "1",
                             "minimum_value_warning": "min_bead_width / line_width * 100",
-                            "maximum_value_warning": "90",
                             "maximum_value": "99"
                         }
                     }

From 3d81ff7e91c5ace7355bf9340c15506251333893 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Wed, 10 Nov 2021 11:18:14 +0100
Subject: [PATCH 12/15] PP-60: New min_bead_width formula based on the width
 the outer wall can become. Removed default value.

---
 resources/definitions/fdmprinter.def.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 505263935c..9aaf0f5c2d 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1262,7 +1262,6 @@
                     "description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.",
                     "unit": "mm",
                     "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200",
-                    "default_value": "0.2",
                     "minimum_value": "0.001",
                     "minimum_value_warning": "min_feature_size",
                     "maximum_value_warning": "wall_line_width_0",

From 43e7edda546d72a6b3429b80378ec07a2e9512fe Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Wed, 10 Nov 2021 11:22:33 +0100
Subject: [PATCH 13/15] PP-60: Remove thin wall settings from the S5 profile

---
 resources/definitions/ultimaker_s5.def.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 5ad560a0c7..d4ba3781f2 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -118,9 +118,6 @@
         "material_standby_temperature": { "value": "100" },
         "multiple_mesh_overlap": { "value": "0" },
         "prime_tower_enable": { "value": "True" },
-        "fill_outline_gaps": { "value": "True" },
-        "min_feature_size": { "value": "wall_line_width_0 / 4" },
-        "min_bead_width": { "value": "wall_line_width_0 / 2" },
         "raft_airgap": { "value": "0" },
         "raft_base_speed": { "value": "20" },
         "raft_base_thickness": { "value": "0.3" },

From 046ccf57bf5dbf3047bd324a44c6fb84dc9fbc36 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Wed, 10 Nov 2021 11:26:23 +0100
Subject: [PATCH 14/15] PP-60: Removed warning levels for middle line threshold

---
 resources/definitions/fdmprinter.def.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 9aaf0f5c2d..e43084352d 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1097,7 +1097,6 @@
                     "unit": "%",
                     "default_value": 90,
                     "minimum_value": "1",
-                    "minimum_value_warning": "min_bead_width / line_width * 100",
                     "maximum_value": "99",
                     "children":
                     {
@@ -1109,7 +1108,6 @@
                             "default_value": 50,
                             "value": "wall_transition_threshold",
                             "minimum_value": "1",
-                            "minimum_value_warning": "min_bead_width / line_width * 100",
                             "maximum_value": "99"
                         },
                         "wall_add_middle_threshold": {
@@ -1120,7 +1118,6 @@
                             "default_value": 50,
                             "value": "wall_transition_threshold * 8/9",
                             "minimum_value": "1",
-                            "minimum_value_warning": "min_bead_width / line_width * 100",
                             "maximum_value": "99"
                         }
                     }

From 9e8025942aff631b774c6fc6e14ae0be2967bd1e Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Thu, 11 Nov 2021 14:55:32 +0100
Subject: [PATCH 15/15] Changes as request by the reviewers. - Undid removal of
 default value for min_bead_with - Style improvement formula
 wall_add_middle_threshold

---
 resources/definitions/fdmprinter.def.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index e43084352d..e41f0c6e9d 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -1116,7 +1116,7 @@
                             "type": "float",
                             "unit": "%",
                             "default_value": 50,
-                            "value": "wall_transition_threshold * 8/9",
+                            "value": "wall_transition_threshold * 8 / 9",
                             "minimum_value": "1",
                             "maximum_value": "99"
                         }
@@ -1259,6 +1259,7 @@
                     "description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.",
                     "unit": "mm",
                     "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200",
+                    "default_value": "0.2",
                     "minimum_value": "0.001",
                     "minimum_value_warning": "min_feature_size",
                     "maximum_value_warning": "wall_line_width_0",