From 05e889621ecaba1eec47216fb5393fd7cfb65ed0 Mon Sep 17 00:00:00 2001 From: Andrew Finkle Date: Wed, 27 Feb 2019 10:29:28 -0500 Subject: [PATCH 1/6] Create structur3d_discov3ry1_complete_um2plus.json --- ...tructur3d_discov3ry1_complete_um2plus.json | 82 +++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 resources/definitions/structur3d_discov3ry1_complete_um2plus.json diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.json new file mode 100644 index 0000000000..28fd2b71f9 --- /dev/null +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.json @@ -0,0 +1,82 @@ +{ + "version": 2, + "name": "Ultimaker 2+", + "inherits": "ultimaker2", + "metadata": { + "author": "Ultimaker", + "manufacturer": "Ultimaker B.V.", + "weight": 1, + "file_formats": "text/x-gcode", + "platform": "ultimaker2_platform.obj", + "platform_texture": "Ultimaker2Plusbackplate.png", + "preferred_variant_name": "0.4 mm", + "has_variants": true, + "has_materials": true, + "has_machine_materials": true, + "has_machine_quality": true, + "first_start_actions": [], + "supported_actions": [], + "machine_extruder_trains": + { + "0": "ultimaker2_plus_extruder_0" + }, + "firmware_file": "MarlinUltimaker2plus.hex" + }, + + "overrides": { + "machine_name": { "default_value": "Ultimaker 2+" }, + "speed_infill": { + "value": "speed_print" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "layer_height_0": { + "value": "round(machine_nozzle_size / 1.5, 2)" + }, + "line_width": { + "value": "round(machine_nozzle_size * 0.875, 2)" + }, + "speed_layer_0": { + "default_value": 20 + }, + "speed_support": { + "value": "speed_wall_0" + }, + "machine_height": { + "default_value": 205 + }, + "machine_show_variants": { + "default_value": true + }, + "gantry_height": { + "default_value": 52 + }, + "machine_nozzle_head_distance": { + "default_value": 5 + }, + "machine_nozzle_expansion_angle": { + "default_value": 45 + }, + "machine_heat_zone_length": { + "default_value": 20 + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -44, 14 ], + [ -44, -34 ], + [ 64, 14 ], + [ 64, -34 ] + ] + }, + "machine_disallowed_areas": { + "default_value": [ + [[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]], + [[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]], + [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], + [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] + ] + } + } +} From 3f765a9ca27ab3b6f9dc2ab38e55ecf54a814838 Mon Sep 17 00:00:00 2001 From: Andrew Finkle Date: Wed, 27 Feb 2019 10:29:58 -0500 Subject: [PATCH 2/6] Revert "Create structur3d_discov3ry1_complete_um2plus.json" This reverts commit 05e889621ecaba1eec47216fb5393fd7cfb65ed0. --- ...tructur3d_discov3ry1_complete_um2plus.json | 82 ------------------- 1 file changed, 82 deletions(-) delete mode 100644 resources/definitions/structur3d_discov3ry1_complete_um2plus.json diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.json deleted file mode 100644 index 28fd2b71f9..0000000000 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.json +++ /dev/null @@ -1,82 +0,0 @@ -{ - "version": 2, - "name": "Ultimaker 2+", - "inherits": "ultimaker2", - "metadata": { - "author": "Ultimaker", - "manufacturer": "Ultimaker B.V.", - "weight": 1, - "file_formats": "text/x-gcode", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2Plusbackplate.png", - "preferred_variant_name": "0.4 mm", - "has_variants": true, - "has_materials": true, - "has_machine_materials": true, - "has_machine_quality": true, - "first_start_actions": [], - "supported_actions": [], - "machine_extruder_trains": - { - "0": "ultimaker2_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2plus.hex" - }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2+" }, - "speed_infill": { - "value": "speed_print" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "layer_height_0": { - "value": "round(machine_nozzle_size / 1.5, 2)" - }, - "line_width": { - "value": "round(machine_nozzle_size * 0.875, 2)" - }, - "speed_layer_0": { - "default_value": 20 - }, - "speed_support": { - "value": "speed_wall_0" - }, - "machine_height": { - "default_value": 205 - }, - "machine_show_variants": { - "default_value": true - }, - "gantry_height": { - "default_value": 52 - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_nozzle_expansion_angle": { - "default_value": 45 - }, - "machine_heat_zone_length": { - "default_value": 20 - }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] - ] - }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]], - [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], - [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] - ] - } - } -} From 5581cd5c2c09b2bd91f262a135b1197726738dfa Mon Sep 17 00:00:00 2001 From: Andrew Finkle Date: Wed, 27 Feb 2019 11:55:25 -0500 Subject: [PATCH 3/6] Added definition, extruder, material, and variants for Discov3ry Complete --- ...tur3d_discov3ry1_complete_um2plus.def.json | 142 ++++++++++++++++++ ...v3ry1_complete_um2plus_extruder_0.def.json | 16 ++ ..._discov3ry1_complete_um2plus_0.20.inst.cfg | 14 ++ ..._discov3ry1_complete_um2plus_0.25.inst.cfg | 14 ++ ..._discov3ry1_complete_um2plus_0.41.inst.cfg | 14 ++ ..._discov3ry1_complete_um2plus_0.58.inst.cfg | 14 ++ ..._discov3ry1_complete_um2plus_0.84.inst.cfg | 14 ++ ..._discov3ry1_complete_um2plus_1.19.inst.cfg | 14 ++ ..._discov3ry1_complete_um2plus_1.60.inst.cfg | 14 ++ 9 files changed, 256 insertions(+) create mode 100644 resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json create mode 100644 resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json create mode 100644 resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg create mode 100644 resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg create mode 100644 resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg create mode 100644 resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg create mode 100644 resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg create mode 100644 resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg create mode 100644 resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json new file mode 100644 index 0000000000..8e1f2ea03b --- /dev/null +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -0,0 +1,142 @@ +{ + "version": 2, + + "name": "Discov3ry Complete (Ultimaker 2+)", + + "inherits": "fdmprinter", + + "metadata": { + "author": "Andrew Finkle, CTO", + + "manufacturer": "Structur3d.io", + + "visible": true, + + "weight": 1, + + "file_formats": "text/x-gcode", + + "platform": "ultimaker2_platform.obj", + + "platform_texture": "Ultimaker2Plusbackplate.png", + + "platform_offset": [0, 0, 0], + + "has_materials": true, + + "has_variants": true, + + "variants_name": "Print core", + + "preferred_variant_name": "0.84mm (Green)", + + "has_machine_materials": true, + + "preferred_material": "structur3d_dap100silicone", + + "has_variant_materials": false, + + "has_machine_quality": false, + + "preferred_quality_type": "extra_fast", + + "first_start_actions": [], + + "supported_actions": [], + + "machine_extruder_trains": + { + "0": "structur3d_discov3ry1_complete_um2plus_extruder_0" + }, + "firmware_file": "MarlinUltimaker2plus.hex" + + }, + + "overrides": { + "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, + "speed_infill": { + "value": "speed_print" + }, + "infill_sparse_density": { + "value": 100 + }, + "retraction_hop_enabled": { + "value": true + }, + "adhesion_type": { + "default_value": "skirt" + }, + "skirt_brim_minimal_length": { + "value": 1500 + }, + "speed_print": { + "value": 15 + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "layer_height_0": { + "value": "round(machine_nozzle_size / 1.5, 2)" + }, + "line_width": { + "value": "round(machine_nozzle_size * 0.875, 2)" + }, + "speed_layer_0": { + "default_value": 10 + }, + "speed_support": { + "value": "speed_wall_0" + }, + "machine_height": { + "default_value": 205 + }, + "machine_width": { + "default_value": 205 + }, + "machine_depth": { + "default_value": 205 + }, + "machine_show_variants": { + "default_value": true + }, + "gantry_height": { + "default_value": 52 + }, + "machine_nozzle_head_distance": { + "default_value": 5 + }, + "machine_nozzle_expansion_angle": { + "default_value": 45 + }, + "machine_heat_zone_length": { + "default_value": 20 + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -44, 14 ], + [ -44, -34 ], + [ 64, 14 ], + [ 64, -34 ] + ] + }, + "machine_disallowed_areas": { + "default_value": [ + [[-115, 112.5], [ -78, 112.5], [ -80, 102.5], [-115, 102.5]], + [[ 115, 112.5], [ 115, 102.5], [ 105, 102.5], [ 103, 112.5]], + [[-115, -112.5], [-115, -104.5], [ -84, -104.5], [ -82, -112.5]], + [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] + ] + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "\n;Updated Firmware (.hex and Marlin .ino) for \n;Ultimaker 2+ with Discov3ry Extruder available at: \n;https://github.com/Structur3d/UM2.1Discov3ry-Firmware-beta \n;**Learn more at https://www.structur3d.io** \n \nM104 S{material_print_temperature} ;Start heating extruder \nM140 S{material_bed_temperature} ;Start heating bed \nG21 ;metric values \nG90 ;absolute positioning \nM82 ;set extruder to absolute mode \nM107 ;start with the fan off \nM302 ;allow cold extrusion \nM92 E2589 ;set extruder EEPROM steps/mm for paste \nG28 Z0 ;move Z to bottom endstops \nG28 X0 Y0 ;move X/Y to endstops \nG1 X15 Y0 F4000 ;move X/Y to front of printer \nG1 Z15.0 F9000 ;move the platform to 15mm \nG92 E0 ;zero the extruded length \nG1 F200 E10 ;extrude 10 mm of feed stock \nG92 E0 ;zero the extruded length again \nG1 F9000 \n;Put printing message on LCD screen \nM117 Printing..." + }, + "machine_end_gcode": { + "default_value": "M104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it) \nM92 E282 ;reset extruder EEPROM steps/mm for plastic filament \nG91 ;relative positioning \nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure \nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more \nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way \nM84 ;steppers off\nG90 ;absolute positioning" + } + + } +} diff --git a/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json new file mode 100644 index 0000000000..8436dc0a94 --- /dev/null +++ b/resources/extruders/structur3d_discov3ry1_complete_um2plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "structur3d_discov3ry1_complete_um2plus_extruder_0", + "version": 2, + "name": "Discov3ry Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "structur3d_discov3ry1_complete_um2plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.84 }, + "material_diameter": { "default_value": 3.175 } + } +} diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg new file mode 100644 index 0000000000..cbafbcbbc7 --- /dev/null +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.20mm (Clear) +version = 4 +definition = structur3d_discov3ry1_complete_um2plus + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = 0.20mm (Clear) +machine_nozzle_size = 0.20 +machine_nozzle_tip_outer_diameter = 0.30 diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg new file mode 100644 index 0000000000..54ed35afff --- /dev/null +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.25mm (Red) +version = 4 +definition = structur3d_discov3ry1_complete_um2plus + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = 0.25mm (Red) +machine_nozzle_size = 0.25 +machine_nozzle_tip_outer_diameter = 0.35 diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg new file mode 100644 index 0000000000..c5f071240e --- /dev/null +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.41mm (Blue) +version = 4 +definition = structur3d_discov3ry1_complete_um2plus + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = 0.41mm (Blue) +machine_nozzle_size = 0.41 +machine_nozzle_tip_outer_diameter = 0.51 \ No newline at end of file diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg new file mode 100644 index 0000000000..0dcab9e9e9 --- /dev/null +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.58mm (Pink) +version = 4 +definition = structur3d_discov3ry1_complete_um2plus + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = 0.58mm (Pink) +machine_nozzle_size = 0.58 +machine_nozzle_tip_outer_diameter = 0.68 \ No newline at end of file diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg new file mode 100644 index 0000000000..b011364fda --- /dev/null +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 0.84mm (Green) +version = 4 +definition = structur3d_discov3ry1_complete_um2plus + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = 0.84mm (Green) +machine_nozzle_size = 0.84 +machine_nozzle_tip_outer_diameter = 0.94 \ No newline at end of file diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg new file mode 100644 index 0000000000..84453c9b0d --- /dev/null +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.19mm (Grey) +version = 4 +definition = structur3d_discov3ry1_complete_um2plus + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = 1.19mm (Grey) +machine_nozzle_size = 1.19 +machine_nozzle_tip_outer_diameter = 1.29 \ No newline at end of file diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg new file mode 100644 index 0000000000..ef0fa455af --- /dev/null +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = 1.60mm (Olive) +version = 4 +definition = structur3d_discov3ry1_complete_um2plus + +[metadata] +setting_version = 5 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = 1.60mm (Olive) +machine_nozzle_size = 1.60 +machine_nozzle_tip_outer_diameter = 1.70 \ No newline at end of file From 180156da78316f6e1ae5f4ad6ff031b05eb07407 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Fri, 1 Mar 2019 11:45:08 +0100 Subject: [PATCH 4/6] Correct whitespace Change tabs to spaces according to our style standards. And remove a bunch of unnecessary white lines to make it easier to read. --- ...tur3d_discov3ry1_complete_um2plus.def.json | 51 +++++-------------- 1 file changed, 14 insertions(+), 37 deletions(-) diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 8e1f2ea03b..2875b949be 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -1,55 +1,32 @@ { "version": 2, - "name": "Discov3ry Complete (Ultimaker 2+)", - - "inherits": "fdmprinter", - + "inherits": "fdmprinter", "metadata": { "author": "Andrew Finkle, CTO", - - "manufacturer": "Structur3d.io", - - "visible": true, - - "weight": 1, - + "manufacturer": "Structur3d.io", + "visible": true, + "weight": 1, "file_formats": "text/x-gcode", - "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2Plusbackplate.png", - "platform_offset": [0, 0, 0], - "has_materials": true, - - "has_variants": true, - + "has_variants": true, "variants_name": "Print core", - "preferred_variant_name": "0.84mm (Green)", - "has_machine_materials": true, - - "preferred_material": "structur3d_dap100silicone", - + "preferred_material": "structur3d_dap100silicone", "has_variant_materials": false, - "has_machine_quality": false, - - "preferred_quality_type": "extra_fast", - - "first_start_actions": [], - - "supported_actions": [], - - "machine_extruder_trains": + "preferred_quality_type": "extra_fast", + "first_start_actions": [], + "supported_actions": [], + "machine_extruder_trains": { "0": "structur3d_discov3ry1_complete_um2plus_extruder_0" }, - "firmware_file": "MarlinUltimaker2plus.hex" - + "firmware_file": "MarlinUltimaker2plus.hex" }, "overrides": { @@ -57,7 +34,7 @@ "speed_infill": { "value": "speed_print" }, - "infill_sparse_density": { + "infill_sparse_density": { "value": 100 }, "retraction_hop_enabled": { @@ -90,7 +67,7 @@ "machine_height": { "default_value": 205 }, - "machine_width": { + "machine_width": { "default_value": 205 }, "machine_depth": { @@ -128,7 +105,7 @@ [[ 115, -112.5], [ 108, -112.5], [ 110, -104.5], [ 115, -104.5]] ] }, - "machine_gcode_flavor": { + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { From df8d060a00f4ddd3b9da794406708a071b4beb5c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 5 Mar 2019 14:37:45 +0100 Subject: [PATCH 5/6] Increment setting_version This must be up-to-date with the setting version that Cura currently uses, in order to ensure that the settings have the same names and the same functionality. The settings that are set by these profiles are all nozzle-dimensional settings that haven't changed since 3.5, so we don't need to actually change the settings right now. Contributes to issue CURA-6262. --- .../structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg | 2 +- .../structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg | 4 ++-- .../structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg | 4 ++-- .../structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg | 4 ++-- .../structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg | 4 ++-- .../structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg index cbafbcbbc7..bd67b654cd 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.20.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 5 +setting_version = 7 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg index 54ed35afff..389984f293 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.25.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 5 +setting_version = 7 type = variant hardware_type = nozzle diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg index c5f071240e..f6936233e9 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.41.inst.cfg @@ -4,11 +4,11 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 5 +setting_version = 7 type = variant hardware_type = nozzle [values] machine_nozzle_id = 0.41mm (Blue) machine_nozzle_size = 0.41 -machine_nozzle_tip_outer_diameter = 0.51 \ No newline at end of file +machine_nozzle_tip_outer_diameter = 0.51 diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg index 0dcab9e9e9..b30770afc4 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.58.inst.cfg @@ -4,11 +4,11 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 5 +setting_version = 7 type = variant hardware_type = nozzle [values] machine_nozzle_id = 0.58mm (Pink) machine_nozzle_size = 0.58 -machine_nozzle_tip_outer_diameter = 0.68 \ No newline at end of file +machine_nozzle_tip_outer_diameter = 0.68 diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg index b011364fda..b83bef727d 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_0.84.inst.cfg @@ -4,11 +4,11 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 5 +setting_version = 7 type = variant hardware_type = nozzle [values] machine_nozzle_id = 0.84mm (Green) machine_nozzle_size = 0.84 -machine_nozzle_tip_outer_diameter = 0.94 \ No newline at end of file +machine_nozzle_tip_outer_diameter = 0.94 diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg index 84453c9b0d..9a0f4922ef 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.19.inst.cfg @@ -4,11 +4,11 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 5 +setting_version = 7 type = variant hardware_type = nozzle [values] machine_nozzle_id = 1.19mm (Grey) machine_nozzle_size = 1.19 -machine_nozzle_tip_outer_diameter = 1.29 \ No newline at end of file +machine_nozzle_tip_outer_diameter = 1.29 diff --git a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg index ef0fa455af..a235f406c0 100644 --- a/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg +++ b/resources/variants/structur3d_discov3ry1_complete_um2plus_1.60.inst.cfg @@ -4,11 +4,11 @@ version = 4 definition = structur3d_discov3ry1_complete_um2plus [metadata] -setting_version = 5 +setting_version = 7 type = variant hardware_type = nozzle [values] machine_nozzle_id = 1.60mm (Olive) machine_nozzle_size = 1.60 -machine_nozzle_tip_outer_diameter = 1.70 \ No newline at end of file +machine_nozzle_tip_outer_diameter = 1.70 From 0fe9e660b11a58e9d3a0a9f3c786f651f7dfa301 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 5 Mar 2019 15:36:31 +0100 Subject: [PATCH 6/6] Don't show Silicone for UM printers that are incompatible with it anyway It's still an open bug that we show materials of which all configurations are incompatible with the printer. Contributes to issue CURA-6262. --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index a980a1afdf..aec7907dbe 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -7,7 +7,7 @@ "manufacturer": "Ultimaker B.V.", "category": "Ultimaker", "visible": false, - "exclude_materials": [ "generic_hips", "generic_petg" ] + "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ] }, "overrides": { "machine_max_feedrate_e": {