Merge branch 'Ultimaker:main' into master

9 files changed, 129 insertions, 62 deletions

diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json
index 067422354e..352cd23394 100644
--- a/resources/definitions/SV02.def.json
+++ b/resources/definitions/SV02.def.json
@@ -44,7 +44,6 @@
         "machine_max_jerk_xy": { "value": 8 },

         "machine_max_jerk_z": { "value": 0.4 },

         "machine_max_jerk_e": { "value": 5 },

-        "machine_heated_bed": { "default_value": true },

         "material_diameter": { "default_value": 1.75 },

         "infill_overlap": { "default_value": 15	},

         "acceleration_print": { "value": 500 },

diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json
index c411162359..6763cbb7f2 100644
--- a/resources/definitions/fdmprinter.def.json
+++ b/resources/definitions/fdmprinter.def.json
@@ -2256,7 +2256,7 @@
                     "maximum_value": "machine_height",
                     "maximum_value_warning": "resolveOrValue('infill_sparse_thickness') * 10",
                     "type": "float",
-                    "value": "0 if infill_sparse_density > 0 else 0",
+                    "value": "0",
                     "limit_to_extruder": "infill_extruder_nr",
                     "enabled": "infill_sparse_density > 0",
                     "settable_per_mesh": true,
diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 5818c11a6f..8c6d8c0dda 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -50,23 +50,29 @@
         "wall_thickness": {
             "value": "wall_line_width_0 + wall_line_width_x"
         },
-        "infill_before_walls": {
-            "value": "False"
-        },
         "infill_material_flow": {
             "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow"
         },
         "retraction_combing": {
             "value": "'no_outer_surfaces'"
         },
+        "retraction_count_max": {
+            "value": 25
+        },
+        "retraction_extrusion_window": {
+            "value": 1
+        },
         "roofing_layer_count": {
-            "value": "0"
+            "value": "1"
         },
         "roofing_material_flow": {
             "value": "material_flow"
         },
         "skin_material_flow": {
-            "value": "0.97 * material_flow"
+            "value": "0.95 * material_flow"
+        },
+        "support_interface_material_flow": {
+            "value": "skin_material_flow"
         },
         "skin_monotonic" : {
             "value": true
@@ -89,11 +95,124 @@
         "meshfix_maximum_deviation": {
             "value": "machine_nozzle_size / 10"
         },
-        "jerk_travel": {
-            "value": "jerk_print"
+        "jerk_travel_enabled": {
+            "value": false
+        },
+        "acceleration_travel_enabled": {
+            "value": false
         },
         "acceleration_travel": {
             "value": "acceleration_wall"
+        },
+        "skin_edge_support_thickness": {
+            "value": "4 * layer_height if infill_sparse_density < 30 else 0"
+        },
+        "bridge_settings_enabled": {
+            "value": false
+        },
+        "bridge_wall_min_length": {
+            "value": 0
+        },
+        "bridge_skin_support_threshold": {
+            "value": 50
+        },
+        "bridge_sparse_infill_max_density": {
+            "value": 0
+        },
+        "bridge_wall_coast": {
+            "value": 0
+        },
+        "bridge_wall_speed": {
+            "value": "speed_wall"
+        },
+        "bridge_wall_material_flow": {
+            "value": "wall_material_flow"
+        },
+        "bridge_skin_speed": {
+            "value": "speed_topbottom"
+        },
+        "bridge_skin_material_flow": {
+            "value": "skin_material_flow"
+        },
+        "bridge_skin_density": {
+            "value": "80"
+        },
+        "bridge_fan_speed": {
+             "value": "cool_fan_speed_max"
+        },
+        "bridge_enable_more_layers": {
+            "value": false
+        },
+        "bridge_skin_speed_2": {
+            "value": "speed_topbottom"
+        },
+        "bridge_skin_material_flow_2": {
+            "value": "skin_material_flow"
+        },
+        "bridge_skin_density_2": {
+            "value": 100
+        },
+        "bridge_fan_speed_2": {
+            "value": "cool_fan_speed_min"
+        },
+        "bridge_skin_speed_3": {
+             "value": "speed_topbottom"
+        },
+        "bridge_skin_material_flow_3": {
+            "value": "skin_material_flow"
+        },
+        "bridge_skin_density_3": {
+             "value": 100
+        },
+        "bridge_fan_speed_3": {
+             "value": "cool_fan_speed_min"
+        },
+        "jerk_print": {
+            "value": "20",
+            "minimum_value_warning": 20
+        },
+        "jerk_infill": {
+            "minimum_value_warning": 20
+        },
+        "jerk_wall": {
+            "minimum_value_warning": 20
+        },
+        "jerk_wall_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_roofing": {
+            "minimum_value_warning": 20
+        },
+        "jerk_topbottom": {
+            "minimum_value_warning": 20
+        },
+        "jerk_support": {
+            "minimum_value_warning": 20
+        },
+        "jerk_support_infill": {
+            "minimum_value_warning": 20
+        },
+        "jerk_support_interface": {
+            "minimum_value_warning": 20
+        },
+        "jerk_prime_tower": {
+            "minimum_value_warning": 20
+        },
+        "jerk_layer_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_print_layer_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_travel": {
+            "value": "jerk_print",
+            "minimum_value_warning": 20
+        },
+        "jerk_travel_layer_0": {
+            "minimum_value_warning": 20
+        },
+        "jerk_skirt_brim": {
+            "minimum_value_warning": 20
         }
     }
 }
diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json
index fd21ab5271..858d5f91a7 100644
--- a/resources/definitions/ultimaker3.def.json
+++ b/resources/definitions/ultimaker3.def.json
@@ -101,20 +101,6 @@
         "infill_wipe_dist": { "value": "0" },
         "initial_layer_line_width_factor": { "value": "120" },
         "jerk_enabled": { "value": "True" },
-        "jerk_print": { "value": "20", "minimum_value_warning": 20 },
-        "jerk_infill": {"minimum_value_warning": 20 },
-        "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
-        "jerk_roofing": {"minimum_value_warning": 20 },
-        "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_infill": {"minimum_value_warning": 20 },
-        "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
-        "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
-        "jerk_print_layer_0": {"minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"minimum_value_warning": 20 },
         "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'))" },
@@ -136,8 +122,6 @@
         "raft_margin": { "value": "10" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 640a062c6d..67f8ddab83 100644
--- a/resources/definitions/ultimaker_s3.def.json
+++ b/resources/definitions/ultimaker_s3.def.json
@@ -93,20 +93,6 @@
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
-        "jerk_print": { "value": "20", "minimum_value_warning": 20 },
-        "jerk_infill": {"minimum_value_warning": 20 },
-        "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
-        "jerk_roofing": {"minimum_value_warning": 20 },
-        "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_infill": {"minimum_value_warning": 20 },
-        "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
-        "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
-        "jerk_print_layer_0": {"minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"minimum_value_warning": 20 },
         "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'))" },
@@ -128,8 +114,6 @@
         "raft_speed": { "value": "25" },
         "raft_surface_layers": { "value": "1" },
         "retraction_amount": { "value": "6.5" },
-        "retraction_count_max": { "value": "10" },
-        "retraction_extrusion_window": { "value": "1" },
         "retraction_hop": { "value": "2" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },
@@ -155,7 +139,6 @@
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "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" },
         "initial_layer_line_width_factor": { "value": "120" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index 0d5d7499cc..005c876117 100644
--- a/resources/definitions/ultimaker_s5.def.json
+++ b/resources/definitions/ultimaker_s5.def.json
@@ -95,20 +95,6 @@
         "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
         "infill_wipe_dist": { "value": "0" },
         "jerk_enabled": { "value": "True" },
-        "jerk_print": { "value": "20", "minimum_value_warning": 20 },
-        "jerk_infill": {"minimum_value_warning": 20 },
-        "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 },
-        "jerk_roofing": {"minimum_value_warning": 20 },
-        "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_infill": {"minimum_value_warning": 20 },
-        "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"},
-        "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20},
-        "jerk_print_layer_0": {"minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"minimum_value_warning": 20 },
         "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'))" },
@@ -130,8 +116,6 @@
         "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" },
         "retraction_hop_enabled": { "value": "extruders_enabled_count > 1"  },
         "retraction_hop_only_when_collides": { "value": "True" },
@@ -157,7 +141,6 @@
         "switch_extruder_prime_speed": { "value": "15" },
         "switch_extruder_retraction_amount": { "value": "8" },
         "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" },
         "optimize_wall_printing_order": { "value": "True" },
diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json
index 06ba86de2d..82b05f3366 100644
--- a/resources/definitions/uni_base.def.json
+++ b/resources/definitions/uni_base.def.json
@@ -138,7 +138,6 @@
         "machine_height":                    {"default_value": 250},
         "machine_extruder_count":            {"value": 2}, 
         "machine_buildplate_type":           {"value": "glass"},
-        "machine_heated_bed":                {"default_value": true},
         "machine_center_is_zero":            {"default_value": false},
         "machine_gcode_flavor":              {"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_head_with_fans_polygon":    {"default_value": [
diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json
index ec069b24fb..b9a1484ae7 100644
--- a/resources/definitions/voron2_base.def.json
+++ b/resources/definitions/voron2_base.def.json
@@ -98,8 +98,9 @@
         "machine_start_gcode":                          { "default_value": "print_start" },
         "machine_end_gcode":                            { "default_value": "print_end" },
         "adhesion_type":                                { "default_value": "skirt" },
+        "retraction_amount":                            { "default_value": 0.75 },
         "skirt_brim_minimal_length":                    { "default_value": 550 },
-        "retraction_speed":                             { "default_value": 80, "maximum_value_warning": 130 },
+        "retraction_speed":                             { "default_value": 30, "maximum_value_warning": 130 },
         "retraction_retract_speed":                     { "maximum_value_warning": 130 },
         "retraction_prime_speed":                       { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 },
         "retraction_hop_enabled":                       { "default_value": true },
diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json
index 1ef9398987..9f73419d46 100644
--- a/resources/definitions/zav_base.def.json
+++ b/resources/definitions/zav_base.def.json
@@ -147,7 +147,6 @@
         "machine_height":                    {"default_value": 270},
         "machine_extruder_count":            {"value": 1}, 
         "machine_buildplate_type":           {"value": "glass"},
-        "machine_heated_bed":                {"default_value": true},
         "machine_center_is_zero":            {"default_value": false},
         "machine_gcode_flavor":              {"default_value": "RepRap (Marlin/Sprinter)"},
         "machine_head_with_fans_polygon":    {"default_value": [