From 7b6827e128756eb3ca01ac17f07297fe45cef940 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Sat, 30 Sep 2023 12:35:03 +0200 Subject: [PATCH] EN4 definition inherits elegoo_base Pros: - Less redundancy between elegoo_base and N4 definition Cons: - Changes in elegoo_base also effect N4 - I don't fully understand what presets get priority over others and when they overwrite or just extend another preset. It works for now but changes in Curas preset parsing/handling may break this profile! --- .../definitions/elegoo_neptune_4.def.json | 70 +------------------ ...elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg | 2 +- ...o_n4_aa0.4_pla_0.15mm_engineering.inst.cfg | 2 +- ...elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg | 2 +- ...oo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg | 2 +- .../elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg | 2 +- .../elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg | 2 +- .../elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg | 2 +- .../neptune_4/elegoo_n4_layer_0.05.inst.cfg | 2 +- .../neptune_4/elegoo_n4_layer_0.10.inst.cfg | 2 +- .../neptune_4/elegoo_n4_layer_0.15.inst.cfg | 2 +- .../neptune_4/elegoo_n4_layer_0.20.inst.cfg | 2 +- .../neptune_4/elegoo_n4_layer_0.30.inst.cfg | 2 +- .../neptune_4/elegoo_n4_layer_0.40.inst.cfg | 2 +- .../neptune_4/elegoo_n4_layer_0.60.inst.cfg | 2 +- ...goo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg | 2 +- ...goo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg | 2 +- ...goo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg | 2 +- ...goo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg | 2 +- 19 files changed, 21 insertions(+), 85 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index f48571866a..768a8dab03 100644 --- a/resources/definitions/elegoo_neptune_4.def.json +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -1,36 +1,12 @@ { "version": 2, "name": "ELEGOO NEPTUNE 4", - "inherits": "fdmprinter", + "inherits": "elegoo_base", "metadata": { "visible": true, "author": "mastercaution", - "manufacturer": "ELEGOO", - "file_formats": "text/x-gcode", - "platform": "elegoo_platform.3mf", - "exclude_materials": [ - "generic_nylon", - "generic_hips", - "generic_bvoh", - "generic_cpe", - "generic_pc", - "generic_pva", - "generic_pvc" - ], - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { "0": "elegoo_neptune4_extruder_0" }, - "platform_offset": [ - -2.2, - 14.5, - -31 - ], - "preferred_material": "generic_pla_175", - "preferred_quality_type": "Elegoo_N4_layer_020", - "preferred_variant_name": "0.40mm_Elegoo_Nozzle", - "variants_name": "Nozzle Size" + "machine_extruder_trains": { "0": "elegoo_neptune4_extruder_0" } }, "overrides": { @@ -43,7 +19,6 @@ "machine_max_acceleration_e": { "value": 5000 }, "machine_max_acceleration_x": { "value": 5000 }, "machine_max_acceleration_y": { "value": 5000 }, - "machine_max_jerk_xy": { "value": 8.0 }, "machine_nozzle_cool_down_speed": { "value": 0.75 }, "machine_nozzle_heat_up_speed": { "value": 1.6 }, "machine_head_with_fans_polygon": @@ -70,14 +45,6 @@ "acceleration_travel": { "value": 5000 }, "cool_fan_full_layer": { "value": 2 }, - "cool_fan_speed": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" }, - "cool_fan_speed_0": - { - "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled", - "value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0" - }, - "cool_fan_speed_max": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" }, - "cool_fan_speed_min": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" }, "infill_line_width": { @@ -150,38 +117,7 @@ "value": "speed_print_layer_0" }, - "brim_gap": { "default_value": 0.1 }, - "brim_width": { "default_value": 5 }, - "gradual_support_infill_step_height": { "value": "5" }, - "infill_overlap": { "value": "10 if infill_sparse_density < 20.01 else 5 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else 0" }, - "infill_overlap_mm": { "value": "0.5 * (infill_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0)) * infill_overlap / 100" }, - "infill_pattern": { "value": "'lines' if (infill_sparse_density > 35 or speed_print >= 80) else 'grid' " }, "initial_layer_line_width_factor": { "value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 125 if line_width < 0.5 else 110" }, - "material_diameter": { "value": 1.75 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_print_temperature_layer_0": { "value": "210 if material_print_temperature < 210 else material_print_temperature" }, - "min_infill_area": { "value": "5" }, - "minimum_interface_area": { "default_value": 10 }, - "minimum_support_area": { "value": "3 if support_structure == 'normal' else 0" }, - "optimize_wall_printing_order": { "default_value": true }, - "prime_tower_brim_enable": { "default_value": true }, - "prime_tower_min_volume": { "value": "(layer_height) * (prime_tower_size / 2)**2 * 3 * 0.5 " }, - "prime_tower_size": { "default_value": 30 }, - "prime_tower_wipe_enabled": { "default_value": false }, - "raft_base_speed": { "value": "0.4 * raft_speed" }, - "raft_base_thickness": { "value": "resolveOrValue('machine_nozzle_size') * 0.75" }, - "raft_interface_speed": { "value": "0.6 * raft_speed" }, - "raft_interface_thickness": { "value": "resolveOrValue('machine_nozzle_size') * 0.75" }, - "raft_margin": { "default_value": 5 }, - "raft_surface_fan_speed": { "value": "cool_fan_speed" }, - "raft_surface_line_width": { "value": "machine_nozzle_size * 1.25" }, - "raft_surface_thickness": { "value": "resolveOrValue('machine_nozzle_size')*0.375" }, - "retraction_hop": { "value": "layer_height if layer_height > 0.199 else 0.2" }, - - "support_material_flow": { "value": "material_flow * 0.95" }, - "support_xy_distance": { "value": "machine_nozzle_size * 1.7" }, - "support_xy_distance_overhang": { "value": "machine_nozzle_size * 1.2 if support_interface_enable else machine_nozzle_size * 0.8" }, - "support_z_distance": { "value": "layer_height * 1.2 if (support_interface_enable and support_bottom_enable and layer_height < 0.16) or support_bottom_enable else layer_height" } + "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" } } } \ No newline at end of file diff --git a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg index f8b04bbd9c..c83f21e72c 100644 --- a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] intent_category = visual material = generic_pla -quality_type = Elegoo_N4_layer_005 +quality_type = Elegoo_layer_005 setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg index c0da2bdbf7..0fd0d70eee 100644 --- a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = engineering is_experimental = True material = generic_pla -quality_type = Elegoo_N4_layer_015 +quality_type = Elegoo_layer_015 setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg index 64f68abefb..f4d5a778d7 100644 --- a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] intent_category = visual material = generic_pla -quality_type = Elegoo_N4_layer_015 +quality_type = Elegoo_layer_015 setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg index 8c4fd4400f..a77fbde88c 100644 --- a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = engineering is_experimental = True material = generic_pla -quality_type = Elegoo_N4_layer_010 +quality_type = Elegoo_layer_010 setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg index 3f25c6f488..b40164ff74 100644 --- a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] intent_category = visual material = generic_pla -quality_type = Elegoo_N4_layer_010 +quality_type = Elegoo_layer_010 setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg index a8bbaf5c56..1767ca8807 100644 --- a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = quick is_experimental = True material = generic_pla -quality_type = Elegoo_N4_layer_020 +quality_type = Elegoo_layer_020 setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg index 6cd4cb69b2..4880142c06 100644 --- a/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = quick is_experimental = True material = generic_pla -quality_type = Elegoo_N4_layer_030 +quality_type = Elegoo_layer_030 setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.05.inst.cfg b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.05.inst.cfg index f065b8fb8f..8deff4ba88 100644 --- a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.05.inst.cfg +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.05.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = Elegoo_N4_layer_005 +quality_type = Elegoo_layer_005 setting_version = 22 type = quality weight = -1 diff --git a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.10.inst.cfg index 5f6bf18811..4d19d0f21b 100644 --- a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.10.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = Elegoo_N4_layer_010 +quality_type = Elegoo_layer_010 setting_version = 22 type = quality weight = -2 diff --git a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.15.inst.cfg index 47496c3790..64f00befdf 100644 --- a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.15.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = Elegoo_N4_layer_015 +quality_type = Elegoo_layer_015 setting_version = 22 type = quality weight = -3 diff --git a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.20.inst.cfg index a360084c44..06995a4e43 100644 --- a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = Elegoo_N4_layer_020 +quality_type = Elegoo_layer_020 setting_version = 22 type = quality weight = -4 diff --git a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.30.inst.cfg index 7f2057882c..09a6e30e7c 100644 --- a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.30.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = Elegoo_N4_layer_030 +quality_type = Elegoo_layer_030 setting_version = 22 type = quality weight = -6 diff --git a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.40.inst.cfg b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.40.inst.cfg index 612b2dfc27..ac180ca1ab 100644 --- a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.40.inst.cfg +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = Elegoo_N4_layer_040 +quality_type = Elegoo_layer_040 setting_version = 22 type = quality weight = -6 diff --git a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.60.inst.cfg b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.60.inst.cfg index 8b68acd37a..a053731bf4 100644 --- a/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.60.inst.cfg +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = Elegoo_N4_layer_060 +quality_type = Elegoo_layer_060 setting_version = 22 type = quality weight = -6 diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg index c5af87957d..f9dcf2c75b 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] material = generic_pla -quality_type = Elegoo_N4_layer_010 +quality_type = Elegoo_layer_010 setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg index 2a19171113..209ce52fa2 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] material = generic_pla -quality_type = Elegoo_N4_layer_015 +quality_type = Elegoo_layer_015 setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg index f097c8b7a5..9805a1ae5a 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] material = generic_pla -quality_type = Elegoo_N4_layer_020 +quality_type = Elegoo_layer_020 setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg index 1e6b84c6e3..cb6ca323e6 100644 --- a/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] material = generic_pla -quality_type = Elegoo_N4_layer_030 +quality_type = Elegoo_layer_030 setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle