diff --git a/resources/machines/RigidBot.json b/resources/machines/RigidBot.json index c136e8fbb8..99991e5fdb 100644 --- a/resources/machines/RigidBot.json +++ b/resources/machines/RigidBot.json @@ -37,7 +37,6 @@ "overrides": { "layer_height": { "default": 0.2 }, - "shell_thickness": { "default": 0.8 }, "wall_thickness": { "default": 0.8 }, "top_bottom_thickness": { "default": 0.3, "visible": true }, "material_print_temperature": { "default": 195, "visible": true }, diff --git a/resources/machines/RigidBotBig.json b/resources/machines/RigidBotBig.json index fdb2d06bf6..49458a7e31 100644 --- a/resources/machines/RigidBotBig.json +++ b/resources/machines/RigidBotBig.json @@ -35,7 +35,6 @@ "overrides": { "layer_height": { "default": 0.2 }, - "shell_thickness": { "default": 0.8}, "wall_thickness": { "default": 0.8 }, "top_bottom_thickness": { "default": 0.3, "visible": true }, "material_print_temperature": { "default": 195, "visible": true }, diff --git a/resources/machines/bq_hephestos.json b/resources/machines/bq_hephestos.json index 46e90b539e..b895dfbc13 100644 --- a/resources/machines/bq_hephestos.json +++ b/resources/machines/bq_hephestos.json @@ -40,7 +40,6 @@ "overrides": { "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, - "shell_thickness": { "default": 1.0 }, "wall_thickness": { "default": 1.0, "visible": false }, "top_bottom_thickness": { "default": 1.0, "visible": false}, "bottom_thickness": { "default": 1.0, "visible": false }, diff --git a/resources/machines/bq_hephestos_2.json b/resources/machines/bq_hephestos_2.json index e602c8d34a..f9f5786507 100644 --- a/resources/machines/bq_hephestos_2.json +++ b/resources/machines/bq_hephestos_2.json @@ -43,7 +43,6 @@ "material_diameter": { "default": 1.75 }, "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": true }, - "shell_thickness": { "default": 1.2 }, "wall_line_count": { "default": 3, "visible": false }, "wall_thickness": { "default": 1.2, "visible": false }, "top_bottom_thickness": { "default": 1.2, "visible": false }, diff --git a/resources/machines/bq_hephestos_xl.json b/resources/machines/bq_hephestos_xl.json index 2027be980e..a6ad6261ed 100644 --- a/resources/machines/bq_hephestos_xl.json +++ b/resources/machines/bq_hephestos_xl.json @@ -40,7 +40,6 @@ "overrides": { "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, - "shell_thickness": { "default": 1.0 }, "wall_thickness": { "default": 1.0, "visible": false }, "top_bottom_thickness": { "default": 1.0, "visible": false}, "bottom_thickness": { "default": 1.0, "visible": false }, diff --git a/resources/machines/bq_witbox.json b/resources/machines/bq_witbox.json index d7b1789976..a2fad0fd49 100644 --- a/resources/machines/bq_witbox.json +++ b/resources/machines/bq_witbox.json @@ -40,7 +40,6 @@ "overrides": { "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": false }, - "shell_thickness": { "default": 1.0 }, "wall_thickness": { "default": 1.0, "visible": false }, "top_bottom_thickness": { "default": 1.0, "visible": false}, "bottom_thickness": { "default": 1.0, "visible": false }, diff --git a/resources/machines/bq_witbox_2.json b/resources/machines/bq_witbox_2.json index 77b0a55738..e7fe50cea9 100644 --- a/resources/machines/bq_witbox_2.json +++ b/resources/machines/bq_witbox_2.json @@ -43,7 +43,6 @@ "material_diameter": { "default": 1.75 }, "layer_height": { "default": 0.2 }, "layer_height_0": { "default": 0.2, "visible": true }, - "shell_thickness": { "default": 1.2 }, "wall_line_count": { "default": 3, "visible": false }, "wall_thickness": { "default": 1.2, "visible": false }, "top_bottom_thickness": { "default": 1.2, "visible": false }, diff --git a/resources/machines/fdmprinter.json b/resources/machines/fdmprinter.json index a566d81312..31dda7d204 100644 --- a/resources/machines/fdmprinter.json +++ b/resources/machines/fdmprinter.json @@ -340,92 +340,78 @@ "visible": true, "icon": "category_shell", "settings": { - "shell_thickness": { - "label": "Shell Thickness", - "description": "The thickness of the outside shell in the horizontal and vertical direction. This is used in combination with the nozzle size to define the number of perimeter lines and the thickness of those perimeter lines. This is also used to define the number of solid top and bottom layers.", + "wall_thickness": { + "label": "Wall Thickness", + "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.", "unit": "mm", - "type": "float", "default": 0.8, "min_value": "0", - "min_value_warning": "0.2", - "max_value_warning": "5", - "visible": false, - "enabled": "False", + "min_value_warning": "line_width", + "max_value_warning": "5 * line_width", + "type": "float", + "visible": true, "children": { - "wall_thickness": { - "label": "Wall Thickness", - "description": "The thickness of the outside walls in the horizontal direction. This value divided by the wall line width defines the number of walls.", + "wall_line_count": { + "label": "Wall Line Count", + "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.", + "default": 2, + "min_value": "0", + "type": "int", + "visible": false, + "inherit_function": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1)" + } + } + }, + "top_bottom_thickness": { + "label": "Top/Bottom Thickness", + "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", + "unit": "mm", + "default": 0.8, + "min_value": "0", + "max_value": "5", + "min_value_warning": "0.6", + "type": "float", + "visible": true, + "children": { + "top_thickness": { + "label": "Top Thickness", + "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.", "unit": "mm", "default": 0.8, "min_value": "0", - "min_value_warning": "line_width", - "max_value_warning": "5 * line_width", + "max_value_warning": "100", "type": "float", - "visible": true, + "visible": false, "children": { - "wall_line_count": { - "label": "Wall Line Count", - "description": "The number of walls. When calculated by the wall thickness, this value is rounded to a whole number.", - "default": 2, - "min_value": "0", + "top_layers": { + "label": "Top Layers", + "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.", + "default": 8, + "min_value": "0", + "max_value_warning": "100", "type": "int", "visible": false, - "inherit_function": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1)" + "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } }, - "top_bottom_thickness": { - "label": "Top/Bottom Thickness", - "description": " The thickness of the top/bottom layers in the print. This value divided by the layer height defines the number of top/bottom layers.", + "bottom_thickness": { + "label": "Bottom Thickness", + "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.", "unit": "mm", - "default": 0.8, + "default": 0.6, "min_value": "0", - "max_value": "5", - "min_value_warning": "0.6", "type": "float", - "visible": true, + "visible": false, "children": { - "top_thickness": { - "label": "Top Thickness", - "description": "The thickness of the top layers in the print. This value divided by the layer height defines the number of top layers.", - "unit": "mm", - "default": 0.8, + "bottom_layers": { + "label": "Bottom Layers", + "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", "min_value": "0", - "max_value_warning": "100", - "type": "float", + "default": 6, + "type": "int", "visible": false, - "children": { - "top_layers": { - "label": "Top Layers", - "description": "The number of top layers. When calculated by the top thickness, this value is rounded to a whole number.", - "default": 8, - "min_value": "0", - "max_value_warning": "100", - "type": "int", - "visible": false, - "inherit_function": "0 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" - } - } - }, - "bottom_thickness": { - "label": "Bottom Thickness", - "description": "The thickness of the bottom layers in the print. This value divided by the layer height defines the number of bottom layers.", - "unit": "mm", - "default": 0.6, - "min_value": "0", - "type": "float", - "visible": false, - "children": { - "bottom_layers": { - "label": "Bottom Layers", - "description": "The number of bottom layers. When calculated by the bottom thickness, this value is rounded to a whole number.", - "min_value": "0", - "default": 6, - "type": "int", - "visible": false, - "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" - } - } + "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)" } } } diff --git a/resources/machines/innovo-inventor.json b/resources/machines/innovo-inventor.json index 439edb5990..61d090196a 100644 --- a/resources/machines/innovo-inventor.json +++ b/resources/machines/innovo-inventor.json @@ -30,7 +30,6 @@ "overrides": { "layer_height": { "default": 0.15}, - "shell_thickness": { "default": 0.8}, "wall_thickness": { "default": 0.8}, "top_bottom_thickness": { "default": 0.3, "visible": true}, "material_print_temperature": { "default": 215, "visible": true}, diff --git a/resources/profiles/general/Low+Quality.cfg b/resources/profiles/general/Low+Quality.cfg index 96c1778826..f7f4e5d6b7 100644 --- a/resources/profiles/general/Low+Quality.cfg +++ b/resources/profiles/general/Low+Quality.cfg @@ -10,6 +10,6 @@ cool_min_layer_time = 3 speed_wall_0 = 40 speed_wall_x = 80 speed_infill = 100 -shell_thickness = 1 +wall_thickness = 1 speed_topbottom = 30 diff --git a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile index 8eacab211f..d5c27687a5 100644 --- a/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.25_normal.curaprofile @@ -10,7 +10,7 @@ weight = -2 line_width = 0.22 layer_height = 0.06 layer_height_0 = 0.15 -shell_thickness = 0.88 +wall_thickness = 0.88 top_bottom_thickness = 0.72 infill_sparse_density = 22 retraction_amount = 6 diff --git a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile index f2051858cb..5088c055c2 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_fast.curaprofile @@ -10,7 +10,7 @@ weight = -1 line_width = 0.35 layer_height = 0.15 layer_height_0 = 0.26 -shell_thickness = 0.7 +wall_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile index 3889ff5da0..5140474e48 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_high.curaprofile @@ -10,7 +10,7 @@ weight = -3 line_width = 0.35 layer_height = 0.06 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.84 infill_sparse_density = 22 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile index 174cc9d947..88862832b2 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 [settings] line_width = 0.35 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile index 72388e94b6..5cb807de01 100644 --- a/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile @@ -10,7 +10,7 @@ weight = -4 line_width = 0.35 layer_height = 0.04 layer_height_0 = 0.26 -shell_thickness = 1.4 +wall_thickness = 1.4 top_bottom_thickness = 1.12 infill_sparse_density = 25 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile index 4e86a6aab2..13d1c783d6 100644 --- a/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile @@ -10,7 +10,7 @@ weight = -2 line_width = 0.53 layer_height = 0.15 layer_height_0 = 0.4 -shell_thickness = 1.59 +wall_thickness = 1.59 top_bottom_thickness = 1.2 retraction_amount = 6 speed_print = 25 diff --git a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile index 6a34ecb59c..030bd38064 100644 --- a/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2+/pla_0.8_normal.curaprofile @@ -10,7 +10,7 @@ weight = -2 line_width = 0.7 layer_height = 0.2 layer_height_0 = 0.5 -shell_thickness = 2.1 +wall_thickness = 2.1 top_bottom_thickness = 1.6 infill_sparse_density = 20 retraction_amount = 6 diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile index bd9fb0eb3f..bde58062f0 100644 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.22 layer_height = 0.06 layer_height_0 = 0.15 -shell_thickness = 0.88 +wall_thickness = 0.88 top_bottom_thickness = 0.72 infill_sparse_density = 22 infill_overlap = 0.022 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile index 80be7f3c63..b31b36267a 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile @@ -9,7 +9,7 @@ weight = -1 line_width = 0.35 layer_height = 0.15 layer_height_0 = 0.26 -shell_thickness = 0.7 +wall_thickness = 0.7 top_bottom_thickness = 0.6 infill_sparse_density = 18 infill_overlap = 0.035 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile index 608bd1a198..16e9a6cfd5 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile @@ -9,7 +9,7 @@ weight = -3 line_width = 0.35 layer_height = 0.06 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.84 infill_sparse_density = 22 infill_overlap = 0.035 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile index 9ac81316c3..9e745b37cd 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.35 layer_height = 0.1 layer_height_0 = 0.26 -shell_thickness = 1.05 +wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_overlap = 0.035 retraction_amount = 5.5 diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile index bca7de1bee..1970a0c96c 100644 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile @@ -9,7 +9,7 @@ weight = -4 line_width = 0.35 layer_height = 0.04 layer_height_0 = 0.26 -shell_thickness = 1.4 +wall_thickness = 1.4 top_bottom_thickness = 1.12 infill_sparse_density = 25 infill_overlap = 0.035 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile index f72dc0bce8..cd2cc7dee7 100644 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.53 layer_height = 0.15 layer_height_0 = 0.4 -shell_thickness = 1.59 +wall_thickness = 1.59 top_bottom_thickness = 1.2 infill_overlap = 0.053 retraction_amount = 6 diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile index df87e18f42..27fd2701a1 100644 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile @@ -9,7 +9,7 @@ weight = -2 line_width = 0.7 layer_height = 0.2 layer_height_0 = 0.5 -shell_thickness = 2.1 +wall_thickness = 2.1 top_bottom_thickness = 1.6 infill_sparse_density = 20 infill_overlap = 0.07