diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index fc9fc98866..b74fe4f03c 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -1090,12 +1090,13 @@ "global_only": "True", "children": { "cool_fan_speed_min": { - "label": "Minimum Fan Speed", - "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", + "label": "Normal Fan Speed", + "description": "Normally the fan runs at the minimum fan speed. If a layer takes less than Shortest Layer Time Normal Fan Speed, the fan speed adjusts from Normal Fan Speed towards Maximum Fan Speed.", "unit": "%", "type": "float", "min_value": "0", - "max_value": "100", + "max_value": "min(100, cool_fan_speed_max)", + "inherit_function": "parent_value", "default": 100, "visible": false, "enabled": "cool_fan_enabled", @@ -1103,10 +1104,10 @@ }, "cool_fan_speed_max": { "label": "Maximum Fan Speed", - "description": "Normally the fan runs at the minimum fan speed. If the layer is slowed down due to minimum layer time, the fan speed adjusts between minimum and maximum fan speed.", + "description": "If a layer is slowed down due to minimum layer time, the fan speed will be the Maximum Fan Speed.", "unit": "%", "type": "float", - "min_value": "0", + "min_value": "max(0, cool_fan_speed_min)", "max_value": "100", "default": 100, "visible": false, @@ -1116,8 +1117,8 @@ } }, "cool_fan_full_at_height": { - "label": "Fan Full on at Height", - "description": "The height at which the fan is turned on completely. For the layers below this the fan speed is scaled linearly with the fan off for the first layer.", + "label": "Slow Fan Down Below Height", + "description": "The height at which the fan is set to Normal Fan Speed. For the layers below this the fan speed is scaled linearly with the fan off on the first layer.", "unit": "mm", "type": "float", "default": 0.5, @@ -1128,8 +1129,8 @@ "global_only": "True", "children": { "cool_fan_full_layer": { - "label": "Fan Full on at Layer", - "description": "The layer number at which the fan is turned on completely. For the layers below this the fan speed is scaled linearly with the fan off for the first layer.", + "label": "Slow Fan Down Below Layer", + "description": "The layer number at which the fan is set to Normal Fan Speed. For the layers below this the fan speed is scaled linearly with the fan off on the first layer.", "type": "int", "default": 1, "min_value": "0", @@ -1142,7 +1143,7 @@ }, "cool_min_layer_time": { "label": "Minimum Layer Time", - "description": "The minimum time spent in a layer: Gives the layer time to cool down before the next one is put on top. If a layer would print in less time, then the printer will slow down to make sure it has spent at least this many seconds printing the layer.", + "description": "The minimum time spent in a layer. Gives fast layers extra time to cool down before printing the next layer. If a layer would print in less time, then the printer will slow down to make sure it has spent at least this many seconds printing the layer.", "unit": "sec", "type": "float", "default": 5, @@ -1152,8 +1153,8 @@ "global_only": "True" }, "cool_min_layer_time_fan_speed_max": { - "label": "Minimum Layer Time Full Fan Speed", - "description": "The minimum time spent in a layer which will cause the fan to be at maximum speed. The fan speed increases linearly from minimum fan speed for layers taking the minimum layer time to maximum fan speed for layers taking the time specified here.", + "label": "Shortest Layer Time Normal Fan Speed", + "description": "The minimum time spent in a layer which will cause the fan to be at normal speed. All layers taking shorter than this time will get increased fan speeds, up to Maximum Fan Speed for layers taking Minmal Layer Time. All layers taking longer than this time will have Normal Fan Speed.", "unit": "sec", "type": "float", "default": 10, @@ -1164,7 +1165,7 @@ }, "cool_min_speed": { "label": "Minimum Speed", - "description": "The minimum layer time can cause the print to slow down so much it starts to droop. The minimum feedrate protects against this. Even if a print gets slowed down it will never be slower than this minimum speed.", + "description": "The minimum layer time can cause the print to slow down so much it starts to droop. The Minimum Speed protects against this. Even if a print gets slowed down it will never be slower than this minimum speed.", "unit": "mm/s", "type": "float", "default": 10, @@ -1175,7 +1176,7 @@ }, "cool_lift_head": { "label": "Lift Head", - "description": "Lift the head away from the print if the minimum speed is hit because of cool slowdown, and wait the extra time away from the print surface until the minimum layer time is used up.", + "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": "boolean", "default": false, "visible": false, diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index 50e95b7f67..4398e4efb6 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -8,13 +8,12 @@ "platform_texture": "Ultimaker2backplate.png", "visible": false, "file_formats": "text/x-gcode", - "inherits": "ultimaker2.json", + "inherits": "ultimaker2_olsson.json", "machine_settings": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, - "machine_height": { "default": 310 }, - "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 } + "machine_height": { "default": 313 }, + "machine_show_variants": { "default": true } } } diff --git a/resources/machines/ultimaker2_extended_olsson_025.json b/resources/machines/ultimaker2_extended_olsson_025.json index 7d5e1ba384..ea09020363 100644 --- a/resources/machines/ultimaker2_extended_olsson_025.json +++ b/resources/machines/ultimaker2_extended_olsson_025.json @@ -12,6 +12,7 @@ "variant": "0.25 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.25 } + "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 } } } diff --git a/resources/machines/ultimaker2_extended_olsson_040.json b/resources/machines/ultimaker2_extended_olsson_040.json index c031c5a7f4..dfbd4a94d9 100644 --- a/resources/machines/ultimaker2_extended_olsson_040.json +++ b/resources/machines/ultimaker2_extended_olsson_040.json @@ -13,6 +13,7 @@ "variant": "0.4 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2_extended_olsson_060.json b/resources/machines/ultimaker2_extended_olsson_060.json index ce811fa556..30d1cc082c 100644 --- a/resources/machines/ultimaker2_extended_olsson_060.json +++ b/resources/machines/ultimaker2_extended_olsson_060.json @@ -13,6 +13,7 @@ "variant": "0.6 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.60 } + "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 } } } diff --git a/resources/machines/ultimaker2_extended_olsson_080.json b/resources/machines/ultimaker2_extended_olsson_080.json index a7b703f051..04fe80337c 100644 --- a/resources/machines/ultimaker2_extended_olsson_080.json +++ b/resources/machines/ultimaker2_extended_olsson_080.json @@ -13,6 +13,7 @@ "variant": "0.8 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { - "machine_nozzle_size": { "default": 0.80 } + "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 } } } diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json index 89efeddabe..e6813fcce3 100644 --- a/resources/machines/ultimaker2_extended_plus.json +++ b/resources/machines/ultimaker2_extended_plus.json @@ -13,8 +13,9 @@ "machine_settings": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, - "machine_height": { "default": 310 }, + "machine_height": { "default": 313 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 } + "machine_nozzle_head_distance": { "default": 5 }, + "machine_nozzle_expansion_angle": { "default": 45 } } } diff --git a/resources/machines/ultimaker2_extended_plus_025.json b/resources/machines/ultimaker2_extended_plus_025.json index 06c98a2c95..187079aa33 100644 --- a/resources/machines/ultimaker2_extended_plus_025.json +++ b/resources/machines/ultimaker2_extended_plus_025.json @@ -11,6 +11,7 @@ "variant": "0.25 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.25 } + "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 } } } diff --git a/resources/machines/ultimaker2_extended_plus_040.json b/resources/machines/ultimaker2_extended_plus_040.json index 6ad7be488e..b548bbe423 100644 --- a/resources/machines/ultimaker2_extended_plus_040.json +++ b/resources/machines/ultimaker2_extended_plus_040.json @@ -11,6 +11,7 @@ "variant": "0.4 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2_extended_plus_060.json b/resources/machines/ultimaker2_extended_plus_060.json index 490a68e89c..9d39c267ba 100644 --- a/resources/machines/ultimaker2_extended_plus_060.json +++ b/resources/machines/ultimaker2_extended_plus_060.json @@ -11,6 +11,7 @@ "variant": "0.6 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.60 } + "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 } } } diff --git a/resources/machines/ultimaker2_extended_plus_080.json b/resources/machines/ultimaker2_extended_plus_080.json index e92064a54b..bf74998f57 100644 --- a/resources/machines/ultimaker2_extended_plus_080.json +++ b/resources/machines/ultimaker2_extended_plus_080.json @@ -11,6 +11,7 @@ "variant": "0.8 mm", "profiles_machine": "ultimaker2plus", "machine_settings": { - "machine_nozzle_size": { "default": 0.80 } + "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 } } } diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index ec6acd1a18..106c1c5f78 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -11,6 +11,11 @@ "inherits": "ultimaker2.json", "overrides": { - "machine_show_variants": { "default": true } + "machine_show_variants": { "default": true }, + "machine_nozzle_head_distance": { "default": 5 }, + "machine_nozzle_expansion_angle": { "default": 45 }, + "machine_height": { "default": 203 }, + "machine_heat_zone_length": { "default": 16 }, + "gantry_height": { "default": 52 } } } diff --git a/resources/machines/ultimaker2_olsson_025.json b/resources/machines/ultimaker2_olsson_025.json index cc70c21624..71552cddfd 100644 --- a/resources/machines/ultimaker2_olsson_025.json +++ b/resources/machines/ultimaker2_olsson_025.json @@ -14,6 +14,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 }, "coasting_volume": { "default": 0.1 }, "coasting_min_volume": { "default": 0.17 } diff --git a/resources/machines/ultimaker2_olsson_040.json b/resources/machines/ultimaker2_olsson_040.json index 481ff00b3a..ae1c3073d0 100644 --- a/resources/machines/ultimaker2_olsson_040.json +++ b/resources/machines/ultimaker2_olsson_040.json @@ -13,6 +13,7 @@ "variant": "0.4 mm", "overrides": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2_olsson_060.json b/resources/machines/ultimaker2_olsson_060.json index a0e2af8ee9..f87b79b64e 100644 --- a/resources/machines/ultimaker2_olsson_060.json +++ b/resources/machines/ultimaker2_olsson_060.json @@ -14,6 +14,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 }, "coasting_volume": { "default": 1.36 } } } diff --git a/resources/machines/ultimaker2_olsson_080.json b/resources/machines/ultimaker2_olsson_080.json index 9ab0497651..e3018e42ad 100644 --- a/resources/machines/ultimaker2_olsson_080.json +++ b/resources/machines/ultimaker2_olsson_080.json @@ -14,6 +14,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 }, "coasting_volume": { "default": 3.22 } } } diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json index fc1eafb4bb..e9114b769f 100644 --- a/resources/machines/ultimaker2plus.json +++ b/resources/machines/ultimaker2plus.json @@ -13,9 +13,12 @@ "overrides": { "machine_width": { "default": 230 }, "machine_depth": { "default": 225 }, - "machine_height": { "default": 200 }, + "machine_height": { "default": 203 }, "machine_show_variants": { "default": true }, - "gantry_height": { "default": 50 }, + "gantry_height": { "default": 52 }, + "machine_nozzle_head_distance": { "default": 5 }, + "machine_nozzle_expansion_angle": { "default": 45 }, + "machine_heat_zone_length": { "default": 16 }, "machine_head_with_fans_polygon": { "default": [ diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json index 0e13d8c34d..22bb33cb55 100644 --- a/resources/machines/ultimaker2plus_025.json +++ b/resources/machines/ultimaker2plus_025.json @@ -13,6 +13,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.25 }, + "machine_nozzle_tip_outer_diameter": { "default": 0.8 }, "coasting_volume": { "default": 0.1 }, "coasting_min_volume": { "default": 0.17 } } diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json index c98bde63d3..29fc1a75f3 100644 --- a/resources/machines/ultimaker2plus_040.json +++ b/resources/machines/ultimaker2plus_040.json @@ -12,6 +12,7 @@ "variant": "0.4 mm", "overrides": { - "machine_nozzle_size": { "default": 0.40 } + "machine_nozzle_size": { "default": 0.40 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.05 } } } diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json index 243241cb4c..cfcc2ab4f2 100644 --- a/resources/machines/ultimaker2plus_060.json +++ b/resources/machines/ultimaker2plus_060.json @@ -13,6 +13,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.60 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.25 }, "coasting_volume": { "default": 1.36 } } } diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json index be08f5c5a3..2f2cd2571c 100644 --- a/resources/machines/ultimaker2plus_080.json +++ b/resources/machines/ultimaker2plus_080.json @@ -13,6 +13,7 @@ "overrides": { "machine_nozzle_size": { "default": 0.80 }, + "machine_nozzle_tip_outer_diameter": { "default": 1.35 }, "coasting_volume": { "default": 3.22 } } }