From 4cc0b0e5b5ec03c5fd88f26c6e6a10bf91ca3028 Mon Sep 17 00:00:00 2001 From: Tyler Adler Date: Sat, 15 Jan 2022 18:19:35 -0800 Subject: [PATCH] Revert "Readd qualities" This reverts commit f5aaef98a045d59fa7ab66903dfbd26ea4946d03. --- .../definitions/elegoo_neptune_2.def.json | 8 ++-- .../elegoo_neptune_2_best.inst.cfg | 35 ---------------- .../elegoo_neptune_2_coarse.inst.cfg | 24 ----------- .../elegoo_neptune_2_normal.inst.cfg | 42 ------------------- .../elegoo_neptune_2_rough.inst.cfg | 40 ------------------ 5 files changed, 3 insertions(+), 146 deletions(-) delete mode 100644 resources/quality/elegoo_neptune_2/elegoo_neptune_2_best.inst.cfg delete mode 100644 resources/quality/elegoo_neptune_2/elegoo_neptune_2_coarse.inst.cfg delete mode 100644 resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg delete mode 100644 resources/quality/elegoo_neptune_2/elegoo_neptune_2_rough.inst.cfg diff --git a/resources/definitions/elegoo_neptune_2.def.json b/resources/definitions/elegoo_neptune_2.def.json index eb5f28c599..920add445d 100644 --- a/resources/definitions/elegoo_neptune_2.def.json +++ b/resources/definitions/elegoo_neptune_2.def.json @@ -1,20 +1,18 @@ { + "name": "Neptune 2", "version": 2, - "name": "Elegoo Neptune 2", "inherits": "fdmprinter", - "metadata": - { + "metadata": { "visible": true, "author": "Toylerrr", "manufacturer": "Elegoo", - "file_formats": "text/x-gcode", "platform": "elegoo_neptune_2.stl", "platform_offset": [0,0,0], + "file_formats": "text/x-gcode", "machine_extruder_trains": { "0": "elgoo_neptune2_extruder_0" }, - "has_machine_quality": true, "preferred_material": "generic_pla", "exclude_materials": [ "Vertex_Delta_ABS", diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_best.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_best.inst.cfg deleted file mode 100644 index 1e56dcb94f..0000000000 --- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_best.inst.cfg +++ /dev/null @@ -1,35 +0,0 @@ -[general] -version = 4 -name = Best -definition = elegoo_neptune_2 - -[metadata] -setting_version = 17 -type = quality -quality_type = Xfine -weight = 1 -global_quality = True - -[values] -acceleration_enabled = True -jerk_enabled = True -layer_height = 0.12 -layer_height_0 = 0.2 -support_enable = False - -coasting_enable = False -infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) -infill_pattern = grid -infill_sparse_density = 15 -material_flow_layer_0 = 95 -retraction_amount = 6 -skirt_brim_speed = 25.0 -speed_layer_0 = 25.0 -speed_travel_layer_0 = 125.0 -speed_wall_x = 50.0 -top_bottom_thickness = 1 -travel_compensate_overlapping_walls_0_enabled = True -wall_0_material_flow = 95 -wall_0_wipe_dist = 0.4 -wall_thickness = 1.2 -z_seam_type = sharpest_corner \ No newline at end of file diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_coarse.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_coarse.inst.cfg deleted file mode 100644 index dd014f2e73..0000000000 --- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_coarse.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Coarse -definition = elegoo_neptune_2 - -[metadata] -setting_version = 17 -type = quality -quality_type = coarse -weight = -3 -global_quality = True - -[values] -layer_height = 0.4 -layer_height_0 = 0.45 -top_thickness = 1.2 -bottom_thickness = 1.2 -speed_print = 50 -wall_thickness = 1.2 -wall_line_count = 3 -retraction_enable = true -retraction_amount = 5 -retraction_speed = 70 -retraction_combing = noskin \ No newline at end of file diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg deleted file mode 100644 index 486d46a6d7..0000000000 --- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_normal.inst.cfg +++ /dev/null @@ -1,42 +0,0 @@ -[general] -version = 4 -name = Normal -definition = elegoo_neptune_2 - -[metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = 0 -global_quality = True - -[values] -acceleration_enabled = True -adhesion_type = skirt -jerk_enabled = True -layer_height = 0.2 -layer_height_0 = 0.2 -support_enable = False -coasting_enable = False -infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) -infill_pattern = grid -infill_sparse_density = 15 -material_flow_layer_0 = 95 -retraction_amount = 6 -skin_angles = [90 ] -skin_line_width = =line_width -skin_monotonic = True -skin_outline_count = 0 -skin_overlap = 30.0 -skirt_brim_speed = 25.0 -speed_layer_0 = 25.0 -speed_travel_layer_0 = 125.0 -speed_wall_x = 50.0 -support_xy_distance = 0.2 -top_bottom_thickness = 1 -travel_compensate_overlapping_walls_0_enabled = True -wall_0_inset = 0.2 -wall_0_material_flow = 95 -wall_0_wipe_dist = 0.4 -wall_thickness = 1.2 -z_seam_type = sharpest_corner \ No newline at end of file diff --git a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_rough.inst.cfg b/resources/quality/elegoo_neptune_2/elegoo_neptune_2_rough.inst.cfg deleted file mode 100644 index db35887a98..0000000000 --- a/resources/quality/elegoo_neptune_2/elegoo_neptune_2_rough.inst.cfg +++ /dev/null @@ -1,40 +0,0 @@ -[general] -version = 4 -name = Draft -definition = elegoo_neptune_2 - -[metadata] -setting_version = 17 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -acceleration_enabled = True -jerk_enabled = True -layer_height = 0.28 -layer_height_0 = 0.28 - -bottom_layers = =999999 if infill_sparse_density == 100 else math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4)) -coasting_enable = False -infill_line_distance = =0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1)))) -infill_pattern = grid -infill_sparse_density = 10.0 -material_flow_layer_0 = 95 -retraction_amount = 6 -roofing_layer_count = 1 -skin_overlap = 15.0 -skirt_brim_speed = 25.0 -speed_layer_0 = 30.0 -speed_print = 60.0 -speed_travel_layer_0 = 125.0 -speed_wall_x = 50.0 -top_bottom_thickness = =layer_height_0+layer_height*3 -top_layers = =0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4)) -travel_compensate_overlapping_walls_0_enabled = True -wall_0_material_flow = 95 -wall_0_wipe_dist = 0.4 -wall_thickness = 1.2 -z_seam_corner = z_seam_corner_weighted -z_seam_type = sharpest_corner \ No newline at end of file