diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index 406d5c0f0b..ed0c6d1c9d 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -1,134 +1,141 @@ - { - "version": 2, - - "name": "ELEGOO Base Printer", - - "inherits": "fdmprinter", - - "metadata": { - "author": "NARUTO", - "manufacturer": "ELEGOO", - "file_formats": "text/x-gcode", - "platform": "elegoo_platform.3mf", - "platform_offset": [-2.2, 14.5, -31], - "has_machine_quality": true, - "preferred_quality_type": "fine", - "preferred_material": "generic_pla_175", - "machine_extruder_trains":{"0": "elegoo_extruder_0"}, - "exclude_materials": [ - "generic_nylon_175", - "generic_nylon", - "generic_hips_175", - "generic_hips", - "generic_gffcpe", - "generic_bvoh_175", - "generic_ccfpe", - "generic_cffcpe", - "generic_cpe_plus", - "generic_cpe_175", - "generic_cpe", - "generic_tpu", - "generic_pp", - "generic_pc", - "generic_pc_175", - "generic_pvc", - "generic_pva", - "generic_pva_175", - "generic_pvc_175", - "generic_pp" - ] + "version": 2, + "name": "ELEGOO Base Printer", + "inherits": "fdmprinter", + "metadata": + { + "author": "NARUTO", + "manufacturer": "ELEGOO", + "file_formats": "text/x-gcode", + "platform": "elegoo_platform.3mf", + "exclude_materials": [ + "generic_nylon_175", + "generic_nylon", + "generic_hips_175", + "generic_hips", + "generic_gffcpe", + "generic_bvoh_175", + "generic_ccfpe", + "generic_cffcpe", + "generic_cpe_plus", + "generic_cpe_175", + "generic_cpe", + "generic_tpu", + "generic_pp", + "generic_pc", + "generic_pc_175", + "generic_pvc", + "generic_pva", + "generic_pva_175", + "generic_pvc_175", + "generic_pp" + ], + "has_machine_quality": true, + "machine_extruder_trains": { "0": "elegoo_extruder_0" }, + "platform_offset": [ + -2.2, + 14.5, + -31 + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "fine" + }, + "overrides": + { + "acceleration_enabled": { "value": true }, + "acceleration_layer_0": { "value": 500 }, + "acceleration_print": { "value": 1000 }, + "acceleration_travel": { "value": "acceleration_print" }, + "brim_gap": { "default_value": 0.1 }, + "brim_width": { "default_value": 5 }, + "cool_fan_full_at_height": { "value": "layer_height_0 if resolveOrValue('adhesion_type') == 'raft' else resolveOrValue('layer_height_0')+0.4" }, + "cool_fan_speed": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" }, + "cool_fan_speed_0": + { + "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled", + "value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0" }, - - "overrides": { - "machine_max_acceleration_x":{"value": 1000}, - "machine_max_acceleration_y":{"value": 1000}, - "machine_max_acceleration_e":{"value": 5000}, - "machine_acceleration":{"value": 1000}, - "machine_max_jerk_xy":{"value": 8.0}, - - "gantry_height": {"value": "machine_height-20"}, - "material_initial_print_temperature":{"value": "material_print_temperature"}, - "material_final_print_temperature":{"value": "material_print_temperature"}, - "material_print_temperature_layer_0":{"value": "210 if material_print_temperature < 210 else material_print_temperature"}, - "machine_heated_bed":{"default_value": true}, - "material_diameter":{"value": 1.75}, - "line_width":{"value":"machine_nozzle_size + 0.02"}, - "wall_thickness":{"value":"wall_line_width_0 if magic_spiralize else line_width * 2"}, - "retraction_hop":{"value": "layer_height if layer_height > 0.199 else 0.2"}, - "fill_outline_gaps": {"default_value": false}, - - "acceleration_enabled":{"value": true}, - "acceleration_print":{"value": 1000}, - "acceleration_layer_0":{"value": 500}, - "acceleration_travel":{"value": "acceleration_print"}, - "speed_infill":{"value": "math.ceil(speed_wall + 35)"}, - "speed_wall_x":{"value": "speed_wall + 15"}, - "speed_topbottom":{"value": "speed_wall + 15"}, - "speed_prime_tower":{"value": "speed_print if speed_print < 70.1 else 90 if speed_print > 100 else speed_print * 0.5+35"}, - "speed_travel":{"value": "90 if speed_print < 60.1 else speed_print * 1.5 if speed_print > 90 else speed_print+30"}, - "speed_layer_0":{"value": "speed_print * 20 / 60 if material_bed_temperature > 70 else speed_print * 30 / 60","maximum_value_warning": "60"}, - "speed_travel_layer_0": {"value": "70 if speed_layer_0 < 20 else 90 if speed_layer_0 > 40 else speed_layer_0+50"}, - "skirt_brim_speed":{"value": "speed_print_layer_0"}, - "speed_support": {"value": "speed_print if speed_wall > 0 and speed_wall < 40.01 else speed_wall + 40 "}, - "initial_layer_line_width_factor":{"value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 130 if line_width < 0.5 else 110"}, - "optimize_wall_printing_order":{"default_value": true }, - "z_seam_type":{"default_value": "back"}, - "z_seam_corner":{"default_value": "z_seam_corner_weighted"}, - - "support_angle":{"value": "45 if speed_print > 99.9 else 50"}, - "gradual_support_infill_step_height":{"value": "5"}, - "support_infill_angles":{"default_value": "[65]"}, - "support_brim_enable":{"value": "support_structure == 'normal' or support_structure == 'tree'"}, - "support_brim_width":{"default_value": 3 ,"value" : "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 " }, - "support_z_distance":{"value": "layer_height * 1.2 if (support_interface_enable and support_bottom_enable and layer_height < 0.16) or support_bottom_enable else layer_height"}, - "support_top_distance":{"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'layer_height') + (0 if support_structure == 'tree' else 0)"}, - "support_xy_distance":{"value": "machine_nozzle_size * 1.7"}, - "support_xy_distance_overhang":{"value": "machine_nozzle_size * 1.2 if support_interface_enable else machine_nozzle_size * 0.8"}, - "support_offset":{"default_value": 0.3}, - "support_interface_density":{"default_value": 33.333}, - "support_interface_pattern":{"default_value": "lines"}, - "support_roof_pattern":{"value": "'grid'"}, - "support_bottom_offset":{"value": "-0.4"}, - "support_use_towers":{"default_value": false}, - "support_tower_maximum_supported_diameter":{"value": "1"}, - "support_material_flow":{"value": "material_flow * 0.95"}, - "minimum_support_area":{"default_value": 3}, - "minimum_interface_area": {"default_value": 10}, - - "brim_width":{"default_value": 5 }, - "brim_gap":{"default_value": 0.1}, - "cool_fan_full_at_height":{"value": "layer_height_0 if resolveOrValue('adhesion_type') == 'raft' else resolveOrValue('layer_height_0')+0.4"}, - "retraction_combing":{"value": "'no_outer_surfaces' if (any(extruderValues('skin_monotonic')) or any(extruderValues('ironing_enabled')) or (any(extruderValues('roofing_monotonic')) and any(extruderValues('roofing_layer_count')))) else 'no_outer_surfaces'"}, - "retraction_combing_max_distance":{"value": "(infill_line_distance)*1.5 + 5 "}, - "infill_pattern":{"value": "'lines' if (infill_sparse_density > 35 or speed_print >= 80) else 'grid' "}, - "infill_sparse_density":{"default_value": 15}, - "zig_zaggify_infill":{"value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_sparse_density < 30 "}, - "z_seam_position": {"default_value": "left" }, - "prime_tower_brim_enable":{"default_value": true}, - "prime_tower_size":{"default_value": 30}, - "prime_tower_min_volume":{ "value": "(layer_height) * (prime_tower_size / 2)**2 * 3 * 0.5 "}, - "prime_tower_wipe_enabled":{"default_value": false}, - "retraction_amount":{"default_value": 5}, - "switch_extruder_retraction_amount":{"value": "15 if extruders_enabled_count > 1 else machine_heat_zone_length"}, - "raft_margin":{ "default_value": 5}, - - "infill_overlap":{"value": "10 if infill_sparse_density < 20.01 else 5 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else 0"}, - "infill_overlap_mm":{"value": "0.5 * (infill_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0)) * infill_overlap / 100"}, - "min_infill_area":{"value": "5"}, - "speed_slowdown_layers":{"value": "0 if resolveOrValue('adhesion_type') == 'raft' else speed_print / 30"}, - "raft_base_thickness":{"value": "resolveOrValue('machine_nozzle_size') * 0.75"}, - "raft_interface_thickness":{"value": "resolveOrValue('machine_nozzle_size') * 0.75"}, - "raft_surface_fan_speed":{"value": "cool_fan_speed"}, - "raft_surface_thickness":{"value": "resolveOrValue('machine_nozzle_size')*0.375"}, - "raft_surface_line_width":{"value": "machine_nozzle_size * 1.25"}, - "raft_speed":{"value": "30"}, - "raft_interface_speed":{"value": "0.6 * raft_speed"}, - "raft_base_speed":{"value": "0.4 * raft_speed"}, - - "cool_fan_speed":{"enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled"}, - "cool_fan_speed_min":{"enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled"}, - "cool_fan_speed_max":{"enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled"}, - "cool_fan_speed_0":{"value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0","enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled"} - } -} + "cool_fan_speed_max": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" }, + "cool_fan_speed_min": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" }, + "fill_outline_gaps": { "default_value": false }, + "gantry_height": { "value": "machine_height-20" }, + "gradual_support_infill_step_height": { "value": "5" }, + "infill_overlap": { "value": "10 if infill_sparse_density < 20.01 else 5 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else 0" }, + "infill_overlap_mm": { "value": "0.5 * (infill_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0)) * infill_overlap / 100" }, + "infill_pattern": { "value": "'lines' if (infill_sparse_density > 35 or speed_print >= 80) else 'grid' " }, + "infill_sparse_density": { "default_value": 15 }, + "initial_layer_line_width_factor": { "value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 130 if line_width < 0.5 else 110" }, + "line_width": { "value": "machine_nozzle_size + 0.02" }, + "machine_acceleration": { "value": 1000 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_x": { "value": 1000 }, + "machine_max_acceleration_y": { "value": 1000 }, + "machine_max_jerk_xy": { "value": 8.0 }, + "material_diameter": { "value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temperature_layer_0": { "value": "210 if material_print_temperature < 210 else material_print_temperature" }, + "min_infill_area": { "value": "5" }, + "minimum_interface_area": { "default_value": 10 }, + "minimum_support_area": { "default_value": 3 }, + "optimize_wall_printing_order": { "default_value": true }, + "prime_tower_brim_enable": { "default_value": true }, + "prime_tower_min_volume": { "value": "(layer_height) * (prime_tower_size / 2)**2 * 3 * 0.5 " }, + "prime_tower_size": { "default_value": 30 }, + "prime_tower_wipe_enabled": { "default_value": false }, + "raft_base_speed": { "value": "0.4 * raft_speed" }, + "raft_base_thickness": { "value": "resolveOrValue('machine_nozzle_size') * 0.75" }, + "raft_interface_speed": { "value": "0.6 * raft_speed" }, + "raft_interface_thickness": { "value": "resolveOrValue('machine_nozzle_size') * 0.75" }, + "raft_margin": { "default_value": 5 }, + "raft_speed": { "value": "30" }, + "raft_surface_fan_speed": { "value": "cool_fan_speed" }, + "raft_surface_line_width": { "value": "machine_nozzle_size * 1.25" }, + "raft_surface_thickness": { "value": "resolveOrValue('machine_nozzle_size')*0.375" }, + "retraction_amount": { "default_value": 5 }, + "retraction_combing": { "value": "'no_outer_surfaces' if (any(extruderValues('skin_monotonic')) or any(extruderValues('ironing_enabled')) or (any(extruderValues('roofing_monotonic')) and any(extruderValues('roofing_layer_count')))) else 'no_outer_surfaces'" }, + "retraction_combing_max_distance": { "value": "(infill_line_distance)*1.5 + 5 " }, + "retraction_hop": { "value": "layer_height if layer_height > 0.199 else 0.2" }, + "skirt_brim_speed": { "value": "speed_print_layer_0" }, + "speed_infill": { "value": "math.ceil(speed_wall + 35)" }, + "speed_layer_0": + { + "maximum_value_warning": "60", + "value": "speed_print * 20 / 60 if material_bed_temperature > 70 else speed_print * 30 / 60" + }, + "speed_prime_tower": { "value": "speed_print if speed_print < 70.1 else 90 if speed_print > 100 else speed_print * 0.5+35" }, + "speed_slowdown_layers": { "value": "0 if resolveOrValue('adhesion_type') == 'raft' else speed_print / 30" }, + "speed_support": { "value": "speed_print if speed_wall > 0 and speed_wall < 40.01 else speed_wall + 40 " }, + "speed_topbottom": { "value": "speed_wall + 15" }, + "speed_travel": { "value": "90 if speed_print < 60.1 else speed_print * 1.5 if speed_print > 90 else speed_print+30" }, + "speed_travel_layer_0": { "value": "70 if speed_layer_0 < 20 else 90 if speed_layer_0 > 40 else speed_layer_0+50" }, + "speed_wall_x": { "value": "speed_wall + 15" }, + "support_angle": { "value": "45 if speed_print > 99.9 else 50" }, + "support_bottom_offset": { "value": "-0.4" }, + "support_brim_enable": { "value": "support_structure == 'normal' or support_structure == 'tree'" }, + "support_brim_width": + { + "default_value": 3, + "value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 " + }, + "support_infill_angles": { "default_value": "[65]" }, + "support_interface_density": { "default_value": 33.333 }, + "support_interface_pattern": { "default_value": "lines" }, + "support_material_flow": { "value": "material_flow * 0.95" }, + "support_offset": { "default_value": 0.3 }, + "support_roof_pattern": { "value": "'grid'" }, + "support_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'layer_height') + (0 if support_structure == 'tree' else 0)" }, + "support_tower_maximum_supported_diameter": { "value": "1" }, + "support_use_towers": { "default_value": false }, + "support_xy_distance": { "value": "machine_nozzle_size * 1.7" }, + "support_xy_distance_overhang": { "value": "machine_nozzle_size * 1.2 if support_interface_enable else machine_nozzle_size * 0.8" }, + "support_z_distance": { "value": "layer_height * 1.2 if (support_interface_enable and support_bottom_enable and layer_height < 0.16) or support_bottom_enable else layer_height" }, + "switch_extruder_retraction_amount": { "value": "15 if extruders_enabled_count > 1 else machine_heat_zone_length" }, + "wall_thickness": { "value": "wall_line_width_0 if magic_spiralize else line_width * 2" }, + "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 " } + } +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_1.def.json b/resources/definitions/elegoo_neptune_1.def.json index 4ac8491132..2b23fd8482 100644 --- a/resources/definitions/elegoo_neptune_1.def.json +++ b/resources/definitions/elegoo_neptune_1.def.json @@ -1,28 +1,30 @@ { - "name": "ELEGOO NEPTUNE", - "version": 2, - "inherits": "elegoo_base", - "metadata": { - "author": "NARUTO", - "visible": true, - "quality_definition": "elegoo_base" - }, - "overrides": { - "machine_name": {"default_value": "ELEGOO NEPTUNE"}, - "machine_width": {"default_value": 210}, - "machine_depth": {"default_value": 210}, - "machine_height": {"default_value": 200}, - "machine_head_with_fans_polygon": { "value": [ [-50, 20], [50, 20], [50, -25], [-50, -25] ] }, - - "machine_start_gcode" : { - "default_value": ";ELEGOO NEPTUNE\nG90\nG28 ;home\nG1 Z0.6 F100 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" - }, - "machine_end_gcode" : { - "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" - }, - - "material_bed_temperature":{"value": "default_material_bed_temperature + 5"} - - } -} - + "version": 2, + "name": "ELEGOO NEPTUNE", + "inherits": "elegoo_base", + "metadata": + { + "visible": true, + "author": "NARUTO", + "quality_definition": "elegoo_base" + }, + "overrides": + { + "machine_depth": { "default_value": 210 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_head_with_fans_polygon": + { + "value": [ + [-50, 20], + [50, 20], + [50, -25], + [-50, -25] + ] + }, + "machine_height": { "default_value": 200 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE" }, + "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE\nG90\nG28 ;home\nG1 Z0.6 F100 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 210 }, + "material_bed_temperature": { "value": "default_material_bed_temperature + 5" } + } +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_2s.def.json b/resources/definitions/elegoo_neptune_2s.def.json index c5ad05bb15..e1d6b14082 100644 --- a/resources/definitions/elegoo_neptune_2s.def.json +++ b/resources/definitions/elegoo_neptune_2s.def.json @@ -1,27 +1,30 @@ { - "name": "ELEGOO NEPTUNE 2S", - "version": 2, - "inherits": "elegoo_base", - "metadata": { - "author": "NARUTO", - "visible": true, - "quality_definition": "elegoo_base" - }, - "overrides": { - "machine_name": {"default_value": "ELEGOO NEPTUNE 2S"}, - "machine_width": {"default_value": 235}, - "machine_depth": {"default_value": 235}, - "machine_height": {"default_value": 260}, - "machine_head_with_fans_polygon": { "value": [ [-55, 20], [55, 20], [55, -25], [-55, -25] ] }, - - "machine_start_gcode" : { - "default_value": ";ELEGOO NEPTUNE 2S\nG90\nG28 ;home\nG1 Z0.6 F100 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" - }, - "machine_end_gcode" : { - "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" - }, - - "material_bed_temperature":{"value": "default_material_bed_temperature + 10"} - - } -} + "version": 2, + "name": "ELEGOO NEPTUNE 2S", + "inherits": "elegoo_base", + "metadata": + { + "visible": true, + "author": "NARUTO", + "quality_definition": "elegoo_base" + }, + "overrides": + { + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_head_with_fans_polygon": + { + "value": [ + [-55, 20], + [55, 20], + [55, -25], + [-55, -25] + ] + }, + "machine_height": { "default_value": 260 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE 2S" }, + "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 2S\nG90\nG28 ;home\nG1 Z0.6 F100 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 235 }, + "material_bed_temperature": { "value": "default_material_bed_temperature + 10" } + } +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_3.def.json b/resources/definitions/elegoo_neptune_3.def.json index 84952f5d13..2bb7e035ce 100644 --- a/resources/definitions/elegoo_neptune_3.def.json +++ b/resources/definitions/elegoo_neptune_3.def.json @@ -1,27 +1,30 @@ { - "name": "ELEGOO NEPTUNE 3", - "version": 2, - "inherits": "elegoo_base", - "metadata": { - "author": "NARUTO", - "visible": true, - "quality_definition": "elegoo_base" - }, - "overrides": { - "machine_name": {"default_value": "ELEGOO NEPTUNE 3"}, - "machine_width": {"default_value": 235}, - "machine_depth": {"default_value": 235}, - "machine_height": {"default_value": 280}, - "machine_head_with_fans_polygon": { "value": [ [-55, 20], [55, 20], [55, -25], [-55, -25] ] }, - - "machine_start_gcode" : { - "default_value": ";ELEGOO NEPTUNE 3\n;M413 S0;S0=Disable power-loss recovery:S1=Enable power-loss recovery\nM220 S100 ;Set the feed speed to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.6 F100\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" - }, - "machine_end_gcode" : { - "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" - }, - - "material_bed_temperature":{"value": "default_material_bed_temperature + 10"} - - } -} + "version": 2, + "name": "ELEGOO NEPTUNE 3", + "inherits": "elegoo_base", + "metadata": + { + "visible": true, + "author": "NARUTO", + "quality_definition": "elegoo_base" + }, + "overrides": + { + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_head_with_fans_polygon": + { + "value": [ + [-55, 20], + [55, 20], + [55, -25], + [-55, -25] + ] + }, + "machine_height": { "default_value": 280 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE 3" }, + "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3\n;M413 S0;S0=Disable power-loss recovery:S1=Enable power-loss recovery\nM220 S100 ;Set the feed speed to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.6 F100\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 235 }, + "material_bed_temperature": { "value": "default_material_bed_temperature + 10" } + } +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_3max.def.json b/resources/definitions/elegoo_neptune_3max.def.json index 396fd46437..4d4148a5d2 100644 --- a/resources/definitions/elegoo_neptune_3max.def.json +++ b/resources/definitions/elegoo_neptune_3max.def.json @@ -1,24 +1,26 @@ { - "name": "ELEGOO NEPTUNE 3 Max", - "version": 2, - "inherits": "elegoo_neptune_3pro", - "metadata": { - "platform_offset": [-2.1, -0.2, 0], - "platform": "elegoo_platform_max.3mf" - }, - "overrides": { - "machine_max_acceleration_x":{"value": 700}, - "machine_max_acceleration_y":{"value": 500}, - "machine_acceleration":{"value": 700}, - "machine_name": {"default_value": "ELEGOO NEPTUNE 3 Max"}, - "machine_width": {"default_value": 426}, - "machine_depth": {"default_value": 426}, - "machine_height": {"default_value": 510}, - "acceleration_wall":{"value": 700}, - - "machine_start_gcode" : { - "default_value": ";ELEGOO NEPTUNE 3 Max\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" - } - - } -} + "version": 2, + "name": "ELEGOO NEPTUNE 3 Max", + "inherits": "elegoo_neptune_3pro", + "metadata": + { + "platform": "elegoo_platform_max.3mf", + "platform_offset": [ + -2.1, + -0.2, + 0 + ] + }, + "overrides": + { + "acceleration_wall": { "value": 700 }, + "machine_acceleration": { "value": 700 }, + "machine_depth": { "default_value": 426 }, + "machine_height": { "default_value": 510 }, + "machine_max_acceleration_x": { "value": 700 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE 3 Max" }, + "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3 Max\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 426 } + } +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_3plus.def.json b/resources/definitions/elegoo_neptune_3plus.def.json index 492779ed6b..3d2187042f 100644 --- a/resources/definitions/elegoo_neptune_3plus.def.json +++ b/resources/definitions/elegoo_neptune_3plus.def.json @@ -1,23 +1,26 @@ { - "name": "ELEGOO NEPTUNE 3 Plus", - "version": 2, - "inherits": "elegoo_neptune_3pro", - "metadata": { - "platform_offset": [-2.1, -0.2, 0], - "platform": "elegoo_platform_max.3mf" - }, - "overrides": { - "machine_max_acceleration_x":{"value": 700}, - "machine_max_acceleration_y":{"value": 700}, - "machine_acceleration":{"value": 700}, - "machine_name": {"default_value": "ELEGOO NEPTUNE 3 Plus"}, - "machine_width": {"default_value": 330}, - "machine_depth": {"default_value": 330}, - "machine_height": {"default_value": 410}, - "acceleration_wall":{"value": 700}, - - "machine_start_gcode" : { - "default_value": ";ELEGOO NEPTUNE 3 Plus\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" - } - } -} + "version": 2, + "name": "ELEGOO NEPTUNE 3 Plus", + "inherits": "elegoo_neptune_3pro", + "metadata": + { + "platform": "elegoo_platform_max.3mf", + "platform_offset": [ + -2.1, + -0.2, + 0 + ] + }, + "overrides": + { + "acceleration_wall": { "value": 700 }, + "machine_acceleration": { "value": 700 }, + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 410 }, + "machine_max_acceleration_x": { "value": 700 }, + "machine_max_acceleration_y": { "value": 700 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE 3 Plus" }, + "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3 Plus\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 330 } + } +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_3pro.def.json b/resources/definitions/elegoo_neptune_3pro.def.json index 2fabe5c52c..9d2bacbf1f 100644 --- a/resources/definitions/elegoo_neptune_3pro.def.json +++ b/resources/definitions/elegoo_neptune_3pro.def.json @@ -1,35 +1,38 @@ { - "name": "ELEGOO NEPTUNE 3 Pro", - "version": 2, - "inherits": "elegoo_base", - "metadata": { - "author": "NARUTO", - "visible": true, - "quality_definition": "elegoo_base" - }, - "overrides": { - "machine_name": {"default_value": "ELEGOO NEPTUNE 3 Pro"}, - "machine_width": {"default_value": 235}, - "machine_depth": {"default_value": 235}, - "machine_height": {"default_value": 280}, - "machine_head_with_fans_polygon": { "value": [ [-55, 30], [55, 30], [55, -35], [-55, -35] ] }, - "speed_travel":{"value": "150 if speed_print < 100 else speed_print * 1.5"}, - "speed_travel_layer_0": {"value": "100"}, - - "machine_start_gcode" : { - "default_value": ";ELEGOO NEPTUNE 3 Pro\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" - }, - "machine_end_gcode" : { - "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" - }, - - "material_bed_temperature":{"value": "default_material_bed_temperature + 10"}, - "retraction_amount":{"value": 1}, - "retraction_speed":{"resolve": 25}, - "retraction_retract_speed":{"resolve": 25}, - "retraction_prime_speed":{"resolve": 25}, - "retraction_count_max":{"value": 80}, - "infill_overlap":{"value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5"} - - } -} + "version": 2, + "name": "ELEGOO NEPTUNE 3 Pro", + "inherits": "elegoo_base", + "metadata": + { + "visible": true, + "author": "NARUTO", + "quality_definition": "elegoo_base" + }, + "overrides": + { + "infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" }, + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_head_with_fans_polygon": + { + "value": [ + [-55, 30], + [55, 30], + [55, -35], + [-55, -35] + ] + }, + "machine_height": { "default_value": 280 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE 3 Pro" }, + "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3 Pro\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 235 }, + "material_bed_temperature": { "value": "default_material_bed_temperature + 10" }, + "retraction_amount": { "value": 1 }, + "retraction_count_max": { "value": 80 }, + "retraction_prime_speed": { "resolve": 25 }, + "retraction_retract_speed": { "resolve": 25 }, + "retraction_speed": { "resolve": 25 }, + "speed_travel": { "value": "150 if speed_print < 100 else speed_print * 1.5" }, + "speed_travel_layer_0": { "value": "100" } + } +} \ No newline at end of file diff --git a/resources/definitions/elegoo_neptune_x.def.json b/resources/definitions/elegoo_neptune_x.def.json index 3f35fcb199..77f6c1e10d 100644 --- a/resources/definitions/elegoo_neptune_x.def.json +++ b/resources/definitions/elegoo_neptune_x.def.json @@ -1,27 +1,30 @@ { - "name": "ELEGOO NEPTUNE X", - "version": 2, - "inherits": "elegoo_base", - "metadata": { - "author": "NARUTO", - "visible": true, - "quality_definition": "elegoo_base" - }, - "overrides": { - "machine_name": {"default_value": "ELEGOO NEPTUNE X"}, - "machine_width": {"default_value": 235}, - "machine_depth": {"default_value": 235}, - "machine_height": {"default_value": 310}, - "machine_head_with_fans_polygon": { "value": [ [-55, 20], [55, 20], [55, -25], [-55, -25] ] }, - - "machine_start_gcode" : { - "default_value": ";ELEGOO NEPTUNE X\nG90\nG28 ;home\nG1 Z0.6 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" - }, - "machine_end_gcode" : { - "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" - }, - - "material_bed_temperature":{"value": "default_material_bed_temperature + 5"} - - } -} + "version": 2, + "name": "ELEGOO NEPTUNE X", + "inherits": "elegoo_base", + "metadata": + { + "visible": true, + "author": "NARUTO", + "quality_definition": "elegoo_base" + }, + "overrides": + { + "machine_depth": { "default_value": 235 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" }, + "machine_head_with_fans_polygon": + { + "value": [ + [-55, 20], + [55, 20], + [55, -25], + [-55, -25] + ] + }, + "machine_height": { "default_value": 310 }, + "machine_name": { "default_value": "ELEGOO NEPTUNE X" }, + "machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE X\nG90\nG28 ;home\nG1 Z0.6 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" }, + "machine_width": { "default_value": 235 }, + "material_bed_temperature": { "value": "default_material_bed_temperature + 5" } + } +} \ No newline at end of file diff --git a/resources/extruders/elegoo_extruder_0.def.json b/resources/extruders/elegoo_extruder_0.def.json index 85bcb0bcc5..c6332f41bd 100644 --- a/resources/extruders/elegoo_extruder_0.def.json +++ b/resources/extruders/elegoo_extruder_0.def.json @@ -2,13 +2,14 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "elegoo_base", "position": "0" }, - - "overrides": { - "extruder_nr": {"default_value": 0}, + "overrides": + { + "extruder_nr": { "default_value": 0 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg b/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg index f73605c2af..dc69b0af22 100644 --- a/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg +++ b/resources/quality/elegoo/base/abs040/abs_040012.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = abs_040012 definition = elegoo_base +name = abs_040012 +version = 4 [metadata] +material = generic_abs_175 +quality_type = high setting_version = 20 type = quality -quality_type = high -material = generic_abs_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 10 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.72 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +wall_thickness = =line_width*2 diff --git a/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg b/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg index 7009e93f63..ff621dfb68 100644 --- a/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg +++ b/resources/quality/elegoo/base/abs040/abs_040016.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = abs_040016 definition = elegoo_base +name = abs_040016 +version = 4 [metadata] +material = generic_abs_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_abs_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 10 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.64 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +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 index dda312e7be..3408891b1b 100644 --- a/resources/quality/elegoo/base/abs040/abs_040020.inst.cfg +++ b/resources/quality/elegoo/base/abs040/abs_040020.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = abs_040020 definition = elegoo_base +name = abs_040020 +version = 4 [metadata] +material = generic_abs_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_abs_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 10 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.8 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +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 index 28a1f79e86..0870be9452 100644 --- a/resources/quality/elegoo/base/abs040/abs_040024.inst.cfg +++ b/resources/quality/elegoo/base/abs040/abs_040024.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = abs_040024 definition = elegoo_base +name = abs_040024 +version = 4 [metadata] +material = generic_abs_175 +quality_type = medium setting_version = 20 type = quality -quality_type = medium -material = generic_abs_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 10 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.75 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +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 index f154689dee..be6d330b8e 100644 --- a/resources/quality/elegoo/base/abs040/abs_040028.inst.cfg +++ b/resources/quality/elegoo/base/abs040/abs_040028.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = abs_040028 definition = elegoo_base +name = abs_040028 +version = 4 [metadata] +material = generic_abs_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_abs_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 10 -raft_airgap = =0.2 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.84 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +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 index 164a9b261b..3a1eb40060 100644 --- a/resources/quality/elegoo/base/asa040/asa_040012.inst.cfg +++ b/resources/quality/elegoo/base/asa040/asa_040012.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = asa_040012 definition = elegoo_base +name = asa_040012 +version = 4 [metadata] +material = generic_asa_175 +quality_type = high setting_version = 20 type = quality -quality_type = high -material = generic_asa_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 15 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.72 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +wall_thickness = =line_width*2 diff --git a/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg b/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg index acf31b2357..e686413233 100644 --- a/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg +++ b/resources/quality/elegoo/base/asa040/asa_040016.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = asa_040016 definition = elegoo_base +name = asa_040016 +version = 4 [metadata] +material = generic_asa_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_asa_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 15 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.64 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +wall_thickness = =line_width*2 diff --git a/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg b/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg index 34fe59b293..b4676cda42 100644 --- a/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg +++ b/resources/quality/elegoo/base/asa040/asa_040020.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = asa_040020 definition = elegoo_base +name = asa_040020 +version = 4 [metadata] +material = generic_asa_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_asa_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 15 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.8 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +wall_thickness = =line_width*2 diff --git a/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg b/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg index 31748c55a3..4e8c3f9a1f 100644 --- a/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg +++ b/resources/quality/elegoo/base/asa040/asa_040024.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = asa_040024 definition = elegoo_base +name = asa_040024 +version = 4 [metadata] +material = generic_asa_175 +quality_type = medium setting_version = 20 type = quality -quality_type = medium -material = generic_asa_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 15 -raft_airgap = =0.15 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.75 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +wall_thickness = =line_width*2 diff --git a/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg b/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg index 2b557c1200..bbd9c3bf91 100644 --- a/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg +++ b/resources/quality/elegoo/base/asa040/asa_040028.inst.cfg @@ -1,30 +1,30 @@ [general] -version = 4 -name = asa_040028 definition = elegoo_base +name = asa_040028 +version = 4 [metadata] +material = generic_asa_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_asa_175 [values] -wall_thickness = =line_width*2 -brim_width = 10 -material_shrinkage_percentage_xy = 100.3 brim_gap = 0 -raft_margin = 15 -raft_airgap = =0.2 +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 -support_z_distance = =layer_height/2 +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 -cool_fan_enabled = False +support_z_distance = =layer_height/2 top_bottom_thickness = 0.84 -default_material_print_temperature = 240 -default_material_bed_temperature = 80 -cool_fan_speed_0 = 0 -cool_fan_speed = 0 -retraction_speed = 25 +wall_thickness = =line_width*2 diff --git a/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg b/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg index 022286a76c..d0c966161b 100644 --- a/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg @@ -1,20 +1,20 @@ [general] -version = 4 -name = High Quality definition = elegoo_base +name = High Quality +version = 4 [metadata] +global_quality = True +quality_type = high setting_version = 20 type = quality -quality_type = high weight = -1 -global_quality = True [values] layer_height = 0.12 layer_height_0 = 0.2 -top_bottom_thickness = 0.7 +material_print_temperature = =default_material_print_temperature prime_tower_size = 40 speed_print = 70 -material_print_temperature = =default_material_print_temperature +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 index 7c0d02abf7..13ccca712d 100644 --- a/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg @@ -1,20 +1,20 @@ [general] -version = 4 -name = Normal Quality definition = elegoo_base +name = Normal Quality +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = -2 -global_quality = True [values] layer_height = 0.16 layer_height_0 = 0.25 -top_bottom_thickness = 0.8 +material_print_temperature = =default_material_print_temperature prime_tower_size = 35 speed_print = 60 -material_print_temperature = =default_material_print_temperature +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 index 5b5c4d81af..33ced3b4cf 100644 --- a/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = Fine Quality definition = elegoo_base +name = Fine Quality +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 20 type = quality -quality_type = fine weight = -3 -global_quality = True [values] layer_height = 0.20 layer_height_0 = 0.25 -top_bottom_thickness = 0.8 -prime_tower_size = 31 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 index 732ed55d18..3bf3865bb9 100644 --- a/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = Medium Quality definition = elegoo_base +name = Medium Quality +version = 4 [metadata] +global_quality = True +quality_type = medium setting_version = 20 type = quality -quality_type = medium weight = -4 -global_quality = True [values] layer_height = 0.24 layer_height_0 = 0.25 -top_bottom_thickness = 1.0 -prime_tower_size = 28 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 index 08709b780b..3379bbef81 100644 --- a/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg +++ b/resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = Draft Quality definition = elegoo_base +name = Draft Quality +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 20 type = quality -quality_type = draft weight = -5 -global_quality = True [values] layer_height = 0.28 layer_height_0 = 0.30 -top_bottom_thickness = 1.0 -prime_tower_size = 27 material_print_temperature = =default_material_print_temperature + 5 +prime_tower_size = 27 +top_bottom_thickness = 1.0 diff --git a/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg b/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg index 75f403fda0..ccb5de943d 100644 --- a/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg +++ b/resources/quality/elegoo/base/petg040/petg_040012.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = petg_040012 definition = elegoo_base +name = petg_040012 +version = 4 [metadata] +material = generic_petg_175 +quality_type = high setting_version = 20 type = quality -quality_type = high -material = generic_petg_175 [values] -cool_fan_speed_min = =cool_fan_speed*0.5 -cool_min_layer_time_fan_speed_max = 30 -cool_min_layer_time = 10 brim_width = 6 -material_shrinkage_percentage_xy = 100.2 -raft_margin = 10 -raft_airgap = =0.35 -layer_0_z_overlap = =raft_airgap*0.6 -speed_support = =speed_wall_x -default_material_print_temperature = 235 +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 index 6798dfd4d4..5dc896bec0 100644 --- a/resources/quality/elegoo/base/petg040/petg_040016.inst.cfg +++ b/resources/quality/elegoo/base/petg040/petg_040016.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = petg_040016 definition = elegoo_base +name = petg_040016 +version = 4 [metadata] +material = generic_petg_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_petg_175 [values] -cool_fan_speed_min = =cool_fan_speed*0.5 -cool_min_layer_time_fan_speed_max = 30 -cool_min_layer_time = 10 brim_width = 6 -material_shrinkage_percentage_xy = 100.2 -raft_margin = 10 -raft_airgap = =0.35 -layer_0_z_overlap = =raft_airgap*0.6 -speed_support = =speed_wall_x -default_material_print_temperature = 235 +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 index 7980e7d094..f497cf8111 100644 --- a/resources/quality/elegoo/base/petg040/petg_040020.inst.cfg +++ b/resources/quality/elegoo/base/petg040/petg_040020.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = petg_040020 definition = elegoo_base +name = petg_040020 +version = 4 [metadata] +material = generic_petg_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_petg_175 [values] -cool_fan_speed_min = =cool_fan_speed*0.5 -cool_min_layer_time_fan_speed_max = 30 -cool_min_layer_time = 10 brim_width = 6 -material_shrinkage_percentage_xy = 100.2 -raft_margin = 10 -raft_airgap = =0.35 -layer_0_z_overlap = =raft_airgap*0.6 -speed_support = =speed_wall_x -default_material_print_temperature = 235 +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 index bc0847edc8..416f70bff5 100644 --- a/resources/quality/elegoo/base/petg040/petg_040024.inst.cfg +++ b/resources/quality/elegoo/base/petg040/petg_040024.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = petg_040024 definition = elegoo_base +name = petg_040024 +version = 4 [metadata] +material = generic_petg_175 +quality_type = medium setting_version = 20 type = quality -quality_type = medium -material = generic_petg_175 [values] -cool_fan_speed_min = =cool_fan_speed*0.5 -cool_min_layer_time_fan_speed_max = 30 -cool_min_layer_time = 10 brim_width = 6 -material_shrinkage_percentage_xy = 100.2 -raft_margin = 10 -raft_airgap = =0.35 -layer_0_z_overlap = =raft_airgap*0.6 -speed_support = =speed_wall_x -default_material_print_temperature = 235 +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_040028.inst.cfg b/resources/quality/elegoo/base/petg040/petg_040028.inst.cfg index 5dfea5df2e..83aeeebc7b 100644 --- a/resources/quality/elegoo/base/petg040/petg_040028.inst.cfg +++ b/resources/quality/elegoo/base/petg040/petg_040028.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = petg_040028 definition = elegoo_base +name = petg_040028 +version = 4 [metadata] +material = generic_petg_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_petg_175 [values] -cool_fan_speed_min = =cool_fan_speed*0.5 -cool_min_layer_time_fan_speed_max = 30 -cool_min_layer_time = 10 brim_width = 6 -material_shrinkage_percentage_xy = 100.2 -raft_margin = 10 -raft_airgap = =0.38 -layer_0_z_overlap = =raft_airgap*0.6 -speed_support = =speed_wall_x -default_material_print_temperature = 235 +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.38 +raft_margin = 10 retraction_speed = 25 +speed_support = =speed_wall_x diff --git a/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg b/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg index af5289b7e2..68cc59a857 100644 --- a/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg +++ b/resources/quality/elegoo/base/pla040/pla_040012.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = pla_040012 definition = elegoo_base +name = pla_040012 +version = 4 [metadata] +material = generic_pla_175 +quality_type = high setting_version = 20 type = quality -quality_type = high -material = generic_pla_175 [values] -raft_airgap = =0.3 -layer_0_z_overlap = =raft_airgap*0.7 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 index e885df7cfd..b73e5ce833 100644 --- a/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg +++ b/resources/quality/elegoo/base/pla040/pla_040016.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = pla_040016 definition = elegoo_base +name = pla_040016 +version = 4 [metadata] +material = generic_pla_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_pla_175 [values] -raft_airgap = =0.3 -layer_0_z_overlap = =raft_airgap*0.7 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 index b88dfa0e9a..90c8b47411 100644 --- a/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg +++ b/resources/quality/elegoo/base/pla040/pla_040020.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = pla_040020 definition = elegoo_base +name = pla_040020 +version = 4 [metadata] +material = generic_pla_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_pla_175 [values] -raft_airgap = =0.3 -layer_0_z_overlap = =raft_airgap*0.7 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 index b0a9405a3f..6a734bdfa7 100644 --- a/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg +++ b/resources/quality/elegoo/base/pla040/pla_040024.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = pla_040024 definition = elegoo_base +name = pla_040024 +version = 4 [metadata] +material = generic_pla_175 +quality_type = medium setting_version = 20 type = quality -quality_type = medium -material = generic_pla_175 [values] -raft_airgap = =0.3 -layer_0_z_overlap = =raft_airgap*0.6 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 index 24861b9302..57dc36c6c8 100644 --- a/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg +++ b/resources/quality/elegoo/base/pla040/pla_040028.inst.cfg @@ -1,18 +1,18 @@ [general] -version = 4 -name = pla_040028 definition = elegoo_base +name = pla_040028 +version = 4 [metadata] +material = generic_pla_175 +quality_type = draft setting_version = 20 type = quality -quality_type = draft -material = generic_pla_175 [values] -raft_airgap = =0.35 -layer_0_z_overlap = =raft_airgap*0.6 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/quality/elegoo/base/tpu040/tpu_040012.inst.cfg b/resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg index e7b890243f..07d0315a64 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg +++ b/resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = tpu_040012 definition = elegoo_base +name = tpu_040012 +version = 4 [metadata] +material = generic_tpu_175 +quality_type = high setting_version = 20 type = quality -quality_type = high -material = generic_tpu_175 [values] +brim_width = 5 +cool_min_layer_time = 10 +default_material_bed_temperature = 45 +default_material_print_temperature = 230 +retraction_speed = 25 speed_print = 50 speed_print_layer_0 = 15 -brim_width = 5 -speed_wall_x = =speed_wall speed_support = =speed_wall_x -speed_topbottom = =speed_wall speed_support_interface = =speed_wall_x +speed_topbottom = =speed_wall +speed_wall_x = =speed_wall support_angle = 35 -cool_min_layer_time = 10 -default_material_print_temperature = 230 -default_material_bed_temperature = 45 -retraction_speed = 25 diff --git a/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg b/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg index ff1d9d5d86..9a57d03271 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg +++ b/resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = tpu_040016 definition = elegoo_base +name = tpu_040016 +version = 4 [metadata] +material = generic_tpu_175 +quality_type = normal setting_version = 20 type = quality -quality_type = normal -material = generic_tpu_175 [values] +brim_width = 5 +cool_min_layer_time = 10 +default_material_bed_temperature = 45 +default_material_print_temperature = 230 +retraction_speed = 25 speed_print = 50 speed_print_layer_0 = 15 -brim_width = 5 -speed_wall_x = =speed_wall speed_support = =speed_wall_x -speed_topbottom = =speed_wall speed_support_interface = =speed_wall_x +speed_topbottom = =speed_wall +speed_wall_x = =speed_wall support_angle = 35 -cool_min_layer_time = 10 -default_material_print_temperature = 230 -default_material_bed_temperature = 45 -retraction_speed = 25 diff --git a/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg b/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg index c9bef92116..738aa29469 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg +++ b/resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = tpu_040020 definition = elegoo_base +name = tpu_040020 +version = 4 [metadata] +material = generic_tpu_175 +quality_type = fine setting_version = 20 type = quality -quality_type = fine -material = generic_tpu_175 [values] +brim_width = 5 +cool_min_layer_time = 10 +default_material_bed_temperature = 45 +default_material_print_temperature = 230 +retraction_speed = 25 speed_print = 50 speed_print_layer_0 = 15 -brim_width = 5 -speed_wall_x = =speed_wall speed_support = =speed_wall_x -speed_topbottom = =speed_wall speed_support_interface = =speed_wall_x +speed_topbottom = =speed_wall +speed_wall_x = =speed_wall support_angle = 35 -cool_min_layer_time = 10 -default_material_print_temperature = 230 -default_material_bed_temperature = 45 -retraction_speed = 25 diff --git a/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg b/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg index f57deba9b0..5d1f7d5523 100644 --- a/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg +++ b/resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg @@ -1,25 +1,25 @@ [general] -version = 4 -name = tpu_040024 definition = elegoo_base +name = tpu_040024 +version = 4 [metadata] +material = generic_tpu_175 +quality_type = medium setting_version = 20 type = quality -quality_type = medium -material = generic_tpu_175 [values] +brim_width = 5 +cool_min_layer_time = 10 +default_material_bed_temperature = 45 +default_material_print_temperature = 230 +retraction_speed = 25 speed_print = 50 speed_print_layer_0 = 15 -brim_width = 5 -speed_wall_x = =speed_wall speed_support = =speed_wall_x -speed_topbottom = =speed_wall speed_support_interface = =speed_wall_x +speed_topbottom = =speed_wall +speed_wall_x = =speed_wall support_angle = 35 -cool_min_layer_time = 10 -default_material_print_temperature = 230 -default_material_bed_temperature = 45 -retraction_speed = 25