From bb7f598d305022314bfb17d74c2e65dbf2997671 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Sat, 18 Mar 2023 16:51:41 +0100 Subject: [PATCH 1/9] Update elegoo pla definitions and add intents --- resources/definitions/elegoo_base.def.json | 8 +++-- ...egoo_base_aa0.4_pla_0.05mm_visual.inst.cfg | 17 ++++++++++ ...base_aa0.4_pla_0.15mm_engineering.inst.cfg | 24 ++++++++++++++ ...egoo_base_aa0.4_pla_0.15mm_visual.inst.cfg | 17 ++++++++++ ..._base_aa0.4_pla_0.1mm_engineering.inst.cfg | 24 ++++++++++++++ ...legoo_base_aa0.4_pla_0.1mm_visual.inst.cfg | 17 ++++++++++ ...elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg | 23 ++++++++++++++ ...elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg | 28 +++++++++++++++++ .../base/elegoo_global_012_high.inst.cfg | 20 ------------ .../base/elegoo_global_016_normal.inst.cfg | 20 ------------ .../base/elegoo_global_020_fine.inst.cfg | 19 ------------ .../base/elegoo_global_024_medium.inst.cfg | 19 ------------ .../base/elegoo_global_028_draft.inst.cfg | 19 ------------ .../elegoo/base/elegoo_layer_0.05.inst.cfg | 16 ++++++++++ .../elegoo/base/elegoo_layer_0.10.inst.cfg | 16 ++++++++++ .../elegoo/base/elegoo_layer_0.15.inst.cfg | 16 ++++++++++ .../elegoo/base/elegoo_layer_0.20.inst.cfg | 16 ++++++++++ .../elegoo/base/elegoo_layer_0.30.inst.cfg | 16 ++++++++++ .../elegoo/base/elegoo_layer_0.40.inst.cfg | 16 ++++++++++ .../elegoo/base/elegoo_layer_0.60.inst.cfg | 16 ++++++++++ ...elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg | 29 +++++++++++++++++ ...elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg | 28 +++++++++++++++++ ...elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg | 21 +++++++++++++ ...elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg | 24 ++++++++++++++ ...elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg | 28 +++++++++++++++++ ...elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg | 31 +++++++++++++++++++ ...elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg | 15 +++++++++ ...elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg | 15 +++++++++ ...elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg | 15 +++++++++ ...elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg | 15 +++++++++ ...elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg | 26 ++++++++++++++++ ...elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg | 27 ++++++++++++++++ ...elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg | 28 +++++++++++++++++ .../elegoo/base/pla040/pla_040012.inst.cfg | 18 ----------- .../elegoo/base/pla040/pla_040016.inst.cfg | 18 ----------- .../elegoo/base/pla040/pla_040020.inst.cfg | 18 ----------- .../elegoo/base/pla040/pla_040024.inst.cfg | 18 ----------- .../elegoo/base/pla040/pla_040028.inst.cfg | 18 ----------- .../elegoo_neptune_1_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_1_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_1_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_1_0.80.inst.cfg | 13 ++++++++ .../elegoo_neptune_2_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_2_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_2_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_2_0.80.inst.cfg | 13 ++++++++ .../elegoo_neptune_2D_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_2D_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_2D_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_2D_0.80.inst.cfg | 13 ++++++++ .../elegoo_neptune_2s_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_2s_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_2s_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_2s_0.80.inst.cfg | 13 ++++++++ .../elegoo_neptune_3_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_3_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_3_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_3_0.80.inst.cfg | 13 ++++++++ .../elegoo_neptune_3max_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_3max_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_3max_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_3max_0.80.inst.cfg | 12 +++++++ .../elegoo_neptune_3plus_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_3plus_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_3plus_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_3plus_0.80.inst.cfg | 12 +++++++ .../elegoo_neptune_3pro_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_3pro_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_3pro_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_3pro_0.80.inst.cfg | 13 ++++++++ .../elegoo_neptune_x_0.20.inst.cfg | 13 ++++++++ .../elegoo_neptune_x_0.40.inst.cfg | 13 ++++++++ .../elegoo_neptune_x_0.60.inst.cfg | 13 ++++++++ .../elegoo_neptune_x_0.80.inst.cfg | 13 ++++++++ 74 files changed, 1036 insertions(+), 189 deletions(-) create mode 100644 resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg create mode 100644 resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg create mode 100644 resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg create mode 100644 resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg create mode 100644 resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg create mode 100644 resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg create mode 100644 resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg delete mode 100644 resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg delete mode 100644 resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg delete mode 100644 resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg delete mode 100644 resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg delete mode 100644 resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg create mode 100644 resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg create mode 100644 resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg create mode 100644 resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg create mode 100644 resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg delete mode 100644 resources/quality/elegoo/base/pla040/pla_040012.inst.cfg delete mode 100644 resources/quality/elegoo/base/pla040/pla_040016.inst.cfg delete mode 100644 resources/quality/elegoo/base/pla040/pla_040020.inst.cfg delete mode 100644 resources/quality/elegoo/base/pla040/pla_040024.inst.cfg delete mode 100644 resources/quality/elegoo/base/pla040/pla_040028.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg create mode 100644 resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index 2e47f345d6..f1ad995e60 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -31,6 +31,8 @@ "generic_pp" ], "has_machine_quality": true, + "has_materials": true, + "has_variants": true, "machine_extruder_trains": { "0": "elegoo_extruder_0" }, "platform_offset": [ -2.2, @@ -38,7 +40,9 @@ -31 ], "preferred_material": "generic_pla_175", - "preferred_quality_type": "fine" + "preferred_quality_type": "Elegoo_layer_020", + "preferred_variant_name": "0.40mm_Elegoo_Nozzle", + "variants_name": "Nozzle Size" }, "overrides": { @@ -136,4 +140,4 @@ "z_seam_type": { "default_value": "back" }, "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_sparse_density < 30 " } } -} \ No newline at end of file +} diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg new file mode 100644 index 0000000000..8a5b1442a8 --- /dev/null +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = elegoo_base +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_pla +quality_type = Elegoo_layer_005 +setting_version = 21 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 + diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg new file mode 100644 index 0000000000..538d4100e7 --- /dev/null +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = elegoo_base +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_pla +quality_type = Elegoo_layer_015 +setting_version = 21 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +jerk_print = 30 +speed_infill = =speed_print +speed_print = 30 +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_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg new file mode 100644 index 0000000000..ce9ec58df3 --- /dev/null +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = elegoo_base +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_pla +quality_type = Elegoo_layer_015 +setting_version = 21 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 + diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg new file mode 100644 index 0000000000..500d4423cd --- /dev/null +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = elegoo_base +name = Accurate +version = 4 + +[metadata] +intent_category = engineering +material = generic_pla +quality_type = Elegoo_layer_010 +setting_version = 21 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +jerk_print = 30 +speed_infill = =speed_print +speed_print = 30 +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_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg new file mode 100644 index 0000000000..14b1c67b7d --- /dev/null +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = elegoo_base +name = Visual +version = 4 + +[metadata] +intent_category = visual +material = generic_pla +quality_type = Elegoo_layer_010 +setting_version = 21 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +speed_infill = 50 +top_bottom_thickness = 1.05 + diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg new file mode 100644 index 0000000000..1c7d3ab8af --- /dev/null +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg @@ -0,0 +1,23 @@ +[general] +definition = elegoo_base +name = Quick +version = 4 + +[metadata] +intent_category = quick +material = generic_pla +quality_type = Elegoo_layer_020 +setting_version = 21 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +infill_sparse_density = 15 +jerk_print = 30 +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_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg new file mode 100644 index 0000000000..ca165a3200 --- /dev/null +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_base +name = Quick +version = 4 + +[metadata] +intent_category = quick +is_experimental = True +material = generic_pla +quality_type = Elegoo_layer_030 +setting_version = 21 +type = intent +variant = 0.40mm_Elegoo_Nozzle + +[values] +acceleration_print = 4000 +acceleration_wall = 2000 +acceleration_wall_0 = 2000 +infill_sparse_density = 10 +jerk_print = 30 +speed_infill = =speed_print +speed_print = 50 +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/base/elegoo_global_012_high.inst.cfg b/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg deleted file mode 100644 index 220993355c..0000000000 --- a/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[general] -definition = elegoo_base -name = High Quality -version = 4 - -[metadata] -global_quality = True -quality_type = high -setting_version = 21 -type = quality -weight = -1 - -[values] -layer_height = 0.12 -layer_height_0 = 0.2 -material_print_temperature = =default_material_print_temperature -prime_tower_size = 40 -speed_print = 70 -top_bottom_thickness = 0.7 - diff --git a/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg b/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg deleted file mode 100644 index d6af9ed364..0000000000 --- a/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[general] -definition = elegoo_base -name = Normal Quality -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 21 -type = quality -weight = -2 - -[values] -layer_height = 0.16 -layer_height_0 = 0.25 -material_print_temperature = =default_material_print_temperature -prime_tower_size = 35 -speed_print = 60 -top_bottom_thickness = 0.8 - diff --git a/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg b/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg deleted file mode 100644 index 64300aa7e0..0000000000 --- a/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[general] -definition = elegoo_base -name = Fine Quality -version = 4 - -[metadata] -global_quality = True -quality_type = fine -setting_version = 21 -type = quality -weight = -3 - -[values] -layer_height = 0.20 -layer_height_0 = 0.25 -material_print_temperature = =default_material_print_temperature -prime_tower_size = 31 -top_bottom_thickness = 0.8 - diff --git a/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg b/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg deleted file mode 100644 index 7ce810f39e..0000000000 --- a/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[general] -definition = elegoo_base -name = Medium Quality -version = 4 - -[metadata] -global_quality = True -quality_type = medium -setting_version = 21 -type = quality -weight = -4 - -[values] -layer_height = 0.24 -layer_height_0 = 0.25 -material_print_temperature = =default_material_print_temperature -prime_tower_size = 28 -top_bottom_thickness = 1.0 - diff --git a/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg b/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg deleted file mode 100644 index 892f0147ce..0000000000 --- a/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[general] -definition = elegoo_base -name = Draft Quality -version = 4 - -[metadata] -global_quality = True -quality_type = draft -setting_version = 21 -type = quality -weight = -5 - -[values] -layer_height = 0.28 -layer_height_0 = 0.30 -material_print_temperature = =default_material_print_temperature + 5 -prime_tower_size = 27 -top_bottom_thickness = 1.0 - diff --git a/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg new file mode 100644 index 0000000000..a7fe07fc8e --- /dev/null +++ b/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_base +name = Extra Fine +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_layer_005 +setting_version = 21 +type = quality +weight = -1 + +[values] +layer_height = 0.05 +layer_height_0 = 0.12 + diff --git a/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg new file mode 100644 index 0000000000..1a89da00e1 --- /dev/null +++ b/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_base +name = Fine +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_layer_010 +setting_version = 21 +type = quality +weight = -2 + +[values] +layer_height = 0.10 +layer_height_0 = 0.12 + diff --git a/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg new file mode 100644 index 0000000000..3c738189b4 --- /dev/null +++ b/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_base +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_layer_015 +setting_version = 21 +type = quality +weight = -3 + +[values] +layer_height = 0.15 +layer_height_0 = 0.15 + diff --git a/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg new file mode 100644 index 0000000000..f239902b6f --- /dev/null +++ b/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_base +name = Fast +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_layer_020 +setting_version = 21 +type = quality +weight = -4 + +[values] +layer_height = 0.20 +layer_height_0 = 0.20 + diff --git a/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg new file mode 100644 index 0000000000..7e7e5ea0fc --- /dev/null +++ b/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_base +name = Extra Fast +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_layer_030 +setting_version = 21 +type = quality +weight = -6 + +[values] +layer_height = 0.30 +layer_height_0 = 0.30 + diff --git a/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg new file mode 100644 index 0000000000..cf6b2e3cf1 --- /dev/null +++ b/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_base +name = Turbo +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_layer_040 +setting_version = 21 +type = quality +weight = -6 + +[values] +layer_height = 0.40 +layer_height_0 = 0.40 + diff --git a/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg new file mode 100644 index 0000000000..0bdac9aab8 --- /dev/null +++ b/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg @@ -0,0 +1,16 @@ +[general] +definition = elegoo_base +name = Extra Turbo +version = 4 + +[metadata] +global_quality = True +quality_type = Elegoo_layer_060 +setting_version = 21 +type = quality +weight = -6 + +[values] +layer_height = 0.60 +layer_height_0 = 0.60 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg new file mode 100644 index 0000000000..702dd12244 --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg @@ -0,0 +1,29 @@ +[general] +definition = elegoo_base +name = pla_noz0.20_lay0.05 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_005 +setting_version = 21 +type = quality +variant = 0.20mm_Elegoo_Nozzle + +[values] +brim_width = 8 +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = 190 +retraction_hop = 0.2 +skin_overlap = 5 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 25 / 30) +speed_wall_0 = =math.ceil(speed_print * 20 / 30) +top_bottom_thickness = 0.72 +travel_avoid_distance = 0.4 +wall_0_inset = 0.015 +wall_0_wipe_dist = 0.25 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg new file mode 100644 index 0000000000..d6779a1b34 --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_base +name = pla_noz0.20_lay0.10 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_010 +setting_version = 21 +type = quality +variant = 0.20mm_Elegoo_Nozzle + +[values] +brim_width = 8 +infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_heat_up_speed = 1.4 +material_print_temperature = 190 +retraction_hop = 0.2 +skin_overlap = 5 +speed_print = 30 +speed_wall = =math.ceil(speed_print * 25 / 30) +speed_wall_0 = =math.ceil(speed_print * 20 / 30) +top_bottom_thickness = 0.72 +travel_avoid_distance = 0.4 +wall_0_inset = 0.015 +wall_0_wipe_dist = 0.25 diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg new file mode 100644 index 0000000000..64aea60136 --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -0,0 +1,21 @@ +[general] +definition = elegoo_base +name = pla_noz0.40_lay0.10 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_010 +setting_version = 21 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = False +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +skin_overlap = 10 +top_bottom_thickness = 1 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg new file mode 100644 index 0000000000..dcbcd6e72c --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,24 @@ +[general] +definition = elegoo_base +name = pla_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_015 +setting_version = 21 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +prime_tower_enable = False +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +speed_print = 70 +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/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg new file mode 100644 index 0000000000..1c01b53547 --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_base +name = pla_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_020 +setting_version = 21 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +acceleration_wall = 2000 +acceleration_wall_0 = 2000 +infill_sparse_density = 15 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 5 +prime_tower_enable = False +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +skin_overlap = 20 +speed_topbottom = =math.ceil(speed_print * 40 / 70) +speed_wall = =math.ceil(speed_print * 55 / 70) +speed_wall_0 = =math.ceil(speed_wall * 45 / 50) +top_bottom_thickness = 0.8 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg new file mode 100644 index 0000000000..99524cbb9e --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = elegoo_base +name = pla_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_030 +setting_version = 21 +type = quality +variant = 0.40mm_Elegoo_Nozzle + +[values] +acceleration_print = 2000 +acceleration_topbottom = 1000 +acceleration_wall = 1500 +acceleration_wall_0 = 1000 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +prime_tower_enable = False +raft_airgap = 0.25 +retraction_prime_speed = =retraction_speed +skin_overlap = 20 +speed_print = 50 +speed_wall = 50 +top_bottom_thickness = 0.9 +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg new file mode 100644 index 0000000000..65b6eb9b5b --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = elegoo_base +name = pla_noz0.60_lay0.15 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_015 +setting_version = 21 +type = quality +variant = 0.60mm_Elegoo_Nozzle + +[values] +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg new file mode 100644 index 0000000000..ab14f4126a --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = elegoo_base +name = pla_noz0.60_lay0.20 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_020 +setting_version = 21 +type = quality +variant = 0.60mm_Elegoo_Nozzle + +[values] +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg new file mode 100644 index 0000000000..449b964dac --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = elegoo_base +name = pla_noz0.60_lay0.30 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_030 +setting_version = 21 +type = quality +variant = 0.60mm_Elegoo_Nozzle + +[values] +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg new file mode 100644 index 0000000000..48756381ef --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = elegoo_base +name = pla_noz0.60_lay0.40 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_040 +setting_version = 21 +type = quality +variant = 0.60mm_Elegoo_Nozzle + +[values] +wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg new file mode 100644 index 0000000000..e38dd89d52 --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = elegoo_base +name = pla_noz0.80_lay0.30 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_030 +setting_version = 21 +type = quality +variant = 0.80mm_Elegoo_Nozzle + +[values] +gradual_infill_step_height = =3 * layer_height +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 10 +prime_tower_enable = True +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 40 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg new file mode 100644 index 0000000000..95af41e9af --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = elegoo_base +name = pla_noz0.80_lay0.40 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_040 +setting_version = 21 +type = quality +variant = 0.80mm_Elegoo_Nozzle + +[values] +gradual_infill_step_height = =3 * layer_height +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 15 +prime_tower_enable = True +speed_infill = =math.ceil(speed_print * 35 / 45) +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 35 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg new file mode 100644 index 0000000000..f03d1e38be --- /dev/null +++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = elegoo_base +name = pla_noz0.80_lay0.60 +version = 4 + +[metadata] +material = generic_pla +quality_type = Elegoo_layer_060 +setting_version = 21 +type = quality +variant = 0.80mm_Elegoo_Nozzle + +[values] +gradual_infill_step_height = =3 * layer_height +machine_nozzle_cool_down_speed = 0.75 +machine_nozzle_heat_up_speed = 1.6 +material_print_temperature = =default_material_print_temperature + 15 +prime_tower_enable = True +speed_infill = =math.ceil(speed_print * 35 / 45) +speed_print = 45 +speed_topbottom = =math.ceil(speed_print * 35 / 45) +speed_wall = =math.ceil(speed_print * 35 / 45) +speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 + + diff --git a/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg deleted file mode 100644 index 8866ba45e8..0000000000 --- a/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = elegoo_base -name = pla_040012 -version = 4 - -[metadata] -material = generic_pla_175 -quality_type = high -setting_version = 21 -type = quality - -[values] -brim_width = 3.5 -default_material_bed_temperature = 50 -layer_0_z_overlap = =raft_airgap*0.7 -raft_airgap = =0.3 -retraction_speed = 45 - diff --git a/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg deleted file mode 100644 index c452578deb..0000000000 --- a/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = elegoo_base -name = pla_040016 -version = 4 - -[metadata] -material = generic_pla_175 -quality_type = normal -setting_version = 21 -type = quality - -[values] -brim_width = 3.5 -default_material_bed_temperature = 50 -layer_0_z_overlap = =raft_airgap*0.7 -raft_airgap = =0.3 -retraction_speed = 45 - diff --git a/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg deleted file mode 100644 index d60beeaff5..0000000000 --- a/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = elegoo_base -name = pla_040020 -version = 4 - -[metadata] -material = generic_pla_175 -quality_type = fine -setting_version = 21 -type = quality - -[values] -brim_width = 3.5 -default_material_bed_temperature = 50 -layer_0_z_overlap = =raft_airgap*0.7 -raft_airgap = =0.3 -retraction_speed = 45 - diff --git a/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg deleted file mode 100644 index cd5ffd3ac1..0000000000 --- a/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = elegoo_base -name = pla_040024 -version = 4 - -[metadata] -material = generic_pla_175 -quality_type = medium -setting_version = 21 -type = quality - -[values] -brim_width = 3.5 -default_material_bed_temperature = 50 -layer_0_z_overlap = =raft_airgap*0.6 -raft_airgap = =0.3 -retraction_speed = 45 - diff --git a/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg deleted file mode 100644 index 4a8fd56257..0000000000 --- a/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg +++ /dev/null @@ -1,18 +0,0 @@ -[general] -definition = elegoo_base -name = pla_040028 -version = 4 - -[metadata] -material = generic_pla_175 -quality_type = draft -setting_version = 21 -type = quality - -[values] -brim_width = 3.5 -default_material_bed_temperature = 50 -layer_0_z_overlap = =raft_airgap*0.6 -raft_airgap = =0.35 -retraction_speed = 45 - diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg new file mode 100644 index 0000000000..e82d1a87c3 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_1 +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg new file mode 100644 index 0000000000..0c8a94547a --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_1 +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg new file mode 100644 index 0000000000..6d1cf9be24 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_1 +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg new file mode 100644 index 0000000000..a85f1db828 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_1 +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg new file mode 100644 index 0000000000..73aebe70f9 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2 +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg new file mode 100644 index 0000000000..217312655f --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2 +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg new file mode 100644 index 0000000000..f978408841 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2 +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg new file mode 100644 index 0000000000..3e58db3d38 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2 +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg new file mode 100644 index 0000000000..5a00fefcc3 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2D +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg new file mode 100644 index 0000000000..578ff86aa9 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2D +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg new file mode 100644 index 0000000000..e55abeed6a --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2D +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg new file mode 100644 index 0000000000..c56da2e226 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2D +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg new file mode 100644 index 0000000000..6c0dc9cc57 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2s +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg new file mode 100644 index 0000000000..3b77bc21b9 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2s +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg new file mode 100644 index 0000000000..7a88bb4f69 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2s +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg new file mode 100644 index 0000000000..2b60d5371a --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_2s +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg new file mode 100644 index 0000000000..d253cc0be9 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3 +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg new file mode 100644 index 0000000000..c125005884 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3 +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg new file mode 100644 index 0000000000..fea194e59b --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3 +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg new file mode 100644 index 0000000000..c8a402ea56 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3 +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg new file mode 100644 index 0000000000..f60c1befbc --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3max +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg new file mode 100644 index 0000000000..2d5f5b549d --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3max +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg new file mode 100644 index 0000000000..4d31f9ee62 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3max +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg new file mode 100644 index 0000000000..1b4ed43f0a --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = elegoo_neptune_3max +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg new file mode 100644 index 0000000000..f60c1befbc --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3max +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg new file mode 100644 index 0000000000..2d5f5b549d --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3max +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg new file mode 100644 index 0000000000..4d31f9ee62 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3max +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg new file mode 100644 index 0000000000..1b4ed43f0a --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = elegoo_neptune_3max +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 \ No newline at end of file diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg new file mode 100644 index 0000000000..b2edd68133 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3pro +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg new file mode 100644 index 0000000000..4b7df28e19 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3pro +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg new file mode 100644 index 0000000000..6c2a29d0cc --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3pro +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg new file mode 100644 index 0000000000..8d2f4f5cb0 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_3pro +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg new file mode 100644 index 0000000000..2b804030e6 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_x +name = 0.20mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg new file mode 100644 index 0000000000..f185172da1 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_x +name = 0.40mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg new file mode 100644 index 0000000000..c9afa7091c --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_x +name = 0.60mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg new file mode 100644 index 0000000000..ac23406718 --- /dev/null +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = elegoo_neptune_x +name = 0.80mm_Elegoo_Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 21 +type = variant + +[values] +machine_nozzle_size = 0.8 + From 855a63bfc9d4efa9cae89ccf4fc1a54289c32a48 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Sat, 18 Mar 2023 16:51:56 +0100 Subject: [PATCH 2/9] add tpu configurations --- .../elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg} | 7 ++++--- .../elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg} | 7 ++++--- .../elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg} | 8 ++++---- .../elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg} | 8 ++++---- 4 files changed, 16 insertions(+), 14 deletions(-) rename resources/quality/elegoo/base/{tpu040/tpu_040012.inst.cfg => tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg} (79%) rename resources/quality/elegoo/base/{tpu040/tpu_040016.inst.cfg => tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg} (79%) rename resources/quality/elegoo/base/{tpu040/tpu_040020.inst.cfg => tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg} (79%) rename resources/quality/elegoo/base/{tpu040/tpu_040024.inst.cfg => tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg} (79%) diff --git a/resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg similarity index 79% rename from resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg index 6a4e701397..5b2133160b 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = tpu_040012 +name = tpu_noz0.40_lay0.10 version = 4 [metadata] -material = generic_tpu_175 -quality_type = high +material = generic_tpu +quality_type = Elegoo_layer_010 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_width = 5 diff --git a/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg similarity index 79% rename from resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg index 41fc419ba5..ec85674d20 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = tpu_040016 +name = tpu_noz0.40_lay0.15 version = 4 [metadata] -material = generic_tpu_175 -quality_type = normal +material = generic_tpu +quality_type = Elegoo_layer_015 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_width = 5 diff --git a/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg similarity index 79% rename from resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg index d49e63167e..2c85e4c6f8 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = tpu_040020 +name = tpu_noz0.40_lay0.20 version = 4 [metadata] -material = generic_tpu_175 -quality_type = fine +material = generic_tpu +quality_type = Elegoo_layer_020 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_width = 5 @@ -22,4 +23,3 @@ speed_support_interface = =speed_wall_x speed_topbottom = =speed_wall speed_wall_x = =speed_wall support_angle = 35 - diff --git a/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg similarity index 79% rename from resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg rename to resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg index 9cffe94c11..69a76ee491 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = tpu_040024 +name = tpu_noz0.40_lay0.30 version = 4 [metadata] -material = generic_tpu_175 -quality_type = medium +material = generic_tpu +quality_type = Elegoo_layer_030 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_width = 5 @@ -22,4 +23,3 @@ speed_support_interface = =speed_wall_x speed_topbottom = =speed_wall speed_wall_x = =speed_wall support_angle = 35 - From b09397756c095ca78fe3d6f9587d827f4b5f04b9 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Sat, 18 Mar 2023 16:52:13 +0100 Subject: [PATCH 3/9] Add abs and asa configurations --- ...elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg | 33 +++++++++++++++++++ ...elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg | 31 +++++++++++++++++ ...elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg | 31 +++++++++++++++++ ...legoo_asa_nozzle_0.40_layer_0.10.inst.cfg} | 7 ++-- ...legoo_asa_nozzle_0.40_layer_0.15.inst.cfg} | 7 ++-- ...legoo_asa_nozzle_0.40_layer_0.20.inst.cfg} | 7 ++-- ...legoo_asa_nozzle_0.40_layer_0.30.inst.cfg} | 5 +-- .../elegoo/base/petg040/petg_040012.inst.cfg | 25 -------------- .../elegoo/base/petg040/petg_040016.inst.cfg | 25 -------------- .../elegoo/base/petg040/petg_040020.inst.cfg | 25 -------------- .../elegoo/base/petg040/petg_040024.inst.cfg | 25 -------------- 11 files changed, 112 insertions(+), 109 deletions(-) create mode 100644 resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg rename resources/quality/elegoo/base/{asa040/asa_040024.inst.cfg => asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg} (86%) rename resources/quality/elegoo/base/{asa040/asa_040016.inst.cfg => asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg} (89%) rename resources/quality/elegoo/base/{asa040/asa_040020.inst.cfg => asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg} (89%) rename resources/quality/elegoo/base/{asa040/asa_040028.inst.cfg => asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg} (89%) delete mode 100644 resources/quality/elegoo/base/petg040/petg_040012.inst.cfg delete mode 100644 resources/quality/elegoo/base/petg040/petg_040016.inst.cfg delete mode 100644 resources/quality/elegoo/base/petg040/petg_040020.inst.cfg delete mode 100644 resources/quality/elegoo/base/petg040/petg_040024.inst.cfg diff --git a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg new file mode 100644 index 0000000000..e71ebd816c --- /dev/null +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,33 @@ +[general] +definition = elegoo_base +name = abs_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_abs +quality_type = Elegoo_layer_015 +setting_version = 21 +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 +default_material_bed_temperature = 80 +default_material_print_temperature = 240 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 15 +retraction_speed = 25 +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/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg new file mode 100644 index 0000000000..0b312aa858 --- /dev/null +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = elegoo_base +name = abs_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_abs +quality_type = Elegoo_layer_020 +setting_version = 21 +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 +default_material_bed_temperature = 80 +default_material_print_temperature = 240 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.15 +raft_margin = 10 +retraction_speed = 25 +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/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg new file mode 100644 index 0000000000..6d16352465 --- /dev/null +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,31 @@ +[general] +definition = elegoo_base +name = abs_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_abs +quality_type = Elegoo_layer_030 +setting_version = 21 +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 +default_material_bed_temperature = 80 +default_material_print_temperature = 240 +layer_0_z_overlap = =raft_airgap*0.8 +material_shrinkage_percentage_xy = 100.3 +raft_airgap = =0.2 +raft_margin = 15 +retraction_speed = 25 +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/base/asa040/asa_040024.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg similarity index 86% rename from resources/quality/elegoo/base/asa040/asa_040024.inst.cfg rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg index 50db1fd874..9c7e2b2241 100644 --- a/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = asa_040024 +name = asa_noz0.40_lay0.10 version = 4 [metadata] material = generic_asa_175 -quality_type = medium +quality_type = Elegoo_layer_010 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_gap = 0 @@ -25,6 +26,6 @@ retraction_speed = 25 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.75 +top_bottom_thickness = 0.72 wall_thickness = =line_width*2 diff --git a/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg similarity index 89% rename from resources/quality/elegoo/base/asa040/asa_040016.inst.cfg rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg index ccba9d9067..66990b8f58 100644 --- a/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = asa_040016 +name = asa_noz0.40_lay0.15 version = 4 [metadata] material = generic_asa_175 -quality_type = normal +quality_type = Elegoo_layer_015 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_gap = 0 @@ -28,3 +29,5 @@ support_z_distance = =layer_height/2 top_bottom_thickness = 0.64 wall_thickness = =line_width*2 + + diff --git a/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg similarity index 89% rename from resources/quality/elegoo/base/asa040/asa_040020.inst.cfg rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg index 782619cb98..a3207a113d 100644 --- a/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = asa_040020 +name = asa_noz0.40_lay0.20 version = 4 [metadata] material = generic_asa_175 -quality_type = fine +quality_type = Elegoo_layer_020 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_gap = 0 @@ -28,3 +29,5 @@ support_z_distance = =layer_height/2 top_bottom_thickness = 0.8 wall_thickness = =line_width*2 + + diff --git a/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg similarity index 89% rename from resources/quality/elegoo/base/asa040/asa_040028.inst.cfg rename to resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg index a440935ae7..571f5b64a9 100644 --- a/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = asa_040028 +name = asa_noz0.40_lay0.30 version = 4 [metadata] material = generic_asa_175 -quality_type = draft +quality_type = Elegoo_layer_030 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_gap = 0 diff --git a/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg b/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg deleted file mode 100644 index 9d3782da23..0000000000 --- a/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -definition = elegoo_base -name = petg_040012 -version = 4 - -[metadata] -material = generic_petg_175 -quality_type = high -setting_version = 21 -type = quality - -[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 -default_material_bed_temperature = 70 -default_material_print_temperature = 235 -layer_0_z_overlap = =raft_airgap*0.6 -material_shrinkage_percentage_xy = 100.2 -raft_airgap = =0.35 -raft_margin = 10 -retraction_speed = 25 -speed_support = =speed_wall_x - diff --git a/resources/quality/elegoo/base/petg040/petg_040016.inst.cfg b/resources/quality/elegoo/base/petg040/petg_040016.inst.cfg deleted file mode 100644 index 0951f69990..0000000000 --- a/resources/quality/elegoo/base/petg040/petg_040016.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -definition = elegoo_base -name = petg_040016 -version = 4 - -[metadata] -material = generic_petg_175 -quality_type = normal -setting_version = 21 -type = quality - -[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 -default_material_bed_temperature = 70 -default_material_print_temperature = 235 -layer_0_z_overlap = =raft_airgap*0.6 -material_shrinkage_percentage_xy = 100.2 -raft_airgap = =0.35 -raft_margin = 10 -retraction_speed = 25 -speed_support = =speed_wall_x - diff --git a/resources/quality/elegoo/base/petg040/petg_040020.inst.cfg b/resources/quality/elegoo/base/petg040/petg_040020.inst.cfg deleted file mode 100644 index 3d62040286..0000000000 --- a/resources/quality/elegoo/base/petg040/petg_040020.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -definition = elegoo_base -name = petg_040020 -version = 4 - -[metadata] -material = generic_petg_175 -quality_type = fine -setting_version = 21 -type = quality - -[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 -default_material_bed_temperature = 70 -default_material_print_temperature = 235 -layer_0_z_overlap = =raft_airgap*0.6 -material_shrinkage_percentage_xy = 100.2 -raft_airgap = =0.35 -raft_margin = 10 -retraction_speed = 25 -speed_support = =speed_wall_x - diff --git a/resources/quality/elegoo/base/petg040/petg_040024.inst.cfg b/resources/quality/elegoo/base/petg040/petg_040024.inst.cfg deleted file mode 100644 index a3dbaa7a9c..0000000000 --- a/resources/quality/elegoo/base/petg040/petg_040024.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -definition = elegoo_base -name = petg_040024 -version = 4 - -[metadata] -material = generic_petg_175 -quality_type = medium -setting_version = 21 -type = quality - -[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 -default_material_bed_temperature = 70 -default_material_print_temperature = 235 -layer_0_z_overlap = =raft_airgap*0.6 -material_shrinkage_percentage_xy = 100.2 -raft_airgap = =0.35 -raft_margin = 10 -retraction_speed = 25 -speed_support = =speed_wall_x - From 34c063ae72eaa4491758c847ad8502ea4d3cb81c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Sat, 18 Mar 2023 16:52:27 +0100 Subject: [PATCH 4/9] add petg and remove abs definitions --- ...legoo_abs_nozzle_0.40_layer_0.10.inst.cfg} | 8 ++--- ...elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg | 3 +- ...elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg | 2 +- .../elegoo/base/abs040/abs_040016.inst.cfg | 30 ------------------- .../elegoo/base/abs040/abs_040020.inst.cfg | 30 ------------------- .../elegoo/base/abs040/abs_040024.inst.cfg | 30 ------------------- .../elegoo/base/abs040/abs_040028.inst.cfg | 30 ------------------- .../elegoo/base/asa040/asa_040012.inst.cfg | 30 ------------------- ...egoo_petg_nozzle_0.40_layer_0.10.inst.cfg} | 9 +++--- ...legoo_petg_nozzle_0.40_layer_0.15.inst.cfg | 27 +++++++++++++++++ ...legoo_petg_nozzle_0.40_layer_0.20.inst.cfg | 27 +++++++++++++++++ ...legoo_petg_nozzle_0.40_layer_0.30.inst.cfg | 27 +++++++++++++++++ 12 files changed, 93 insertions(+), 160 deletions(-) rename resources/quality/elegoo/base/{abs040/abs_040012.inst.cfg => abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg} (86%) delete mode 100644 resources/quality/elegoo/base/abs040/abs_040016.inst.cfg delete mode 100644 resources/quality/elegoo/base/abs040/abs_040020.inst.cfg delete mode 100644 resources/quality/elegoo/base/abs040/abs_040024.inst.cfg delete mode 100644 resources/quality/elegoo/base/abs040/abs_040028.inst.cfg delete mode 100644 resources/quality/elegoo/base/asa040/asa_040012.inst.cfg rename resources/quality/elegoo/base/{petg040/petg_040028.inst.cfg => petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg} (77%) create mode 100644 resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg create mode 100644 resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg create mode 100644 resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg diff --git a/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg similarity index 86% rename from resources/quality/elegoo/base/abs040/abs_040012.inst.cfg rename to resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg index 5369bd52b8..4963202e3b 100644 --- a/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = abs_040012 +name = abs_noz0.40_lay0.10 version = 4 [metadata] -material = generic_abs_175 -quality_type = high +material = generic_abs +quality_type = Elegoo_layer_010 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_gap = 0 @@ -27,4 +28,3 @@ 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/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg index e71ebd816c..47457d80d6 100644 --- a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg @@ -21,7 +21,7 @@ default_material_print_temperature = 240 layer_0_z_overlap = =raft_airgap*0.8 material_shrinkage_percentage_xy = 100.3 raft_airgap = =0.15 -raft_margin = 15 +raft_margin = 10 retraction_speed = 25 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 @@ -31,3 +31,4 @@ wall_thickness = =line_width*2 + diff --git a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg index 6d16352465..5ad763983b 100644 --- a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg @@ -21,7 +21,7 @@ default_material_print_temperature = 240 layer_0_z_overlap = =raft_airgap*0.8 material_shrinkage_percentage_xy = 100.3 raft_airgap = =0.2 -raft_margin = 15 +raft_margin = 10 retraction_speed = 25 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 diff --git a/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg b/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg deleted file mode 100644 index b78931770e..0000000000 --- a/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[general] -definition = elegoo_base -name = abs_040016 -version = 4 - -[metadata] -material = generic_abs_175 -quality_type = normal -setting_version = 21 -type = quality - -[values] -brim_gap = 0 -brim_width = 10 -cool_fan_enabled = False -cool_fan_speed = 0 -cool_fan_speed_0 = 0 -default_material_bed_temperature = 80 -default_material_print_temperature = 240 -layer_0_z_overlap = =raft_airgap*0.8 -material_shrinkage_percentage_xy = 100.3 -raft_airgap = =0.15 -raft_margin = 10 -retraction_speed = 25 -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/base/abs040/abs_040020.inst.cfg b/resources/quality/elegoo/base/abs040/abs_040020.inst.cfg deleted file mode 100644 index 2a27c592ba..0000000000 --- a/resources/quality/elegoo/base/abs040/abs_040020.inst.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[general] -definition = elegoo_base -name = abs_040020 -version = 4 - -[metadata] -material = generic_abs_175 -quality_type = fine -setting_version = 21 -type = quality - -[values] -brim_gap = 0 -brim_width = 10 -cool_fan_enabled = False -cool_fan_speed = 0 -cool_fan_speed_0 = 0 -default_material_bed_temperature = 80 -default_material_print_temperature = 240 -layer_0_z_overlap = =raft_airgap*0.8 -material_shrinkage_percentage_xy = 100.3 -raft_airgap = =0.15 -raft_margin = 10 -retraction_speed = 25 -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/base/abs040/abs_040024.inst.cfg b/resources/quality/elegoo/base/abs040/abs_040024.inst.cfg deleted file mode 100644 index 3a4d4cfb72..0000000000 --- a/resources/quality/elegoo/base/abs040/abs_040024.inst.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[general] -definition = elegoo_base -name = abs_040024 -version = 4 - -[metadata] -material = generic_abs_175 -quality_type = medium -setting_version = 21 -type = quality - -[values] -brim_gap = 0 -brim_width = 10 -cool_fan_enabled = False -cool_fan_speed = 0 -cool_fan_speed_0 = 0 -default_material_bed_temperature = 80 -default_material_print_temperature = 240 -layer_0_z_overlap = =raft_airgap*0.8 -material_shrinkage_percentage_xy = 100.3 -raft_airgap = =0.15 -raft_margin = 10 -retraction_speed = 25 -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.75 -wall_thickness = =line_width*2 - diff --git a/resources/quality/elegoo/base/abs040/abs_040028.inst.cfg b/resources/quality/elegoo/base/abs040/abs_040028.inst.cfg deleted file mode 100644 index f2b1d30c2e..0000000000 --- a/resources/quality/elegoo/base/abs040/abs_040028.inst.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[general] -definition = elegoo_base -name = abs_040028 -version = 4 - -[metadata] -material = generic_abs_175 -quality_type = draft -setting_version = 21 -type = quality - -[values] -brim_gap = 0 -brim_width = 10 -cool_fan_enabled = False -cool_fan_speed = 0 -cool_fan_speed_0 = 0 -default_material_bed_temperature = 80 -default_material_print_temperature = 240 -layer_0_z_overlap = =raft_airgap*0.8 -material_shrinkage_percentage_xy = 100.3 -raft_airgap = =0.2 -raft_margin = 10 -retraction_speed = 25 -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/base/asa040/asa_040012.inst.cfg b/resources/quality/elegoo/base/asa040/asa_040012.inst.cfg deleted file mode 100644 index d6eedbb199..0000000000 --- a/resources/quality/elegoo/base/asa040/asa_040012.inst.cfg +++ /dev/null @@ -1,30 +0,0 @@ -[general] -definition = elegoo_base -name = asa_040012 -version = 4 - -[metadata] -material = generic_asa_175 -quality_type = high -setting_version = 21 -type = quality - -[values] -brim_gap = 0 -brim_width = 10 -cool_fan_enabled = False -cool_fan_speed = 0 -cool_fan_speed_0 = 0 -default_material_bed_temperature = 80 -default_material_print_temperature = 240 -layer_0_z_overlap = =raft_airgap*0.8 -material_shrinkage_percentage_xy = 100.3 -raft_airgap = =0.15 -raft_margin = 15 -retraction_speed = 25 -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/base/petg040/petg_040028.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg similarity index 77% rename from resources/quality/elegoo/base/petg040/petg_040028.inst.cfg rename to resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg index dff79cc0e0..a8bb3cf500 100644 --- a/resources/quality/elegoo/base/petg040/petg_040028.inst.cfg +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg @@ -1,13 +1,14 @@ [general] definition = elegoo_base -name = petg_040028 +name = petg_noz0.40_lay0.10 version = 4 [metadata] -material = generic_petg_175 -quality_type = draft +material = generic_petg +quality_type = Elegoo_layer_010 setting_version = 21 type = quality +variant = 0.40mm_Elegoo_Nozzle [values] brim_width = 6 @@ -18,7 +19,7 @@ default_material_bed_temperature = 70 default_material_print_temperature = 235 layer_0_z_overlap = =raft_airgap*0.6 material_shrinkage_percentage_xy = 100.2 -raft_airgap = =0.38 +raft_airgap = =0.35 raft_margin = 10 retraction_speed = 25 speed_support = =speed_wall_x diff --git a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg new file mode 100644 index 0000000000..8332a85aa2 --- /dev/null +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = elegoo_base +name = petg_noz0.40_lay0.15 +version = 4 + +[metadata] +material = generic_petg +quality_type = Elegoo_layer_015 +setting_version = 21 +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 +default_material_bed_temperature = 70 +default_material_print_temperature = 235 +layer_0_z_overlap = =raft_airgap*0.6 +material_shrinkage_percentage_xy = 100.2 +raft_airgap = =0.35 +raft_margin = 10 +retraction_speed = 25 +speed_support = =speed_wall_x + + diff --git a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg new file mode 100644 index 0000000000..2ac79a155a --- /dev/null +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = elegoo_base +name = petg_noz0.40_lay0.20 +version = 4 + +[metadata] +material = generic_petg +quality_type = Elegoo_layer_020 +setting_version = 21 +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 +default_material_bed_temperature = 70 +default_material_print_temperature = 235 +layer_0_z_overlap = =raft_airgap*0.6 +material_shrinkage_percentage_xy = 100.2 +raft_airgap = =0.35 +raft_margin = 10 +retraction_speed = 25 +speed_support = =speed_wall_x + + diff --git a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg new file mode 100644 index 0000000000..51d446fe36 --- /dev/null +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = elegoo_base +name = petg_noz0.40_lay0.30 +version = 4 + +[metadata] +material = generic_petg +quality_type = Elegoo_layer_030 +setting_version = 21 +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 +default_material_bed_temperature = 70 +default_material_print_temperature = 235 +layer_0_z_overlap = =raft_airgap*0.6 +material_shrinkage_percentage_xy = 100.2 +raft_airgap = =0.35 +raft_margin = 10 +retraction_speed = 25 +speed_support = =speed_wall_x + + From ee0b14fcac64153281c9af7b4bbd1e65d6012a6c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 12 Apr 2023 15:40:13 +0200 Subject: [PATCH 5/9] Update update script. Deleted qualities will now be replaced with new ones. --- .../VersionUpgrade53to54.py | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py index c84ff268b0..f37af5fa46 100644 --- a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py +++ b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py @@ -32,6 +32,44 @@ _REMOVED_SETTINGS = { "wireframe_roof_outer_delay", "wireframe_nozzle_clearance", } +"elegoo_global_012_high" +_RENAMED_PROFILES = { + "abs_040012" : "elegoo_abs_nozzle_0.40_layer_0.10", + "abs_040016" : "elegoo_abs_nozzle_0.40_layer_0.15", + "abs_040020" : "elegoo_abs_nozzle_0.40_layer_0.20", + "abs_040024" : "elegoo_abs_nozzle_0.40_layer_0.20", + "abs_040028" : "elegoo_abs_nozzle_0.40_layer_0.30", + + "asa_040012" : "elegoo_asa_nozzle_0.40_layer_0.10", + "asa_040016" : "elegoo_asa_nozzle_0.40_layer_0.15", + "asa_040020" : "elegoo_asa_nozzle_0.40_layer_0.20", + "asa_040024" : "elegoo_asa_nozzle_0.40_layer_0.20", + "asa_040028" : "elegoo_asa_nozzle_0.40_layer_0.30", + + "petg_040012": "elegoo_petg_nozzle_0.40_layer_0.10", + "petg_040016": "elegoo_petg_nozzle_0.40_layer_0.15", + "petg_040020": "elegoo_petg_nozzle_0.40_layer_0.20", + "petg_040024": "elegoo_petg_nozzle_0.40_layer_0.20", + "petg_040028": "elegoo_petg_nozzle_0.40_layer_0.30", + + "pla_040012": "elegoo_pla_nozzle_0.40_layer_0.10", + "pla_040016": "elegoo_pla_nozzle_0.40_layer_0.15", + "pla_040020": "elegoo_pla_nozzle_0.40_layer_0.20", + "pla_040024": "elegoo_pla_nozzle_0.40_layer_0.20", + "pla_040028": "elegoo_pla_nozzle_0.40_layer_0.30", + + "tpu_040012": "elegoo_tpu_nozzle_0.40_layer_0.10", + "tpu_040016": "elegoo_tpu_nozzle_0.40_layer_0.15", + "tpu_040020": "elegoo_tpu_nozzle_0.40_layer_0.20", + "tpu_040024": "elegoo_tpu_nozzle_0.40_layer_0.20", + "tpu_040028": "elegoo_tpu_nozzle_0.40_layer_0.30", + + "elegoo_global_012_high.inst.cfg": "elegoo_layer_0.10.inst.cfg", + "elegoo_global_016_normal.inst.cfg": "elegoo_layer_0.15.inst.cfg", + "elegoo_global_020_fine.inst.cfg": "elegoo_layer_0.20.inst.cfg", + "elegoo_global_024_medium.inst.cfg": "elegoo_layer_0.20.inst.cfg", + "elegoo_global_028_draft.inst.cfg": "elegoo_layer_0.30.inst.cfg", +} class VersionUpgrade53to54(VersionUpgrade): @@ -112,6 +150,9 @@ class VersionUpgrade53to54(VersionUpgrade): parser["metadata"]["setting_version"] = "22" + for container in parser['containers']: + parser['containers'][container] = _RENAMED_PROFILES.get(parser['containers'][container], parser['containers'][container]) + result = io.StringIO() parser.write(result) return [filename], [result.getvalue()] From ed1b844b4189079fbb83eec049d564a83cab21eb Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 12 Apr 2023 15:43:03 +0200 Subject: [PATCH 6/9] Remove random string and format --- .../VersionUpgrade53to54.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py index f37af5fa46..6845c58a5b 100644 --- a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py +++ b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py @@ -32,19 +32,19 @@ _REMOVED_SETTINGS = { "wireframe_roof_outer_delay", "wireframe_nozzle_clearance", } -"elegoo_global_012_high" -_RENAMED_PROFILES = { - "abs_040012" : "elegoo_abs_nozzle_0.40_layer_0.10", - "abs_040016" : "elegoo_abs_nozzle_0.40_layer_0.15", - "abs_040020" : "elegoo_abs_nozzle_0.40_layer_0.20", - "abs_040024" : "elegoo_abs_nozzle_0.40_layer_0.20", - "abs_040028" : "elegoo_abs_nozzle_0.40_layer_0.30", - "asa_040012" : "elegoo_asa_nozzle_0.40_layer_0.10", - "asa_040016" : "elegoo_asa_nozzle_0.40_layer_0.15", - "asa_040020" : "elegoo_asa_nozzle_0.40_layer_0.20", - "asa_040024" : "elegoo_asa_nozzle_0.40_layer_0.20", - "asa_040028" : "elegoo_asa_nozzle_0.40_layer_0.30", +_RENAMED_PROFILES = { + "abs_040012": "elegoo_abs_nozzle_0.40_layer_0.10", + "abs_040016": "elegoo_abs_nozzle_0.40_layer_0.15", + "abs_040020": "elegoo_abs_nozzle_0.40_layer_0.20", + "abs_040024": "elegoo_abs_nozzle_0.40_layer_0.20", + "abs_040028": "elegoo_abs_nozzle_0.40_layer_0.30", + + "asa_040012": "elegoo_asa_nozzle_0.40_layer_0.10", + "asa_040016": "elegoo_asa_nozzle_0.40_layer_0.15", + "asa_040020": "elegoo_asa_nozzle_0.40_layer_0.20", + "asa_040024": "elegoo_asa_nozzle_0.40_layer_0.20", + "asa_040028": "elegoo_asa_nozzle_0.40_layer_0.30", "petg_040012": "elegoo_petg_nozzle_0.40_layer_0.10", "petg_040016": "elegoo_petg_nozzle_0.40_layer_0.15", From 83117e59852f0f6502ef68718681af624de9c20c Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 12 Apr 2023 16:00:24 +0200 Subject: [PATCH 7/9] bump versions --- .../PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg | 2 +- .../PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg | 2 +- .../PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg | 2 +- .../PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg | 2 +- .../elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg | 2 +- .../elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg | 2 +- .../elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg | 2 +- .../abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg | 2 +- .../abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg | 2 +- .../abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg | 2 +- .../abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg | 2 +- .../asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg | 2 +- .../asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg | 2 +- .../asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg | 2 +- .../asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg | 2 +- resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg | 2 +- resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg | 2 +- resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg | 2 +- resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg | 2 +- resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg | 2 +- resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg | 2 +- resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg | 2 +- .../nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg | 2 +- .../nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg | 2 +- .../nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg | 2 +- .../nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg | 2 +- .../pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg | 2 +- .../pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg | 2 +- .../pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg | 2 +- .../pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg | 2 +- .../pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg | 2 +- .../pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg | 2 +- .../pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg | 2 +- .../pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg | 2 +- .../pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg | 2 +- .../pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg | 2 +- .../pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg | 2 +- .../pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg | 2 +- .../pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg | 2 +- .../tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg | 2 +- .../tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg | 2 +- .../tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg | 2 +- .../tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg | 2 +- .../elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg | 2 +- .../elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg | 2 +- .../elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg | 2 +- .../elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg | 2 +- .../elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg | 2 +- .../elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg | 2 +- .../elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg | 2 +- .../elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg | 2 +- .../elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg | 2 +- .../elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg | 2 +- .../elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg | 2 +- .../elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg | 2 +- .../elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg | 2 +- .../elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg | 2 +- .../elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg | 2 +- .../elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg | 2 +- .../elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg | 2 +- .../elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg | 2 +- .../elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg | 2 +- .../elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg | 2 +- .../elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg | 2 +- .../elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg | 2 +- .../elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg | 2 +- .../elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg | 2 +- .../elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg | 2 +- 79 files changed, 79 insertions(+), 79 deletions(-) diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg index 8a5b1442a8..e82884e3fb 100644 --- a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.05mm_visual.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = visual material = generic_pla quality_type = Elegoo_layer_005 -setting_version = 21 +setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg index 538d4100e7..bdbeef66b4 100644 --- a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_engineering.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = engineering material = generic_pla quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg index ce9ec58df3..9d8758f605 100644 --- a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.15mm_visual.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = visual material = generic_pla quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg index 500d4423cd..de7bdc5730 100644 --- a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_engineering.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = engineering material = generic_pla quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg index 14b1c67b7d..d89f8510ec 100644 --- a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.1mm_visual.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = visual material = generic_pla quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg index 1c7d3ab8af..c1fd50eab3 100644 --- a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.2mm_quick.inst.cfg @@ -7,7 +7,7 @@ version = 4 intent_category = quick material = generic_pla quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg index ca165a3200..9dc2c50697 100644 --- a/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg +++ b/resources/intent/elegoo_base/PLA/elegoo_base_aa0.4_pla_0.3mm_quick.inst.cfg @@ -8,7 +8,7 @@ intent_category = quick is_experimental = True material = generic_pla quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = intent variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg index 4963202e3b..09f740f263 100644 --- a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.10.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg index 47457d80d6..c77f46068f 100644 --- a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.15.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg index 0b312aa858..149d17021e 100644 --- a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.20.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg index 5ad763983b..9c58ee7fc9 100644 --- a/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/abs/nozzle_0.40/elegoo_abs_nozzle_0.40_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg index 9c7e2b2241..3543bf211e 100644 --- a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.10.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa_175 quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg index 66990b8f58..e2a1347e99 100644 --- a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.15.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa_175 quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg index a3207a113d..c457e2a5b5 100644 --- a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.20.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa_175 quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg index 571f5b64a9..e992206e6b 100644 --- a/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/asa/nozzle_0.40/elegoo_asa_nozzle_0.40_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_asa_175 quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg index a7fe07fc8e..0175d5dbfa 100644 --- a/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_layer_0.05.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = Elegoo_layer_005 -setting_version = 21 +setting_version = 22 type = quality weight = -1 diff --git a/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg index 1a89da00e1..d4fa921e7b 100644 --- a/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_layer_0.10.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = quality weight = -2 diff --git a/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg index 3c738189b4..572a4a7c52 100644 --- a/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_layer_0.15.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = quality weight = -3 diff --git a/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg index f239902b6f..ee4226a6a8 100644 --- a/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_layer_0.20.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = quality weight = -4 diff --git a/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg index 7e7e5ea0fc..dea809b063 100644 --- a/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality weight = -6 diff --git a/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg index cf6b2e3cf1..cca7b701aa 100644 --- a/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_layer_0.40.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = Elegoo_layer_040 -setting_version = 21 +setting_version = 22 type = quality weight = -6 diff --git a/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg b/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg index 0bdac9aab8..a7ff7a2610 100644 --- a/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_layer_0.60.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = Elegoo_layer_060 -setting_version = 21 +setting_version = 22 type = quality weight = -6 diff --git a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg index a8bb3cf500..9080be34e6 100644 --- a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.10.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_petg quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg index 8332a85aa2..20ddba557b 100644 --- a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.15.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_petg quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg index 2ac79a155a..6a03b46b12 100644 --- a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.20.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_petg quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg index 51d446fe36..35487d81e4 100644 --- a/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/petg/nozzle_0.40/elegoo_petg_nozzle_0.40_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_petg quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg index 702dd12244..3e70c6034d 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_005 -setting_version = 21 +setting_version = 22 type = quality variant = 0.20mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg index d6779a1b34..73ab456379 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = quality variant = 0.20mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg index 64aea60136..d5a2f73729 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.10.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg index dcbcd6e72c..e86f454664 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.15.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg index 1c01b53547..db7e5a43c7 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.20.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg index 99524cbb9e..d84cc9e656 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.40/elegoo_pla_nozzle_0.40_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg index 65b6eb9b5b..043662209b 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.15.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = quality variant = 0.60mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg index ab14f4126a..b47c51abeb 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.20.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = quality variant = 0.60mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg index 449b964dac..38de41d075 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality variant = 0.60mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg index 48756381ef..efb1ababd0 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.60/elegoo_pla_nozzle_0.60_layer_0.40.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_040 -setting_version = 21 +setting_version = 22 type = quality variant = 0.60mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg index e38dd89d52..b6c63fad0f 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality variant = 0.80mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg index 95af41e9af..1e3eec080a 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.40.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_040 -setting_version = 21 +setting_version = 22 type = quality variant = 0.80mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg index f03d1e38be..089c501484 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.80/elegoo_pla_nozzle_0.80_layer_0.60.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = Elegoo_layer_060 -setting_version = 21 +setting_version = 22 type = quality variant = 0.80mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg index 5b2133160b..32e2de589d 100644 --- a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.10.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = Elegoo_layer_010 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg index ec85674d20..d2cd594cb7 100644 --- a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.15.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = Elegoo_layer_015 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg index 2c85e4c6f8..31e3b9a1ff 100644 --- a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.20.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = Elegoo_layer_020 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg index 69a76ee491..4c63fc0cff 100644 --- a/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg +++ b/resources/quality/elegoo/base/tpu/nozzle_0.40/elegoo_tpu_nozzle_0.40_layer_0.30.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu quality_type = Elegoo_layer_030 -setting_version = 21 +setting_version = 22 type = quality variant = 0.40mm_Elegoo_Nozzle diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg index e82d1a87c3..ff14878f69 100644 --- a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg index 0c8a94547a..30ee88ddd3 100644 --- a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg index 6d1cf9be24..8a5d31cca2 100644 --- a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg index a85f1db828..558d8fbdad 100644 --- a/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_1/elegoo_neptune_1_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg index 73aebe70f9..4c1180e555 100644 --- a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg index 217312655f..a38d2db989 100644 --- a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg index f978408841..13cd15ad7d 100644 --- a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg index 3e58db3d38..785396f64a 100644 --- a/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2/elegoo_neptune_2_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg index 5a00fefcc3..eded48e16d 100644 --- a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg index 578ff86aa9..68655ba6f6 100644 --- a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg index e55abeed6a..93094eced6 100644 --- a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg index c56da2e226..cc5430a687 100644 --- a/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2D/elegoo_neptune_2D_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg index 6c0dc9cc57..dba8f4835c 100644 --- a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg index 3b77bc21b9..c289d4595f 100644 --- a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg index 7a88bb4f69..23a9449b56 100644 --- a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg index 2b60d5371a..a4ec2af878 100644 --- a/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_2s/elegoo_neptune_2s_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg index d253cc0be9..253e434aaa 100644 --- a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg index c125005884..1a638c6f36 100644 --- a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg index fea194e59b..4ae27b83f3 100644 --- a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg index c8a402ea56..bd4be2b2dc 100644 --- a/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3/elegoo_neptune_3_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg index f60c1befbc..502b18c49a 100644 --- a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg index 2d5f5b549d..8e5aa468d8 100644 --- a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg index 4d31f9ee62..58dd28cbc1 100644 --- a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg index 1b4ed43f0a..b63632a71e 100644 --- a/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3max/elegoo_neptune_3max_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg index f60c1befbc..502b18c49a 100644 --- a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg index 2d5f5b549d..8e5aa468d8 100644 --- a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg index 4d31f9ee62..58dd28cbc1 100644 --- a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg index 1b4ed43f0a..b63632a71e 100644 --- a/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3plus/elegoo_neptune_3plus_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg index b2edd68133..54301e7ad8 100644 --- a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg index 4b7df28e19..0e49ef7d51 100644 --- a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg index 6c2a29d0cc..9e60d5aaa5 100644 --- a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg index 8d2f4f5cb0..c69d81dab8 100644 --- a/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_3pro/elegoo_neptune_3pro_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg index 2b804030e6..c06a52f29b 100644 --- a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.20.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg index f185172da1..2d3802546f 100644 --- a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.40.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg index c9afa7091c..e0a715a717 100644 --- a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.60.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] diff --git a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg index ac23406718..196a9f8ce0 100644 --- a/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg +++ b/resources/variants/elegoo/elegoo_neptune_x/elegoo_neptune_x_0.80.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 21 +setting_version = 22 type = variant [values] From 12c53ce4e441b48d967e42c358d488ecaf379783 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 12 Apr 2023 16:26:46 +0200 Subject: [PATCH 8/9] Use resolveOrValue --- resources/definitions/elegoo_base.def.json | 2 +- .../pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg | 2 +- .../pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index f1ad995e60..e13bd5be32 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -138,6 +138,6 @@ "z_seam_corner": { "default_value": "z_seam_corner_weighted" }, "z_seam_position": { "default_value": "left" }, "z_seam_type": { "default_value": "back" }, - "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_sparse_density < 30 " } + "zig_zaggify_infill": { "value": "resolveOrValue('infill_pattern') == 'cross' or resolveOrValue('infill_pattern') == 'cross_3d' or resolveOrValue('infill_sparse_density') < 30 " } } } diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg index 3e70c6034d..c5ed8f40f8 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg @@ -12,7 +12,7 @@ variant = 0.20mm_Elegoo_Nozzle [values] brim_width = 8 -infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_overlap = =0 if resolveOrValue('infill_sparse_density') > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg index 73ab456379..f98dd73c40 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg @@ -12,7 +12,7 @@ variant = 0.20mm_Elegoo_Nozzle [values] brim_width = 8 -infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_overlap = =0 if resolveOrValue('infill_sparse_density') > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 From 3f43aca4cd674c3a18b7bc71703b5c7394b01918 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Fri, 28 Apr 2023 11:02:00 +0200 Subject: [PATCH 9/9] fixed upgrade path --- .../VersionUpgrade53to54/VersionUpgrade53to54.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py index 6845c58a5b..f3a8314769 100644 --- a/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py +++ b/plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py @@ -64,11 +64,11 @@ _RENAMED_PROFILES = { "tpu_040024": "elegoo_tpu_nozzle_0.40_layer_0.20", "tpu_040028": "elegoo_tpu_nozzle_0.40_layer_0.30", - "elegoo_global_012_high.inst.cfg": "elegoo_layer_0.10.inst.cfg", - "elegoo_global_016_normal.inst.cfg": "elegoo_layer_0.15.inst.cfg", - "elegoo_global_020_fine.inst.cfg": "elegoo_layer_0.20.inst.cfg", - "elegoo_global_024_medium.inst.cfg": "elegoo_layer_0.20.inst.cfg", - "elegoo_global_028_draft.inst.cfg": "elegoo_layer_0.30.inst.cfg", + "elegoo_global_012_high": "elegoo_layer_0.10", + "elegoo_global_016_normal": "elegoo_layer_0.15", + "elegoo_global_020_fine": "elegoo_layer_0.20", + "elegoo_global_024_medium": "elegoo_layer_0.20", + "elegoo_global_028_draft": "elegoo_layer_0.30", }