From 6e7e0b5f7706caab3e116bf98e1ed7a10db5dd49 Mon Sep 17 00:00:00 2001
From: "p.kuiper" <p.kuiper@ultimaker.com>
Date: Fri, 3 Jun 2022 14:02:53 +0200
Subject: [PATCH] Switching on support gradual infill and support offset to
 2*line width when support interface layer is enabled.

Relates to PP-108
---
 resources/definitions/ultimaker.def.json    | 20 +++++++++++++-------
 resources/definitions/ultimaker3.def.json   |  5 -----
 resources/definitions/ultimaker_s3.def.json |  5 -----
 resources/definitions/ultimaker_s5.def.json |  5 -----
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 172a7ccfbd..67a602bd19 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -221,19 +221,22 @@
             "value": true
         },
         "support_infill_rate": {
-            "value": "80 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 80"
+            "value": "0 if support_enable and support_structure == 'tree' else (80 if support_interface_enable else 15)"
         },
         "support_offset": {
-            "value": "2*line_width"
+            "value": "2*line_width if support_interface_enable else 0"
         },
         "support_xy_distance": {
             "value": "support_offset"
         },
+        "support_xy_distance_overhang": {
+            "value": "wall_line_width_0"
+        },
         "support_join_distance": {
             "value": 0
         },
         "gradual_support_infill_steps": {
-            "value": 2
+            "value": "2 if support_interface_enable else 0"
         },
         "gradual_support_infill_step_height": {
             "value": "4*layer_height"
@@ -247,14 +250,17 @@
         "support_interface_pattern": {
             "value": "'zigzag'"
         },
-        "support_interface_enable": {
-            "value": true
-        },
-        "minimum_interface_area": {
+         "minimum_interface_area": {
             "value": "minimum_support_area"
         },
         "support_interface_offset": {
             "value": "support_offset"
+        },
+        "support_use_towers": {
+            "value": false
+        },
+        "support_z_distance": {
+            "value": "0"
         }
     }
 }
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" },