From 76c6de66b803330f057cfb58e7ce885e13be0a47 Mon Sep 17 00:00:00 2001 From: Evident Date: Tue, 29 Aug 2023 09:45:25 -0700 Subject: [PATCH 01/19] Created profile for Neptune 4 Pro Create elegoo_neptune_4pro.def.json for Neptune 4 Pro profile. --- .../definitions/elegoo_neptune_4pro.def.json | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 resources/definitions/elegoo_neptune_4pro.def.json diff --git a/resources/definitions/elegoo_neptune_4pro.def.json b/resources/definitions/elegoo_neptune_4pro.def.json new file mode 100644 index 00000000000..281d6007f2b --- /dev/null +++ b/resources/definitions/elegoo_neptune_4pro.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "ELEGOO NEPTUNE 4 Pro", + "inherits": "elegoo_base", + "metadata": + { + "visible": true, + "author": "Evident", + "quality_definition": "elegoo_base" + }, + "overrides": + { + "machine_name": { "default_value": "ELEGOO NEPTUNE 4 Pro" }, + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 270 }, + "machine_width": { "default_value": 235 }, + "machine_head_with_fans_polygon": + { + "value": [ + [-55, 30], + [55, 30], + [55, -35], + [-55, -35] + ] + }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z2 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_start_gcode": { "default_value": "G28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y80.0 Z0.28 F1500.0 E10 ;Draw the first line\nG1 X1.4 Y80.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "material_bed_temperature": { "value": "default_material_bed_temperature + 10" }, + "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" }, + "retraction_amount": { "value": 1 }, + "retraction_count_max": { "value": 80 }, + "retraction_prime_speed": { "resolve": 25 }, + "retraction_retract_speed": { "resolve": 25 }, + "retraction_speed": { "resolve": 25 }, + "speed_travel": { "300 if speed_print < 300 else speed_print * 1.25 if speed_print < 400 else 500" }, + "speed_travel_layer_0": { "value": "200" } + } +} From 1ec0896678f5a81e1537b6fb6e30b48cfd605b21 Mon Sep 17 00:00:00 2001 From: Evident Date: Tue, 29 Aug 2023 23:58:09 -0700 Subject: [PATCH 02/19] Fix: elegoo_neptune_4pro.def.json Corrected missing "value" key in "speed_travel" object on line 35 --- resources/definitions/elegoo_neptune_4pro.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/elegoo_neptune_4pro.def.json b/resources/definitions/elegoo_neptune_4pro.def.json index 281d6007f2b..c393efd856a 100644 --- a/resources/definitions/elegoo_neptune_4pro.def.json +++ b/resources/definitions/elegoo_neptune_4pro.def.json @@ -32,7 +32,7 @@ "retraction_prime_speed": { "resolve": 25 }, "retraction_retract_speed": { "resolve": 25 }, "retraction_speed": { "resolve": 25 }, - "speed_travel": { "300 if speed_print < 300 else speed_print * 1.25 if speed_print < 400 else 500" }, + "speed_travel": { "value": "300 if speed_print < 300 else speed_print * 1.25 if speed_print < 400 else 500" }, "speed_travel_layer_0": { "value": "200" } } } From 7494c8af168b48ed4ae3d5ea17e673043fb439c1 Mon Sep 17 00:00:00 2001 From: Federico Rapetti Date: Mon, 25 Sep 2023 21:44:05 +0200 Subject: [PATCH 03/19] Add missing variants --- .../elegoo_neptune_3pro_0.40.inst.cfg | 13 +++++++++++++ .../elegoo_neptune_4pro_0.40.inst.cfg | 13 +++++++++++++ .../elegoo_neptune_4pro_0.60.inst.cfg | 13 +++++++++++++ .../elegoo_neptune_4pro_0.80.inst.cfg | 13 +++++++++++++ 4 files changed, 52 insertions(+) create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_3pro_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_3pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_3pro_0.40.inst.cfg new file mode 100644 index 00000000000..b938fd368e2 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_3pro_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg new file mode 100644 index 00000000000..6b6401b95f7 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg new file mode 100644 index 00000000000..f7b4f3dccde --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg new file mode 100644 index 00000000000..e3c2e1ed54b --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.8 + From af3562ab748284032fdd68c9ae62729a3c7590d7 Mon Sep 17 00:00:00 2001 From: Federico Rapetti Date: Tue, 26 Sep 2023 00:54:59 +0200 Subject: [PATCH 04/19] Fix Elegoo Neptune 4 Pro 0.20 variant name --- ...ptune_3pro_0.40.inst.cfg => elegoo_neptune_4pro_0.20.inst.cfg} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/variants/elegoo/elegoo_neptune_4pro/{elegoo_neptune_3pro_0.40.inst.cfg => elegoo_neptune_4pro_0.20.inst.cfg} (100%) diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_3pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg similarity index 100% rename from resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_3pro_0.40.inst.cfg rename to resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg From 6d0e0f2cbc826d03c76d75f3879d6b302351703d Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Wed, 27 Sep 2023 01:15:58 +0200 Subject: [PATCH 05/19] Add support for ELEGOO Neptune 4 --- .../definitions/elegoo_neptune_4.def.json | 187 ++++++++++++++++++ .../elegoo_neptune4_extruder_0.def.json | 15 ++ ...elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg | 16 ++ ...o_n4_aa0.4_pla_0.15mm_engineering.inst.cfg | 24 +++ ...elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg | 16 ++ ...oo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg | 24 +++ .../elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg | 16 ++ .../elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg | 23 +++ .../elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg | 23 +++ .../neptune_4/elegoo_n4_layer_0.05.inst.cfg | 16 ++ .../neptune_4/elegoo_n4_layer_0.10.inst.cfg | 16 ++ .../neptune_4/elegoo_n4_layer_0.15.inst.cfg | 16 ++ .../neptune_4/elegoo_n4_layer_0.20.inst.cfg | 16 ++ .../neptune_4/elegoo_n4_layer_0.30.inst.cfg | 16 ++ .../neptune_4/elegoo_n4_layer_0.40.inst.cfg | 16 ++ .../neptune_4/elegoo_n4_layer_0.60.inst.cfg | 16 ++ ...goo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg | 21 ++ ...goo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg | 20 ++ ...goo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg | 19 ++ ...goo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg | 21 ++ .../elegoo_neptune_4_0.20.inst.cfg | 13 ++ .../elegoo_neptune_4_0.40.inst.cfg | 13 ++ .../elegoo_neptune_4_0.60.inst.cfg | 13 ++ .../elegoo_neptune_4_0.80.inst.cfg | 13 ++ 24 files changed, 589 insertions(+) create mode 100644 resources/definitions/elegoo_neptune_4.def.json create mode 100644 resources/extruders/elegoo_neptune4_extruder_0.def.json create mode 100644 resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg create mode 100644 resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg create mode 100644 resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg create mode 100644 resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg create mode 100644 resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg create mode 100644 resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg create mode 100644 resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.05.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.40.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.60.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.80.inst.cfg diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json new file mode 100644 index 00000000000..0238c2aeadd --- /dev/null +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -0,0 +1,187 @@ +{ + "version": 2, + "name": "ELEGOO NEPTUNE 4", + "inherits": "fdmprinter", + "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" + }, + "overrides": + { + "machine_name": { "default_value": "ELEGOO NEPTUNE 4" }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 230 }, + "machine_height": { "default_value": 270 }, + "machine_acceleration": { "value": 1000 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 1000 }, + "machine_max_acceleration_y": { "value": 1000 }, + "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": + { + "value": [ + [-55, 30], + [55, 30], + [55, -35], + [-55, -35] + ] + }, + "gantry_height": { "value": 6 }, + + "retraction_amount": { "default_value": 0.5 }, + "retraction_speed": { "default_value": 45 }, + "retraction_count_max": { "value": 80 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": "G28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y80.0 Z0.28 F1500.0 E10 ;Draw the first line\nG1 X1.4 Y80.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z2 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + + "acceleration_enabled": { "value": true }, + "acceleration_layer_0": { "value": 3000 }, + "acceleration_print": { "value": 3000 }, + "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": + { + "default_value": 0.45, + "value": "line_width + 0.05" + }, + "speed_print": + { + "maximum_value_warning": "500", + "default_value": 250 + }, + "speed_wall": + { + "maximum_value_warning": "500", + "default_value": 125, + "value": "speed_print / 2" + }, + "speed_wall_0": + { + "maximum_value_warning": "500", + "default_value": 125, + "value": "speed_wall" + }, + "speed_wall_x": + { + "maximum_value_warning": "500", + "default_value": 200, + "value": "speed_wall + (speed_wall / 2)" + }, + "speed_topbottom": + { + "maximum_value_warning": "500", + "default_value": 125, + "value": "speed_wall" + }, + "speed_travel": + { + "maximum_value_warning": "500", + "default_value": 250, + "value": "speed_print" + }, + "speed_layer_0": + { + "maximum_value_warning": "500", + "default_value": 60, + "value": 60 + }, + "speed_print_layer_0": { "maximum_value_warning": "500" }, + "speed_travel_layer_0": + { + "maximum_value_warning": "500", + "default_value": 200, + "value": "speed_layer_0*2" + }, + "speed_infill": + { + "maximum_value_warning": "500", + "value": "speed_print" + }, + "speed_roofing": { "maximum_value_warning": "500" }, + "speed_support": { "maximum_value_warning": "500" }, + "speed_support_infill": { "maximum_value_warning": "500" }, + "speed_support_interface": { "maximum_value_warning": "500" }, + "speed_support_roof": { "maximum_value_warning": "500" }, + "speed_support_bottom": { "maximum_value_warning": "500" }, + "speed_prime_tower": { "maximum_value_warning": "500" }, + "skirt_brim_speed": + { + "maximum_value_warning": "500", + "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" } + } +} \ No newline at end of file diff --git a/resources/extruders/elegoo_neptune4_extruder_0.def.json b/resources/extruders/elegoo_neptune4_extruder_0.def.json new file mode 100644 index 00000000000..938cfc8da5c --- /dev/null +++ b/resources/extruders/elegoo_neptune4_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "elegoo_neptune_4", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "material_diameter": { "default_value": 1.75 } + } +} \ 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 new file mode 100644 index 00000000000..9ed5e630537 --- /dev/null +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_pla +quality_type = Elegoo_N4_layer_005 +setting_version = 22 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +top_bottom_thickness = 1.05 + 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 new file mode 100644 index 00000000000..31914fbb0e4 --- /dev/null +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = elegoo_neptune_4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_pla +quality_type = Elegoo_N4_layer_015 +setting_version = 22 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +speed_infill = =speed_print +speed_print = 150 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + 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 new file mode 100644 index 00000000000..71e2945204d --- /dev/null +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_pla +quality_type = Elegoo_N4_layer_015 +setting_version = 22 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +top_bottom_thickness = 1.05 + 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 new file mode 100644 index 00000000000..c67118c7e4b --- /dev/null +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = elegoo_neptune_4 +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +is_experimental = True +material = generic_pla +quality_type = Elegoo_N4_layer_010 +setting_version = 22 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +speed_infill = =speed_print +speed_print = 150 +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = =wall_thickness +wall_thickness = =line_width * 3 + 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 new file mode 100644 index 00000000000..9ee290868a3 --- /dev/null +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_pla +quality_type = Elegoo_N4_layer_010 +setting_version = 22 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +top_bottom_thickness = 1.05 + 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 new file mode 100644 index 00000000000..8171f658f24 --- /dev/null +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = elegoo_neptune_4 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_pla +quality_type = Elegoo_N4_layer_020 +setting_version = 22 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +infill_sparse_density = 15 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = 0.8 + 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 new file mode 100644 index 00000000000..7fe60ec396f --- /dev/null +++ b/resources/intent/elegoo_neptune_4/PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = elegoo_neptune_4 +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_pla +quality_type = Elegoo_N4_layer_030 +setting_version = 22 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +infill_sparse_density = 10 +speed_infill = =speed_print +speed_topbottom = =speed_print +speed_wall = =speed_print +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +top_bottom_thickness = 0.8 + 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 new file mode 100644 index 00000000000..f065b8fb8fa --- /dev/null +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.05.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Extra Fine +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_N4_layer_005 +setting_version = 22 +type = quality +weight = -1 + +[values] +layer_height = 0.05 +layer_height_0 = 0.12 + 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 new file mode 100644 index 00000000000..5f6bf18811b --- /dev/null +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.10.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Fine +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_N4_layer_010 +setting_version = 22 +type = quality +weight = -2 + +[values] +layer_height = 0.10 +layer_height_0 = 0.12 + 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 new file mode 100644 index 00000000000..47496c37904 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.15.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_N4_layer_015 +setting_version = 22 +type = quality +weight = -3 + +[values] +layer_height = 0.15 +layer_height_0 = 0.15 + 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 new file mode 100644 index 00000000000..a360084c448 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.20.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_N4_layer_020 +setting_version = 22 +type = quality +weight = -4 + +[values] +layer_height = 0.20 +layer_height_0 = 0.20 + 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 new file mode 100644 index 00000000000..7f2057882c0 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.30.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Extra Fast +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_N4_layer_030 +setting_version = 22 +type = quality +weight = -6 + +[values] +layer_height = 0.30 +layer_height_0 = 0.30 + 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 new file mode 100644 index 00000000000..612b2dfc278 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.40.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Turbo +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_N4_layer_040 +setting_version = 22 +type = quality +weight = -6 + +[values] +layer_height = 0.40 +layer_height_0 = 0.40 + 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 new file mode 100644 index 00000000000..8b68acd37ae --- /dev/null +++ b/resources/quality/elegoo/neptune_4/elegoo_n4_layer_0.60.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_neptune_4 +name = Extra Turbo +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_N4_layer_060 +setting_version = 22 +type = quality +weight = -6 + +[values] +layer_height = 0.60 +layer_height_0 = 0.60 + 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 new file mode 100644 index 00000000000..c5af87957da --- /dev/null +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -0,0 +1,21 @@ +[general] +definition = elegoo_neptune_4 +name = pla_noz0.40_lay0.10 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_N4_layer_010 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +prime_tower_enable = False +raft_airgap = 0.25 +speed_topbottom = =math.ceil(speed_print * 35 / 70) +speed_wall = =math.ceil(speed_print * 45 / 70) +speed_wall_0 = =math.ceil(speed_wall * 35 / 70) +skin_overlap = 10 +top_bottom_thickness = 1 + 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 new file mode 100644 index 00000000000..d5e650e307d --- /dev/null +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,20 @@ +[general] +definition = elegoo_neptune_4 +name = pla_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_N4_layer_015 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +prime_tower_enable = False +raft_airgap = 0.25 +speed_topbottom = =math.ceil(speed_print * 35 / 70) +speed_wall = =math.ceil(speed_print * 45 / 70) +speed_wall_0 = =math.ceil(speed_wall * 35 / 70) +top_bottom_thickness = 1 + 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 new file mode 100644 index 00000000000..f097c8b7a5d --- /dev/null +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = elegoo_neptune_4 +name = pla_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_N4_layer_020 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +infill_sparse_density = 15 +prime_tower_enable = False +raft_airgap = 0.25 +skin_overlap = 20 +top_bottom_thickness = 0.8 + 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 new file mode 100644 index 00000000000..1e6b84c6e3a --- /dev/null +++ b/resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,21 @@ +[general] +definition = elegoo_neptune_4 +name = pla_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_N4_layer_030 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 +material_print_temperature = =default_material_print_temperature + 5 +prime_tower_enable = False +raft_airgap = 0.25 +skin_overlap = 20 +top_bottom_thickness = 0.9 + diff --git a/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.20.inst.cfg new file mode 100644 index 00000000000..3498effd991 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4 +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.40.inst.cfg new file mode 100644 index 00000000000..086826b12b9 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4 +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.60.inst.cfg new file mode 100644 index 00000000000..5ad651685a7 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4 +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.80.inst.cfg new file mode 100644 index 00000000000..3380d42cc8a --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4/elegoo_neptune_4_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4 +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.8 + From f8ea66604ed60746af31cc35a8772552b26401e7 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Thu, 28 Sep 2023 16:52:54 +0200 Subject: [PATCH 06/19] EN4 Improve print time estimation --- resources/definitions/elegoo_neptune_4.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index 0238c2aeadd..f48571866af 100644 --- a/resources/definitions/elegoo_neptune_4.def.json +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -38,11 +38,11 @@ "machine_width": { "default_value": 235 }, "machine_depth": { "default_value": 230 }, "machine_height": { "default_value": 270 }, - "machine_acceleration": { "value": 1000 }, + "machine_acceleration": { "value": 3000 }, "machine_heated_bed": { "default_value": true }, "machine_max_acceleration_e": { "value": 5000 }, - "machine_max_acceleration_x": { "value": 1000 }, - "machine_max_acceleration_y": { "value": 1000 }, + "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 }, From 952a704b733f634f312bb0f6b59fd94a67053060 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Thu, 28 Sep 2023 23:25:05 +0200 Subject: [PATCH 07/19] EN4 tune visual profiles --- .../PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg | 2 +- .../PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg | 2 +- .../PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 9ed5e630537..d20971cf4e5 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 @@ -13,4 +13,4 @@ variant = 0.40mm_Elegoo_Nozzle [values] top_bottom_thickness = 1.05 - +skin_line_width = 0.4 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 71e2945204d..f32d4116881 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 @@ -13,4 +13,4 @@ variant = 0.40mm_Elegoo_Nozzle [values] top_bottom_thickness = 1.05 - +skin_line_width = 0.4 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 9ee290868a3..33e38998ce4 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 @@ -13,4 +13,4 @@ variant = 0.40mm_Elegoo_Nozzle [values] top_bottom_thickness = 1.05 - +skin_line_width = 0.4 From 7bc22a0f9d47a44aa364af22cf3c3daca37d1b36 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Fri, 29 Sep 2023 14:53:52 +0200 Subject: [PATCH 08/19] EN4 fine-tune profiles --- .../PLA/elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg | 1 + .../PLA/elegoo_n4_aa0.4_pla_0.15mm_engineering.inst.cfg | 7 ++++--- .../PLA/elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg | 1 + .../PLA/elegoo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg | 7 ++++--- .../PLA/elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg | 3 ++- .../PLA/elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg | 5 +++-- .../PLA/elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg | 4 +++- .../elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) 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 d20971cf4e5..f8b04bbd9c8 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 @@ -12,5 +12,6 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] +speed_print = 150 top_bottom_thickness = 1.05 skin_line_width = 0.4 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 31914fbb0e4..c0da2bdbf7f 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 @@ -13,10 +13,11 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] -speed_infill = =speed_print speed_print = 150 -speed_topbottom = =speed_print -speed_wall = =speed_print +speed_travel = =min(speed_print * 4 / 3, 250) if speed_print <= 250 else speed_print +speed_infill = =speed_print +speed_topbottom = =speed_print * 2 / 3 +speed_wall = =speed_print * 2 / 3 speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness 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 f32d4116881..64f68abefba 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 @@ -12,5 +12,6 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] +speed_print = 150 top_bottom_thickness = 1.05 skin_line_width = 0.4 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 c67118c7e4b..8c4fd4400fa 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 @@ -13,10 +13,11 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] -speed_infill = =speed_print speed_print = 150 -speed_topbottom = =speed_print -speed_wall = =speed_print +speed_travel = =min(speed_print * 4 / 3, 250) if speed_print <= 250 else speed_print +speed_infill = =speed_print +speed_topbottom = =speed_print * 2 / 3 +speed_wall = =speed_print * 2 / 3 speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness 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 33e38998ce4..3f25c6f4886 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 @@ -12,5 +12,6 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] -top_bottom_thickness = 1.05 +speed_print = 150 +top_bottom_thickness = 1 skin_line_width = 0.4 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 8171f658f24..a8bbaf5c56b 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 @@ -13,11 +13,12 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] +speed_print = 300 +speed_travel = 400 infill_sparse_density = 15 speed_infill = =speed_print speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -top_bottom_thickness = 0.8 - +top_bottom_thickness = 0.6 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 7fe60ec396f..6cd4cb69b22 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 @@ -13,11 +13,13 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] +speed_print = 300 +speed_travel = 400 infill_sparse_density = 10 speed_infill = =speed_print speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -top_bottom_thickness = 0.8 +top_bottom_thickness = 0.6 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 d5e650e307d..2a19171113a 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 @@ -16,5 +16,5 @@ raft_airgap = 0.25 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) -top_bottom_thickness = 1 +top_bottom_thickness = 0.9 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 09/19] 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 f48571866af..768a8dab035 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 f8b04bbd9c8..c83f21e72cc 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 c0da2bdbf7f..0fd0d70eeef 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 64f68abefba..f4d5a778d73 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 8c4fd4400fa..a77fbde88cb 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 3f25c6f4886..b40164ff744 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 a8bbaf5c56b..1767ca88074 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 6cd4cb69b22..4880142c06f 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 f065b8fb8fa..8deff4ba88c 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 5f6bf18811b..4d19d0f21bd 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 47496c37904..64f00befdfb 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 a360084c448..06995a4e438 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 7f2057882c0..09a6e30e7cd 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 612b2dfc278..ac180ca1ab7 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 8b68acd37ae..a053731bf42 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 c5af87957da..f9dcf2c75b7 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 2a19171113a..209ce52fa2b 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 f097c8b7a5d..9805a1ae5a8 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 1e6b84c6e3a..cb6ca323e69 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 From ab3d44d7d4a5afdbc18af7e39f4c359891318dd5 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Sat, 30 Sep 2023 21:02:19 +0200 Subject: [PATCH 10/19] EN4 Fix print one at a time Removed `gantry_height` because it covers the entire build plate and makes printing one at a time practically impossible. The user should manually verify that the printing order is correct, so the external part cooler does not nock of already printed models. --- resources/definitions/elegoo_neptune_4.def.json | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index 768a8dab035..96776d0cce2 100644 --- a/resources/definitions/elegoo_neptune_4.def.json +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -24,13 +24,12 @@ "machine_head_with_fans_polygon": { "value": [ - [-55, 30], - [55, 30], - [55, -35], - [-55, -35] + [-40, 50], + [-40, -30], + [40, 50], + [40, -30] ] }, - "gantry_height": { "value": 6 }, "retraction_amount": { "default_value": 0.5 }, "retraction_speed": { "default_value": 45 }, From 2074bf4ef551c8e636540e35c802e4356a4dd796 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:14:48 +0200 Subject: [PATCH 11/19] EN4 Remove obsolete extruder defintion --- .../extruders/elegoo_neptune4_extruder_0.def.json | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 resources/extruders/elegoo_neptune4_extruder_0.def.json diff --git a/resources/extruders/elegoo_neptune4_extruder_0.def.json b/resources/extruders/elegoo_neptune4_extruder_0.def.json deleted file mode 100644 index 938cfc8da5c..00000000000 --- a/resources/extruders/elegoo_neptune4_extruder_0.def.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": - { - "machine": "elegoo_neptune_4", - "position": "0" - }, - "overrides": - { - "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file From aa9bdaa3cce22c309c10f0b9ec71d70da904ebde Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Sun, 1 Oct 2023 00:15:45 +0200 Subject: [PATCH 12/19] EN4 Add Neptune 4 Pro definition It's basically a Neptune 4 --- .../definitions/elegoo_neptune_4pro.def.json | 15 +++++++++++++++ .../elegoo_neptune_4pro_0.20.inst.cfg | 13 +++++++++++++ .../elegoo_neptune_4pro_0.40.inst.cfg | 13 +++++++++++++ .../elegoo_neptune_4pro_0.60.inst.cfg | 13 +++++++++++++ .../elegoo_neptune_4pro_0.80.inst.cfg | 13 +++++++++++++ 5 files changed, 67 insertions(+) create mode 100644 resources/definitions/elegoo_neptune_4pro.def.json create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg diff --git a/resources/definitions/elegoo_neptune_4pro.def.json b/resources/definitions/elegoo_neptune_4pro.def.json new file mode 100644 index 00000000000..ca7e7c1293d --- /dev/null +++ b/resources/definitions/elegoo_neptune_4pro.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "ELEGOO NEPTUNE 4 Pro", + "inherits": "elegoo_neptune_4", + "metadata": + { + "visible": true, + "author": "mastercaution", + "quality_definition": "elegoo_neptune_4" + }, + "overrides": + { + "machine_name": { "default_value": "ELEGOO NEPTUNE 4 Pro" } + } +} \ No newline at end of file diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg new file mode 100644 index 00000000000..b938fd368e2 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg new file mode 100644 index 00000000000..6b6401b95f7 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg new file mode 100644 index 00000000000..f7b4f3dccde --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg new file mode 100644 index 00000000000..e3c2e1ed54b --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_4pro +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.8 + From 4aafc04505e458bb4e343a9d8e2ee0beab4237f1 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Sun, 1 Oct 2023 12:45:14 +0200 Subject: [PATCH 13/19] EN4 Fix missing extruder error --- resources/definitions/elegoo_neptune_4.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index 96776d0cce2..63d2e573e00 100644 --- a/resources/definitions/elegoo_neptune_4.def.json +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -5,8 +5,7 @@ "metadata": { "visible": true, - "author": "mastercaution", - "machine_extruder_trains": { "0": "elegoo_neptune4_extruder_0" } + "author": "mastercaution" }, "overrides": { From e5155371522b37539647a76ed94c628d8e640b84 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Sun, 1 Oct 2023 21:40:40 +0200 Subject: [PATCH 14/19] EN4 Add materials generic ABS, ASA, PETG, TPU Profiles are mostly copied from elegoo/base. Most hardcoded temperature values were removed, so custom materials settings have an effect. --- ...goo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg | 28 +++++++++++++++++++ ...goo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg | 28 +++++++++++++++++++ ...goo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg | 28 +++++++++++++++++++ ...goo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg | 28 +++++++++++++++++++ ...goo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg | 28 +++++++++++++++++++ ...goo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg | 28 +++++++++++++++++++ ...goo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg | 28 +++++++++++++++++++ ...goo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg | 28 +++++++++++++++++++ ...oo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg | 22 +++++++++++++++ ...oo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg | 22 +++++++++++++++ ...oo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg | 21 ++++++++++++++ ...oo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg | 22 +++++++++++++++ ...goo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg | 19 +++++++++++++ ...goo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg | 19 +++++++++++++ ...goo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg | 19 +++++++++++++ ...goo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg | 19 +++++++++++++ 16 files changed, 387 insertions(+) create mode 100644 resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg new file mode 100644 index 00000000000..e05b278e4c8 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = abs_noz0.40_lay0.10 +version = 4 + +[metadata] +material = generic_abs +quality_type = Elegoo_layer_010 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 10 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.72 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg new file mode 100644 index 00000000000..412f393a459 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = abs_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_abs +quality_type = Elegoo_layer_015 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 10 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.64 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg new file mode 100644 index 00000000000..df3353baed8 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = abs_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_abs +quality_type = Elegoo_layer_020 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 10 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg new file mode 100644 index 00000000000..8219690265c --- /dev/null +++ b/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = abs_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_abs +quality_type = Elegoo_layer_030 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.2 +raft_margin = 10 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.84 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg new file mode 100644 index 00000000000..a0ae0016503 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = asa_noz0.40_lay0.10 +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = Elegoo_layer_010 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 15 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.72 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg new file mode 100644 index 00000000000..228eea99dc3 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = asa_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = Elegoo_layer_015 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 15 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.64 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg new file mode 100644 index 00000000000..df1e5802e7f --- /dev/null +++ b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = asa_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = Elegoo_layer_020 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 15 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.8 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg new file mode 100644 index 00000000000..335a479a34f --- /dev/null +++ b/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_neptune_4 +name = asa_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_asa_175 +quality_type = Elegoo_layer_030 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_gap = 0 +brim_width = 10 +cool_fan_enabled = False +cool_fan_speed = 0 +cool_fan_speed_0 = 0 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.2 +raft_margin = 15 +support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0) +support_xy_distance_overhang = =machine_nozzle_size*0.8 +support_z_distance = =layer_height/2 +top_bottom_thickness = 0.84 +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg new file mode 100644 index 00000000000..52b8b688105 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = elegoo_neptune_4 +name = petg_noz0.40_lay0.10 +version = 4 + +[metadata] +material = generic_petg +quality_type = Elegoo_layer_010 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 6 +cool_fan_speed_min = =cool_fan_speed*0.5 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 30 +layer_0_z_overlap = =raft_airgap*0.6 +material_shrinkage_percentage_xy = 100.2 +raft_airgap = =0.35 +raft_margin = 10 + diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg new file mode 100644 index 00000000000..ee9fda159b8 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = elegoo_neptune_4 +name = petg_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_petg +quality_type = Elegoo_layer_015 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 6 +cool_fan_speed_min = =cool_fan_speed*0.5 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 30 +layer_0_z_overlap = =raft_airgap*0.6 +material_shrinkage_percentage_xy = 100.2 +raft_airgap = =0.35 +raft_margin = 10 + diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg new file mode 100644 index 00000000000..727c575e8db --- /dev/null +++ b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,21 @@ +[general] +definition = elegoo_neptune_4 +name = petg_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_petg +quality_type = Elegoo_layer_020 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 6 +cool_fan_speed_min = =cool_fan_speed*0.5 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 30 +layer_0_z_overlap = =raft_airgap*0.6 +material_shrinkage_percentage_xy = 100.2 +raft_airgap = =0.35 +raft_margin = 10 diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg new file mode 100644 index 00000000000..a3043234b60 --- /dev/null +++ b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = elegoo_neptune_4 +name = petg_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_petg +quality_type = Elegoo_layer_030 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 6 +cool_fan_speed_min = =cool_fan_speed*0.5 +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 30 +layer_0_z_overlap = =raft_airgap*0.6 +material_shrinkage_percentage_xy = 100.2 +raft_airgap = =0.35 +raft_margin = 10 + diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg new file mode 100644 index 00000000000..f5c76ef6c7a --- /dev/null +++ b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = elegoo_neptune_4 +name = tpu_noz0.40_lay0.10 +version = 4 + +[metadata] +material = generic_tpu +quality_type = Elegoo_layer_010 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 5 +cool_min_layer_time = 10 +speed_print = 150 +speed_travel = 250 +support_angle = 35 + diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg new file mode 100644 index 00000000000..8762cb12bca --- /dev/null +++ b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = elegoo_neptune_4 +name = tpu_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_tpu +quality_type = Elegoo_layer_015 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 5 +cool_min_layer_time = 10 +speed_print = 150 +speed_travel = 250 +support_angle = 35 + diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg new file mode 100644 index 00000000000..cb3a64810ec --- /dev/null +++ b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = elegoo_neptune_4 +name = tpu_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_tpu +quality_type = Elegoo_layer_020 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 5 +cool_min_layer_time = 10 +speed_print = 150 +speed_travel = 250 +support_angle = 35 + diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg new file mode 100644 index 00000000000..e04d7319e9b --- /dev/null +++ b/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = elegoo_neptune_4 +name = tpu_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_tpu +quality_type = Elegoo_layer_030 +setting_version = 22 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +brim_width = 5 +cool_min_layer_time = 10 +speed_print = 150 +speed_travel = 250 +support_angle = 35 + From d73b5cb458f871f049373286bc4a2b5785b32bd3 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Tue, 3 Oct 2023 23:11:00 +0200 Subject: [PATCH 15/19] EN4 Run printer-linter --- .../definitions/elegoo_neptune_4.def.json | 123 +++++++++--------- ...elegoo_n4_aa0.4_pla_0.05mm_visual.inst.cfg | 3 +- ...o_n4_aa0.4_pla_0.15mm_engineering.inst.cfg | 4 +- ...elegoo_n4_aa0.4_pla_0.15mm_visual.inst.cfg | 3 +- ...oo_n4_aa0.4_pla_0.1mm_engineering.inst.cfg | 4 +- .../elegoo_n4_aa0.4_pla_0.1mm_visual.inst.cfg | 3 +- .../elegoo_n4_aa0.4_pla_0.2mm_quick.inst.cfg | 5 +- .../elegoo_n4_aa0.4_pla_0.3mm_quick.inst.cfg | 4 +- ...oo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg | 1 + ...goo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg | 2 +- 10 files changed, 76 insertions(+), 76 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index 63d2e573e00..4e73f5a879b 100644 --- a/resources/definitions/elegoo_neptune_4.def.json +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -9,17 +9,22 @@ }, "overrides": { - "machine_name": { "default_value": "ELEGOO NEPTUNE 4" }, - "machine_width": { "default_value": 235 }, - "machine_depth": { "default_value": 230 }, - "machine_height": { "default_value": 270 }, + "acceleration_enabled": { "value": true }, + "acceleration_layer_0": { "value": 3000 }, + "acceleration_print": { "value": 3000 }, + "acceleration_travel": { "value": 5000 }, + "cool_fan_full_layer": { "value": 2 }, + "infill_line_width": + { + "default_value": 0.45, + "value": "line_width + 0.05" + }, + "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" }, + "initial_layer_line_width_factor": { "value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 125 if line_width < 0.5 else 110" }, "machine_acceleration": { "value": 3000 }, - "machine_heated_bed": { "default_value": true }, - "machine_max_acceleration_e": { "value": 5000 }, - "machine_max_acceleration_x": { "value": 5000 }, - "machine_max_acceleration_y": { "value": 5000 }, - "machine_nozzle_cool_down_speed": { "value": 0.75 }, - "machine_nozzle_heat_up_speed": { "value": 1.6 }, + "machine_depth": { "default_value": 230 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z2 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_head_with_fans_polygon": { "value": [ @@ -29,93 +34,83 @@ [40, -30] ] }, - + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 270 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 5000 }, + "machine_max_acceleration_y": { "value": 5000 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE 4" }, + "machine_nozzle_cool_down_speed": { "value": 0.75 }, + "machine_nozzle_heat_up_speed": { "value": 1.6 }, + "machine_start_gcode": { "default_value": "G28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y80.0 Z0.28 F1500.0 E10 ;Draw the first line\nG1 X1.4 Y80.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, + "machine_width": { "default_value": 235 }, "retraction_amount": { "default_value": 0.5 }, - "retraction_speed": { "default_value": 45 }, "retraction_count_max": { "value": 80 }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": "G28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y80.0 Z0.28 F1500.0 E10 ;Draw the first line\nG1 X1.4 Y80.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z2 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, - - "acceleration_enabled": { "value": true }, - "acceleration_layer_0": { "value": 3000 }, - "acceleration_print": { "value": 3000 }, - "acceleration_travel": { "value": 5000 }, - - "cool_fan_full_layer": { "value": 2 }, - - "infill_line_width": - { - "default_value": 0.45, - "value": "line_width + 0.05" - }, - "speed_print": + "retraction_speed": { "default_value": 45 }, + "skirt_brim_speed": { "maximum_value_warning": "500", - "default_value": 250 + "value": "speed_print_layer_0" }, - "speed_wall": + "speed_infill": { "maximum_value_warning": "500", - "default_value": 125, - "value": "speed_print / 2" + "value": "speed_print" }, - "speed_wall_0": + "speed_layer_0": { + "default_value": 60, "maximum_value_warning": "500", - "default_value": 125, - "value": "speed_wall" + "value": 60 }, - "speed_wall_x": + "speed_prime_tower": { "maximum_value_warning": "500" }, + "speed_print": { - "maximum_value_warning": "500", - "default_value": 200, - "value": "speed_wall + (speed_wall / 2)" + "default_value": 250, + "maximum_value_warning": "500" }, + "speed_print_layer_0": { "maximum_value_warning": "500" }, + "speed_roofing": { "maximum_value_warning": "500" }, + "speed_support": { "maximum_value_warning": "500" }, + "speed_support_bottom": { "maximum_value_warning": "500" }, + "speed_support_infill": { "maximum_value_warning": "500" }, + "speed_support_interface": { "maximum_value_warning": "500" }, + "speed_support_roof": { "maximum_value_warning": "500" }, "speed_topbottom": { - "maximum_value_warning": "500", "default_value": 125, + "maximum_value_warning": "500", "value": "speed_wall" }, "speed_travel": { - "maximum_value_warning": "500", "default_value": 250, - "value": "speed_print" - }, - "speed_layer_0": - { "maximum_value_warning": "500", - "default_value": 60, - "value": 60 + "value": "speed_print" }, - "speed_print_layer_0": { "maximum_value_warning": "500" }, "speed_travel_layer_0": { - "maximum_value_warning": "500", "default_value": 200, + "maximum_value_warning": "500", "value": "speed_layer_0*2" }, - "speed_infill": + "speed_wall": { + "default_value": 125, "maximum_value_warning": "500", - "value": "speed_print" + "value": "speed_print / 2" }, - "speed_roofing": { "maximum_value_warning": "500" }, - "speed_support": { "maximum_value_warning": "500" }, - "speed_support_infill": { "maximum_value_warning": "500" }, - "speed_support_interface": { "maximum_value_warning": "500" }, - "speed_support_roof": { "maximum_value_warning": "500" }, - "speed_support_bottom": { "maximum_value_warning": "500" }, - "speed_prime_tower": { "maximum_value_warning": "500" }, - "skirt_brim_speed": + "speed_wall_0": { + "default_value": 125, "maximum_value_warning": "500", - "value": "speed_print_layer_0" + "value": "speed_wall" }, - - "initial_layer_line_width_factor": { "value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 125 if line_width < 0.5 else 110" }, - "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" } + "speed_wall_x": + { + "default_value": 200, + "maximum_value_warning": "500", + "value": "speed_wall + (speed_wall / 2)" + } } } \ 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 c83f21e72cc..e0e87bffc3d 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 @@ -12,6 +12,7 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] +skin_line_width = 0.4 speed_print = 150 top_bottom_thickness = 1.05 -skin_line_width = 0.4 + 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 0fd0d70eeef..1ad1d4cb795 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 @@ -13,10 +13,10 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] -speed_print = 150 -speed_travel = =min(speed_print * 4 / 3, 250) if speed_print <= 250 else speed_print speed_infill = =speed_print +speed_print = 150 speed_topbottom = =speed_print * 2 / 3 +speed_travel = =min(speed_print * 4 / 3, 250) if speed_print <= 250 else speed_print speed_wall = =speed_print * 2 / 3 speed_wall_0 = =speed_wall speed_wall_x = =speed_wall 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 f4d5a778d73..df6271085f6 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 @@ -12,6 +12,7 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] +skin_line_width = 0.4 speed_print = 150 top_bottom_thickness = 1.05 -skin_line_width = 0.4 + 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 a77fbde88cb..4a6b207a919 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 @@ -13,10 +13,10 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] -speed_print = 150 -speed_travel = =min(speed_print * 4 / 3, 250) if speed_print <= 250 else speed_print speed_infill = =speed_print +speed_print = 150 speed_topbottom = =speed_print * 2 / 3 +speed_travel = =min(speed_print * 4 / 3, 250) if speed_print <= 250 else speed_print speed_wall = =speed_print * 2 / 3 speed_wall_0 = =speed_wall speed_wall_x = =speed_wall 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 b40164ff744..c3c5e329509 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 @@ -12,6 +12,7 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] +skin_line_width = 0.4 speed_print = 150 top_bottom_thickness = 1 -skin_line_width = 0.4 + 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 1767ca88074..6f36752648f 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 @@ -13,12 +13,13 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] -speed_print = 300 -speed_travel = 400 infill_sparse_density = 15 speed_infill = =speed_print +speed_print = 300 speed_topbottom = =speed_print +speed_travel = 400 speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = 0.6 + 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 4880142c06f..f56023baef0 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 @@ -13,11 +13,11 @@ type = intent variant = 0.40mm_Elegoo_Nozzle [values] -speed_print = 300 -speed_travel = 400 infill_sparse_density = 10 speed_infill = =speed_print +speed_print = 300 speed_topbottom = =speed_print +speed_travel = 400 speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg index 727c575e8db..0c7c3abf04b 100644 --- a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg @@ -19,3 +19,4 @@ layer_0_z_overlap = =raft_airgap*0.6 material_shrinkage_percentage_xy = 100.2 raft_airgap = =0.35 raft_margin = 10 + 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 f9dcf2c75b7..66eb9f49c08 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 @@ -13,9 +13,9 @@ variant = 0.40mm_Elegoo_Nozzle [values] prime_tower_enable = False raft_airgap = 0.25 +skin_overlap = 10 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) -skin_overlap = 10 top_bottom_thickness = 1 From 39a3a73db4c7c475644c8513675a354e66d525ef Mon Sep 17 00:00:00 2001 From: Federico Rapetti Date: Thu, 5 Oct 2023 00:03:50 +0200 Subject: [PATCH 16/19] Revert old definitions --- .../definitions/elegoo_neptune_4pro.def.json | 38 ------------------- .../elegoo_neptune_4pro_0.20.inst.cfg | 13 ------- .../elegoo_neptune_4pro_0.40.inst.cfg | 13 ------- .../elegoo_neptune_4pro_0.60.inst.cfg | 13 ------- .../elegoo_neptune_4pro_0.80.inst.cfg | 13 ------- 5 files changed, 90 deletions(-) delete mode 100644 resources/definitions/elegoo_neptune_4pro.def.json delete mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg delete mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg delete mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg delete mode 100644 resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg diff --git a/resources/definitions/elegoo_neptune_4pro.def.json b/resources/definitions/elegoo_neptune_4pro.def.json deleted file mode 100644 index c393efd856a..00000000000 --- a/resources/definitions/elegoo_neptune_4pro.def.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": 2, - "name": "ELEGOO NEPTUNE 4 Pro", - "inherits": "elegoo_base", - "metadata": - { - "visible": true, - "author": "Evident", - "quality_definition": "elegoo_base" - }, - "overrides": - { - "machine_name": { "default_value": "ELEGOO NEPTUNE 4 Pro" }, - "machine_depth": { "default_value": 235 }, - "machine_height": { "default_value": 270 }, - "machine_width": { "default_value": 235 }, - "machine_head_with_fans_polygon": - { - "value": [ - [-55, 30], - [55, 30], - [55, -35], - [-55, -35] - ] - }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F1600 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z2 ;Raise Z more\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, - "machine_start_gcode": { "default_value": "G28 ;home\nG92 E0 ;Reset Extruder\nG1 Z4.0 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X1.1 Y80.0 Z0.28 F1500.0 E10 ;Draw the first line\nG1 X1.4 Y80.0 Z0.28 F5000.0 ;Move to side a little\nG1 X1.4 Y20 Z0.28 F1500.0 E20 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up" }, - "material_bed_temperature": { "value": "default_material_bed_temperature + 10" }, - "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" }, - "retraction_amount": { "value": 1 }, - "retraction_count_max": { "value": 80 }, - "retraction_prime_speed": { "resolve": 25 }, - "retraction_retract_speed": { "resolve": 25 }, - "retraction_speed": { "resolve": 25 }, - "speed_travel": { "value": "300 if speed_print < 300 else speed_print * 1.25 if speed_print < 400 else 500" }, - "speed_travel_layer_0": { "value": "200" } - } -} diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg deleted file mode 100644 index b938fd368e2..00000000000 --- a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.20.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = elegoo_neptune_4pro -name = 0.20mm_Elegoo_Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.2 - diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg deleted file mode 100644 index 6b6401b95f7..00000000000 --- a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.40.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = elegoo_neptune_4pro -name = 0.40mm_Elegoo_Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.4 - diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg deleted file mode 100644 index f7b4f3dccde..00000000000 --- a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.60.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = elegoo_neptune_4pro -name = 0.60mm_Elegoo_Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.6 - diff --git a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg deleted file mode 100644 index e3c2e1ed54b..00000000000 --- a/resources/variants/elegoo/elegoo_neptune_4pro/elegoo_neptune_4pro_0.80.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = elegoo_neptune_4pro -name = 0.80mm_Elegoo_Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.8 - From 05facee620e715faa9f5ba64eb5119f7178b5c3e Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Thu, 5 Oct 2023 01:46:00 +0200 Subject: [PATCH 17/19] EN4 Remove redundancies in definition --- resources/definitions/elegoo_neptune_4.def.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index 4e73f5a879b..2e28deb63aa 100644 --- a/resources/definitions/elegoo_neptune_4.def.json +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -9,7 +9,6 @@ }, "overrides": { - "acceleration_enabled": { "value": true }, "acceleration_layer_0": { "value": 3000 }, "acceleration_print": { "value": 3000 }, "acceleration_travel": { "value": 5000 }, @@ -47,11 +46,7 @@ "retraction_amount": { "default_value": 0.5 }, "retraction_count_max": { "value": 80 }, "retraction_speed": { "default_value": 45 }, - "skirt_brim_speed": - { - "maximum_value_warning": "500", - "value": "speed_print_layer_0" - }, + "skirt_brim_speed": { "maximum_value_warning": "500" }, "speed_infill": { "maximum_value_warning": "500", From 59c585643c313e98103f4968c62e9c42d2f84db9 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Thu, 5 Oct 2023 02:12:34 +0200 Subject: [PATCH 18/19] EN4 Fix directory names for `clang-tidy` --- .../elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg | 0 .../elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg | 0 .../elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg | 0 .../elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg | 0 .../elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg | 0 .../elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg | 0 .../elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg | 0 .../elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg | 0 .../elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg | 0 .../elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg | 0 .../elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg | 0 .../elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg | 0 .../elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg | 0 .../elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg | 0 .../elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg | 0 .../elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg | 0 .../elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg | 0 .../elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg | 0 .../elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg | 0 .../elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/elegoo/neptune_4/abs/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/abs/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/abs/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/abs/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/asa/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/asa/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/asa/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/asa/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/petg/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/petg/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/petg/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/petg/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/pla/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/pla/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/pla/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/pla/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/tpu/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/tpu/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/tpu/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg (100%) rename resources/quality/elegoo/neptune_4/tpu/{nozzle_0.40 => nozzle_0_40}/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg (100%) diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg rename to resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.10.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg rename to resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.15.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg rename to resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.20.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/abs/nozzle_0.40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg rename to resources/quality/elegoo/neptune_4/abs/nozzle_0_40/elegoo_n4_abs_nozzle_0.40_layer_0.30.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg rename to resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.10.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg rename to resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.15.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg rename to resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.20.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/asa/nozzle_0.40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg rename to resources/quality/elegoo/neptune_4/asa/nozzle_0_40/elegoo_n4_asa_nozzle_0.40_layer_0.30.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg rename to resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.10.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg rename to resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.15.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg rename to resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.20.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/petg/nozzle_0.40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg rename to resources/quality/elegoo/neptune_4/petg/nozzle_0_40/elegoo_n4_petg_nozzle_0.40_layer_0.30.inst.cfg 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 similarity index 100% rename from resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg rename to resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.10.inst.cfg 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 similarity index 100% rename from resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg rename to resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.15.inst.cfg 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 similarity index 100% rename from resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg rename to resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.20.inst.cfg 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 similarity index 100% rename from resources/quality/elegoo/neptune_4/pla/nozzle_0.40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg rename to resources/quality/elegoo/neptune_4/pla/nozzle_0_40/elegoo_n4_pla_nozzle_0.40_layer_0.30.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg rename to resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.10.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg rename to resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.15.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg rename to resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.20.inst.cfg diff --git a/resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg similarity index 100% rename from resources/quality/elegoo/neptune_4/tpu/nozzle_0.40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg rename to resources/quality/elegoo/neptune_4/tpu/nozzle_0_40/elegoo_n4_tpu_nozzle_0.40_layer_0.30.inst.cfg From ae50a047f5da79f77abc0ae36133a7609fb02547 Mon Sep 17 00:00:00 2001 From: Christopher Peredy <16451370+mastercaution@users.noreply.github.com> Date: Mon, 9 Oct 2023 02:44:06 +0200 Subject: [PATCH 19/19] EN4 Remove ineffective default values The test `test_validateOverridingDefaultValue` pointed out that some default values are ineffective. This commit removes these default values. --- resources/definitions/elegoo_neptune_4.def.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index 2e28deb63aa..21fd28f6f73 100644 --- a/resources/definitions/elegoo_neptune_4.def.json +++ b/resources/definitions/elegoo_neptune_4.def.json @@ -13,11 +13,7 @@ "acceleration_print": { "value": 3000 }, "acceleration_travel": { "value": 5000 }, "cool_fan_full_layer": { "value": 2 }, - "infill_line_width": - { - "default_value": 0.45, - "value": "line_width + 0.05" - }, + "infill_line_width": { "value": "line_width + 0.05" }, "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" }, "initial_layer_line_width_factor": { "value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 125 if line_width < 0.5 else 110" }, "machine_acceleration": { "value": 3000 }, @@ -54,7 +50,6 @@ }, "speed_layer_0": { - "default_value": 60, "maximum_value_warning": "500", "value": 60 }, @@ -73,37 +68,31 @@ "speed_support_roof": { "maximum_value_warning": "500" }, "speed_topbottom": { - "default_value": 125, "maximum_value_warning": "500", "value": "speed_wall" }, "speed_travel": { - "default_value": 250, "maximum_value_warning": "500", "value": "speed_print" }, "speed_travel_layer_0": { - "default_value": 200, "maximum_value_warning": "500", "value": "speed_layer_0*2" }, "speed_wall": { - "default_value": 125, "maximum_value_warning": "500", "value": "speed_print / 2" }, "speed_wall_0": { - "default_value": 125, "maximum_value_warning": "500", "value": "speed_wall" }, "speed_wall_x": { - "default_value": 200, "maximum_value_warning": "500", "value": "speed_wall + (speed_wall / 2)" }