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] EN4 Run printer-linter --- .../definitions/elegoo_neptune_4.def.json | 157 +++++++++--------- ...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, 93 insertions(+), 93 deletions(-) diff --git a/resources/definitions/elegoo_neptune_4.def.json b/resources/definitions/elegoo_neptune_4.def.json index 63d2e573e0..4e73f5a879 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] ] }, - - "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_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_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": + "machine_width": { "default_value": 235 }, + "retraction_amount": { "default_value": 0.5 }, + "retraction_count_max": { "value": 80 }, + "retraction_speed": { "default_value": 45 }, + "skirt_brim_speed": { "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" + "value": "speed_print_layer_0" }, "speed_infill": { "maximum_value_warning": "500", "value": "speed_print" }, + "speed_layer_0": + { + "default_value": 60, + "maximum_value_warning": "500", + "value": 60 + }, + "speed_prime_tower": { "maximum_value_warning": "500" }, + "speed_print": + { + "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_support_bottom": { "maximum_value_warning": "500" }, - "speed_prime_tower": { "maximum_value_warning": "500" }, - "skirt_brim_speed": + "speed_topbottom": { + "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_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)" + } } } \ 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 c83f21e72c..e0e87bffc3 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 0fd0d70eee..1ad1d4cb79 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 f4d5a778d7..df6271085f 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 a77fbde88c..4a6b207a91 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 b40164ff74..c3c5e32950 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 1767ca8807..6f36752648 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 4880142c06..f56023baef 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 727c575e8d..0c7c3abf04 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 f9dcf2c75b..66eb9f49c0 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