Fix profiles and FDMprinter after merge

Merge didn't go too well.

Contributes to issue CURA-1235.

resources/machines/fdmprinter.json

@@ -395,6 +395,26 @@
                                 }
                             }
                         },
+                        "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(round(parent_value / layer_height, 4))"
+                                }
+                            }
+                        },
                         "wall_0_inset": {
                             "label": "Outer Wall Inset",
                             "description": "Inset applied to the path of the outer wall. If the outer wall is smaller than the nozzle, and printed after the inner walls, use this offset to get the hole in the nozzle to overlap with the inner walls instead of the outside of the object.",
@@ -413,61 +433,6 @@
                             "default": false,
                             "visible": false,
                             "inherit": false
-                        },
-                        "top_bottom_thickness": {
-                            "label": "Bottom/Top Thickness",
-                            "description": "This controls the thickness of the bottom and top layers. The number of solid layers put down is calculated from the layer thickness and this value. Having this value a multiple of the layer thickness makes sense. Keep it near your wall thickness to make an evenly strong part.",
-                            "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": "This controls the thickness of the top layers. The number of solid layers printed is calculated from the layer thickness and this value. Having this value be a multiple of the layer thickness makes sense. Keep it near your wall thickness to make an evenly strong part.",
-                                    "unit": "mm",
-                                    "default": 0.8,
-                                    "min_value": "0",
-                                    "max_value_warning": "100",
-                                    "type": "float",
-                                    "visible": false,
-                                    "children": {
-                                        "top_layers": {
-                                            "label": "Top Layers",
-                                            "description": "This controls the number of top layers.",
-                                            "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": "This controls the thickness of the bottom layers. The number of solid layers printed is calculated from the layer thickness and this value. Having this value be a multiple of the layer thickness makes sense. And keep it near to your wall thickness to make an evenly strong part.",
-                                    "unit": "mm",
-                                    "default": 0.6,
-                                    "min_value": "0",
-                                    "type": "float",
-                                    "visible": false,
-                                    "children": {
-                                        "bottom_layers": {
-                                            "label": "Bottom Layers",
-                                            "description": "This controls the amount of bottom layers.",
-                                            "min_value": "0",
-                                            "default": 6,
-                                            "type": "int",
-                                            "visible": false,
-                                            "inherit_function": "999999 if infill_sparse_density == 100 else math.ceil(parent_value / layer_height)"
-                                        }
-                                    }
-                                }
-                            }
                         }
                     }
                 },

resources/profiles/ultimaker2+/abs_0.25_high.curaprofile

@@ -15,7 +15,6 @@ support_enable = False
 retraction_combing = All
 cool_min_speed = 25
 brim_line_count = 32
-top_thickness = 0.72
 material_flow = 100.0
 cool_lift_head = True
 speed_print = 20
@@ -30,7 +29,6 @@ infill_before_walls = False
 retraction_speed = 40.0
 skin_no_small_gaps_heuristic = False
 infill_sparse_density = 22
-shell_thickness = 0.88
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
@@ -38,7 +36,6 @@ infill_overlap = 0.022
 speed_wall_x = 25
 skirt_minimal_length = 150.0
 speed_layer_0 = 20
-bottom_thickness = 0.72
 layer_height_0 = 0.15
 magic_mesh_surface_mode = False
 cool_fan_speed_min = 50

resources/profiles/ultimaker2+/abs_0.8_fast.curaprofile

@@ -15,7 +15,6 @@ support_enable = False
 retraction_combing = All
 cool_min_speed = 15
 brim_line_count = 10
-top_thickness = 1.2
 material_flow = 100.0
 cool_lift_head = True
 speed_print = 20
@@ -29,7 +28,6 @@ speed_infill = 40
 infill_before_walls = False
 retraction_speed = 40.0
 skin_no_small_gaps_heuristic = False
-shell_thickness = 2.1
 cool_fan_speed_max = 100
 raft_airgap = 0.0
 material_bed_temperature = 70
