Merge pull request #14373 from Ultimaker/PP-71_improved-minimum-layer-time-behaviour

PP-71_improved-minimum-layer-time-behaviour

resources/definitions/fdmprinter.def.json

@@ -4405,6 +4405,7 @@
                     "unit": "mm/s",
                     "type": "float",
                     "default_value": 10,
+                    "enabled": "cool_min_layer_time > 0",
                     "minimum_value": "0",
                     "maximum_value_warning": "100",
                     "settable_per_mesh": false,
@@ -4416,6 +4417,7 @@
                     "description": "When the minimum speed is hit because of minimum layer time, lift the head away from the print and wait the extra time until the minimum layer time is reached.",
                     "type": "bool",
                     "default_value": false,
+                    "enabled": "cool_min_layer_time > 0",
                     "settable_per_mesh": false,
                     "settable_per_extruder": true
                 },
@@ -4426,6 +4428,7 @@
                     "unit": "\u00b0C",
                     "type": "float",
                     "value": "material_print_temperature",
+                    "enabled": "cool_min_layer_time > 0",
                     "minimum_value": "material_final_print_temperature",
                     "maximum_value": "material_print_temperature",
                     "settable_per_mesh": false,

resources/definitions/ultimaker.def.json

@@ -37,6 +37,11 @@
         "bridge_wall_material_flow": { "value": "wall_material_flow" },
         "bridge_wall_speed": { "value": "bridge_skin_speed" },
         "cool_fan_speed_0": { "value": "cool_fan_speed_min" },
+        "cool_fan_speed_max": { "value": "100" },
+        "cool_min_layer_time": { "value": 6 },
+        "cool_min_layer_time_fan_speed_max": { "value": "cool_min_layer_time + 5" },
+        "cool_min_speed": { "value": "round(speed_wall_0 * 3 / 4) if cool_lift_head else round(speed_wall_0 / 5)" },
+        "cool_min_temperature": { "value": "material_print_temperature - 15" },
         "gradual_support_infill_step_height": { "value": "4 * layer_height" },
         "gradual_support_infill_steps": { "value": "2 if support_interface_enable else 0" },
         "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" },

resources/definitions/ultimaker2_plus_connect.def.json

@@ -101,11 +101,6 @@
         "machine_width": { "default_value": 223 },
         "material_bed_temperature": { "maximum_value": 110 },
         "material_bed_temperature_layer_0": { "maximum_value": 110 },
-        "material_final_print_temperature":
-        {
-            "maximum_value": 260,
-            "value": "material_print_temperature"
-        },
         "material_initial_print_temperature":
         {
             "maximum_value": 260,

resources/definitions/ultimaker3.def.json

@@ -60,8 +60,6 @@
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 3500)" },
         "brim_width": { "value": "3" },
         "cool_fan_speed": { "value": "50" },
-        "cool_fan_speed_max": { "value": "100" },
-        "cool_min_speed": { "value": "5" },
         "default_material_print_temperature": { "value": "200" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gantry_height": { "value": "60" },

resources/definitions/ultimaker_s3.def.json

@@ -58,8 +58,6 @@
         "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" },
         "brim_width": { "value": "3" },
         "cool_fan_speed": { "value": "50" },
-        "cool_fan_speed_max": { "value": "100" },
-        "cool_min_speed": { "value": "5" },
         "default_material_print_temperature": { "value": "200" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gantry_height": { "value": "55" },

resources/definitions/ultimaker_s5.def.json

@@ -60,8 +60,6 @@
         "brim_width": { "value": "3" },
         "build_volume_temperature": { "maximum_value": 50 },
         "cool_fan_speed": { "value": "50" },
-        "cool_fan_speed_max": { "value": "100" },
-        "cool_min_speed": { "value": "5" },
         "default_material_print_temperature": { "value": "200" },
         "extruder_prime_pos_abs": { "default_value": true },
         "gantry_height": { "value": "55" },

resources/quality/ultimaker2_plus/um2p_abs_0.25_normal.inst.cfg

@@ -13,9 +13,6 @@ weight = 1
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_layer_time = 3
-cool_min_layer_time_fan_speed_max = 15
-cool_min_speed = 10
 infill_sparse_density = 22
 speed_print = 30
 top_bottom_thickness = 0.72

resources/quality/ultimaker2_plus/um2p_abs_0.4_fast.inst.cfg

@@ -13,9 +13,6 @@ weight = -1
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_layer_time = 3
-cool_min_layer_time_fan_speed_max = 15
-cool_min_speed = 10
 infill_sparse_density = 18
 speed_infill = =math.ceil(speed_print * 100 / 55)
 speed_print = 55

resources/quality/ultimaker2_plus/um2p_abs_0.4_high.inst.cfg

@@ -13,9 +13,6 @@ weight = 1
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_layer_time = 3
-cool_min_layer_time_fan_speed_max = 15
-cool_min_speed = 10
 infill_sparse_density = 22
 speed_infill = =math.ceil(speed_print * 45 / 45)
 speed_print = 45

resources/quality/ultimaker2_plus/um2p_abs_0.4_normal.inst.cfg

@@ -13,9 +13,6 @@ weight = 0
 
 [values]
 cool_fan_speed_min = =cool_fan_speed * 0.2
-cool_min_layer_time = 3
-cool_min_layer_time_fan_speed_max = 15
-cool_min_speed = 10
 infill_sparse_density = 20
 speed_print = 45
 speed_wall = =math.ceil(speed_print * 30 / 45)