From 205902ee68b7e43fb140ec7d2a410601eb610a6b Mon Sep 17 00:00:00 2001 From: Rijk van Manen Date: Mon, 12 Dec 2022 15:39:28 +0100 Subject: [PATCH] printer linter format PP-296 --- resources/definitions/ultimaker2.def.json | 173 ++++++++--------- .../definitions/ultimaker2_extended.def.json | 26 ++- .../ultimaker2_extended_olsson.def.json | 10 +- .../ultimaker2_extended_plus.def.json | 26 ++- resources/definitions/ultimaker2_go.def.json | 79 ++++---- .../definitions/ultimaker2_olsson.def.json | 9 +- .../definitions/ultimaker2_plus.def.json | 140 ++++++++------ .../ultimaker2_plus_connect.def.json | 166 ++++++++++------ resources/definitions/ultimaker3.def.json | 178 +++++++++++------- .../definitions/ultimaker3_extended.def.json | 51 ++--- .../definitions/ultimaker_original.def.json | 127 +++++++------ .../ultimaker_original_dual.def.json | 120 ++++++------ .../ultimaker_original_plus.def.json | 34 ++-- resources/definitions/ultimaker_s3.def.json | 129 +++++++------ resources/definitions/ultimaker_s5.def.json | 142 +++++++------- 15 files changed, 790 insertions(+), 620 deletions(-) diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index b28ce07770..f68d51dd6c 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -2,102 +2,105 @@ "version": 2, "name": "Ultimaker 2", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", - "platform_texture": "Ultimaker2backplate.png", - "platform_offset": [9, 0, 0], - "has_materials": false, - "has_machine_quality": true, - "preferred_variant_name": "0.4 mm", - "machine_extruder_trains": - { - "0": "ultimaker2_extruder_0" - }, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "structur3d_dap100silicone", + "ultimaker_petg_red", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent" + ], "firmware_file": "MarlinUltimaker2.hex", - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"] + "has_machine_quality": true, + "has_materials": false, + "machine_extruder_trains": { "0": "ultimaker2_extruder_0" }, + "platform_offset": [ + 9, + 0, + 0 + ], + "platform_texture": "Ultimaker2backplate.png", + "preferred_variant_name": "0.4 mm", + "weight": 3 }, - "overrides": { - "machine_name": { "default_value": "Ultimaker 2" }, - "machine_start_gcode" : { - "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\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 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" - }, - "machine_end_gcode" : { - "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\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\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"" - }, - "machine_width": { - "default_value": 223 - }, - "machine_depth": { - "default_value": 223 - }, - "machine_height": { - "default_value": 205 - }, - "machine_heated_bed": { - "default_value": true + "overrides": + { + "cool_fan_speed_0": { "value": 0 }, + "gantry_height": { "value": "48" }, + "layer_height_0": { "value": 0.3 }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 223 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-82, 112.5], + [-84, 102.5], + [-115, 102.5] + ], + [ + [115, 112.5], + [115, 102.5], + [110, 102.5], + [108, 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_end_gcode": { "value": "\";Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\" if machine_gcode_flavor == \"UltiGCode\" else \"M104 S0 ;extruder heater off\\nM140 S0 ;heated bed heater off (if you have it)\\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\\n;Version _2.6 of the firmware can abort the print too early if the file ends\\n;too soon. However if the file hasn't ended yet because there are comments at\\n;the end of the file, it won't abort yet. Therefore we have to put at least 512\\n;bytes at the end of the g-code so that the file is not yet finished by the\\n;time that the motion planner gets flushed. With firmware version _3.3 this\\n;should be fixed, so this comment wouldn't be necessary any more. Now we have\\n;to pad this text to make precisely 512 bytes.\"" }, + "machine_gcode_flavor": { "default_value": "UltiGCode" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -42, 12 ], - [ -42, -32 ], - [ 62, 12 ], - [ 62, -32 ] + [-42, 12], + [-42, -32], + [62, 12], + [62, -32] ] }, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "48" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "UltiGCode" - }, - "machine_disallowed_areas": { - "default_value": [ - [[-115, 112.5], [ -82, 112.5], [ -84, 102.5], [-115, 102.5]], - [[ 115, 112.5], [ 115, 102.5], [ 110, 102.5], [ 108, 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_nozzle_tip_outer_diameter": { - "default_value": 1 - }, - "machine_nozzle_head_distance": { - "default_value": 3 - }, - "machine_max_feedrate_x": { - "default_value": 300 - }, - "machine_max_feedrate_y": { - "default_value": 300 - }, - "machine_max_feedrate_z": { - "default_value": 40 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "support_z_distance": { - "value": "0.1" - }, - "cool_fan_speed_0": { - "value": 0 - }, - "layer_height_0": { - "value": 0.3 - }, - "speed_slowdown_layers": { - "value": 2 - } + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 205 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_name": { "default_value": "Ultimaker 2" }, + "machine_nozzle_head_distance": { "default_value": 3 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 1 }, + "machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\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 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 223 }, + "speed_slowdown_layers": { "value": 2 }, + "support_z_distance": { "value": "0.1" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended.def.json b/resources/definitions/ultimaker2_extended.def.json index 572634c602..92adfae7e4 100644 --- a/resources/definitions/ultimaker2_extended.def.json +++ b/resources/definitions/ultimaker2_extended.def.json @@ -2,25 +2,21 @@ "version": 2, "name": "Ultimaker 2 Extended", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker2extended.hex", + "machine_extruder_trains": { "0": "ultimaker2_extended_extruder_0" }, "platform_texture": "Ultimaker2Extendedbackplate.png", - "machine_extruder_trains": - { - "0": "ultimaker2_extended_extruder_0" - }, - "firmware_file": "MarlinUltimaker2extended.hex" + "quality_definition": "ultimaker2", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Extended" }, - "machine_height": { - "default_value": 305 - } + "overrides": + { + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Ultimaker 2 Extended" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended_olsson.def.json b/resources/definitions/ultimaker2_extended_olsson.def.json index d2eb7f9a5d..f2afc8c6d0 100644 --- a/resources/definitions/ultimaker2_extended_olsson.def.json +++ b/resources/definitions/ultimaker2_extended_olsson.def.json @@ -2,11 +2,9 @@ "version": 2, "name": "Ultimaker 2 Extended with Olsson", "inherits": "ultimaker2_extended", - "metadata": { - "has_variants": true - }, - - "overrides": { + "metadata": { "has_variants": true }, + "overrides": + { "machine_name": { "default_value": "Ultimaker 2 Extended with Olsson" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_extended_plus.def.json b/resources/definitions/ultimaker2_extended_plus.def.json index 0242115057..23f8a15f40 100644 --- a/resources/definitions/ultimaker2_extended_plus.def.json +++ b/resources/definitions/ultimaker2_extended_plus.def.json @@ -2,25 +2,21 @@ "version": 2, "name": "Ultimaker 2 Extended+", "inherits": "ultimaker2_plus", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2_plus", - "weight": 2, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker2extended-plus.hex", + "machine_extruder_trains": { "0": "ultimaker2_extended_plus_extruder_0" }, "platform_texture": "Ultimaker2ExtendedPlusbackplate.png", - "machine_extruder_trains": - { - "0": "ultimaker2_extended_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2extended-plus.hex" + "quality_definition": "ultimaker2_plus", + "weight": 2 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Extended+" }, - "machine_height": { - "default_value": 305 - } + "overrides": + { + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Ultimaker 2 Extended+" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_go.def.json b/resources/definitions/ultimaker2_go.def.json index 774d215bef..e7ba8d1358 100644 --- a/resources/definitions/ultimaker2_go.def.json +++ b/resources/definitions/ultimaker2_go.def.json @@ -1,44 +1,59 @@ { - "version": 2, + "version": 2, "name": "Ultimaker 2 Go", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker2", - "weight": 3, "file_formats": "text/x-gcode", "platform": "ultimaker2go_platform.obj", + "firmware_file": "MarlinUltimaker2go.hex", + "machine_extruder_trains": { "0": "ultimaker2_go_extruder_0" }, + "platform_offset": [ + 0, + 0, + 0 + ], "platform_texture": "Ultimaker2Gobackplate.png", - "platform_offset": [0, 0, 0], - "machine_extruder_trains": - { - "0": "ultimaker2_go_extruder_0" - }, - "firmware_file": "MarlinUltimaker2go.hex" + "quality_definition": "ultimaker2", + "weight": 3 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2 Go" }, - "machine_width": { - "default_value": 120 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 115 - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_disallowed_areas": { + "overrides": + { + "machine_depth": { "default_value": 120 }, + "machine_disallowed_areas": + { "default_value": [ - [[-60, 60], [-33, 60], [-35, 52], [-60, 52]], - [[ 60, 60], [ 60, 52], [ 35, 52], [ 33, 60]], - [[-60, -60], [-60, -52], [-35, -52], [-33, -60]], - [[ 60, -60], [ 33, -60], [ 35, -52], [ 60, -52]] + [ + [-60, 60], + [-33, 60], + [-35, 52], + [-60, 52] + ], + [ + [60, 60], + [60, 52], + [35, 52], + [33, 60] + ], + [ + [-60, -60], + [-60, -52], + [-35, -52], + [-33, -60] + ], + [ + [60, -60], + [33, -60], + [35, -52], + [60, -52] + ] ] - } + }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 115 }, + "machine_name": { "default_value": "Ultimaker 2 Go" }, + "machine_width": { "default_value": 120 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_olsson.def.json b/resources/definitions/ultimaker2_olsson.def.json index 2f8b877942..74c562988f 100644 --- a/resources/definitions/ultimaker2_olsson.def.json +++ b/resources/definitions/ultimaker2_olsson.def.json @@ -2,12 +2,13 @@ "version": 2, "name": "Ultimaker 2 with Olsson Block", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "has_variants": true, "quality_definition": "ultimaker2" }, - - "overrides": { + "overrides": + { "machine_name": { "default_value": "Ultimaker 2 with Olsson Block" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 0d4191383d..18b377813a 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -2,72 +2,104 @@ "version": 2, "name": "Ultimaker 2+", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 1, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_red", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent" + ], + "firmware_file": "MarlinUltimaker2plus.hex", + "first_start_actions": [], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker2_plus_extruder_0" }, "platform_texture": "Ultimaker2Plusbackplate.png", "preferred_variant_name": "0.4 mm", - "has_variants": true, - "has_materials": true, - "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_red", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent"], - "first_start_actions": [], "supported_actions": [], - "machine_extruder_trains": - { - "0": "ultimaker2_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker2plus.hex" + "weight": 1 }, - - "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)" - }, - "speed_support": { - "value": "speed_wall_0" - }, - "machine_height": { - "default_value": 205 - }, - "machine_show_variants": { - "default_value": true - }, - "gantry_height": { - "value": "52" - }, - "machine_nozzle_head_distance": { - "default_value": 5 - }, - "machine_heat_zone_length": { - "default_value": 20 + "overrides": + { + "gantry_height": { "value": "52" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "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_head_with_fans_polygon": { "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] + [-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_heat_zone_length": { "default_value": 20 }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Ultimaker 2+" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_show_variants": { "default_value": true }, + "speed_infill": { "value": "speed_print" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 5674b4f030..ac3c84546d 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -2,87 +2,131 @@ "version": 2, "name": "Ultimaker 2+ Connect", "inherits": "ultimaker2", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 1, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker2_plus_connect_platform.obj", - "platform_texture": "Ultimaker2PlusConnectbackplate.png", - "platform_offset": [-1, -6, 0], - "preferred_variant_name": "0.4 mm", - "has_variants": true, - "has_materials": true, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone" + ], + "first_start_actions": [], "has_machine_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], - "first_start_actions": [], + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker2_plus_connect_extruder_0" }, + "platform_offset": [ + -1, + -6, + 0 + ], + "platform_texture": "Ultimaker2PlusConnectbackplate.png", + "preferred_variant_name": "0.4 mm", "supported_actions": [], - "machine_extruder_trains": - { - "0": "ultimaker2_plus_connect_extruder_0" - }, + "supports_network_connection": true, "supports_usb_connection": false, - "supports_network_connection": true + "weight": 1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 2+ Connect" }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_width": { "default_value": 223 }, - "machine_depth": { "default_value": 220 }, - "machine_height": { "default_value": 205 }, - "machine_show_variants": { "default_value": true }, + "overrides": + { "gantry_height": { "value": "52" }, - "machine_nozzle_head_distance": { "default_value": 5 }, - "machine_heat_zone_length": { "default_value": 20 }, + "infill_overlap": { "value": "0" }, + "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": "0" }, + "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, + "machine_depth": { "default_value": 220 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-115, 112.5], + [-83, 112.5], + [-85, 104.0], + [-115, 104.0] + ], + [ + [115, 112.5], + [115, 104.0], + [104, 104.0], + [102, 112.5] + ], + [ + [-115, -112.5], + [-115, -104.0], + [-87, -104.0], + [-85, -112.5] + ], + [ + [115, -112.5], + [104, -112.5], + [106, -104.0], + [115, -104.0] + ] + ] + }, + "machine_end_gcode": { "value": "''" }, + "machine_gcode_flavor": { "default_value": "Griffin" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -44, 14 ], - [ -44, -34 ], - [ 64, 14 ], - [ 64, -34 ] + [-44, 14], + [-44, -34], + [64, 14], + [64, -34] ] }, - "machine_disallowed_areas": - { - "default_value": [ - [[-115, 112.5], [ -83, 112.5], [ -85, 104.0], [-115, 104.0]], - [[ 115, 112.5], [ 115, 104.0], [ 104, 104.0], [ 102, 112.5]], - [[-115, -112.5], [-115, -104.0], [ -87, -104.0], [ -85, -112.5]], - [[ 115, -112.5], [ 104, -112.5], [ 106, -104.0], [ 115, -104.0]] - ] - }, - "infill_wipe_dist": { "value": "0" }, - "infill_overlap": { "value": "0" }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, - "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, - "optimize_wall_printing_order": { "value": "True" }, - "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, - "speed_support": { "value": "speed_wall_0" }, - "material_initial_print_temperature": { - "value": "material_print_temperature", - "maximum_value": 260 - }, - "material_final_print_temperature": { - "value": "material_print_temperature", - "maximum_value": 260 - }, - "material_print_temperature_layer_0": { - "maximum_value": 260 - }, + "machine_heat_zone_length": { "default_value": 20 }, + "machine_height": { "default_value": 205 }, + "machine_name": { "default_value": "Ultimaker 2+ Connect" }, + "machine_nozzle_head_distance": { "default_value": 5 }, + "machine_show_variants": { "default_value": true }, "machine_start_gcode": { "value": "''" }, - "machine_end_gcode": { "value": "''" }, + "machine_width": { "default_value": 223 }, "material_bed_temperature": { "maximum_value": 110 }, "material_bed_temperature_layer_0": { "maximum_value": 110 }, + "material_final_print_temperature": + { + "maximum_value": 260, + "value": "material_print_temperature" + }, + "material_initial_print_temperature": + { + "maximum_value": 260, + "value": "material_print_temperature" + }, "material_print_temperature": { "maximum_value": 260 }, - "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, + "material_print_temperature_layer_0": { "maximum_value": 260 }, "meshfix_maximum_deviation": { "value": "(layer_height / 3) if magic_spiralize else (layer_height / 4)" }, + "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_travel_resolution": { "value": 0.5 }, - "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": true, + "enabled": true, + "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" + }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, - "speed_wall_x": { "value": "speed_wall" } + "retraction_speed": { "value": "45" }, + "speed_support": { "value": "speed_wall_0" }, + "speed_wall_x": { "value": "speed_wall" }, + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index eb19058a98..11e99f8460 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -2,85 +2,54 @@ "version": 2, "name": "Ultimaker 3", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/gzip;text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "Ultimaker3backplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [ + 9066 + ], + "exclude_materials": [ + "generic_hips", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone" + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" ], + "id": 9066, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], - "preferred_variant_name": "AA 0.4", - "preferred_quality_type": "normal", - "variants_name": "Print core", "machine_extruder_trains": { "0": "ultimaker3_extruder_left", "1": "ultimaker3_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "Ultimaker3backplate.png", + "preferred_quality_type": "normal", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, "supports_network_connection": true, - "firmware_update_info": { - "id": 9066, - "check_urls": - [ - "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" - ], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9066 - ] + "supports_usb_connection": false, + "variants_name": "Print core" }, - - - - "overrides": { - "machine_name": { "default_value": "Ultimaker 3" }, - "machine_width": { "default_value": 233 }, - "machine_depth": { "default_value": 215 }, - "machine_height": { "default_value": 200 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.9, -45.8 ], - [ -41.9, 33.9 ], - [ 59.9, 33.9 ], - [ 59.9, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "60" }, - "machine_disallowed_areas": { "default_value": [ - [[92.8, -53.4], [92.8, -97.5], [116.5, -97.5], [116.5, -53.4]], - [[73.8, 107.5], [73.8, 100.5], [116.5, 100.5], [116.5, 107.5]], - [[74.6, 107.5], [74.6, 100.5], [116.5, 100.5], [116.5, 107.5]], - [[74.9, -97.5], [74.9, -107.5], [116.5, -107.5], [116.5, -97.5]], - [[-116.5, -103.5], [-116.5, -107.5], [-100.9, -107.5], [-100.9, -103.5]], - [[-116.5, 105.8], [-96.9, 105.8], [-96.9, 107.5], [-116.5, 107.5]] - ]}, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "G91 ;Relative movement\nG0 F15000 X8.0 Z0.5 E-4.5 ;Wiping+material retraction\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\nG90 ;Disable relative movement" }, - "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, - "prime_tower_wipe_enabled": { "default_value": false }, - - "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, + "overrides": + { "acceleration_enabled": { "value": true }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -93,22 +62,97 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "60" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 215 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [92.8, -53.4], + [92.8, -97.5], + [116.5, -97.5], + [116.5, -53.4] + ], + [ + [73.8, 107.5], + [73.8, 100.5], + [116.5, 100.5], + [116.5, 107.5] + ], + [ + [74.6, 107.5], + [74.6, 100.5], + [116.5, 100.5], + [116.5, 107.5] + ], + [ + [74.9, -97.5], + [74.9, -107.5], + [116.5, -107.5], + [116.5, -97.5] + ], + [ + [-116.5, -103.5], + [-116.5, -107.5], + [-100.9, -107.5], + [-100.9, -103.5] + ], + [ + [-116.5, 105.8], + [-96.9, 105.8], + [-96.9, 107.5], + [-116.5, 107.5] + ] + ] + }, + "machine_end_gcode": { "default_value": "G91 ;Relative movement\nG0 F15000 X8.0 Z0.5 E-4.5 ;Wiping+material retraction\nG0 F10000 Z1.5 E4.5 ;Compensation for the retraction\nG90 ;Disable relative movement" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.9, -45.8], + [-41.9, 33.9], + [59.9, 33.9], + [59.9, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker 3" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 233 }, "material_bed_temperature": { "maximum_value": "115" }, "material_bed_temperature_layer_0": { "maximum_value": "115" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": true, + "enabled": true, + "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" + }, "prime_tower_enable": { "default_value": true }, + "prime_tower_position_x": { "value": "machine_depth - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) - 30" }, + "prime_tower_wipe_enabled": { "default_value": false }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, @@ -130,4 +174,4 @@ "wall_0_inset": { "value": "0" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker3_extended.def.json b/resources/definitions/ultimaker3_extended.def.json index 970d3a405d..5afbbce1da 100644 --- a/resources/definitions/ultimaker3_extended.def.json +++ b/resources/definitions/ultimaker3_extended.def.json @@ -2,42 +2,45 @@ "version": 2, "name": "Ultimaker 3 Extended", "inherits": "ultimaker3", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "quality_definition": "ultimaker3", - "visible": true, "file_formats": "application/gzip;text/x-gcode", "platform": "ultimaker3_platform.obj", - "platform_texture": "Ultimaker3Extendedbackplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [ + 9511 + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" ], + "id": 9511, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variants": true, - "preferred_variant_name": "AA 0.4", - "variants_name": "Print core", "machine_extruder_trains": { "0": "ultimaker3_extended_extruder_left", "1": "ultimaker3_extended_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "Ultimaker3Extendedbackplate.png", + "preferred_variant_name": "AA 0.4", + "quality_definition": "ultimaker3", "supported_actions": [ "DiscoverUM3Action" ], - "firmware_update_info": { - "id": 9511, - "check_urls": - [ - "https://software.ultimaker.com/releases/firmware/9066/stable/um-update.swu.version" - ], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9511 - ] + "variants_name": "Print core" }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker 3 Extended" }, - "machine_height": { "default_value": 300 } + "overrides": + { + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "Ultimaker 3 Extended" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index e9afb3977e..c34dd4aadf 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -2,75 +2,84 @@ "version": 2, "name": "Ultimaker Original", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", - "has_materials": true, - "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], - "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "BedLevel"], - "machine_extruder_trains": - { - "0": "ultimaker_original_extruder_0" - }, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petg_red" + ], "firmware_file": "MarlinUltimaker-{baudrate}.hex", - "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex" + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}.hex", + "first_start_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "ultimaker_original_extruder_0" }, + "supported_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original" }, - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 205 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "cool_fan_speed_0": { "value": 0 }, + "gantry_height": { "value": "55" }, + "infill_before_walls": { "value": "False" }, + "layer_height_0": { "value": 0.3 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 205 }, + "machine_end_gcode": { "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\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'" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." - }, - "machine_end_gcode": { - "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\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'" - }, - "infill_before_walls": { - "value": "False" - }, - "cool_fan_speed_0": { - "value": 0 - }, - "layer_height_0": { - "value": 0.3 - }, - "speed_slowdown_layers": { - "value": 2 - } + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Ultimaker Original" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y50 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 205 }, + "speed_slowdown_layers": { "value": 2 } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original_dual.def.json b/resources/definitions/ultimaker_original_dual.def.json index bda8a0ce12..59bc4fb8bb 100644 --- a/resources/definitions/ultimaker_original_dual.def.json +++ b/resources/definitions/ultimaker_original_dual.def.json @@ -2,74 +2,88 @@ "version": 2, "name": "Ultimaker Original Dual Extrusion", "inherits": "ultimaker", - "metadata": { + "metadata": + { "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker_platform.3mf", - "has_materials": true, + "exclude_materials": [ + "generic_hips", + "generic_petg", + "generic_bam", + "ultimaker_bam", + "generic_pva", + "ultimaker_pva", + "generic_tough_pla", + "ultimaker_tough_pla_black", + "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", + "ultimaker_tough_pla_white", + "generic_cffcpe", + "generic_cffpa", + "generic_gffcpe", + "generic_gffpa", + "structur3d_dap100silicone", + "ultimaker_petg_blue", + "ultimaker_petg_grey", + "ultimaker_petg_black", + "ultimaker_petg_green", + "ultimaker_petg_white", + "ultimaker_petg_orange", + "ultimaker_petg_silver", + "ultimaker_petg_yellow", + "ultimaker_petg_transparent", + "ultimaker_petg_red_translucent", + "ultimaker_petg_blue_translucent", + "ultimaker_petg_green_translucent", + "ultimaker_petg_yellow_fluorescent", + "ultimaker_petg_red" + ], + "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", + "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", + "first_start_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], "has_machine_quality": true, - "quality_definition": "ultimaker_original", - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone", "ultimaker_petg_blue", "ultimaker_petg_grey", "ultimaker_petg_black", "ultimaker_petg_green", "ultimaker_petg_white", "ultimaker_petg_orange", "ultimaker_petg_silver", "ultimaker_petg_yellow", "ultimaker_petg_transparent", "ultimaker_petg_red_translucent", "ultimaker_petg_blue_translucent", "ultimaker_petg_green_translucent", "ultimaker_petg_yellow_fluorescent", "ultimaker_petg_red" ], + "has_materials": true, "machine_extruder_trains": { "0": "ultimaker_original_dual_1st", "1": "ultimaker_original_dual_2nd" }, - "firmware_file": "MarlinUltimaker-{baudrate}-dual.hex", - "firmware_hbk_file": "MarlinUltimaker-HBK-{baudrate}-dual.hex", - "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], - "supported_actions": ["UMOUpgradeSelection", "BedLevel"] + "quality_definition": "ultimaker_original", + "supported_actions": [ + "UMOUpgradeSelection", + "BedLevel" + ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original" }, - "machine_width": { - "default_value": 205 - }, - "machine_height": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 195 - }, - "machine_center_is_zero": { - "default_value": false - }, + "overrides": + { + "gantry_height": { "value": "55" }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 195 }, + "machine_end_gcode": { "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\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" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "default_value": [ - [ -75, 35 ], - [ -75, -18 ], - [ 18, 35 ], - [ 18, -18 ] + [-75, 35], + [-75, -18], + [18, 35], + [18, -18] ] }, - "gantry_height": { - "value": "55" - }, - "machine_use_extruder_offset_to_offset_coords": { - "default_value": true - }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_start_gcode": { - "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 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 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\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" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "prime_tower_position_x": { - "value": "195" - }, - "prime_tower_position_y": { - "value": "149" - } + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "Ultimaker Original" }, + "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nT1 ;Switch to the 2nd extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F200 E-{switch_extruder_retraction_amount}\nT0 ;Switch to the 1st extruder\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, + "machine_use_extruder_offset_to_offset_coords": { "default_value": true }, + "machine_width": { "default_value": 205 }, + "prime_tower_position_x": { "value": "195" }, + "prime_tower_position_y": { "value": "149" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_original_plus.def.json b/resources/definitions/ultimaker_original_plus.def.json index 949e2e8d0d..26924a8ba6 100644 --- a/resources/definitions/ultimaker_original_plus.def.json +++ b/resources/definitions/ultimaker_original_plus.def.json @@ -2,31 +2,25 @@ "version": 2, "name": "Ultimaker Original+", "inherits": "ultimaker_original", - "metadata": { + "metadata": + { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "weight": 4, "file_formats": "text/x-gcode", "platform": "ultimaker2_platform.obj", + "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex", + "firmware_hbk_file": "MarlinUltimaker-UMOP-{baudrate}.hex", + "first_start_actions": [ "BedLevel" ], + "machine_extruder_trains": { "0": "ultimaker_original_plus_extruder_0" }, "platform_texture": "UltimakerPlusbackplate.png", "quality_definition": "ultimaker_original", - "first_start_actions": ["BedLevel"], - "supported_actions": ["BedLevel"], - "machine_extruder_trains": - { - "0": "ultimaker_original_plus_extruder_0" - }, - "firmware_file": "MarlinUltimaker-UMOP-{baudrate}.hex", - "firmware_hbk_file": "MarlinUltimaker-UMOP-{baudrate}.hex" + "supported_actions": [ "BedLevel" ], + "weight": 4 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker Original+" }, - "machine_heated_bed": { - "default_value": true - }, - "machine_max_feedrate_z": { - "default_value": 30 - } + "overrides": + { + "machine_heated_bed": { "default_value": true }, + "machine_max_feedrate_z": { "default_value": 30 }, + "machine_name": { "default_value": "Ultimaker Original+" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index ce94981307..ecd9e8e09c 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -2,78 +2,53 @@ "version": 2, "name": "Ultimaker S3", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", - "platform_texture": "UltimakerS3backplate.png", - "platform_offset": [0, 0, 0], + "bom_numbers": [213482, 213483], + "exclude_materials": [ + "generic_hips", + "generic_petg", + "structur3d_dap100silicone" + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version" ], + "id": 213482, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variant_buildplates": false, "has_variants": true, - "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ], - "preferred_variant_name": "AA 0.4", - "preferred_quality_type": "normal", - "variants_name": "Print core", - "nozzle_offsetting_for_disallowed_areas": false, "machine_extruder_trains": { "0": "ultimaker_s3_extruder_left", "1": "ultimaker_s3_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "nozzle_offsetting_for_disallowed_areas": false, + "platform_offset": [ + 0, + 0, + 0 + ], + "platform_texture": "UltimakerS3backplate.png", + "preferred_quality_type": "normal", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, "supports_material_export": true, - "weight": -1, - "firmware_update_info": { - "id": 213482, - "check_urls": ["https://software.ultimaker.com/releases/firmware/213482/stable/um-update.swu.version"], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 213482, 213483 - ] + "supports_usb_connection": false, + "variants_name": "Print core", + "weight": -1 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker S3" }, - "machine_width": { "default_value": 230 }, - "machine_depth": { "default_value": 190 }, - "machine_height": { "default_value": 200 }, - "machine_heated_bed": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.4, -45.8 ], - [ -41.4, 36.0 ], - [ 63.3, 36.0 ], - [ 63.3, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "55" }, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "" }, - "prime_blob_enable": { "enabled": true, "default_value": false }, + "overrides": + { "acceleration_enabled": { "value": true }, - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, @@ -85,30 +60,66 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "55" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 190 }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.4, -45.8], + [-41.4, 36.0], + [63.3, 36.0], + [63.3, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker S3" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 230 }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": false, + "enabled": true + }, "prime_tower_enable": { "value": "True" }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, + "retraction_speed": { "value": "45" }, "skin_overlap": { "value": "10" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, "speed_wall_x": { "value": "speed_wall" }, @@ -120,4 +131,4 @@ "wall_0_inset": { "value": "0" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index a77148c2c4..7f54455742 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -2,80 +2,53 @@ "version": 2, "name": "Ultimaker S5", "inherits": "ultimaker", - "metadata": { + "metadata": + { + "visible": true, "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s5_platform.obj", - "platform_texture": "UltimakerS5backplate.png", - "platform_offset": [0, -30, -10], + "bom_numbers": [ + 9051, + 214475, + 214476 + ], + "firmware_update_info": + { + "check_urls": [ "https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version" ], + "id": 9051, + "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" + }, + "first_start_actions": [ "DiscoverUM3Action" ], "has_machine_quality": true, "has_materials": true, "has_variant_buildplates": true, "has_variants": true, - "preferred_variant_name": "AA 0.4", - "preferred_variant_buildplate_name": "Glass", - "preferred_quality_type": "normal", - "variants_name": "Print core", - "nozzle_offsetting_for_disallowed_areas": false, "machine_extruder_trains": { "0": "ultimaker_s5_extruder_left", "1": "ultimaker_s5_extruder_right" }, - "first_start_actions": [ "DiscoverUM3Action" ], + "nozzle_offsetting_for_disallowed_areas": false, + "platform_offset": [ + 0, + -30, + -10 + ], + "platform_texture": "UltimakerS5backplate.png", + "preferred_quality_type": "normal", + "preferred_variant_buildplate_name": "Glass", + "preferred_variant_name": "AA 0.4", "supported_actions": [ "DiscoverUM3Action" ], - "supports_usb_connection": false, - "supports_network_connection": true, "supports_material_export": true, - "weight": -2, - "firmware_update_info": { - "id": 9051, - "check_urls": ["https://software.ultimaker.com/releases/firmware/9051/stable/um-update.swu.version"], - "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" - }, - "bom_numbers": [ - 9051, 214475, 214476 - ] + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Print core", + "weight": -2 }, - - "overrides": { - "machine_name": { "default_value": "Ultimaker S5" }, - "machine_width": { "default_value": 330 }, - "machine_depth": { "default_value": 240 }, - "machine_height": { "default_value": 300 }, - "machine_heated_bed": { "default_value": true }, - "machine_heated_build_volume": { "default_value": true }, - "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, - "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, - "machine_head_with_fans_polygon": - { - "default_value": - [ - [ -41.4, -45.8 ], - [ -41.4, 36.0 ], - [ 63.3, 36.0 ], - [ 63.3, -45.8 ] - ] - }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_max_feedrate_x": { "default_value": 300 }, - "machine_max_feedrate_y": { "default_value": 300 }, - "machine_max_feedrate_z": { "default_value": 40 }, - "machine_acceleration": { "default_value": 3000 }, - "gantry_height": { "value": "55" }, - "machine_extruder_count": { "default_value": 2 }, - "extruder_prime_pos_abs": { "default_value": true }, - "machine_start_gcode": { "default_value": "" }, - "machine_end_gcode": { "default_value": "" }, - "prime_blob_enable": { "enabled": true, "default_value": false }, - - "speed_travel": - { - "maximum_value": "150", - "value": "150" - }, + "overrides": + { "acceleration_enabled": { "value": true }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -85,33 +58,72 @@ "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 3500)" }, "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "brim_width": { "value": "3" }, + "build_volume_temperature": { "maximum_value": 50 }, "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, + "default_material_print_temperature": { "value": "200" }, + "extruder_prime_pos_abs": { "default_value": true }, + "gantry_height": { "value": "55" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_depth": { "default_value": 240 }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-41.4, -45.8], + [-41.4, 36.0], + [63.3, 36.0], + [63.3, -45.8] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_heated_build_volume": { "default_value": true }, + "machine_height": { "default_value": 300 }, + "machine_max_feedrate_x": { "default_value": 300 }, + "machine_max_feedrate_y": { "default_value": 300 }, + "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "default_material_print_temperature": { "value": "200" }, + "machine_name": { "default_value": "Ultimaker S5" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, + "machine_start_gcode": { "default_value": "" }, + "machine_width": { "default_value": 330 }, "multiple_mesh_overlap": { "value": "0" }, + "optimize_wall_printing_order": { "value": "True" }, + "prime_blob_enable": + { + "default_value": false, + "enabled": true + }, "prime_tower_enable": { "value": "True" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "'no_outer_surfaces'"}, + "retraction_combing": { "value": "'no_outer_surfaces'" }, "retraction_hop": { "value": "2" }, - "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, + "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" }, + "retraction_speed": { "value": "45" }, "skin_overlap": { "value": "10" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 35)" }, + "speed_travel": + { + "maximum_value": "150", + "value": "150" + }, "speed_wall": { "value": "math.ceil(speed_print * 30 / 35)" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 30)" }, "speed_wall_x": { "value": "speed_wall" }, @@ -121,8 +133,6 @@ "top_bottom_thickness": { "value": "1" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "optimize_wall_printing_order": { "value": "True" }, - "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, - "build_volume_temperature": { "maximum_value": 50 } + "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } -} +} \ No newline at end of file