@@ -37,7 +35,6 @@ infill_overlap = 0.105
 speed_wall_x = 30
 skirt_minimal_length = 150.0
 speed_layer_0 = 20
-bottom_thickness = 1.2
 layer_height_0 = 0.5
 magic_mesh_surface_mode = False
 cool_fan_speed_min = 50

resources/profiles/ultimaker2+/cpe_0.25_high.curaprofile

@@ -14,7 +14,6 @@ raft_airgap = 0.0
 raft_surface_thickness = 0.27
 raft_interface_line_spacing = 3.0
 skin_no_small_gaps_heuristic = False
-bottom_thickness = 0.72
 raft_surface_line_spacing = 3.0
 retraction_combing = All
 adhesion_type = brim
@@ -29,7 +28,6 @@ retraction_speed = 40.0
 cool_fan_speed_max = 100
 magic_mesh_surface_mode = False
 speed_print = 20
-shell_thickness = 0.88
 speed_wall_0 = 20
 material_flow = 100.0
 support_pattern = lines
@@ -37,7 +35,6 @@ infill_sparse_density = 22
 raft_interface_line_width = 0.4
 layer_height_0 = 0.15
 material_bed_temperature = 70
-top_thickness = 0.72
 top_bottom_thickness = 0.72
 speed_wall_x = 25
 infill_overlap = 0.0374

resources/profiles/ultimaker2+/cpe_0.8_fast.curaprofile

@@ -14,7 +14,6 @@ raft_airgap = 0.0
 raft_surface_thickness = 0.27
 raft_interface_line_spacing = 3.0
 skin_no_small_gaps_heuristic = False
-bottom_thickness = 1.2
 support_pattern = lines
 retraction_combing = All
 adhesion_type = brim
@@ -28,7 +27,6 @@ retraction_speed = 40.0
 cool_fan_speed_max = 100
 magic_mesh_surface_mode = False
 speed_print = 20
-shell_thickness = 2.1
 speed_wall_0 = 20
 material_flow = 100.0
 raft_surface_line_spacing = 3.0
@@ -36,7 +34,6 @@ raft_margin = 5.0
 raft_interface_line_width = 0.4
 layer_height_0 = 0.5
 material_bed_temperature = 70
-top_thickness = 1.2
 top_bottom_thickness = 1.2
 speed_wall_x = 30
 infill_overlap = 0.119

resources/profiles/ultimaker2+/pla_0.25_high.curaprofile

@@ -8,12 +8,10 @@ weight = -3
 
 [settings]
 retraction_combing = All
-top_thickness = 0.72
 speed_layer_0 = 20
 speed_print = 20
 speed_wall_0 = 20
 raft_interface_line_spacing = 3.0
-shell_thickness = 0.88
 infill_overlap = 0.033
 retraction_hop = 0.0
 material_bed_temperature = 70
@@ -41,7 +39,6 @@ top_bottom_thickness = 0.72
 cool_fan_speed_max = 100
 speed_infill = 30
 magic_mesh_surface_mode = False
-bottom_thickness = 0.72
 speed_wall_x = 25
 machine_nozzle_size = 0.22
 raft_surface_line_spacing = 3.0

resources/profiles/ultimaker2+/pla_0.8_fast.curaprofile

@@ -13,7 +13,6 @@ speed_layer_0 = 20
 speed_print = 20
 speed_wall_0 = 25
 raft_interface_line_spacing = 3.0
-shell_thickness = 2.1
 infill_overlap = 0.105
 retraction_hop = 0.0
 material_bed_temperature = 70
@@ -40,7 +39,6 @@ top_bottom_thickness = 1.2
 cool_fan_speed_max = 100
 speed_infill = 40
 magic_mesh_surface_mode = False
-bottom_thickness = 1.2
 speed_wall_x = 30
 machine_nozzle_size = 0.7
 raft_surface_line_spacing = 3.0