diff --git a/resources/machines/ultimaker2.json b/resources/machines/ultimaker2.json index 1274cff8cf..214dbba1e0 100644 --- a/resources/machines/ultimaker2.json +++ b/resources/machines/ultimaker2.json @@ -11,10 +11,6 @@ "inherits": "ultimaker.json", - "pages": [ - "SelectUpgradedPartsUM2" - ], - "machine_extruder_trains": [ { "machine_nozzle_heat_up_speed": { diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json deleted file mode 100644 index eac32e88a2..0000000000 --- a/resources/machines/ultimaker2_olsson.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "id": "ultimaker2_olsson_base", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2.json", - - "overrides": { - "machine_show_variants": { "default": true }, - "machine_nozzle_head_distance": { "default": 5 }, - "machine_nozzle_expansion_angle": { "default": 45 }, - "machine_height": { "default": 203 }, - "machine_heat_zone_length": { "default": 20 }, - "gantry_height": { "default": 52 } - } -} diff --git a/resources/machines/ultimaker2_olsson_025.json b/resources/machines/ultimaker2_olsson_025.json deleted file mode 100644 index 71552cddfd..0000000000 --- a/resources/machines/ultimaker2_olsson_025.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.25 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.25 }, - "machine_nozzle_tip_outer_diameter": { "default": 0.8 }, - - "coasting_volume": { "default": 0.1 }, - "coasting_min_volume": { "default": 0.17 } - } -} diff --git a/resources/machines/ultimaker2_olsson_040.json b/resources/machines/ultimaker2_olsson_040.json deleted file mode 100644 index ae1c3073d0..0000000000 --- a/resources/machines/ultimaker2_olsson_040.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.4 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.40 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.05 } - } -} diff --git a/resources/machines/ultimaker2_olsson_060.json b/resources/machines/ultimaker2_olsson_060.json deleted file mode 100644 index f87b79b64e..0000000000 --- a/resources/machines/ultimaker2_olsson_060.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.6 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.60 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.25 }, - "coasting_volume": { "default": 1.36 } - } -} diff --git a/resources/machines/ultimaker2_olsson_080.json b/resources/machines/ultimaker2_olsson_080.json deleted file mode 100644 index e3018e42ad..0000000000 --- a/resources/machines/ultimaker2_olsson_080.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "id": "ultimaker2_olsson", - "version": 1, - "name": "Ultimaker 2 with Olsson Block", - "manufacturer": "Ultimaker", - "author": "Ultimaker", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "visible": false, - "file_formats": "text/x-gcode", - "inherits": "ultimaker2_olsson.json", - - "variant": "0.8 mm", - - "overrides": { - "machine_nozzle_size": { "default": 0.80 }, - "machine_nozzle_tip_outer_diameter": { "default": 1.35 }, - "coasting_volume": { "default": 3.22 } - } -} diff --git a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile deleted file mode 100644 index bde58062f0..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.25_normal.curaprofile +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.25 mm -weight = -2 - -[settings] -line_width = 0.22 -layer_height = 0.06 -layer_height_0 = 0.15 -wall_thickness = 0.88 -top_bottom_thickness = 0.72 -infill_sparse_density = 22 -infill_overlap = 0.022 -retraction_amount = 6 -retraction_extrusion_window = 6 -speed_infill = 30 -speed_wall_0 = 20 -speed_wall_x = 25 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile deleted file mode 100644 index b31b36267a..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_fast.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = Fast Print -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -1 - -[settings] -line_width = 0.35 -layer_height = 0.15 -layer_height_0 = 0.26 -wall_thickness = 0.7 -top_bottom_thickness = 0.6 -infill_sparse_density = 18 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_wall_0 = 40 -speed_wall_x = 50 -speed_travel = 150 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile deleted file mode 100644 index 16e9a6cfd5..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_high.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = High Quality -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -3 - -[settings] -line_width = 0.35 -layer_height = 0.06 -layer_height_0 = 0.26 -wall_thickness = 1.05 -top_bottom_thickness = 0.84 -infill_sparse_density = 22 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_infill = 50 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile deleted file mode 100644 index 9e745b37cd..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_normal.curaprofile +++ /dev/null @@ -1,21 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -2 - -[settings] -line_width = 0.35 -layer_height = 0.1 -layer_height_0 = 0.26 -wall_thickness = 1.05 -top_bottom_thickness = 0.8 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_infill = 50 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile b/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile deleted file mode 100644 index 1970a0c96c..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.4_ulti.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = Ulti Quality -machine_type = ultimaker2_olsson -machine_variant = 0.4 mm -weight = -4 - -[settings] -line_width = 0.35 -layer_height = 0.04 -layer_height_0 = 0.26 -wall_thickness = 1.4 -top_bottom_thickness = 1.12 -infill_sparse_density = 25 -infill_overlap = 0.035 -retraction_amount = 5.5 -retraction_extrusion_window = 6 -speed_infill = 50 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 15 diff --git a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile deleted file mode 100644 index cd2cc7dee7..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.6_normal.curaprofile +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.6 mm -weight = -2 - -[settings] -line_width = 0.53 -layer_height = 0.15 -layer_height_0 = 0.4 -wall_thickness = 1.59 -top_bottom_thickness = 1.2 -infill_overlap = 0.053 -retraction_amount = 6 -retraction_extrusion_window = 6 -speed_infill = 55 -speed_wall_0 = 25 -speed_wall_x = 40 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 20 \ No newline at end of file diff --git a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile b/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile deleted file mode 100644 index 27fd2701a1..0000000000 --- a/resources/profiles/ultimaker2_olsson/0.8_normal.curaprofile +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 1 -name = Normal Quality -machine_type = ultimaker2_olsson -machine_variant = 0.8 mm -weight = -2 - -[settings] -line_width = 0.7 -layer_height = 0.2 -layer_height_0 = 0.5 -wall_thickness = 2.1 -top_bottom_thickness = 1.6 -infill_sparse_density = 20 -infill_overlap = 0.07 -retraction_amount = 6 -retraction_extrusion_window = 6 -speed_infill = 40 -speed_wall_0 = 20 -speed_wall_x = 30 -speed_topbottom = 20 -speed_layer_0 = 25 -cool_min_layer_time_fan_speed_max = 25