From 47b414a4ae287311b7dba359de6b7eff9452b4cd Mon Sep 17 00:00:00 2001
From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com>
Date: Thu, 15 Sep 2022 14:43:28 +0200
Subject: [PATCH] Pp 230 enable conical support (#13295)

Enable conical support settings for ultimaker profiles. Promote conical support out of experimental. Increase minimum diameter from 5 to 10mm.

Relates to PP-230 and CURA-6710
---
 resources/definitions/fdmprinter.def.json | 75 +++++++++++------------
 resources/definitions/ultimaker.def.json  |  6 ++
 2 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index 5f81c36a45..62e881628a 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -4571,6 +4571,42 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
+                "support_conical_enabled": {
+                    "label": "Enable Conical Support",
+                    "description": "Make support areas smaller at the bottom than at the overhang.",
+                    "type": "bool",
+                    "default_value": false,
+                    "enabled": "support_enable and support_structure != 'tree'",
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "support_conical_angle": {
+                    "label": "Conical Support Angle",
+                    "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.",
+                    "unit": "°",
+                    "type": "float",
+                    "minimum_value": "-90",
+                    "minimum_value_warning": "-45",
+                    "maximum_value_warning": "45",
+                    "maximum_value": "90",
+                    "default_value": 30,
+                    "enabled": "support_conical_enabled and support_enable and support_structure != 'tree'",
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
+                "support_conical_min_width": {
+                    "label": "Conical Support Minimum Width",
+                    "description": "Minimum width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.",
+                    "unit": "mm",
+                    "default_value": 5.0,
+                    "minimum_value": "0",
+                    "minimum_value_warning": "machine_nozzle_size * 3",
+                    "maximum_value_warning": "100.0",
+                    "type": "float",
+                    "enabled": "support_conical_enabled and support_enable and support_structure != 'tree' and support_conical_angle > 0",
+                    "limit_to_extruder": "support_infill_extruder_nr",
+                    "settable_per_mesh": true
+                },
                 "support_type":
                 {
                     "label": "Support Placement",
@@ -6955,45 +6991,6 @@
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
-                "support_conical_enabled":
-                {
-                    "label": "Enable Conical Support",
-                    "description": "Make support areas smaller at the bottom than at the overhang.",
-                    "type": "bool",
-                    "default_value": false,
-                    "enabled": "support_enable and support_structure != 'tree'",
-                    "limit_to_extruder": "support_infill_extruder_nr",
-                    "settable_per_mesh": true
-                },
-                "support_conical_angle":
-                {
-                    "label": "Conical Support Angle",
-                    "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.",
-                    "unit": "°",
-                    "type": "float",
-                    "minimum_value": "-90",
-                    "minimum_value_warning": "-45",
-                    "maximum_value_warning": "45",
-                    "maximum_value": "90",
-                    "default_value": 30,
-                    "enabled": "support_conical_enabled and support_enable and support_structure != 'tree'",
-                    "limit_to_extruder": "support_infill_extruder_nr",
-                    "settable_per_mesh": true
-                },
-                "support_conical_min_width":
-                {
-                    "label": "Conical Support Minimum Width",
-                    "description": "Minimum width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.",
-                    "unit": "mm",
-                    "default_value": 5.0,
-                    "minimum_value": "0",
-                    "minimum_value_warning": "machine_nozzle_size * 3",
-                    "maximum_value_warning": "100.0",
-                    "type": "float",
-                    "enabled": "support_conical_enabled and support_enable and support_structure != 'tree' and support_conical_angle > 0",
-                    "limit_to_extruder": "support_infill_extruder_nr",
-                    "settable_per_mesh": true
-                },
                 "magic_fuzzy_skin_enabled":
                 {
                     "label": "Fuzzy Skin",
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index c63169fc3a..aab796e0a8 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -293,6 +293,12 @@
         "support_z_distance": {
             "value": "0"
         },
+        "support_conical_enabled": {
+            "value": true
+        },
+        "support_conical_min_width": {
+            "value": 10
+        },
         "top_bottom_pattern": {
             "value": "'zigzag'"
         }