Major cleanup for profiles

This removes a bunch of settings that override default values from machine defaults (or inheritance)

resources/machines/fdmprinter.json

@@ -1552,8 +1552,7 @@
                         "brim": "Brim",
                         "raft": "Raft"
                     },
-                    "default": "skirt",
+                    "default": "brim",
-                    "inherit_function": "\"skirt\" if machine_heated_bed else \"brim\"",
                     "global_only": "True"
                 },
                 "skirt_line_count": {

resources/profiles/general/High+Quality.cfg

@@ -5,7 +5,6 @@ weight = -3
 
 [settings]
 layer_height = 0.06
-speed_wall_0 = 30
 speed_topbottom = 15
 speed_infill = 80
 

resources/profiles/general/Normal+Quality.cfg

@@ -4,7 +4,5 @@ name = Normal Quality
 weight = -2
 
 [settings]
-speed_wall_0 = 30
 speed_topbottom = 15
 speed_infill = 80
-

resources/profiles/general/Ulti+Quality.cfg

@@ -5,7 +5,5 @@ weight = -4
 
 [settings]
 layer_height = 0.04
-speed_wall_0 = 30
 speed_topbottom = 15
 speed_infill = 80
-

resources/profiles/materials/abs.cfg

@@ -5,8 +5,6 @@ name = ABS
 
 [settings]
 material_bed_temperature = 100
-adhesion_type = brim
 material_flow = 107
 material_print_temperature = 250
 cool_fan_speed = 50
-cool_fan_speed_max = 50

resources/profiles/materials/cpe.cfg

@@ -4,9 +4,5 @@ type = material
 name = CPE
 
 [settings]
-material_bed_temperature = 60
-adhesion_type = brim
-material_flow = 100
 material_print_temperature = 250
 cool_fan_speed = 50
-cool_fan_speed_max = 50

resources/profiles/materials/pla.cfg

@@ -4,9 +4,3 @@ type = material
 name = PLA
 
 [settings]
-material_bed_temperature = 60
-adhesion_type = skirt
-material_flow = 100
-material_print_temperature = 210
-cool_fan_speed = 100
-cool_fan_speed_max = 100

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

@@ -14,7 +14,6 @@ speed_wall_x = 25
 wall_thickness = 0.88
 speed_infill = 30
 speed_topbottom = 20
-adhesion_type = brim
 speed_print = 20
 cool_min_speed = 25
 line_width = 0.22

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

@@ -11,7 +11,6 @@ layer_height = 0.15
 top_bottom_thickness = 0.75
 layer_height_0 = 0.26
 speed_print = 40
-speed_wall_x = 40
 wall_thickness = 0.7
 speed_infill = 55
 speed_topbottom = 30
@@ -21,7 +20,6 @@ line_width = 0.35
 infill_sparse_density = 18
 speed_travel = 150
 speed_wall_0 = 30
-adhesion_type = brim
 cool_lift_head = True
 cool_fan_speed_min = 50
 

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

@@ -11,11 +11,9 @@ layer_height = 0.06
 top_bottom_thickness = 0.72
 layer_height_0 = 0.26
 speed_print = 30
-speed_wall_x = 30
 wall_thickness = 1.05
 speed_infill = 45
 speed_topbottom = 20
-adhesion_type = brim
 cool_min_speed = 20
 line_width = 0.35
 infill_sparse_density = 22

resources/profiles/ultimaker2+/abs_0.4_normal.curaprofile

@@ -9,7 +9,6 @@ weight = -2
 [settings]
 layer_height_0 = 0.26
 speed_print = 30
-speed_wall_x = 30
 wall_thickness = 1.05
 speed_infill = 45
 speed_topbottom = 20
@@ -17,7 +16,6 @@ cool_min_layer_time = 3
 cool_min_speed = 20
 line_width = 0.35
 speed_wall_0 = 20
-adhesion_type = brim
 cool_lift_head = True
 cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/abs_0.6_normal.curaprofile

@@ -15,7 +15,6 @@ speed_wall_x = 30
 wall_thickness = 1.59
 speed_infill = 55
 speed_topbottom = 20
-adhesion_type = brim
 cool_min_speed = 20
 line_width = 0.53
 speed_wall_0 = 20

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

@@ -15,7 +15,6 @@ speed_wall_x = 30
 wall_thickness = 2.1
 speed_infill = 40
 speed_topbottom = 20
-adhesion_type = brim
 cool_min_speed = 15
 line_width = 0.7
 speed_wall_0 = 20

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

@@ -20,7 +20,6 @@ speed_print = 20
 line_width = 0.22
 infill_sparse_density = 22
 speed_wall_0 = 20
-adhesion_type = brim
 cool_lift_head = True
 cool_fan_speed_min = 50
 

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

@@ -21,7 +21,6 @@ speed_travel = 150
 line_width = 0.35
 infill_sparse_density = 18
 speed_wall_0 = 30
-adhesion_type = brim
 cool_lift_head = True
 cool_fan_speed_min = 50
 

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

@@ -15,7 +15,6 @@ speed_wall_x = 30
 wall_thickness = 1.05
 speed_infill = 45
 speed_topbottom = 20
-adhesion_type = brim
 line_width = 0.35
 infill_sparse_density = 22
 speed_wall_0 = 20

resources/profiles/ultimaker2+/cpe_0.4_normal.curaprofile

@@ -16,7 +16,6 @@ speed_topbottom = 20
 cool_min_layer_time = 3
 line_width = 0.35
 speed_wall_0 = 20
-adhesion_type = brim
 cool_lift_head = True
 cool_fan_speed_min = 50
 

resources/profiles/ultimaker2+/cpe_0.6_normal.curaprofile

@@ -19,7 +19,6 @@ cool_min_layer_time = 3
 speed_print = 20
 line_width = 0.53
 speed_wall_0 = 20
-adhesion_type = brim
 cool_lift_head = True
 cool_fan_speed_min = 50
 

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

@@ -19,7 +19,6 @@ cool_min_layer_time = 3
 speed_print = 20
 line_width = 0.7
 speed_wall_0 = 20
-adhesion_type = brim
 cool_lift_head = True
 cool_fan_speed_min = 50
 

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

@@ -12,7 +12,6 @@ layer_height = 0.06
 layer_height_0 = 0.15
 shell_thickness = 0.88
 top_bottom_thickness = 0.72
-top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_wipe_dist = 0.1
 retraction_amount = 6
@@ -23,9 +22,7 @@ speed_wall_0 = 20
 speed_wall_x = 25
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

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

@@ -12,21 +12,16 @@ layer_height = 0.15
 layer_height_0 = 0.26
 shell_thickness = 0.7
 top_bottom_thickness = 0.6
-top_bottom_pattern = lines
 infill_sparse_density = 18
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
 retraction_min_travel = 0.5
 retraction_count_max = 30
-speed_infill = 60
 speed_wall_0 = 40
 speed_wall_x = 50
-speed_topbottom = 30
 speed_travel = 150
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

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

@@ -12,20 +12,16 @@ layer_height = 0.06
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.84
-top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
 retraction_min_travel = 0.5
 retraction_count_max = 30
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2+/pla_0.4_normal.curaprofile

@@ -12,20 +12,15 @@ layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
-top_bottom_pattern = lines
-infill_sparse_density = 20
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
 retraction_min_travel = 0.5
 retraction_count_max = 30
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2+/pla_0.4_ulti.curaprofile

@@ -12,7 +12,6 @@ layer_height = 0.04
 layer_height_0 = 0.26
 shell_thickness = 1.4
 top_bottom_thickness = 1.12
-top_bottom_pattern = lines
 infill_sparse_density = 25
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
@@ -20,13 +19,10 @@ retraction_min_travel = 0.5
 retraction_count_max = 30
 retraction_extrusion_window = 6
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2+/pla_0.6_normal.curaprofile

@@ -12,8 +12,6 @@ layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
-top_bottom_pattern = lines
-infill_sparse_density = 20
 infill_wipe_dist = 0.3
 retraction_amount = 6
 retraction_min_travel = 0.5
@@ -23,9 +21,7 @@ speed_wall_0 = 25
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1.2
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 20
-adhesion_type = brim

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

@@ -12,8 +12,6 @@ layer_height = 0.2
 layer_height_0 = 0.5
 shell_thickness = 2.1
 top_bottom_thickness = 1.6
-top_bottom_pattern = lines
-infill_sparse_density = 20
 infill_wipe_dist = 0.4
 retraction_amount = 6
 retraction_min_travel = 0.5
@@ -23,9 +21,7 @@ speed_wall_0 = 20
 speed_wall_x = 30
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1.6
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 25
-adhesion_type = brim

resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile

@@ -11,7 +11,6 @@ layer_height = 0.06
 layer_height_0 = 0.15
 shell_thickness = 0.88
 top_bottom_thickness = 0.72
-top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_overlap = 0.022
 infill_wipe_dist = 0.1
@@ -24,9 +23,7 @@ speed_wall_0 = 20
 speed_wall_x = 25
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile

@@ -11,7 +11,6 @@ layer_height = 0.15
 layer_height_0 = 0.26
 shell_thickness = 0.7
 top_bottom_thickness = 0.6
-top_bottom_pattern = lines
 infill_sparse_density = 18
 infill_overlap = 0.035
 infill_wipe_dist = 0.2
@@ -19,15 +18,11 @@ retraction_amount = 5.5
 retraction_min_travel = 0.5
 retraction_count_max = 30
 retraction_extrusion_window = 6
-speed_infill = 60
 speed_wall_0 = 40
 speed_wall_x = 50
-speed_topbottom = 30
 speed_travel = 150
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2_olsson/0.4_high.curaprofile

@@ -11,7 +11,6 @@ layer_height = 0.06
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.84
-top_bottom_pattern = lines
 infill_sparse_density = 22
 infill_overlap = 0.035
 infill_wipe_dist = 0.2
@@ -20,13 +19,10 @@ retraction_min_travel = 0.5
 retraction_count_max = 30
 retraction_extrusion_window = 6
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile

@@ -11,8 +11,6 @@ layer_height = 0.1
 layer_height_0 = 0.26
 shell_thickness = 1.05
 top_bottom_thickness = 0.8
-top_bottom_pattern = lines
-infill_sparse_density = 20
 infill_overlap = 0.035
 infill_wipe_dist = 0.2
 retraction_amount = 5.5
@@ -20,13 +18,10 @@ retraction_min_travel = 0.5
 retraction_count_max = 30
 retraction_extrusion_window = 6
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile

@@ -11,7 +11,6 @@ layer_height = 0.04
 layer_height_0 = 0.26
 shell_thickness = 1.4
 top_bottom_thickness = 1.12
-top_bottom_pattern = lines
 infill_sparse_density = 25
 infill_overlap = 0.035
 infill_wipe_dist = 0.2
@@ -20,13 +19,10 @@ retraction_min_travel = 0.5
 retraction_count_max = 30
 retraction_extrusion_window = 6
 speed_infill = 50
-speed_wall_0 = 30
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 15
-adhesion_type = brim

resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile

@@ -11,8 +11,6 @@ layer_height = 0.15
 layer_height_0 = 0.4
 shell_thickness = 1.59
 top_bottom_thickness = 1.2
-top_bottom_pattern = lines
-infill_sparse_density = 20
 infill_overlap = 0.053
 infill_wipe_dist = 0.3
 retraction_amount = 6
@@ -24,9 +22,7 @@ speed_wall_0 = 25
 speed_wall_x = 40
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1.2
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 20
-adhesion_type = brim

resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile

@@ -11,7 +11,6 @@ layer_height = 0.2
 layer_height_0 = 0.5
 shell_thickness = 2.1
 top_bottom_thickness = 1.6
-top_bottom_pattern = lines
 infill_sparse_density = 20
 infill_overlap = 0.07
 infill_wipe_dist = 0.4
@@ -24,9 +23,7 @@ speed_wall_0 = 20
 speed_wall_x = 30
 speed_topbottom = 20
 speed_layer_0 = 25
-skirt_speed = 25
 speed_slowdown_layers = 2
 travel_avoid_distance = 1.6
 cool_fan_full_layer = 2
 cool_min_layer_time_fan_speed_max = 25
-adhesion_type = brim