Merge pull request #12488 from Ultimaker/PP-108_Improved_support_settings

PP-108 improved support settings

5 files changed, 48 insertions, 15 deletions

diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 8c6d8c0dda..1484935191 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -213,6 +213,51 @@
         },
         "jerk_skirt_brim": {
             "minimum_value_warning": 20
+        },
+        "support_wall_count": {
+            "value": "1 if support_structure == 'tree' else 0"
+        },
+        "zig_zaggify_support": {
+            "value": true
+        },
+        "support_infill_rate": {
+            "value": "80 if gradual_support_infill_steps != 0 else 15"
+        },
+        "gradual_support_infill_steps": {
+            "value": "2 if support_interface_enable else 0"
+        },
+        "gradual_support_infill_step_height": {
+            "value": "4*layer_height"
+        },
+        "support_interface_height": {
+            "value": "2*layer_height"
+        },
+        "support_offset": {
+            "value": "2*line_width if support_interface_enable else 0"
+        },
+        "support_xy_distance": {
+            "value": "1"
+        },
+        "support_xy_distance_overhang": {
+            "value": "wall_line_width_0"
+        },
+        "minimum_support_area": {
+            "value": "(2 + support_offset)**2"
+        },
+        "support_interface_skip_height": {
+            "value": "layer_height"
+        },
+        "support_interface_pattern": {
+            "value": "'concentric'"
+        },
+        "support_interface_offset": {
+            "value": "support_offset"
+        },
+        "support_use_towers": {
+            "value": false
+        },
+        "support_z_distance": {
+            "value": "0"
         }
     }
 }
diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json
index c028363239..5399abc02b 100644
--- a/resources/definitions/ultimaker2.def.json
+++ b/resources/definitions/ultimaker2.def.json
@@ -86,6 +86,9 @@
         },
         "machine_acceleration": {
             "default_value": 3000
+        },
+        "support_z_distance": {
+            "value": "0.1"
         }
     }
 }
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index 858d5f91a7..38428b89ca 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -139,11 +139,6 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "45" },
-        "support_pattern": { "value": "'triangles'" },
-        "support_use_towers": { "value": "False" },
-        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
-        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
-        "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 67f8ddab83..1d0d8a7613 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -131,11 +131,6 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "45" },
-        "support_pattern": { "value": "'triangles'" },
-        "support_use_towers": { "value": "False" },
-        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
-        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
-        "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 005c876117..b48c5cca6e 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -133,11 +133,6 @@
         "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" },
         "speed_wall_x": { "value": "speed_wall" },
         "support_angle": { "value": "45" },
-        "support_pattern": { "value": "'triangles'" },
-        "support_use_towers": { "value": "False" },
-        "support_xy_distance": { "value": "wall_line_width_0 * 2.5" },
-        "support_xy_distance_overhang": { "value": "wall_line_width_0" },
-        "support_z_distance": { "value": "0" },
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "top_bottom_thickness": { "value": "1" },