diff --git a/resources/images/ultimaker2plus_backplate.png b/resources/images/ultimaker2plus_backplate.png new file mode 100644 index 0000000000..f99cbffbfe Binary files /dev/null and b/resources/images/ultimaker2plus_backplate.png differ diff --git a/resources/machines/ultimaker2_extended_plus.json b/resources/machines/ultimaker2_extended_plus.json new file mode 100644 index 0000000000..139fa62a22 --- /dev/null +++ b/resources/machines/ultimaker2_extended_plus.json @@ -0,0 +1,19 @@ +{ + "id": "ultimaker2_extended_plus_base", + "version": 1, + "name": "Ultimaker 2 Extended+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + "visible": false, + "inherits": "ultimaker2plus.json", + + "machine_settings": { + "machine_width": { "default": 230 }, + "machine_depth": { "default": 225 }, + "machine_height": { "default": 310 }, + "machine_show_variants": { "default": true }, + "gantry_height": { "default": 50 } + } +} diff --git a/resources/machines/ultimaker2_extended_plus_025.json b/resources/machines/ultimaker2_extended_plus_025.json new file mode 100644 index 0000000000..cfbb169617 --- /dev/null +++ b/resources/machines/ultimaker2_extended_plus_025.json @@ -0,0 +1,14 @@ +{ + "id": "ultimaker2_extended_plus", + "version": 1, + "name": "Ultimaker 2 Extended+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + "inherits": "ultimaker2_extended_plus.json", + "variant": "0.25mm Nozzle", + "machine_settings": { + "machine_nozzle_size": { "default": 0.25 } + } +} diff --git a/resources/machines/ultimaker2_extended_plus_040.json b/resources/machines/ultimaker2_extended_plus_040.json new file mode 100644 index 0000000000..6833f23f36 --- /dev/null +++ b/resources/machines/ultimaker2_extended_plus_040.json @@ -0,0 +1,14 @@ +{ + "id": "ultimaker2_extended_plus", + "version": 1, + "name": "Ultimaker 2 Extended+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + "inherits": "ultimaker2_extended_plus.json", + "variant": "0.40mm Nozzle", + "machine_settings": { + "machine_nozzle_size": { "default": 0.40 } + } +} diff --git a/resources/machines/ultimaker2_extended_plus_060.json b/resources/machines/ultimaker2_extended_plus_060.json new file mode 100644 index 0000000000..d15272f488 --- /dev/null +++ b/resources/machines/ultimaker2_extended_plus_060.json @@ -0,0 +1,14 @@ +{ + "id": "ultimaker2_extended_plus", + "version": 1, + "name": "Ultimaker 2 Extended+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + "inherits": "ultimaker2_extended_plus.json", + "variant": "0.60mm Nozzle", + "machine_settings": { + "machine_nozzle_size": { "default": 0.60 } + } +} diff --git a/resources/machines/ultimaker2_extended_plus_080.json b/resources/machines/ultimaker2_extended_plus_080.json new file mode 100644 index 0000000000..df721c9a53 --- /dev/null +++ b/resources/machines/ultimaker2_extended_plus_080.json @@ -0,0 +1,14 @@ +{ + "id": "ultimaker2_extended_plus", + "version": 1, + "name": "Ultimaker 2 Extended+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + "inherits": "ultimaker2_extended_plus.json", + "variant": "0.80mm Nozzle", + "machine_settings": { + "machine_nozzle_size": { "default": 0.80 } + } +} diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json new file mode 100644 index 0000000000..99abcccc47 --- /dev/null +++ b/resources/machines/ultimaker2plus.json @@ -0,0 +1,46 @@ +{ + "id": "ultimaker2plus_base", + "version": 1, + "name": "Ultimaker 2+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + "visible": false, + + "inherits": "ultimaker2.json", + + "machine_settings": { + "machine_width": { "default": 230 }, + "machine_depth": { "default": 225 }, + "machine_height": { "default": 200 }, + "machine_show_variants": { "default": true }, + "gantry_height": { "default": 50 } + }, + + "overrides": { + "shell_thickness": { "default": 1.2 }, + "top_bottom_thickness": { "inherit_function": "(parent_value / 3) * 2" }, + "travel_compensate_overlapping_walls_enabled": { "default": true }, + "skin_alternate_rotation": { "default": true }, + "skin_outline_count": { "default": 2 }, + "infill_sparse_density": { "default": 10 }, + "infill_overlap": { "default": 14, "inherit_function": "14 if infill_sparse_density < 95 else 0" }, + "infill_wipe_dist": { "default": 0.35, "inherit_function": "wall_line_width_0" }, + "retraction_amount": { "default": 6 }, + "retraction_min_travel": { "default": 4.5 }, + "retraction_count_max": { "default": 6 }, + "retraction_extrusion_window": { "default": 6.0 }, + "speed_print": { "default": 50 }, + "speed_wall": { "inherit_function": "parent_value / 50 * 30" }, + "speed_wall_x": { "inherit_function": "speed_print / 50 * 40" }, + "speed_topbottom": { "inherit_function": "parent_value / 50 * 20" }, + "speed_layer_0": { "default": 20 }, + "skirt_speed": { "default": 20 }, + "travel_avoid_distance": { "default": 1.0 }, + "coasting_enable": { "default": true }, + "coasting_volume": { "default": 0.4 }, + "support_angle": { "default": 50 }, + "adhesion_type": { "default": "brim" } + } +} diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json new file mode 100644 index 0000000000..fa3e76b7e9 --- /dev/null +++ b/resources/machines/ultimaker2plus_025.json @@ -0,0 +1,31 @@ +{ + "id": "ultimaker2plus", + "version": 1, + "name": "Ultimaker 2+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + + "inherits": "ultimaker2plus.json", + + "variant": "0.25mm Nozzle", + + "machine_settings": { + "machine_nozzle_size": { "default": 0.25 } + }, + + "overrides": { + "layer_height": { "default": 0.06 }, + "layer_height_0": { "default": 0.15 }, + + "infill_sparse_density": { "default": 12 }, + "speed_print": { "default": 30 }, + "speed_wall": { "inherit_function": "parent_value / 30 * 20" }, + "speed_wall_x": { "inherit_function": "speed_print / 30 * 25" }, + "speed_topbottom": { "inherit_function": "parent_value / 30 * 20" }, + + "coasting_volume": { "default": 0.1 }, + "coasting_min_volume": { "default": 0.17 } + } +} diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json new file mode 100644 index 0000000000..36853be5ff --- /dev/null +++ b/resources/machines/ultimaker2plus_040.json @@ -0,0 +1,22 @@ +{ + "id": "ultimaker2plus", + "version": 1, + "name": "Ultimaker 2+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + + "inherits": "ultimaker2plus.json", + + "variant": "0.40mm Nozzle", + + "machine_settings": { + "machine_nozzle_size": { "default": 0.40 } + }, + + "overrides": { + "wall_line_width_0": { "inherit_function": "parent_value * 0.875" }, + "skin_line_width": { "inherit_function": "parent_value * 0.875" } + } +} diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json new file mode 100644 index 0000000000..d047d565ee --- /dev/null +++ b/resources/machines/ultimaker2plus_060.json @@ -0,0 +1,32 @@ +{ + "id": "ultimaker2plus", + "version": 1, + "name": "Ultimaker 2+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + + "inherits": "ultimaker2plus.json", + + "variant": "0.60mm Nozzle", + + "machine_settings": { + "machine_nozzle_size": { "default": 0.60 } + }, + + "overrides": { + "layer_height": { "default": 0.15 }, + "layer_height_0": { "default": 0.4 }, + + "shell_thickness": { "default": 1.8 }, + + "infill_sparse_density": { "default": 15 }, + "speed_print": { "default": 55 }, + "speed_wall": { "inherit_function": "parent_value / 55 * 25" }, + "speed_wall_x": { "inherit_function": "speed_print / 55 * 40" }, + "speed_topbottom": { "inherit_function": "parent_value / 55 * 20" }, + + "coasting_volume": { "default": 1.36 } + } +} diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json new file mode 100644 index 0000000000..2ac52e3a3f --- /dev/null +++ b/resources/machines/ultimaker2plus_080.json @@ -0,0 +1,33 @@ +{ + "id": "ultimaker2plus", + "version": 1, + "name": "Ultimaker 2+", + "manufacturer": "Ultimaker", + "author": "Ultimaker", + "platform": "ultimaker2_platform.obj", + "platform_texture": "ultimaker2plus_backplate.png", + + "inherits": "ultimaker2plus.json", + + "variant": "0.80mm Nozzle", + + "machine_settings": { + "machine_nozzle_size": { "default": 0.80 } + }, + + "overrides": { + "layer_height": { "default": 0.2 }, + "layer_height_0": { "default": 0.5 }, + + "shell_thickness": { "default": 2.4 }, + "top_bottom_thickness": { "inherit_function": "parent_value / 2" }, + + "infill_sparse_density": { "default": 16 }, + "speed_print": { "default": 40 }, + "speed_wall": { "inherit_function": "parent_value / 40 * 20" }, + "speed_wall_x": { "inherit_function": "speed_print / 40 * 30" }, + "speed_topbottom": { "inherit_function": "parent_value / 40 * 20" }, + + "coasting_volume": { "default": 3.22 } + } +}