From c58c541afdd581c11c8d581abd0e8374ff107bd9 Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Mon, 28 Nov 2022 13:19:09 +0100
Subject: [PATCH] Made the default skirt/brim extruder -1 (not overridden),
 this will create the a brim with the same material as the mesh for each mesh.
 Fixed the brim tower setting to reflect changes in the brim behavior. When
 the brim is enabled for the whole print it does not enable it for the prime
 tower anymore. Lastly we reduced the brim inside avoid distance to a smaller
 value to improve the adhesion of large inner objects.

Relates to PP-36
---
 resources/definitions/fdmprinter.def.json | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 54e0d60b02..e2f37e5968 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -5606,8 +5606,7 @@
                             "label": "Skirt/Brim Extruder",
                             "description": "The extruder train to use for printing the skirt or brim. This is used in multi-extrusion.",
                             "type": "optional_extruder",
-                            "default_value": "0",
-                            "value": "adhesion_extruder_nr",
+                            "default_value": "-1",
                             "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable'))",
                             "resolve": "'-1' if '-1' in extruderValues('skirt_brim_extruder_nr') else adhesion_extruder_nr",
                             "settable_per_mesh": false,
@@ -5767,7 +5766,7 @@
                     "description": "If brim is only on outside then parts fully enclosed inside another part will get a brim which might overlap with the internal holes of the outer part. This setting controls how far to stay away from those internal holes. Set to a high value to prevent any brim from being generated for parts enclosed within the holes of other parts.",
                     "unit": "mm",
                     "type": "float",
-                    "default_value": 5,
+                    "value": "2.5",
                     "minimum_value": "0",
                     "enabled": "resolveOrValue('adhesion_type') == 'brim' and any(extruderValues('brim_outside_only'))",
                     "limit_to_extruder": "skirt_brim_extruder_nr",
@@ -6350,7 +6349,7 @@
                     "description": "Prime-towers might need the extra adhesion afforded by a brim even if the model doesn't. Presently can't be used with the 'Raft' adhesion-type.",
                     "type": "bool",
                     "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') != 'raft')",
-                    "resolve": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') in ('none', 'skirt'))",
+                    "resolve": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') in ('none', 'skirt', 'brim'))",
                     "default_value": false,
                     "settable_per_mesh": false,
                     "settable_per_extruder": false