From f4f990708fd7b0d2cd4413c741acf6c09a0f9d23 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Tue, 28 Apr 2020 09:27:31 +0200 Subject: [PATCH] Remove old 'category' metadata Most of it was incorrect and very inconsistent too. These are not used by our code any more. --- .../definitions/Mark2_for_Ultimaker2.def.json | 1 - resources/definitions/alya3dp.def.json | 1 - resources/definitions/alyanx3dp.def.json | 1 - resources/definitions/anet3d.def.json | 1 - resources/definitions/anycubic_4max.def.json | 1 - .../definitions/anycubic_chiron.def.json | 1 - resources/definitions/bibo2_dual.def.json | 1 - .../builder_premium_large.def.json | 1 - .../builder_premium_medium.def.json | 1 - .../builder_premium_small.def.json | 1 - resources/definitions/creality_cr-x.def.json | 1 - resources/definitions/custom.def.json | 1 - resources/definitions/deltacomb.def.json | 1 - resources/definitions/dxu.def.json | 1 - resources/definitions/erzay3d.def.json | 1 - resources/definitions/fabtotum.def.json | 1 - resources/definitions/fdmprinter.def.json | 1 - resources/definitions/gmax15plus.def.json | 1 - .../definitions/gmax15plus_dual.def.json | 1 - .../imade3d_jellybox_root.def.json | 1 - resources/definitions/kupido.def.json | 1 - .../definitions/leapfrog_bolt_pro.def.json | 1 - resources/definitions/malyan_m200.def.json | 1 - resources/definitions/mbot3d_grid4.def.json | 1 - .../definitions/mbot3d_grid4_dual.def.json | 3 +- .../monoprice_select_mini_v1.def.json | 1 - .../monoprice_select_mini_v2.def.json | 1 - resources/definitions/mp_mini_delta.def.json | 1 - .../definitions/raise3D_N2_dual.def.json | 1 - .../definitions/raise3D_N2_plus_dual.def.json | 1 - .../raise3D_N2_plus_single.def.json | 1 - .../definitions/raise3D_N2_single.def.json | 1 - resources/definitions/skriware_2.def.json | 1449 ++++++++--------- .../definitions/stereotech_ste320.def.json | 1 - resources/definitions/strateo3d.def.json | 1 - .../definitions/ubuild-3d_mr_bot_280.def.json | 1 - resources/definitions/ultimaker.def.json | 1 - resources/definitions/ultimaker_s3.def.json | 1 - resources/definitions/ultimaker_s5.def.json | 1 - resources/definitions/uni_print_3d.def.json | 1 - resources/definitions/winbo_dragonl4.def.json | 1 - resources/definitions/winbo_mini2.def.json | 1 - .../definitions/winbo_superhelper105.def.json | 1 - .../definitions/winbo_superhelper155.def.json | 1 - tests/Settings/TestDefinitionContainer.py | 13 +- 45 files changed, 737 insertions(+), 770 deletions(-) diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 6867183081..55f2f1611e 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "TheUltimakerCommunity", "manufacturer": "Foehnsturm", - "category": "Other", "weight": 0, "has_variants": true, "has_materials": true, diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index 8de7c79641..937cc7d6fa 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "ALYA", "manufacturer": "Kati Hal ARGE", - "category": "Other", "file_formats": "text/x-gcode", "platform": "alya_platform.stl", "platform_offset": [-60, -45, 75 ], diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 07e0a090a9..9e9f013ba2 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "ALYA", "manufacturer": "Kati Hal ARGE", - "category": "Other", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.stl", "platform_offset": [-104, 0, 93 ], diff --git a/resources/definitions/anet3d.def.json b/resources/definitions/anet3d.def.json index 1381a6c6ee..990be55463 100644 --- a/resources/definitions/anet3d.def.json +++ b/resources/definitions/anet3d.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Tiger.He", "manufacturer": "Anet", - "category": "anet3d", "visible": false, "file_formats": "text/x-gcode", "first_start_actions": ["MachineSettingsAction"], diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json index 05fffcb206..1be7dc0cab 100644 --- a/resources/definitions/anycubic_4max.def.json +++ b/resources/definitions/anycubic_4max.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Jason Scurtu", "manufacturer": "Anycubic", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "anycubic_4max_platform.stl", diff --git a/resources/definitions/anycubic_chiron.def.json b/resources/definitions/anycubic_chiron.def.json index 1b18a936a7..97d39b439c 100644 --- a/resources/definitions/anycubic_chiron.def.json +++ b/resources/definitions/anycubic_chiron.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "Patrick Glatt", "manufacturer": "Anycubic", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "anycubic_chiron_platform.obj", diff --git a/resources/definitions/bibo2_dual.def.json b/resources/definitions/bibo2_dual.def.json index a644185915..b9b1164e9d 100644 --- a/resources/definitions/bibo2_dual.def.json +++ b/resources/definitions/bibo2_dual.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "unknown", "manufacturer": "BIBO", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": true, "machine_extruder_trains": { diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index d19382a591..cf880ec63a 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Builder SZ", "manufacturer": "Builder", - "category": "Other", "quality_definition": "builder_premium_small", "file_formats": "text/x-gcode", "platform": "builder_premium_platform.stl", diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index e5b8f1785c..28d9f04a67 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Builder SZ", "manufacturer": "Builder", - "category": "Other", "quality_definition": "builder_premium_small", "file_formats": "text/x-gcode", "platform": "builder_premium_platform.stl", diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index 4bcbd7d526..867b6ceff6 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Builder SZ", "manufacturer": "Builder", - "category": "Other", "file_formats": "text/x-gcode", "platform": "builder_premium_platform.stl", "platform_offset": [-126, -36, 117], diff --git a/resources/definitions/creality_cr-x.def.json b/resources/definitions/creality_cr-x.def.json index 3d13c0f703..71a50051da 100644 --- a/resources/definitions/creality_cr-x.def.json +++ b/resources/definitions/creality_cr-x.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "SRC", "manufacturer": "Creality3D", - "category": "Other", "file_formats": "text/x-gcode", "platform": "cr-x.stl", "has_variants": false, diff --git a/resources/definitions/custom.def.json b/resources/definitions/custom.def.json index d0d9e904c5..88cc3c8821 100644 --- a/resources/definitions/custom.def.json +++ b/resources/definitions/custom.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Ultimaker", "manufacturer": "Custom", - "category": "Custom", "file_formats": "text/x-gcode", "has_materials": true, "machine_extruder_trains": diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json index ac2ea5abe1..d044858827 100644 --- a/resources/definitions/deltacomb.def.json +++ b/resources/definitions/deltacomb.def.json @@ -7,7 +7,6 @@ "author": "Gabriele Rossetti", "visible": true, "manufacturer": "Deltacomb 3D", - "category": "Other", "file_formats": "text/x-gcode", "icon": "icon_ultimaker2", "platform": "deltacomb.stl", diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index e39cbba126..e911a8eed6 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "TheUltimakerCommunity", "manufacturer": "DXU", - "category": "Other", "has_variants": true, "has_materials": true, "has_machine_materials": false, diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 875aea708e..1fe777091f 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Alexander Kirsanov", "manufacturer": "Robokinetika", - "category": "Other", "file_formats": "text/x-gcode", "machine_extruder_trains": { diff --git a/resources/definitions/fabtotum.def.json b/resources/definitions/fabtotum.def.json index 355f6a1434..16dac74a3b 100644 --- a/resources/definitions/fabtotum.def.json +++ b/resources/definitions/fabtotum.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "FABtotum", "manufacturer": "FABtotum", - "category": "Other", "file_formats": "text/x-gcode", "platform": "fabtotum_platform.stl", "has_machine_quality": true, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 3077089f8e..afaa39f648 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5,7 +5,6 @@ { "type": "machine", "author": "Ultimaker", - "category": "Other", "manufacturer": "Unknown", "setting_version": 13, "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", diff --git a/resources/definitions/gmax15plus.def.json b/resources/definitions/gmax15plus.def.json index 7cafa09727..56b1111d58 100644 --- a/resources/definitions/gmax15plus.def.json +++ b/resources/definitions/gmax15plus.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "gcreate", "manufacturer": "gcreate", - "category": "Other", "file_formats": "text/x-gcode", "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "has_machine_quality": true, diff --git a/resources/definitions/gmax15plus_dual.def.json b/resources/definitions/gmax15plus_dual.def.json index 8bfadfc4ba..0060ee0ddc 100644 --- a/resources/definitions/gmax15plus_dual.def.json +++ b/resources/definitions/gmax15plus_dual.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "GTL_180109", "manufacturer": "gCreate", - "category": "Other", "file_formats": "text/x-gcode", "platform": "gmax_1-5_xt-plus_s3d_full model_150707.stl", "has_variants": true, diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index 52f541f1d4..f631fcb673 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "IMADE3D", "manufacturer": "IMADE3D", - "category": "Ultimaker", "visible": false, "file_formats": "text/x-gcode", "exclude_materials": [ diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index ad0182a5f6..bee92ac282 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -7,7 +7,6 @@ "visible": true, "author": "ALYA", "manufacturer": "Kati Hal ARGE", - "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], diff --git a/resources/definitions/leapfrog_bolt_pro.def.json b/resources/definitions/leapfrog_bolt_pro.def.json index 09b9ecded5..d6cc30e792 100644 --- a/resources/definitions/leapfrog_bolt_pro.def.json +++ b/resources/definitions/leapfrog_bolt_pro.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Karan and Vincent 20191104", "manufacturer": "Leapfrog B.V.", - "category": "Other", "platform": "leapfrog_bolt_pro_platform.stl", "platform_offset": [0, 0, -14], "file_formats": "text/x-gcode", diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index 2e64cd14fa..71d15cb39b 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Brian Corbino, Tyler Gibson", "manufacturer": "Malyan", - "category": "Other", "file_formats": "text/x-gcode", "platform": "malyan_m200_platform.stl", "platform_offset": [0, -0.25, 0], diff --git a/resources/definitions/mbot3d_grid4.def.json b/resources/definitions/mbot3d_grid4.def.json index a895415dda..fa2deda027 100644 --- a/resources/definitions/mbot3d_grid4.def.json +++ b/resources/definitions/mbot3d_grid4.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Magicfirm", "manufacturer": "Magicfirm", - "category": "Other", "visible": true, "file_formats": "text/x-gcode", "platform_offset": [ diff --git a/resources/definitions/mbot3d_grid4_dual.def.json b/resources/definitions/mbot3d_grid4_dual.def.json index d32590ff3e..891f5dc51f 100644 --- a/resources/definitions/mbot3d_grid4_dual.def.json +++ b/resources/definitions/mbot3d_grid4_dual.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Magicfirm", "manufacturer": "Magicfirm", - "category": "Other", "visible": true, "file_formats": "text/x-gcode", "platform_offset": [ @@ -14,7 +13,7 @@ 0 ], "has_materials": true, - "machine_extruder_trains": { + "machine_extruder_trains": { "0": "mbot3d_grid4_extruder_left", "1": "mbot3d_grid4_extruder_right" } diff --git a/resources/definitions/monoprice_select_mini_v1.def.json b/resources/definitions/monoprice_select_mini_v1.def.json index 4fe67fc92e..21497b13bc 100644 --- a/resources/definitions/monoprice_select_mini_v1.def.json +++ b/resources/definitions/monoprice_select_mini_v1.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Brian Corbino, Tyler Gibson", "manufacturer": "Monoprice", - "category": "Other", "file_formats": "text/x-gcode", "quality_definition": "malyan_m200", "visible": true, diff --git a/resources/definitions/monoprice_select_mini_v2.def.json b/resources/definitions/monoprice_select_mini_v2.def.json index 2364e49383..d671f319ad 100644 --- a/resources/definitions/monoprice_select_mini_v2.def.json +++ b/resources/definitions/monoprice_select_mini_v2.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Tyler Gibson", "manufacturer": "Monoprice", - "category": "Other", "file_formats": "text/x-gcode", "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/mp_mini_delta.def.json b/resources/definitions/mp_mini_delta.def.json index 5aac007b88..e73afb743b 100644 --- a/resources/definitions/mp_mini_delta.def.json +++ b/resources/definitions/mp_mini_delta.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "MPMD Facebook Group", "manufacturer": "Monoprice", - "category": "Other", "file_formats": "text/x-gcode", "platform": "mp_mini_delta_platform.stl", "supports_usb_connection": true, diff --git a/resources/definitions/raise3D_N2_dual.def.json b/resources/definitions/raise3D_N2_dual.def.json index 530ad79d19..f5246f6bb6 100644 --- a/resources/definitions/raise3D_N2_dual.def.json +++ b/resources/definitions/raise3D_N2_dual.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": true, "machine_extruder_trains": diff --git a/resources/definitions/raise3D_N2_plus_dual.def.json b/resources/definitions/raise3D_N2_plus_dual.def.json index ffc4afec16..02f5fd4e11 100644 --- a/resources/definitions/raise3D_N2_plus_dual.def.json +++ b/resources/definitions/raise3D_N2_plus_dual.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": true, "machine_extruder_trains": diff --git a/resources/definitions/raise3D_N2_plus_single.def.json b/resources/definitions/raise3D_N2_plus_single.def.json index ccb169efb1..7ffdf08767 100644 --- a/resources/definitions/raise3D_N2_plus_single.def.json +++ b/resources/definitions/raise3D_N2_plus_single.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": true, "machine_extruder_trains": diff --git a/resources/definitions/raise3D_N2_single.def.json b/resources/definitions/raise3D_N2_single.def.json index f0915d1a31..c4e346ae90 100644 --- a/resources/definitions/raise3D_N2_single.def.json +++ b/resources/definitions/raise3D_N2_single.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Raise3D", "manufacturer": "Raise3D", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": true, "machine_extruder_trains": diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index e8715eb079..7878a9b243 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -1,727 +1,726 @@ { - "name": "Skriware 2", - "version": 2, - "inherits": "fdmprinter", - "metadata": { - "visible": true, - "author": "Skriware", - "manufacturer": "Skriware", - "category": "Other", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "supports_usb_connection": false, - "platform": "skriware_2_platform.stl", - "machine_extruder_trains": { - "0": "skriware_2_extruder_0", - "1": "skriware_2_extruder_1" - } - }, - "overrides": { - "raft_interface_thickness": { - "value": "0.2" - }, - "wipe_retraction_prime_speed": { - "value": "30" - }, - "support_skip_zag_per_mm": { - "default_value": 10 - }, - "material_bed_temperature": { - "value": "50" - }, - "raft_airgap": { - "default_value": 0.2 - }, - "top_layers": { - "value": "4" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "raft_surface_acceleration": { - "value": "400" - }, - "meshfix_maximum_travel_resolution": { - "value": "0.8" - }, - "machine_end_gcode": { - "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107" - }, - "wall_material_flow": { - "value": "99" - }, - "raft_interface_jerk": { - "value": "10" - }, - "acceleration_topbottom": { - "value": "400" - }, - "prime_tower_size": { - "default_value": 1 - }, - "max_skin_angle_for_expansion": { - "default_value": 50 - }, - "raft_acceleration": { - "value": "400" - }, - "support_xy_distance": { - "default_value": 0.6 - }, - "xy_offset_layer_0": { - "value": "-0.16" - }, - "raft_interface_fan_speed": { - "value": "40" - }, - "retraction_speed": { - "default_value": 30 - }, - "speed_print": { - "default_value": 20 - }, - "travel_avoid_supports": { - "default_value": true - }, - "infill_overlap_mm": { - "value": "0.0" - }, - "support_roof_height": { - "value": "0.4" - }, - "speed_travel_layer_0": { - "value": "120" - }, - "speed_wall_0": { - "value": "20" - }, - "acceleration_wall_x": { - "value": "400" - }, - "layer_0_z_overlap": { - "value": "0.1" - }, - "switch_extruder_retraction_speed": { - "value": "30" - }, - "travel_compensate_overlapping_walls_enabled": { - "default_value": false - }, - "raft_base_acceleration": { - "value": "400" - }, - "raft_base_speed": { - "value": "60" - }, - "wall_0_material_flow": { - "value": "99" - }, - "support_infill_rate": { - "value": "20" - }, - "raft_surface_layers": { - "default_value": 1 - }, - "machine_height": { - "default_value": 210 - }, - "retraction_prime_speed": { - "value": "60" - }, - "support_interface_material_flow": { - "value": "99" - }, - "raft_surface_fan_speed": { - "value": "80" - }, - "raft_base_line_width": { - "value": "0.4" - }, - "infill_line_distance": { - "value": "5.33" - }, - "default_material_print_temperature": { - "default_value": 200 - }, - "speed_roofing": { - "value": "20" - }, - "skin_material_flow": { - "value": "99" - }, - "cool_fan_full_layer": { - "value": "1" - }, - "material_break_preparation_temperature": { - "value": "195" - }, - "support_roof_density": { - "value": "70" - }, - "support_infill_sparse_thickness": { - "value": "0.2" - }, - "retraction_retract_speed": { - "value": "30" - }, - "speed_slowdown_layers": { - "default_value": 1 - }, - "support_line_distance": { - "value": "2" - }, - "cool_lift_head": { - "default_value": true - }, - "min_skin_width_for_expansion": { - "value": "0.67" - }, - "cool_min_speed": { - "default_value": 5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 30 - }, - "raft_base_line_spacing": { - "value": "0.8" - }, - "speed_support": { - "value": "50" - }, - "skirt_brim_material_flow": { - "value": "99" - }, - "speed_infill": { - "value": "80" - }, - "support_initial_layer_line_distance": { - "value": "2" - }, - "support_use_towers": { - "default_value": false - }, - "skin_no_small_gaps_heuristic": { - "default_value": true - }, - "acceleration_roofing": { - "value": "400" - }, - "material_initial_print_temperature": { - "value": "195" - }, - "material_diameter": { - "default_value": 1.75 - }, - "xy_offset": { - "default_value": -0.16 - }, - "support_extruder_nr": { - "value": "0" - }, - "support_brim_line_count": { - "value": "16" - }, - "support_interface_extruder_nr": { - "value": "0" - }, - "support_roof_extruder_nr": { - "value": "0" - }, - "material_adhesion_tendency": { - "default_value": 0 - }, - "material_standby_temperature": { - "default_value": 195 - }, - "cool_fan_speed_0": { - "default_value": 100 - }, - "brim_line_count": { - "value": "17" - }, - "adhesion_type": { - "default_value": "raft" - }, - "switch_extruder_retraction_amount": { - "value": "16" - }, - "retraction_amount": { - "default_value": 3 - }, - "acceleration_travel": { - "value": "400" - }, - "jerk_print_layer_0": { - "value": "10" - }, - "raft_surface_thickness": { - "value": "0.2" - }, - "raft_base_jerk": { - "value": "10" - }, - "bottom_thickness": { - "value": "0.8" - }, - "roofing_material_flow": { - "value": "99" - }, - "top_skin_expand_distance": { - "value": "0.8" - }, - "speed_wall_x": { - "value": "20" - }, - "support_enable": { - "default_value": true - }, - "acceleration_print_layer_0": { - "value": "400" - }, - "jerk_prime_tower": { - "value": "5" - }, - "infill_before_walls": { - "default_value": false - }, - "raft_interface_line_spacing": { - "value": "0.4" - }, - "gantry_height": { - "value": "210" - }, - "material_print_temperature_layer_0": { - "value": "195" - }, - "raft_interface_line_width": { - "value": "0.4" - }, - "skirt_brim_line_width": { - "value": "0.5" - }, - "z_seam_y": { - "value": "180" - }, - "roofing_layer_count": { - "value": "1" - }, - "raft_margin": { - "default_value": 4 - }, - "cool_fan_full_at_height": { - "value": "0" - }, - "acceleration_support_interface": { - "value": "250" - }, - "retraction_min_travel": { - "value": "1" - }, - "acceleration_layer_0": { - "value": "400" - }, - "support_z_distance": { - "default_value": 0.2 - }, - "machine_heated_bed": { - "default_value": true - }, - "raft_jerk": { - "value": "10" - }, - "raft_surface_speed": { - "value": "60" - }, - "initial_layer_line_width_factor": { - "default_value": 120 - }, - "machine_start_gcode": { - "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.6 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 Z1.5\nM61 A ;filament sensor reset\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}" - }, - "bottom_skin_preshrink": { - "value": "0.8" - }, - "ironing_inset": { - "value": "0.2" - }, - "jerk_travel": { - "value": "10" - }, - "machine_depth": { - "default_value": 260 - }, - "jerk_skirt_brim": { - "value": "5" - }, - "infill_wipe_dist": { - "value": "0" - }, - "raft_interface_acceleration": { - "value": "400" - }, - "z_seam_x": { - "value": "115" - }, - "material_print_temperature": { - "value": "195" - }, - "material_bed_temperature_layer_0": { - "value": "50" - }, - "wipe_retraction_retract_speed": { - "value": "30" - }, - "jerk_travel_layer_0": { - "value": "10" - }, - "infill_overlap": { - "value": "0" - }, - "acceleration_support_infill": { - "value": "400" - }, - "travel_compensate_overlapping_walls_0_enabled": { - "value": "False" - }, - "support_bottom_material_flow": { - "value": "99" - }, - "jerk_support_roof": { - "value": "5" - }, - "wall_x_material_flow": { - "value": "99" - }, - "speed_support_interface": { - "value": "33.33" - }, - "jerk_layer_0": { - "value": "10" - }, - "support_angle": { - "default_value": 60 - }, - "infill_sparse_thickness": { - "value": "0.2" - }, - "prime_tower_position_y": { - "value": "1" - }, - "retraction_combing": { - "default_value": "infill" - }, - "acceleration_prime_tower": { - "value": "250" - }, - "acceleration_print": { - "default_value": 400 - }, - "acceleration_infill": { - "value": "500" - }, - "bridge_wall_speed": { - "value": "10.0" - }, - "acceleration_wall_0": { - "value": "400" - }, - "support_offset": { - "default_value": 0.2 - }, - "build_volume_temperature": { - "default_value": 28 - }, - "switch_extruder_prime_speed": { - "value": "60" - }, - "speed_prime_tower": { - "value": "20" - }, - "top_skin_preshrink": { - "value": "0.8" - }, - "jerk_ironing": { - "value": "5" - }, - "skin_outline_count": { - "default_value": 0 - }, - "skirt_brim_speed": { - "value": "10.0" - }, - "raft_base_thickness": { - "value": "0.2" - }, - "infill_sparse_density": { - "default_value": 15 - }, - "support_bottom_extruder_nr": { - "value": "0" - }, - "support_material_flow": { - "value": "98" - }, - "min_infill_area": { - "default_value": 1 - }, - "jerk_support": { - "value": "10" - }, - "bottom_skin_expand_distance": { - "value": "0.8" - }, - "retract_at_layer_change": { - "default_value": true - }, - "jerk_support_interface": { - "value": "5" - }, - "jerk_support_bottom": { - "value": "5" - }, - "optimize_wall_printing_order": { - "default_value": true - }, - "skirt_brim_minimal_length": { - "default_value": 50 - }, - "jerk_support_infill": { - "value": "10" - }, - "initial_bottom_layers": { - "value": "3" - }, - "prime_tower_position_x": { - "value": "1" - }, - "acceleration_support_bottom": { - "value": "250" - }, - "speed_support_roof": { - "value": "33.33" - }, - "speed_support_infill": { - "value": "80" - }, - "bridge_skin_speed_2": { - "value": "15" - }, - "raft_fan_speed": { - "default_value": 100 - }, - "wipe_retraction_amount": { - "value": "3" - }, - "skin_edge_support_thickness": { - "value": "0" - }, - "bottom_layers": { - "value": "3" - }, - "retraction_extrusion_window": { - "value": "3" - }, - "acceleration_ironing": { - "value": "250" - }, - "support_top_distance": { - "value": "0.2" - }, - "travel_retract_before_outer_wall": { - "default_value": true - }, - "material_flow": { - "default_value": 99 - }, - "support_bottom_distance": { - "value": "0.2" - }, - "expand_skins_expand_distance": { - "value": "0.8" - }, - "jerk_wall": { - "value": "10" - }, - "support_zag_skip_count": { - "value": "8" - }, - "connect_infill_polygons": { - "value": "False" - }, - "acceleration_skirt_brim": { - "value": "250" - }, - "z_seam_corner": { - "default_value": "z_seam_corner_weighted" - }, - "raft_surface_jerk": { - "value": "10" - }, - "cross_infill_pocket_size": { - "value": "5.33" - }, - "support_infill_extruder_nr": { - "value": "0" - }, - "acceleration_enabled": { - "default_value": true - }, - "jerk_wall_x": { - "value": "10" - }, - "skin_overlap": { - "value": "15" - }, - "infill_material_flow": { - "value": "99" - }, - "speed_equalize_flow_max": { - "default_value": 40 - }, - "skin_preshrink": { - "value": "0.8" - }, - "speed_wall": { - "value": "20" - }, - "support_tree_collision_resolution": { - "value": "0.2" - }, - "meshfix_maximum_deviation": { - "default_value": 0.005 - }, - "jerk_roofing": { - "value": "10" - }, - "fill_outline_gaps": { - "default_value": true - }, - "layer_height": { - "default_value": 0.2 - }, - "remove_empty_first_layers": { - "default_value": false - }, - "prime_tower_flow": { - "value": "99" - }, - "support_roof_line_distance": { - "value": "0.57" - }, - "wipe_retraction_speed": { - "value": "30" - }, - "support_extruder_nr_layer_0": { - "value": "0" - }, - "layer_height_0": { - "default_value": 0.2 - }, - "multiple_mesh_overlap": { - "default_value": 0 - }, - "ooze_shield_dist": { - "default_value": 4 - }, - "jerk_enabled": { - "default_value": true - }, - "acceleration_support": { - "value": "400" - }, - "adhesion_extruder_nr": { - "value": "0" - }, - "skirt_line_count": { - "default_value": 2 - }, - "travel_compensate_overlapping_walls_x_enabled": { - "value": "False" - }, - "jerk_wall_0": { - "value": "10" - }, - "raft_speed": { - "value": "60" - }, - "speed_layer_0": { - "value": "10.0" - }, - "machine_width": { - "default_value": 210 - }, - "acceleration_wall": { - "value": "400" - }, - "jerk_infill": { - "value": "10" - }, - "wipe_hop_enable": { - "value": "False" - }, - "acceleration_travel_layer_0": { - "value": "400" - }, - "raft_interface_speed": { - "value": "60" - }, - "skin_edge_support_layers": { - "value": "0" - }, - "support_xy_distance_overhang": { - "value": "0.5" - }, - "brim_width": { - "default_value": 10 - }, - "coasting_enable": { - "default_value": true - }, - "jerk_print": { - "default_value": 10 - }, - "acceleration_support_roof": { - "value": "250" - }, - "prime_tower_min_volume": { - "default_value": 4 - }, - "support_roof_material_flow": { - "value": "99" - }, - "wall_0_wipe_dist": { - "value": "0" - }, - "jerk_topbottom": { - "value": "10" - }, - "retraction_count_max": { - "default_value": 30 - }, - "skin_overlap_mm": { - "value": "0.06" - }, - "extruders_enabled_count": { - "value": "2" - }, - "speed_support_bottom": { - "value": "33.33" - }, - "support_skip_some_zags": { - "default_value": true - }, - "ooze_shield_angle": { - "default_value": 50 - }, - "wall_thickness": { - "value": "1.2" - }, - "speed_print_layer_0": { - "value": "10.0" - } - } + "name": "Skriware 2", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Skriware", + "manufacturer": "Skriware", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "supports_usb_connection": false, + "platform": "skriware_2_platform.stl", + "machine_extruder_trains": { + "0": "skriware_2_extruder_0", + "1": "skriware_2_extruder_1" + } + }, + "overrides": { + "raft_interface_thickness": { + "value": "0.2" + }, + "wipe_retraction_prime_speed": { + "value": "30" + }, + "support_skip_zag_per_mm": { + "default_value": 10 + }, + "material_bed_temperature": { + "value": "50" + }, + "raft_airgap": { + "default_value": 0.2 + }, + "top_layers": { + "value": "4" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "raft_surface_acceleration": { + "value": "400" + }, + "meshfix_maximum_travel_resolution": { + "value": "0.8" + }, + "machine_end_gcode": { + "default_value": "M59\nG92 E0\nG1 E-10 F300\nM104 T0 S0\nM104 T1 S0\nM140 S0\nG28 X0 Y0\nM84\nM106 S0\nM107" + }, + "wall_material_flow": { + "value": "99" + }, + "raft_interface_jerk": { + "value": "10" + }, + "acceleration_topbottom": { + "value": "400" + }, + "prime_tower_size": { + "default_value": 1 + }, + "max_skin_angle_for_expansion": { + "default_value": 50 + }, + "raft_acceleration": { + "value": "400" + }, + "support_xy_distance": { + "default_value": 0.6 + }, + "xy_offset_layer_0": { + "value": "-0.16" + }, + "raft_interface_fan_speed": { + "value": "40" + }, + "retraction_speed": { + "default_value": 30 + }, + "speed_print": { + "default_value": 20 + }, + "travel_avoid_supports": { + "default_value": true + }, + "infill_overlap_mm": { + "value": "0.0" + }, + "support_roof_height": { + "value": "0.4" + }, + "speed_travel_layer_0": { + "value": "120" + }, + "speed_wall_0": { + "value": "20" + }, + "acceleration_wall_x": { + "value": "400" + }, + "layer_0_z_overlap": { + "value": "0.1" + }, + "switch_extruder_retraction_speed": { + "value": "30" + }, + "travel_compensate_overlapping_walls_enabled": { + "default_value": false + }, + "raft_base_acceleration": { + "value": "400" + }, + "raft_base_speed": { + "value": "60" + }, + "wall_0_material_flow": { + "value": "99" + }, + "support_infill_rate": { + "value": "20" + }, + "raft_surface_layers": { + "default_value": 1 + }, + "machine_height": { + "default_value": 210 + }, + "retraction_prime_speed": { + "value": "60" + }, + "support_interface_material_flow": { + "value": "99" + }, + "raft_surface_fan_speed": { + "value": "80" + }, + "raft_base_line_width": { + "value": "0.4" + }, + "infill_line_distance": { + "value": "5.33" + }, + "default_material_print_temperature": { + "default_value": 200 + }, + "speed_roofing": { + "value": "20" + }, + "skin_material_flow": { + "value": "99" + }, + "cool_fan_full_layer": { + "value": "1" + }, + "material_break_preparation_temperature": { + "value": "195" + }, + "support_roof_density": { + "value": "70" + }, + "support_infill_sparse_thickness": { + "value": "0.2" + }, + "retraction_retract_speed": { + "value": "30" + }, + "speed_slowdown_layers": { + "default_value": 1 + }, + "support_line_distance": { + "value": "2" + }, + "cool_lift_head": { + "default_value": true + }, + "min_skin_width_for_expansion": { + "value": "0.67" + }, + "cool_min_speed": { + "default_value": 5 + }, + "switch_extruder_retraction_speeds": { + "default_value": 30 + }, + "raft_base_line_spacing": { + "value": "0.8" + }, + "speed_support": { + "value": "50" + }, + "skirt_brim_material_flow": { + "value": "99" + }, + "speed_infill": { + "value": "80" + }, + "support_initial_layer_line_distance": { + "value": "2" + }, + "support_use_towers": { + "default_value": false + }, + "skin_no_small_gaps_heuristic": { + "default_value": true + }, + "acceleration_roofing": { + "value": "400" + }, + "material_initial_print_temperature": { + "value": "195" + }, + "material_diameter": { + "default_value": 1.75 + }, + "xy_offset": { + "default_value": -0.16 + }, + "support_extruder_nr": { + "value": "0" + }, + "support_brim_line_count": { + "value": "16" + }, + "support_interface_extruder_nr": { + "value": "0" + }, + "support_roof_extruder_nr": { + "value": "0" + }, + "material_adhesion_tendency": { + "default_value": 0 + }, + "material_standby_temperature": { + "default_value": 195 + }, + "cool_fan_speed_0": { + "default_value": 100 + }, + "brim_line_count": { + "value": "17" + }, + "adhesion_type": { + "default_value": "raft" + }, + "switch_extruder_retraction_amount": { + "value": "16" + }, + "retraction_amount": { + "default_value": 3 + }, + "acceleration_travel": { + "value": "400" + }, + "jerk_print_layer_0": { + "value": "10" + }, + "raft_surface_thickness": { + "value": "0.2" + }, + "raft_base_jerk": { + "value": "10" + }, + "bottom_thickness": { + "value": "0.8" + }, + "roofing_material_flow": { + "value": "99" + }, + "top_skin_expand_distance": { + "value": "0.8" + }, + "speed_wall_x": { + "value": "20" + }, + "support_enable": { + "default_value": true + }, + "acceleration_print_layer_0": { + "value": "400" + }, + "jerk_prime_tower": { + "value": "5" + }, + "infill_before_walls": { + "default_value": false + }, + "raft_interface_line_spacing": { + "value": "0.4" + }, + "gantry_height": { + "value": "210" + }, + "material_print_temperature_layer_0": { + "value": "195" + }, + "raft_interface_line_width": { + "value": "0.4" + }, + "skirt_brim_line_width": { + "value": "0.5" + }, + "z_seam_y": { + "value": "180" + }, + "roofing_layer_count": { + "value": "1" + }, + "raft_margin": { + "default_value": 4 + }, + "cool_fan_full_at_height": { + "value": "0" + }, + "acceleration_support_interface": { + "value": "250" + }, + "retraction_min_travel": { + "value": "1" + }, + "acceleration_layer_0": { + "value": "400" + }, + "support_z_distance": { + "default_value": 0.2 + }, + "machine_heated_bed": { + "default_value": true + }, + "raft_jerk": { + "value": "10" + }, + "raft_surface_speed": { + "value": "60" + }, + "initial_layer_line_width_factor": { + "default_value": 120 + }, + "machine_start_gcode": { + "default_value": "G90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM420 S1 Z0.6 ;enable bed levelling\nG1 Z10 F250 ;move the platform down 10mm\nM107 ;fan off\nM42 P11 S255 ;turn on front fan\nM140 S{material_bed_temperature}\nM104 T0 S{material_print_temperature, 0}\nM104 T1 S{material_print_temperature, 1}\nG1 F2500 Y260 X0\nM190 S{material_bed_temperature}\nM109 T0 S{material_print_temperature, 0}\nM109 T1 S{material_print_temperature, 1}\nM60 ;enable E-FADE Algorithm\nM62 A ;filament sensor off\nG92 E0 ;zero the extruded length\nT1\nG92 E0;zero the extruded length\nG1 F300 Z0.3\nG1 F1200 X20\nG1 F1200 X180 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 F300 Z1.5\nG92 E0 ;zero the extruded length again\nT0\nG92 E0 ;zero the extruded length\nG1 F1200 Y258\nG1 F300 Z0.3\nG1 F1200 X40 E21 ;extrude 21 mm of feed stock\nG1 F1200 E15 ;retracting 6 mm\nG1 F2000 E21\nG1 F2000 E11\nG1 Z1.5\nM61 A ;filament sensor reset\nM63 A ;filament sensor on\nG92 E0 ;zero the extruded length again\nM58 ;end of Start G-Code and signal retract management\nT{initial_extruder_nr}" + }, + "bottom_skin_preshrink": { + "value": "0.8" + }, + "ironing_inset": { + "value": "0.2" + }, + "jerk_travel": { + "value": "10" + }, + "machine_depth": { + "default_value": 260 + }, + "jerk_skirt_brim": { + "value": "5" + }, + "infill_wipe_dist": { + "value": "0" + }, + "raft_interface_acceleration": { + "value": "400" + }, + "z_seam_x": { + "value": "115" + }, + "material_print_temperature": { + "value": "195" + }, + "material_bed_temperature_layer_0": { + "value": "50" + }, + "wipe_retraction_retract_speed": { + "value": "30" + }, + "jerk_travel_layer_0": { + "value": "10" + }, + "infill_overlap": { + "value": "0" + }, + "acceleration_support_infill": { + "value": "400" + }, + "travel_compensate_overlapping_walls_0_enabled": { + "value": "False" + }, + "support_bottom_material_flow": { + "value": "99" + }, + "jerk_support_roof": { + "value": "5" + }, + "wall_x_material_flow": { + "value": "99" + }, + "speed_support_interface": { + "value": "33.33" + }, + "jerk_layer_0": { + "value": "10" + }, + "support_angle": { + "default_value": 60 + }, + "infill_sparse_thickness": { + "value": "0.2" + }, + "prime_tower_position_y": { + "value": "1" + }, + "retraction_combing": { + "default_value": "infill" + }, + "acceleration_prime_tower": { + "value": "250" + }, + "acceleration_print": { + "default_value": 400 + }, + "acceleration_infill": { + "value": "500" + }, + "bridge_wall_speed": { + "value": "10.0" + }, + "acceleration_wall_0": { + "value": "400" + }, + "support_offset": { + "default_value": 0.2 + }, + "build_volume_temperature": { + "default_value": 28 + }, + "switch_extruder_prime_speed": { + "value": "60" + }, + "speed_prime_tower": { + "value": "20" + }, + "top_skin_preshrink": { + "value": "0.8" + }, + "jerk_ironing": { + "value": "5" + }, + "skin_outline_count": { + "default_value": 0 + }, + "skirt_brim_speed": { + "value": "10.0" + }, + "raft_base_thickness": { + "value": "0.2" + }, + "infill_sparse_density": { + "default_value": 15 + }, + "support_bottom_extruder_nr": { + "value": "0" + }, + "support_material_flow": { + "value": "98" + }, + "min_infill_area": { + "default_value": 1 + }, + "jerk_support": { + "value": "10" + }, + "bottom_skin_expand_distance": { + "value": "0.8" + }, + "retract_at_layer_change": { + "default_value": true + }, + "jerk_support_interface": { + "value": "5" + }, + "jerk_support_bottom": { + "value": "5" + }, + "optimize_wall_printing_order": { + "default_value": true + }, + "skirt_brim_minimal_length": { + "default_value": 50 + }, + "jerk_support_infill": { + "value": "10" + }, + "initial_bottom_layers": { + "value": "3" + }, + "prime_tower_position_x": { + "value": "1" + }, + "acceleration_support_bottom": { + "value": "250" + }, + "speed_support_roof": { + "value": "33.33" + }, + "speed_support_infill": { + "value": "80" + }, + "bridge_skin_speed_2": { + "value": "15" + }, + "raft_fan_speed": { + "default_value": 100 + }, + "wipe_retraction_amount": { + "value": "3" + }, + "skin_edge_support_thickness": { + "value": "0" + }, + "bottom_layers": { + "value": "3" + }, + "retraction_extrusion_window": { + "value": "3" + }, + "acceleration_ironing": { + "value": "250" + }, + "support_top_distance": { + "value": "0.2" + }, + "travel_retract_before_outer_wall": { + "default_value": true + }, + "material_flow": { + "default_value": 99 + }, + "support_bottom_distance": { + "value": "0.2" + }, + "expand_skins_expand_distance": { + "value": "0.8" + }, + "jerk_wall": { + "value": "10" + }, + "support_zag_skip_count": { + "value": "8" + }, + "connect_infill_polygons": { + "value": "False" + }, + "acceleration_skirt_brim": { + "value": "250" + }, + "z_seam_corner": { + "default_value": "z_seam_corner_weighted" + }, + "raft_surface_jerk": { + "value": "10" + }, + "cross_infill_pocket_size": { + "value": "5.33" + }, + "support_infill_extruder_nr": { + "value": "0" + }, + "acceleration_enabled": { + "default_value": true + }, + "jerk_wall_x": { + "value": "10" + }, + "skin_overlap": { + "value": "15" + }, + "infill_material_flow": { + "value": "99" + }, + "speed_equalize_flow_max": { + "default_value": 40 + }, + "skin_preshrink": { + "value": "0.8" + }, + "speed_wall": { + "value": "20" + }, + "support_tree_collision_resolution": { + "value": "0.2" + }, + "meshfix_maximum_deviation": { + "default_value": 0.005 + }, + "jerk_roofing": { + "value": "10" + }, + "fill_outline_gaps": { + "default_value": true + }, + "layer_height": { + "default_value": 0.2 + }, + "remove_empty_first_layers": { + "default_value": false + }, + "prime_tower_flow": { + "value": "99" + }, + "support_roof_line_distance": { + "value": "0.57" + }, + "wipe_retraction_speed": { + "value": "30" + }, + "support_extruder_nr_layer_0": { + "value": "0" + }, + "layer_height_0": { + "default_value": 0.2 + }, + "multiple_mesh_overlap": { + "default_value": 0 + }, + "ooze_shield_dist": { + "default_value": 4 + }, + "jerk_enabled": { + "default_value": true + }, + "acceleration_support": { + "value": "400" + }, + "adhesion_extruder_nr": { + "value": "0" + }, + "skirt_line_count": { + "default_value": 2 + }, + "travel_compensate_overlapping_walls_x_enabled": { + "value": "False" + }, + "jerk_wall_0": { + "value": "10" + }, + "raft_speed": { + "value": "60" + }, + "speed_layer_0": { + "value": "10.0" + }, + "machine_width": { + "default_value": 210 + }, + "acceleration_wall": { + "value": "400" + }, + "jerk_infill": { + "value": "10" + }, + "wipe_hop_enable": { + "value": "False" + }, + "acceleration_travel_layer_0": { + "value": "400" + }, + "raft_interface_speed": { + "value": "60" + }, + "skin_edge_support_layers": { + "value": "0" + }, + "support_xy_distance_overhang": { + "value": "0.5" + }, + "brim_width": { + "default_value": 10 + }, + "coasting_enable": { + "default_value": true + }, + "jerk_print": { + "default_value": 10 + }, + "acceleration_support_roof": { + "value": "250" + }, + "prime_tower_min_volume": { + "default_value": 4 + }, + "support_roof_material_flow": { + "value": "99" + }, + "wall_0_wipe_dist": { + "value": "0" + }, + "jerk_topbottom": { + "value": "10" + }, + "retraction_count_max": { + "default_value": 30 + }, + "skin_overlap_mm": { + "value": "0.06" + }, + "extruders_enabled_count": { + "value": "2" + }, + "speed_support_bottom": { + "value": "33.33" + }, + "support_skip_some_zags": { + "default_value": true + }, + "ooze_shield_angle": { + "default_value": 50 + }, + "wall_thickness": { + "value": "1.2" + }, + "speed_print_layer_0": { + "value": "10.0" + } + } } \ No newline at end of file diff --git a/resources/definitions/stereotech_ste320.def.json b/resources/definitions/stereotech_ste320.def.json index 3eb114324b..3aa89effc5 100644 --- a/resources/definitions/stereotech_ste320.def.json +++ b/resources/definitions/stereotech_ste320.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "Stereotech", "manufacturer": "Stereotech LLC.", - "category": "Other", "platform": "stereotech_ste320_platform.obj", "platform_texture": "StereotechSte320backplate.png", "platform_offset": [ diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index 2ee3650404..4b1e4a3fbd 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -6,7 +6,6 @@ { "author": "M.K", "manufacturer": "eMotionTech", - "category": "Other", "visible": true, "file_formats": "text/x-gcode", "has_machine_quality": true, diff --git a/resources/definitions/ubuild-3d_mr_bot_280.def.json b/resources/definitions/ubuild-3d_mr_bot_280.def.json index 255d8f032b..f1c7bc7581 100644 --- a/resources/definitions/ubuild-3d_mr_bot_280.def.json +++ b/resources/definitions/ubuild-3d_mr_bot_280.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "uBuild-3D", "manufacturer": "uBuild-3D", - "category": "Other", "file_formats": "text/x-gcode", "has_materials": true, "preferred_quality_type": "draft", diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 7a60ff35c8..ff9a75c40c 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "visible": false, "exclude_materials": [ "generic_hips", "generic_petg", "structur3d_dap100silicone" ] }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 620de59373..824a0e3a92 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s3_platform.obj", diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index d21edb0843..ded94a2747 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Ultimaker", "manufacturer": "Ultimaker B.V.", - "category": "Ultimaker", "visible": true, "file_formats": "application/x-ufp;text/x-gcode", "platform": "ultimaker_s5_platform.obj", diff --git a/resources/definitions/uni_print_3d.def.json b/resources/definitions/uni_print_3d.def.json index 99d9eab1e0..0f00c23165 100644 --- a/resources/definitions/uni_print_3d.def.json +++ b/resources/definitions/uni_print_3d.def.json @@ -6,7 +6,6 @@ { "visible": true, "author": "Alexander Rössler", - "category": "Other", "manufacturer": "TheCoolTool", "file_formats": "text/x-ngc;text/x-gcode", "platform": "uni_print_3d_platform.stl", diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index f89d592be1..754a1a77a2 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "category": "Other", "visible": true, "file_formats": "text/x-gcode", "supports_usb_connection": false, diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index 49afd18ba8..c2d2d9b7f4 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "category": "Other", "visible": true, "file_formats": "text/x-gcode", "supports_usb_connection": true, diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index fab2e9f45f..576398551b 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "category": "Other", "visible": true, "file_formats": "text/x-gcode", "supports_usb_connection": true, diff --git a/resources/definitions/winbo_superhelper155.def.json b/resources/definitions/winbo_superhelper155.def.json index 65bb4e7b73..77b4bc31c5 100644 --- a/resources/definitions/winbo_superhelper155.def.json +++ b/resources/definitions/winbo_superhelper155.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "Winbo", "manufacturer": "Winbo Smart Tech Co., Ltd.", - "category": "Other", "visible": true, "file_formats": "text/x-gcode", "supports_usb_connection": true, diff --git a/tests/Settings/TestDefinitionContainer.py b/tests/Settings/TestDefinitionContainer.py index 9edf7f3d36..2f2b343338 100644 --- a/tests/Settings/TestDefinitionContainer.py +++ b/tests/Settings/TestDefinitionContainer.py @@ -45,6 +45,18 @@ def test_definitionIds(file_path): definition_id = os.path.basename(file_path).split(".")[0] assert " " not in definition_id # Definition IDs are not allowed to have spaces. +@pytest.mark.parametrize("file_path", definition_filepaths) +def test_noCategory(file_path): + """ + Categories for definition files have been deprecated. Test that they are not + present. + :param file_path: The path of the machine definition to test. + """ + with open(file_path, encoding = "utf-8") as f: + json = f.read() + metadata = DefinitionContainer.deserializeMetadata(json, "test_container_id") + assert "category" not in metadata[0] + ## Tests all definition containers @pytest.mark.parametrize("file_path", machine_filepaths) def test_validateMachineDefinitionContainer(file_path, definition_container): @@ -59,7 +71,6 @@ def test_validateMachineDefinitionContainer(file_path, definition_container): with patch("UM.VersionUpgradeManager.VersionUpgradeManager.getInstance", MagicMock(return_value = mocked_vum)): assertIsDefinitionValid(definition_container, file_path) - def assertIsDefinitionValid(definition_container, file_path): with open(file_path, encoding = "utf-8") as data: json = data.read()