diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json index 0f57e4e1bc..ccdd6475f8 100644 --- a/resources/machines/RigidBot.json +++ b/resources/machines/RigidBot.json @@ -18,6 +18,8 @@ "machine_nozzle_size": { "default": 0.4, "visible": true }, + "machine_nozzle_heat_up_speed": { "default": 2.0 }, + "machine_nozzle_cool_down_speed": { "default": 2.0 }, "machine_head_shape_min_x": { "default": 0 }, "machine_head_shape_min_y": { "default": 0 }, "machine_head_shape_max_x": { "default": 0 }, diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json index f97d5845e4..b3f3f29728 100644 --- a/resources/machines/RigidBotBig.json +++ b/resources/machines/RigidBotBig.json @@ -16,6 +16,8 @@ "machine_heated_bed": { "default": true }, "machine_nozzle_size": { "default": 0.4}, + "machine_nozzle_heat_up_speed": { "default": 2.0 }, + "machine_nozzle_cool_down_speed": { "default": 2.0 }, "machine_head_shape_min_x": { "default": 0 }, "machine_head_shape_min_y": { "default": 0 }, "machine_head_shape_max_x": { "default": 0 }, diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index c8b1393827..f836fdcc13 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -38,6 +38,8 @@ "machine_nozzle_head_distance": { "default": 3, "SEE_machine_extruder_trains": true }, "machine_nozzle_expansion_angle": { "default": 45, "SEE_machine_extruder_trains": true }, "machine_heat_zone_length": { "default": 16, "SEE_machine_extruder_trains": true }, + "machine_nozzle_heat_up_speed": { "default": 2.0, "SEE_machine_extruder_trains": true }, + "machine_nozzle_cool_down_speed": { "default": 2.0, "SEE_machine_extruder_trains": true }, "machine_gcode_flavor": { "default": "RepRap" }, @@ -513,6 +515,13 @@ "visible": true, "icon": "category_material", "settings": { + "material_flow_dependent_temperature": { + "label": "Auto Temperature", + "description": "Change the temperature each layer automatically with the average flow speed of that layer.", + "type": "boolean", + "default": true, + "visible": true + }, "material_print_temperature": { "label": "Printing Temperature", "description": "The temperature used for printing. Set at 0 to pre-heat yourself. For PLA a value of 210C is usually used.\nFor ABS a value of 230C or higher is required.", @@ -520,8 +529,35 @@ "type": "float", "default": 210, "min_value": "0", + "max_value_warning": "260", + "enabled": "not (material_flow_dependent_temperature)" + }, + "material_flow_temp_graph": { + "label": "Flow Temperature Graph", + "description": "Data linking material flow (in mm³/s) to temperature (°C).", + "unit": "", + "type": "string", + "default": "[[0.1,180],[20,230]]", + "enabled": "material_flow_dependent_temperature" + }, + "material_standby_temperature": { + "label": "Standby Temperature", + "description": "The temperature of the nozzle when another nozzle is currently used for printing.", + "unit": "°C", + "type": "float", + "default": 150, + "min_value": "0", "max_value_warning": "260" }, + "material_extrusion_cool_down_speed": { + "label": "Extrusion Cool Down Speed Modifier", + "description": "The extra speed by which the nozzle cools when while extruding. The same value is used to signify the heat up speed lost when heating up while extruding.", + "unit": "°C/s", + "type": "float", + "default": 0.5, + "min_value": "0", + "max_value_warning": "10.0" + }, "material_bed_temperature": { "label": "Bed Temperature", "description": "The temperature used for the heated printer bed. Set at 0 to pre-heat it yourself.", diff --git a/resources/machines/grr_neo.json b/resources/machines/grr_neo.json index 472062a097..488909c79c 100644 --- a/resources/machines/grr_neo.json +++ b/resources/machines/grr_neo.json @@ -16,6 +16,8 @@ "machine_depth": { "default": 150 }, "machine_center_is_zero": { "default": false }, "machine_nozzle_size": { "default": 0.5 }, + "machine_nozzle_heat_up_speed": { "default": 2.0 }, + "machine_nozzle_cool_down_speed": { "default": 2.0 }, "machine_head_shape_min_x": { "default": 75 }, "machine_head_shape_min_y": { "default": 18 }, "machine_head_shape_max_x": { "default": 18 }, diff --git a/resources/machines/maker_starter.json b/resources/machines/maker_starter.json index 8ff7bbd7c0..7e4e08f175 100644 --- a/resources/machines/maker_starter.json +++ b/resources/machines/maker_starter.json @@ -17,6 +17,8 @@ "machine_center_is_zero": { "default": false }, "machine_nozzle_size": { "default": 0.4 }, + "machine_nozzle_heat_up_speed": { "default": 2.0 }, + "machine_nozzle_cool_down_speed": { "default": 2.0 }, "machine_head_shape_min_x": { "default": 0 }, "machine_head_shape_min_y": { "default": 0 }, "machine_head_shape_max_x": { "default": 0 }, diff --git a/resources/machines/prusa_i3.json b/resources/machines/prusa_i3.json index 4311bc1fc2..997a246601 100644 --- a/resources/machines/prusa_i3.json +++ b/resources/machines/prusa_i3.json @@ -16,6 +16,8 @@ "machine_depth": { "default": 200 }, "machine_center_is_zero": { "default": false }, "machine_nozzle_size": { "default": 0.4 }, + "machine_nozzle_heat_up_speed": { "default": 2.0 }, + "machine_nozzle_cool_down_speed": { "default": 2.0 }, "machine_head_shape_min_x": { "default": 75 }, "machine_head_shape_min_y": { "default": 18 }, "machine_head_shape_max_x": { "default": 18 }, diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index 99f2247b0e..319e47cd57 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -16,6 +16,12 @@ "machine_nozzle_size": { "default": 0.4 }, + "machine_nozzle_heat_up_speed": { + "default": 2.0 + }, + "machine_nozzle_cool_down_speed": { + "default": 2.0 + }, "machine_nozzle_tip_outer_diameter": { "default": 1 }, @@ -61,6 +67,8 @@ }, "machine_center_is_zero": { "default": false }, "machine_nozzle_size": { "default": 0.4 }, + "machine_nozzle_heat_up_speed": { "default": 2.0 }, + "machine_nozzle_cool_down_speed": { "default": 2.0 }, "gantry_height": { "default": 55 }, "machine_use_extruder_offset_to_offset_coords": { "default": true }, "machine_gcode_flavor": { "default": "UltiGCode" }, diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index 6ea8d65cee..4c94d5e4c4 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -21,6 +21,12 @@ "machine_nozzle_size": { "default": 0.4 }, + "machine_nozzle_heat_up_speed": { + "default": 2.0 + }, + "machine_nozzle_cool_down_speed": { + "default": 2.0 + }, "machine_nozzle_tip_outer_diameter": { "default": 1 }, @@ -41,6 +47,8 @@ "machine_depth": { "default": 205 }, "machine_center_is_zero": { "default": false }, "machine_nozzle_size": { "default": 0.4 }, + "machine_nozzle_heat_up_speed": { "default": 2.0 }, + "machine_nozzle_cool_down_speed": { "default": 2.0 }, "machine_head_with_fans_polygon": { "default": [