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] 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 + +