From c7d6c650247e3fb0fe2c0f58ff21460197ab7064 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 21 May 2024 14:29:59 +0200 Subject: [PATCH 1/2] Add CPE CFF and GFF profiles. PP-480 --- ..._f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ ..._f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.4_cffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.4_gffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.6_cffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ .../um_f4_cc0.6_gffcpe_0.2mm.inst.cfg | 18 ++++++++++++++++++ 8 files changed, 144 insertions(+) create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..a29540bbeb --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..01ea70dd38 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.4 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..98087f4712 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg new file mode 100644 index 0000000000..ffe4988764 --- /dev/null +++ b/resources/intent/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm_engineering.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = intent +variant = CC 0.6 + +[values] +jerk_print = 30 +speed_print = 80 +wall_thickness = =line_width * 3 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..40f9516580 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..d0dacd043c --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.4_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.4 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..74915d58be --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_cffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_cffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + diff --git a/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg new file mode 100644 index 0000000000..d6140b680a --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_cc0.6_gffcpe_0.2mm.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_factor4 +name = Fast +version = 4 + +[metadata] +material = generic_gffcpe +quality_type = draft +setting_version = 23 +type = quality +variant = CC 0.6 +weight = -2 + +[values] +support_bottom_distance = =support_z_distance / 2 +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 + From 4c65d96c6a2c75ba982a46d0455ea891ef1b61f4 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Tue, 18 Jun 2024 20:27:47 +0200 Subject: [PATCH 2/2] Merge latest changes from main branch. PP-480 --- resources/definitions/fdmprinter.def.json | 19 +- resources/definitions/ultimaker.def.json | 1 + .../ultimaker_method_base.def.json | 14 +- .../definitions/ultimaker_methodx.def.json | 17 +- .../definitions/ultimaker_methodxl.def.json | 6 - .../definitions/ultimaker_sketch.def.json | 206 ++++-------------- .../ultimaker_sketch_large.def.json | 37 ++++ ...um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg} | 6 +- ...tch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg} | 6 +- .../ultimaker_sketch_large_0.4mm.inst.cfg | 15 ++ 10 files changed, 125 insertions(+), 202 deletions(-) create mode 100644 resources/definitions/ultimaker_sketch_large.def.json rename resources/quality/ultimaker_sketch/{um_sketch__pla-175_0.2mm.inst.cfg => um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg} (52%) rename resources/quality/ultimaker_sketch/{um_sketch__tough-pla-175_0.2mm.inst.cfg => um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg} (51%) create mode 100644 resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 124ba37967..c76617ec17 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6208,6 +6208,7 @@ "type": "bool", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false, "children": @@ -6220,6 +6221,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_base_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6231,6 +6233,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_interface_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false }, @@ -6242,6 +6245,7 @@ "value": "raft_remove_inside_corners", "default_value": false, "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "resolve": "any(extruderValues('raft_surface_remove_inside_corners'))", "settable_per_mesh": false, "settable_per_extruder": false } @@ -6845,7 +6849,7 @@ "label": "Prime Tower Type", "description": "How to generate the prime tower:", "type": "enum", - "resolve": "'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", + "resolve": "'interleaved' if all(mode == 'interleaved' for mode in extruderValues('prime_tower_mode')) else 'interleaved' if (all(material_type_var == extruderValues('material_type')[0] for material_type_var in extruderValues('material_type')) and all(material_brand_var == extruderValues('material_brand')[0] for material_brand_var in extruderValues('material_brand'))) else 'normal'", "options": { "normal": "Normal", @@ -8021,6 +8025,19 @@ "default_value": 90, "settable_per_mesh": true }, + "seam_overhang_angle": + { + "label": "Seam Overhanging Wall Angle", + "description": "Try to prevent seams on walls that overhang more than this angle. When the value is 90, no walls will be treated as overhanging.", + "unit": "\u00b0", + "type": "float", + "minimum_value": "0", + "minimum_value_warning": "2", + "maximum_value": "90", + "default_value": 90, + "value": "wall_overhang_angle", + "settable_per_mesh": true + }, "wall_overhang_speed_factor": { "label": "Overhanging Wall Speed", diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 3821fdefd6..97bb099ea4 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -80,6 +80,7 @@ "maximum_value_warning": "120", "minimum_value": "0" }, + "material_print_temp_wait": { "value": false }, "material_print_temperature": { "minimum_value": "0" }, "material_standby_temperature": { diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..92b9729fdf 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -23,12 +23,8 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_pc_175", + "generic_", "ultimaker_rapidrinse_175", - "generic_tpu_175", "goofoo_", "ideagen3D_", "imade3d_", @@ -59,13 +55,7 @@ "1": "ultimaker_method_extruder_right" }, "nozzle_offsetting_for_disallowed_areas": false, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", - "preferred_material": "generic_pla_175", + "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "fast", "preferred_variant_name": "1A", "supports_network_connection": true, diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 9828ba96f2..3f02a30235 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -23,19 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_pc_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -48,6 +36,8 @@ "polywood_pla", "redd_", "tizyx_", + "ultimaker_pla_175", + "ultimaker_tough_pla_175", "verbatim_", "Vertex_", "volumic_", @@ -70,7 +60,6 @@ 0, 16 ], - "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", "preferred_quality_type": "draft", "preferred_variant_name": "1XA", diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 6c12218b51..098586df68 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -18,12 +18,6 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 05e506c3b6..03d31fba0b 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -1,6 +1,6 @@ { "version": 2, - "name": "UltiMaker Sketch", + "name": "MakerBot Sketch", "inherits": "ultimaker", "metadata": { @@ -10,189 +10,60 @@ "file_formats": "application/x-makerbot-sketch", "platform": "ultimaker_sketch_platform.obj", "exclude_materials": [ - "dsm_175_novamidid1030cf", - "Essentium_175_UltrafuseZPCTG", - "imade3d_petg_175", - "imade3d_pla_175", - "imade3d_petg_green", - "imade3d_pla_green", - "imade3d_petg_pink", - "imade3d_pla_pink", - "chromatik_pla", - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_tpu", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", - "Extrudr_GreenTECPro_Black_175", - "Extrudr_GreenTECPro_Blue_175", - "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", - "Extrudr_GreenTECPro_Silver_175", - "Extrudr_GreenTECPro_White_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_asa_175", - "generic_abs_175", - "generic_absr_175", + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", "generic_bvoh_175", "generic_cpe_175", - "generic_cffpa_175", "generic_hips_175", - "generic_nylon_175", "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "generic_rapidrinse_175", - "generic_sr30_175", + "ultimaker_rapidrinse_175", "generic_tpu_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa", - "goofoo_pa_cf", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "ideagen3D_ToughPLA", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "volumic_abs_ultra", - "volumic_arma_ultra", - "volumic_asa_ultra", - "volumic_br80_ultra", - "volumic_bumper_ultra", - "volumic_cu80_ultra", - "volumic_flex93_ultra", - "volumic_medical_ultra", - "volumic_nylon_ultra", - "volumic_pekk_carbone", - "volumic_petgcarbone_ultra", - "volumic_petg_ultra", - "volumic_pla_ultra", - "volumic_pp_ultra", - "volumic_strong_ultra", - "volumic_support_ultra", - "xyzprinting_abs", - "xyzprinting_antibact_pla", - "xyzprinting_carbon_fiber", - "xyzprinting_colorinkjet_pla", - "xyzprinting_flexible", - "xyzprinting_metallic_pla", - "xyzprinting_nylon", - "xyzprinting_pahtcf15", - "xyzprinting_pc", - "xyzprinting_petcf15", - "xyzprinting_petg", - "xyzprinting_pla", - "xyzprinting_ppgf30", - "xyzprinting_tough_pla", - "xyzprinting_tpu", - "zyyx_pro_flex", - "zyyx_pro_pla", - "octofiber_pla", - "fiberlogy_hd_pla" + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_", + "generic_", + "ultimaker_asa", + "ultimaker_abs", + "ultimaker_nylon", + "ultimaker_rapidrinse", + "ultimaker_sr30" ], "has_machine_quality": true, "has_materials": true, - "has_variants": false, + "has_variants": true, "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotSketch.png", "preferred_quality_type": "draft", "preferred_variant_name": "0.4mm", "reference_machine_id": "sketch", "supports_network_connection": true, "supports_usb_connection": false, - "variant_definition": "ultimaker_sketch", "variants_name": "Extruder", "weight": -1 }, @@ -202,6 +73,7 @@ "adhesion_type": { "value": "'raft'" }, "brim_width": { "value": "3" }, "cool_fan_speed": { "value": "100" }, + "cool_min_layer_time": { "value": 3 }, "extruder_prime_pos_abs": { "default_value": true }, "gantry_height": { "value": "60" }, "infill_overlap": { "value": 15 }, @@ -221,7 +93,7 @@ "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, "machine_min_cool_heat_time_window": { "value": "15" }, - "machine_name": { "default_value": "UltiMaker Sketch" }, + "machine_name": { "default_value": "Makerbot Sketch" }, "machine_nozzle_cool_down_speed": { "default_value": 0.8 }, "machine_nozzle_heat_up_speed": { "default_value": 1.4 }, "machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" }, diff --git a/resources/definitions/ultimaker_sketch_large.def.json b/resources/definitions/ultimaker_sketch_large.def.json new file mode 100644 index 0000000000..ca1ef73e4d --- /dev/null +++ b/resources/definitions/ultimaker_sketch_large.def.json @@ -0,0 +1,37 @@ +{ + "version": 2, + "name": "MakerBot Sketch Large", + "inherits": "ultimaker_sketch", + "metadata": + { + "visible": true, + "author": "Ultimaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot-sketch", + "platform": "ultimaker_sketch_large_platform.obj", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { "0": "ultimaker_sketch_extruder" }, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "draft", + "preferred_variant_name": "0.4mm", + "quality_definition": "ultimaker_sketch", + "reference_machine_id": "sketch_large", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "Makerbot Sketch Large" }, + "machine_width": { "default_value": 220 }, + "material_flow": { "default_value": 94 }, + "retraction_amount": { "value": 6 }, + "speed_print": { "value": 50 }, + "speed_travel": { "value": 100 } + } +} \ No newline at end of file diff --git a/resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg similarity index 52% rename from resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg index 17de71876a..79d4211834 100644 --- a/resources/quality/ultimaker_sketch/um_sketch__pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,15 @@ name = Fast version = 4 [metadata] -material = generic_pla_175 +material = ultimaker_pla_175 quality_type = draft setting_version = 23 type = quality +variant = 0.4mm weight = -2 [values] +retraction_min_travel = =2*line_width +support_structure = tree +support_z_distance = =layer_height diff --git a/resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg similarity index 51% rename from resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg rename to resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg index 444ad58aab..64b16d0e07 100644 --- a/resources/quality/ultimaker_sketch/um_sketch__tough-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg @@ -4,11 +4,15 @@ name = Fast version = 4 [metadata] -material = generic_tough_pla_175 +material = ultimaker_tough_pla_175 quality_type = draft setting_version = 23 type = quality +variant = 0.4mm weight = -2 [values] +retraction_min_travel = =2*line_width +support_structure = tree +support_z_distance = =layer_height diff --git a/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg new file mode 100644 index 0000000000..3d9edf5382 --- /dev/null +++ b/resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_sketch_large +name = 0.4mm +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = sketch_l_extruder +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 0.4mm +machine_nozzle_size = 0.4 +