Clean up of jerk settings. Moved the jerk setting up to ultimaker.def.json. Removed duplicate entries in quality profiles and removed a number of strange jerk entries in the quality profiles.

Relates to PP-19

4 files changed, 50 insertions, 45 deletions

diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json
index 2946a06c6d..3b4e830238 100644
--- a/resources/definitions/ultimaker.def.json
+++ b/resources/definitions/ultimaker.def.json
@@ -89,9 +89,6 @@
         "meshfix_maximum_deviation": {
             "value": "machine_nozzle_size / 10"
         },
-        "jerk_travel": {
-            "value": "jerk_print"
-        },
         "acceleration_travel": {
             "value": "acceleration_wall"
         },
@@ -154,6 +151,56 @@
         },
         "bridge_fan_speed_3": {
              "value": "cool_fan_speed_min"
+        },
+        "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 5505cf4ddf..99e4ab4176 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": {"value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 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": {"value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"value": "jerk_print", "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'))" },
diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json
index 5761b09c19..cff2fe741d 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": {"value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 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": {"value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"value": "jerk_print", "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'))" },
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json
index bfd80caeab..f59250f908 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": {"value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_support_interface": {"value": "jerk_topbottom", "minimum_value_warning": 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": {"value": "jerk_print", "minimum_value_warning": 20 },
-        "jerk_travel_layer_0": {"value": "jerk_travel", "minimum_value_warning": 20 },
-        "jerk_skirt_brim": {"value": "jerk_print", "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'))" },