From 384f4fbeaf62d0b99a9a41abaa7f829eda67119b Mon Sep 17 00:00:00 2001 From: Kurt Loeffler Date: Mon, 14 Dec 2015 10:29:02 -0800 Subject: [PATCH 1/2] Reverting 88c8765ee2085d311f965ae66e4d9ae09bd8b113 --- resources/machines/fdmprinter.json | 20 ++++++++++---------- resources/machines/ultimaker2.json | 3 +-- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index ca6bed88b2..d6f7b87685 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -177,8 +177,8 @@ "visible": false }, "line_width": { - "label": "Nozzle Diameter", - "description": "The inner diameter of your printer's nozzle. Each line will be printed with this width in mind. The outer wall and top/bottom surface line widths may be set to a smaller value for higher surface quality. This field was previously named Line Width.", + "label": "Line Width", + "description": "Width of a single line. Each line will be printed with this width in mind. Generally the width of each line should correspond to the width of your nozzle, but for the outer wall and top/bottom surface smaller line widths may be chosen, for higher quality.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -190,7 +190,7 @@ "children": { "wall_line_width": { "label": "Wall Line Width", - "description": "Width of a single shell line. This value will be used instead of Nozzle Diameter when printing shell lines.", + "description": "Width of a single shell line. Each line of the shell will be printed with this width in mind.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -201,7 +201,7 @@ "children": { "wall_line_width_0": { "label": "Outer Wall Line Width", - "description": "Width of the outermost shell line. By printing a thinner outermost wall line you can print higher details with a larger nozzle. This value will be used instead of Nozzle Diameter when printing outermost shell lines.", + "description": "Width of the outermost shell line. By printing a thinner outermost wall line you can print higher details with a larger nozzle.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -212,7 +212,7 @@ }, "wall_line_width_x": { "label": "Other Walls Line Width", - "description": "Width of a single shell line for all shell lines except the outermost one. This value will be used instead of Nozzle Diameter when printing all shell lines except the outermost one.", + "description": "Width of a single shell line for all shell lines except the outermost one.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -225,7 +225,7 @@ }, "skirt_line_width": { "label": "Skirt line width", - "description": "Width of a single skirt line. This value will be used instead of Nozzle Diameter when printing skirts.", + "description": "Width of a single skirt line.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -236,7 +236,7 @@ }, "skin_line_width": { "label": "Top/bottom line width", - "description": "Width of a single top/bottom printed line, used to fill up the top/bottom areas of a print. This value will be used instead of Nozzle Diameter when printing top/bottom lines.", + "description": "Width of a single top/bottom printed line, used to fill up the top/bottom areas of a print.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -247,7 +247,7 @@ }, "infill_line_width": { "label": "Infill line width", - "description": "Width of the inner infill printed lines. This value will be used instead of Nozzle Diameter when infill lines.", + "description": "Width of the inner infill printed lines.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -258,7 +258,7 @@ }, "support_line_width": { "label": "Support line width", - "description": "Width of the printed support structures lines. This value will be used instead of Nozzle Diameter when printing support structure lines.", + "description": "Width of the printed support structures lines.", "unit": "mm", "min_value": "0.0001", "min_value_warning": "0.2", @@ -270,7 +270,7 @@ }, "support_roof_line_width": { "label": "Support Roof line width", - "description": "Width of a single support roof line, used to fill the top of the support. This value will be used instead of Nozzle Diameter when printing support roof lines.", + "description": "Width of a single support roof line, used to fill the top of the support.", "unit": "mm", "default": 0.4, "type": "float", diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index 09beee6147..fb9e980b86 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -87,7 +87,6 @@ "material_print_temperature": { "enabled": "False" }, "material_bed_temperature": { "enabled": "False" }, "material_diameter": { "enabled": "False" }, - "material_flow": { "enabled": "False" }, - "line_width": { "description": "The inner diameter of your printer's nozzle. If you are using an Olsson Block with a non-standard nozzle size then change this field to match the nozzle size you are using. Each line will be printed with this width in mind. The outer wall and top/bottom surface line widths may be set to a smaller value for higher surface quality. This field was previously named Line Width." } + "material_flow": { "enabled": "False" } } } From 608bfa568b650e803add53002b140bfeb56225df Mon Sep 17 00:00:00 2001 From: Kurt Loeffler Date: Mon, 14 Dec 2015 11:14:55 -0800 Subject: [PATCH 2/2] Moved machine_nozzle_size from machine_settings to categories/resolution so it is exposed in the UI. --- resources/machines/fdmprinter.json | 12 +++++++++--- resources/machines/ultimaker2.json | 5 +---- resources/machines/ultimaker_original.json | 3 --- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index d6f7b87685..c6d74e5091 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -61,9 +61,6 @@ "description": "Number of extruder trains. An extruder train is the combination of a feeder, bowden tube, and nozzle.", "default": 1 }, - "machine_nozzle_size": { - "description": "The inner diameter of the hole in the nozzle.", - "default": 0.4, "SEE_machine_extruder_trains": true }, "machine_nozzle_tip_outer_diameter": { "description": "The outer diameter of the tip of the nozzle.", "default": 1, "SEE_machine_extruder_trains": true }, @@ -154,6 +151,15 @@ "visible": true, "icon": "category_layer_height", "settings": { + "machine_nozzle_size": { + "label": "Nozzle Diameter", + "description": "The inner diameter of the hole in the nozzle.", + "unit": "mm", + "type": "float", + "default": 0.4, + "min_value": "0.001", + "visible": false + }, "layer_height": { "label": "Layer Height", "description": "The height of each layer, in mm. Normal quality prints are 0.1mm, high quality is 0.06mm. You can go up to 0.25mm with an Ultimaker for very fast prints at low quality. For most purposes, layer heights between 0.1 and 0.2mm give a good tradeoff of speed and surface finish.", diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index fb9e980b86..f4bbf5011a 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -13,9 +13,6 @@ "machine_extruder_trains": { "0": { - "machine_nozzle_size": { - "default": 0.4 - }, "machine_nozzle_heat_up_speed": { "default": 2.0 }, @@ -66,7 +63,7 @@ ] }, "machine_center_is_zero": { "default": false }, - "machine_nozzle_size": { "default": 0.4 }, + "machine_nozzle_size": { "default": 0.4, "description": "The inner diameter of the hole in the nozzle. If you are using an Olsson Block with a non-standard nozzle then set this field to the nozzle size you are using." }, "machine_nozzle_heat_up_speed": { "default": 2.0 }, "machine_nozzle_cool_down_speed": { "default": 2.0 }, "gantry_height": { "default": 55 }, diff --git a/resources/machines/ultimaker_original.json b/resources/machines/ultimaker_original.json index 1ec13c0005..272030c4a6 100644 --- a/resources/machines/ultimaker_original.json +++ b/resources/machines/ultimaker_original.json @@ -18,9 +18,6 @@ "machine_extruder_trains": { "0": { - "machine_nozzle_size": { - "default": 0.4 - }, "machine_nozzle_heat_up_speed": { "default": 2.0 },