From 5cd1a760e7c48553458190fbcc9a4e2e51131627 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Tue, 1 Mar 2016 18:08:06 +0100 Subject: [PATCH] Fix saving Gcode for UM2 with Olsson printers Add file_format parameter to ultimaker2 with olsson block machine definitions. Also removes some machine overrides that were also removed from um2+ profiles. Fixes CURA-980 --- .../machines/ultimaker2_extended_olsson.json | 3 +- .../ultimaker2_extended_olsson_025.json | 3 +- .../ultimaker2_extended_olsson_040.json | 4 ++- .../ultimaker2_extended_olsson_060.json | 4 ++- .../ultimaker2_extended_olsson_080.json | 4 ++- resources/machines/ultimaker2_olsson.json | 29 ++----------------- resources/machines/ultimaker2_olsson_025.json | 13 ++------- resources/machines/ultimaker2_olsson_040.json | 7 ++--- resources/machines/ultimaker2_olsson_060.json | 14 +-------- resources/machines/ultimaker2_olsson_080.json | 15 +--------- 10 files changed, 22 insertions(+), 74 deletions(-) diff --git a/resources/machines/ultimaker2_extended_olsson.json b/resources/machines/ultimaker2_extended_olsson.json index 679dcfc35f..50e95b7f67 100644 --- a/resources/machines/ultimaker2_extended_olsson.json +++ b/resources/machines/ultimaker2_extended_olsson.json @@ -1,12 +1,13 @@ { "id": "ultimaker2_extended_olsson_base", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended 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", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_olsson_025.json b/resources/machines/ultimaker2_extended_olsson_025.json index 4a63cd56a6..7d5e1ba384 100644 --- a/resources/machines/ultimaker2_extended_olsson_025.json +++ b/resources/machines/ultimaker2_extended_olsson_025.json @@ -1,12 +1,13 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_olsson.json", "variant": "0.25 mm", "profiles_machine": "ultimaker2_olsson", diff --git a/resources/machines/ultimaker2_extended_olsson_040.json b/resources/machines/ultimaker2_extended_olsson_040.json index 13bc8def5f..c031c5a7f4 100644 --- a/resources/machines/ultimaker2_extended_olsson_040.json +++ b/resources/machines/ultimaker2_extended_olsson_040.json @@ -1,13 +1,15 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_olsson.json", + "variant": "0.4 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_olsson_060.json b/resources/machines/ultimaker2_extended_olsson_060.json index 506f9362e4..ce811fa556 100644 --- a/resources/machines/ultimaker2_extended_olsson_060.json +++ b/resources/machines/ultimaker2_extended_olsson_060.json @@ -1,13 +1,15 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", "visible": false, + "file_formats": "text/x-gcode", "inherits": "ultimaker2_extended_olsson.json", + "variant": "0.6 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { diff --git a/resources/machines/ultimaker2_extended_olsson_080.json b/resources/machines/ultimaker2_extended_olsson_080.json index 089a2d5d50..a7b703f051 100644 --- a/resources/machines/ultimaker2_extended_olsson_080.json +++ b/resources/machines/ultimaker2_extended_olsson_080.json @@ -1,13 +1,15 @@ { "id": "ultimaker2_extended_olsson", - "version": 1, + "version": 1, "name": "Ultimaker 2 Extended with Olsson Block", "manufacturer": "Ultimaker", "author": "Ultimaker", "platform": "ultimaker2_platform.obj", "platform_texture": "Ultimaker2backplate.png", + "file_formats": "text/x-gcode", "visible": false, "inherits": "ultimaker2_extended_olsson.json", + "variant": "0.8 mm", "profiles_machine": "ultimaker2_olsson", "machine_settings": { diff --git a/resources/machines/ultimaker2_olsson.json b/resources/machines/ultimaker2_olsson.json index 24d397381d..ec6acd1a18 100644 --- a/resources/machines/ultimaker2_olsson.json +++ b/resources/machines/ultimaker2_olsson.json @@ -1,39 +1,16 @@ { "id": "ultimaker2_olsson_base", - "version": 1, + "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 }, - "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" } + "machine_show_variants": { "default": true } } } diff --git a/resources/machines/ultimaker2_olsson_025.json b/resources/machines/ultimaker2_olsson_025.json index 8e45d35f6d..cc70c21624 100644 --- a/resources/machines/ultimaker2_olsson_025.json +++ b/resources/machines/ultimaker2_olsson_025.json @@ -1,13 +1,13 @@ { "id": "ultimaker2_olsson", - "version": 1, + "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", @@ -15,15 +15,6 @@ "overrides": { "machine_nozzle_size": { "default": 0.25 }, - "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/ultimaker2_olsson_040.json b/resources/machines/ultimaker2_olsson_040.json index cebdce773a..481ff00b3a 100644 --- a/resources/machines/ultimaker2_olsson_040.json +++ b/resources/machines/ultimaker2_olsson_040.json @@ -7,15 +7,12 @@ "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 }, - - "wall_line_width_0": { "inherit_function": "parent_value * 0.875" }, - "skin_line_width": { "inherit_function": "parent_value * 0.875" } + "machine_nozzle_size": { "default": 0.40 } } } diff --git a/resources/machines/ultimaker2_olsson_060.json b/resources/machines/ultimaker2_olsson_060.json index 960c697c92..a0e2af8ee9 100644 --- a/resources/machines/ultimaker2_olsson_060.json +++ b/resources/machines/ultimaker2_olsson_060.json @@ -7,25 +7,13 @@ "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 }, - - "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/ultimaker2_olsson_080.json b/resources/machines/ultimaker2_olsson_080.json index 9509985a2f..9ab0497651 100644 --- a/resources/machines/ultimaker2_olsson_080.json +++ b/resources/machines/ultimaker2_olsson_080.json @@ -7,26 +7,13 @@ "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 }, - - "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 } } }