diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index cd3cd8125c..52a8ae6dc6 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -6,7 +6,8 @@ { "visible": true, "author": "ALYA", - "manufacturer": "ALYA", + "manufacturer": "Kati Hal ARGE", + "category": "Other", "file_formats": "text/x-gcode", "platform": "alya_platform.stl", "platform_offset": [-60, -45, 75 ], @@ -31,23 +32,19 @@ "machine_center_is_zero": { "default_value": false }, "gantry_height": { "default_value": 55 }, "retraction_amount": { "default_value": 1.5 }, + "support_enable": { "default_value": true}, "machine_head_with_fans_polygon": { - "default_value": [ - [75, 18], - [18, 18], - [18, 35], - [75, 35] - ] + "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]] }, "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"}, "default_value": "raft"}, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to max endstops\nG1 Z115.0 F{travel_speed} ;move th e platform up 20mm\nG28 Z0 ;move Z to max endstop\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\nM301 H1 P26.38 I2.57 D67.78\n;Put printing message on LCD screen\nM117 Printing..." + "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" }, "machine_end_gcode": { - "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" + "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" } } } \ No newline at end of file diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index b9c06594c0..a372656960 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -6,13 +6,13 @@ { "visible": true, "author": "ALYA", - "manufacturer": "ALYA", + "manufacturer": "Kati Hal ARGE", "category": "Other", "file_formats": "text/x-gcode", "platform": "alya_nx_platform.stl", - "platform_offset": [-104, -72, 93 ], + "platform_offset": [-104, 0, 93 ], "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], - "preferred_material": "alya_pla", + "preferred_material": "generic_pla", "has_machine_quality": true, "has_materials": true, "has_variants": false, @@ -32,23 +32,19 @@ "machine_center_is_zero": { "default_value": false }, "gantry_height": { "default_value": 55 }, "retraction_amount": { "default_value": 1.5 }, + "support_enable": { "default_value": true}, "machine_head_with_fans_polygon": { - "default_value": [ - [75, 18], - [18, 18], - [18, 35], - [75, 35] - ] + "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]] }, "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"}, "default_value": "raft"}, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_start_gcode": { - "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to max endstops\nG1 Z115.0 F{travel_speed} ;move th e platform up 20mm\nG28 Z0 ;move Z to max endstop\nG1 Z15.0 F{travel_speed} ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\nM301 H1 P26.38 I2.57 D67.78\n;Put printing message on LCD screen\nM117 Printing..." + "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n ; M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" }, "machine_end_gcode": { - "default_value": ";End GCode\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" + "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" } } } \ No newline at end of file diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 412fe979b8..91b01c9260 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -1,40 +1,49 @@ { - "name": "Kupido", "version": 2, + "name": "KUPIDO", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, - "author": "Ultimaker", - "manufacturer": "Kupido", + "author": "ALYA", + "manufacturer": "Kati Hal ARGE", + "category": "Other", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], + "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], + "preferred_material": "generic_pla", + "has_machine_quality": true, + "has_materials": true, + "has_variants": false, + "supports_usb_connection": false, "machine_extruder_trains": { - "0": "kupido_extruder_0" + "0": "alya3dp_extruder_0" } }, "overrides": { - "machine_name": { "default_value": "Kupido" }, - "machine_start_gcode": { - "default_value": " ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n ;M190 S{material_bed_temperature} ;Uncomment to add your own bed temperature line\n ;M109 S{material_print_temperature} ;Uncomment to add your own temperature line\n G21 ;metric values\n G90 ;absolute positioning\n M82 ;set extruder to absolute mode\n M107 ;start with the fan off\n G28 X0 Y0 ;move X Y to endstops\n G28 Z0 ;move Z to endstops\n G1 Z20.0 F40 ;move the platform down 20mm\n G1 Y0 X170 F{speed_travel}\n G92 E0 ;zero the extruded length\n G1 F200 E10 ;extrude 3mm of feed stock\n G92 E0 ;zero the extruded length again\n G4 P7000\n G1 F{speed_travel}\n ;Put printing message on LCD screen\n M117 Printing...\n" + "machine_name": { "default_value": "ALYA 3DP" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 195 }, + "machine_height": { "default_value": 190 }, + "machine_depth": { "default_value": 195 }, + "machine_center_is_zero": { "default_value": false }, + "gantry_height": { "default_value": 55 }, + "retraction_amount": { "default_value": 1 }, + "support_enable": { "default_value": true}, + "machine_head_with_fans_polygon": { + "default_value": [[75, 18],[18, 18],[18, 35],[75, 35]] }, - "machine_end_gcode": { - "default_value": " M104 S0 ;extruder heater off\n M140 S0 ;heated bed heater off (if you have it)\n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning\n" + "adhesion_type": {"options": {"raft": "Raft" ,"none": "None", "brim": "Brim"}, "default_value": "raft"}, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": + { + "default_value": ";Sliced at: {day} {date} {time} \n ;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {fill_density} \n ;Print time: {print_time} \n ;Filament used: {filament_amount}m {filament_weight}g \n ;Filament cost: {filament_cost} \n G28 X0 Y0 ;move X Y to endstops \n G28 Z0 ;move Z to endstops \n M190 S{material_bed_temperature} ;bed temp \n M107 ; switch fan off \n M109 S{material_print_temperature} ;extruder temp set \n G1 F3000 \n G1 Z10 \n G92 E0 ;zero the extruded length \n G1 F200 E1 ;extrude 1mm of feed stock \n G92 E0 ;zero the extruded length again \n G4 P7000 ; wait 7000ms \n M117 Printing... ;Put printing message on LCD screen" }, - "prime_tower_size": { "default_value": 8.660254037844387 }, - "retraction_speed": { "default_value": 60 }, - "material_bed_temperature": { "default_value": 60 }, - "speed_wall_x": { "default_value": 40 }, - "skirt_line_count": { "default_value": 2 }, - "retraction_min_travel": { "default_value": 2 }, - "speed_wall_0": { "default_value": 30 }, - "material_print_temperature": { "default_value": 220 }, - "brim_line_count": { "default_value": 15 }, - "retraction_amount": { "default_value": 3.6 }, - "speed_topbottom": { "default_value": 20 }, - "layer_height": { "default_value": 0.2 }, - "speed_print": { "default_value": 30 }, - "speed_infill": { "default_value": 30 } + "machine_end_gcode": + { + "default_value": ";End GCode\nM104 S0 ;extruder heater off \nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nG28 Z0\nM84 ;steppers off\nG90 ;absolute positioning\n;{profile_string}" + } } -} +} \ No newline at end of file diff --git a/resources/meshes/alya_nx_platform.stl b/resources/meshes/alya_nx_platform.stl index 608953d8de..a28da18298 100644 Binary files a/resources/meshes/alya_nx_platform.stl and b/resources/meshes/alya_nx_platform.stl differ diff --git a/resources/quality/alya3dp/alya3dp_flex_normal.inst.cfg b/resources/quality/alya3dp/alya3dp_flex_normal.inst.cfg deleted file mode 100644 index 464bf2f59d..0000000000 --- a/resources/quality/alya3dp/alya3dp_flex_normal.inst.cfg +++ /dev/null @@ -1,75 +0,0 @@ -[general] -version = 4 -definition = alya3dp -name = Flex Normal - -[metadata] -setting_version = 5 -type = quality -quality_type = alya_normal -weight = 2 -material = alya_flex - -[values] -adhesion_type = raft -layer_height_0 = 0.1 -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_angles = [0,90 ] -infill_sparse_density = 15 -material_diameter = 1.75 -retraction_min_travel = 0.8 -skin_angles = [0,90] -top_layers = 6 -wall_line_count = 2 -infill_pattern = grid -skin_line_width = 0.35 -raft_airgap = 0.18 -raft_base_line_spacing = 1.5 -raft_base_line_width = 0.9 -raft_base_thickness = 0.4 -raft_interface_line_width = 0.4 -raft_interface_thickness = 0.3 -raft_margin = 5 -raft_surface_layers = 3 -raft_surface_line_width = 0.4 -raft_surface_thickness = 0.2 -retract_at_layer_change = true -retraction_hop = 0.5 -retraction_hop_enabled = true -support_enable = True -support_type = everywhere -support_top_distance = 0.25 -support_z_distance = 0.25 -support_bottom_distance = 0.25 -support_brim_width = 6 -support_infill_rate = 15 -support_line_distance = 1.7 -support_line_width = 0.25 -support_initial_layer_line_distance = 2.7 -support_xy_distance = 0.71 -infill_line_width = 0.4 -line_width = 0.4 -optimize_wall_printing_order = True -support_angle = 70 -wall_line_width_x = 0.4 -layer_0_z_overlap = 0.0 -speed_print = 20 -speed_topbottom = 15 -speed_wall_0 = 15 -speed_infill = 15 -speed_layer_0 = 15 -speed_support = 15 -speed_support_interface = 15 -speed_travel = 50 -raft_base_speed = 10 -raft_interface_speed = 15 -raft_surface_speed = 15 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -raft_surface_fan_speed = 100 -retraction_amount = 1.5 -retraction_speed = 20.0 -cool_fan_speed = 30 -cool_fan_speed_0 = 30 \ No newline at end of file diff --git a/resources/quality/alya3dp/alya3dp_normal.inst.cfg b/resources/quality/alya3dp/alya3dp_normal.inst.cfg deleted file mode 100644 index 52348df43b..0000000000 --- a/resources/quality/alya3dp/alya3dp_normal.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Normal -definition = alya3dp - -[metadata] -setting_version = 5 -type = quality -quality_type = alya_normal -weight = 0 -global_quality = True - -[values] -layer_height = 0.16 -layer_height_0 = 0.1 \ No newline at end of file diff --git a/resources/quality/alyanx3dp/alyanx3dp_flex_normal.inst.cfg b/resources/quality/alyanx3dp/alyanx3dp_flex_normal.inst.cfg deleted file mode 100644 index be1282f1c7..0000000000 --- a/resources/quality/alyanx3dp/alyanx3dp_flex_normal.inst.cfg +++ /dev/null @@ -1,75 +0,0 @@ -[general] -version = 4 -definition = alyanx3dp -name = Flex Normal - -[metadata] -setting_version = 5 -type = quality -quality_type = alyanx_normal -weight = 2 -material = alya_flex - -[values] -adhesion_type = raft -layer_height_0 = 0.1 -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_angles = [0,90 ] -infill_sparse_density = 15 -material_diameter = 1.75 -retraction_min_travel = 0.8 -skin_angles = [0,90] -top_layers = 6 -wall_line_count = 2 -infill_pattern = grid -skin_line_width = 0.35 -raft_airgap = 0.18 -raft_base_line_spacing = 1.5 -raft_base_line_width = 0.9 -raft_base_thickness = 0.4 -raft_interface_line_width = 0.4 -raft_interface_thickness = 0.3 -raft_margin = 5 -raft_surface_layers = 3 -raft_surface_line_width = 0.4 -raft_surface_thickness = 0.2 -retract_at_layer_change = true -retraction_hop = 0.5 -retraction_hop_enabled = true -support_enable = True -support_type = everywhere -support_top_distance = 0.25 -support_z_distance = 0.25 -support_bottom_distance = 0.25 -support_brim_width = 6 -support_infill_rate = 15 -support_line_distance = 1.7 -support_line_width = 0.25 -support_initial_layer_line_distance = 2.7 -support_xy_distance = 0.71 -infill_line_width = 0.4 -line_width = 0.4 -optimize_wall_printing_order = True -support_angle = 70 -wall_line_width_x = 0.4 -layer_0_z_overlap = 0.0 -speed_print = 20 -speed_topbottom = 15 -speed_wall_0 = 15 -speed_infill = 15 -speed_layer_0 = 15 -speed_support = 15 -speed_support_interface = 15 -speed_travel = 50 -raft_base_speed = 10 -raft_interface_speed = 15 -raft_surface_speed = 15 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -raft_surface_fan_speed = 100 -retraction_amount = 1.5 -retraction_speed = 20.0 -cool_fan_speed = 30 -cool_fan_speed_0 = 30 \ No newline at end of file diff --git a/resources/quality/alyanx3dp/alyanx3dp_generic_pla_normal.inst.cfg b/resources/quality/alyanx3dp/alyanx3dp_generic_pla_normal.inst.cfg deleted file mode 100644 index 2f68643b72..0000000000 --- a/resources/quality/alyanx3dp/alyanx3dp_generic_pla_normal.inst.cfg +++ /dev/null @@ -1,75 +0,0 @@ -[general] -version = 4 -definition = alyanx3dp -name = Normal - -[metadata] -setting_version = 6 -type = quality -quality_type = alyanx_normal -weight = 2 -material = generic_pla - -[values] -adhesion_type = raft -layer_height_0 = 0.1 -skirt_line_count = 2 -skirt_gap = 2 -fill_outline_gaps = True -infill_angles = [0,90 ] -infill_sparse_density = 15 -material_diameter = 1.75 -retraction_min_travel = 0.8 -skin_angles = [0,90] -top_layers = 6 -wall_line_count = 2 -infill_pattern = grid -skin_line_width = 0.35 -raft_airgap = 0.18 -raft_base_line_spacing = 1.5 -raft_base_line_width = 0.9 -raft_base_thickness = 0.4 -raft_interface_line_width = 0.4 -raft_interface_thickness = 0.3 -raft_margin = 5 -raft_surface_layers = 3 -raft_surface_line_width = 0.4 -raft_surface_thickness = 0.2 -retract_at_layer_change = true -retraction_hop = 0.5 -retraction_hop_enabled = true -support_enable = True -support_type = everywhere -support_top_distance = 0.25 -support_z_distance = 0.25 -support_bottom_distance = 0.25 -support_brim_width = 6 -support_infill_rate = 15 -support_line_distance = 1.7 -support_line_width = 0.25 -support_initial_layer_line_distance = 2.7 -support_xy_distance = 0.71 -infill_line_width = 0.4 -line_width = 0.4 -optimize_wall_printing_order = True -support_angle = 70 -wall_line_width_x = 0.4 -layer_0_z_overlap = 0.0 -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 -speed_infill = 45 -speed_layer_0 = 25 -speed_support = 45 -speed_support_interface = 35 -speed_travel = 60 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -retraction_amount = 1.5 -retraction_speed = 40.0 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 \ No newline at end of file diff --git a/resources/quality/alyanx3dp/alyanx3dp_normal.inst.cfg b/resources/quality/alyanx3dp/alyanx3dp_normal.inst.cfg deleted file mode 100644 index 7a5730c0f7..0000000000 --- a/resources/quality/alyanx3dp/alyanx3dp_normal.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Normal -definition = alyanx3dp - -[metadata] -setting_version = 5 -type = quality -quality_type = alyanx_normal -weight = 0 -global_quality = True - -[values] -layer_height = 0.16 -layer_height_0 = 0.1 \ No newline at end of file diff --git a/resources/quality/alya3dp/alya3dp_pla_normal.inst.cfg b/resources/quality/katihal/alya3dp_normal.inst.cfg similarity index 56% rename from resources/quality/alya3dp/alya3dp_pla_normal.inst.cfg rename to resources/quality/katihal/alya3dp_normal.inst.cfg index 42cf2797dd..0283786190 100644 --- a/resources/quality/alya3dp/alya3dp_pla_normal.inst.cfg +++ b/resources/quality/katihal/alya3dp_normal.inst.cfg @@ -1,36 +1,36 @@ [general] version = 4 -definition = alya3dp name = Normal +definition = alya3dp [metadata] setting_version = 5 type = quality quality_type = alya_normal -weight = 2 -material = alya_pla +weight = 0 +global_quality = True [values] -adhesion_type = raft +layer_height = 0.16 layer_height_0 = 0.1 +adhesion_type = raft skirt_line_count = 2 skirt_gap = 2 fill_outline_gaps = True infill_angles = [0,90 ] infill_sparse_density = 15 -material_diameter = 1.75 retraction_min_travel = 0.8 skin_angles = [0,90] top_layers = 6 wall_line_count = 2 infill_pattern = grid -skin_line_width = 0.35 -raft_airgap = 0.18 -raft_base_line_spacing = 1.5 -raft_base_line_width = 0.9 -raft_base_thickness = 0.4 +skin_line_width = 0.4 +raft_base_line_spacing = 2.6 +raft_base_line_width = 1.2 +raft_base_thickness = 0.3 raft_interface_line_width = 0.4 raft_interface_thickness = 0.3 +raft_interface_line_spacing = 0.8 raft_margin = 5 raft_surface_layers = 3 raft_surface_line_width = 0.4 @@ -38,38 +38,20 @@ raft_surface_thickness = 0.2 retract_at_layer_change = true retraction_hop = 0.5 retraction_hop_enabled = true -support_enable = True support_type = everywhere -support_top_distance = 0.25 +support_interface_pattern =lines +support_top_distance = 0.15 support_z_distance = 0.25 -support_bottom_distance = 0.25 +support_bottom_distance = 0.15 support_brim_width = 6 support_infill_rate = 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 -support_xy_distance = 0.71 +support_xy_distance = 0.7 infill_line_width = 0.4 line_width = 0.4 optimize_wall_printing_order = True support_angle = 70 wall_line_width_x = 0.4 -layer_0_z_overlap = 0.0 -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 -speed_infill = 45 -speed_layer_0 = 25 -speed_support = 45 -speed_support_interface = 35 -speed_travel = 60 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -retraction_amount = 1.5 -retraction_speed = 40.0 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 \ No newline at end of file +wall_line_width_0 = 0.35 \ No newline at end of file diff --git a/resources/quality/katihal/alya3dp_normal_flex.inst.cfg b/resources/quality/katihal/alya3dp_normal_flex.inst.cfg new file mode 100644 index 0000000000..71bdee07cd --- /dev/null +++ b/resources/quality/katihal/alya3dp_normal_flex.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +definition = alya3dp +name = Flex Normal + +[metadata] +setting_version = 5 +type = quality +quality_type = alya_normal +weight = 2 +material = alya_flex + +[values] +material_diameter = 1.75 +speed_print = 20 +speed_topbottom = 15 +speed_wall_0 = 15 +speed_infill = 15 +speed_layer_0 = 15 +speed_support = 15 +speed_support_interface = 15 +speed_travel = 50 +raft_airgap = 0.15 +layer_0_z_overlap = 0.04 +raft_base_speed = 10 +raft_interface_speed = 15 +raft_surface_speed = 15 +raft_base_fan_speed = 0 +raft_interface_fan_speed = 0 +raft_surface_fan_speed = 100 +retraction_amount = 1.5 +retraction_speed = 20.0 +cool_fan_speed = 30 +cool_fan_speed_0 = 30 \ No newline at end of file diff --git a/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg b/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg new file mode 100644 index 0000000000..bec4107baf --- /dev/null +++ b/resources/quality/katihal/alya3dp_normal_generic_pla.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +definition = alya3dp +name = Normal + +[metadata] +setting_version = 5 +type = quality +quality_type = alya_normal +weight = 3 +material = generic_pla + +[values] +material_diameter = 1.75 +speed_print = 40 +speed_topbottom = 30 +speed_wall_0 = 35 +speed_infill = 45 +speed_layer_0 = 25 +speed_support = 45 +speed_support_interface = 35 +speed_travel = 60 +raft_airgap = 0.15 +layer_0_z_overlap = 0.04 +raft_base_speed = 15 +raft_interface_speed = 20 +raft_surface_speed = 35 +raft_surface_fan_speed = 100 +raft_base_fan_speed = 0 +raft_interface_fan_speed = 0 +cool_fan_speed = 100 +cool_fan_speed_0 = 100 \ No newline at end of file diff --git a/resources/quality/alyanx3dp/alyanx3dp_pla_normal.inst.cfg b/resources/quality/katihal/alyanx3dp_normal.inst.cfg similarity index 56% rename from resources/quality/alyanx3dp/alyanx3dp_pla_normal.inst.cfg rename to resources/quality/katihal/alyanx3dp_normal.inst.cfg index 5d9cafd87d..ae01704c8b 100644 --- a/resources/quality/alyanx3dp/alyanx3dp_pla_normal.inst.cfg +++ b/resources/quality/katihal/alyanx3dp_normal.inst.cfg @@ -1,36 +1,36 @@ [general] version = 4 -definition = alyanx3dp name = Normal +definition = alyanx3dp [metadata] setting_version = 5 type = quality quality_type = alyanx_normal -weight = 2 -material = alya_pla +weight = 0 +global_quality = True [values] -adhesion_type = raft +layer_height = 0.16 layer_height_0 = 0.1 +adhesion_type = raft skirt_line_count = 2 skirt_gap = 2 fill_outline_gaps = True infill_angles = [0,90 ] infill_sparse_density = 15 -material_diameter = 1.75 retraction_min_travel = 0.8 skin_angles = [0,90] top_layers = 6 wall_line_count = 2 infill_pattern = grid -skin_line_width = 0.35 -raft_airgap = 0.18 -raft_base_line_spacing = 1.5 -raft_base_line_width = 0.9 -raft_base_thickness = 0.4 +skin_line_width = 0.4 +raft_base_line_spacing = 2.6 +raft_base_line_width = 1.2 +raft_base_thickness = 0.3 raft_interface_line_width = 0.4 raft_interface_thickness = 0.3 +raft_interface_line_spacing = 0.8 raft_margin = 5 raft_surface_layers = 3 raft_surface_line_width = 0.4 @@ -38,38 +38,20 @@ raft_surface_thickness = 0.2 retract_at_layer_change = true retraction_hop = 0.5 retraction_hop_enabled = true -support_enable = True support_type = everywhere -support_top_distance = 0.25 +support_interface_pattern =lines +support_top_distance = 0.15 support_z_distance = 0.25 -support_bottom_distance = 0.25 +support_bottom_distance = 0.15 support_brim_width = 6 support_infill_rate = 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 -support_xy_distance = 0.71 +support_xy_distance = 0.7 infill_line_width = 0.4 line_width = 0.4 optimize_wall_printing_order = True support_angle = 70 wall_line_width_x = 0.4 -layer_0_z_overlap = 0.0 -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 -speed_infill = 45 -speed_layer_0 = 25 -speed_support = 45 -speed_support_interface = 35 -speed_travel = 60 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -retraction_amount = 1.5 -retraction_speed = 40 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 \ No newline at end of file +wall_line_width_0 = 0.35 \ No newline at end of file diff --git a/resources/quality/katihal/alyanx3dp_normal_flex.inst.cfg b/resources/quality/katihal/alyanx3dp_normal_flex.inst.cfg new file mode 100644 index 0000000000..26fb78730e --- /dev/null +++ b/resources/quality/katihal/alyanx3dp_normal_flex.inst.cfg @@ -0,0 +1,34 @@ +[general] +version = 4 +definition = alyanx3dp +name = Flex Normal + +[metadata] +setting_version = 5 +type = quality +quality_type = alyanx_normal +weight = 2 +material = alya_flex + +[values] +material_diameter = 1.75 +speed_print = 20 +speed_topbottom = 15 +speed_wall_0 = 15 +speed_infill = 15 +speed_layer_0 = 15 +speed_support = 15 +speed_support_interface = 15 +speed_travel = 50 +raft_airgap = 0.15 +layer_0_z_overlap = 0.0 +raft_base_speed = 10 +raft_interface_speed = 15 +raft_surface_speed = 15 +raft_base_fan_speed = 0 +raft_interface_fan_speed = 0 +raft_surface_fan_speed = 100 +retraction_amount = 1.5 +retraction_speed = 20.0 +cool_fan_speed = 30 +cool_fan_speed_0 = 30 \ No newline at end of file diff --git a/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg new file mode 100644 index 0000000000..4c79a3ac78 --- /dev/null +++ b/resources/quality/katihal/alyanx3dp_normal_generic_pla.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +definition = alyanx3dp +name = Normal + +[metadata] +setting_version = 6 +type = quality +quality_type = alyanx_normal +weight = 2 +material = generic_pla + +[values] +material_diameter = 1.75 +speed_print = 40 +speed_topbottom = 30 +speed_wall_0 = 35 +speed_infill = 45 +speed_layer_0 = 25 +speed_support = 45 +speed_support_interface = 35 +speed_travel = 60 +raft_airgap = 0.15 +layer_0_z_overlap = 0.04 +raft_base_speed = 15 +raft_interface_speed = 20 +raft_surface_speed = 35 +raft_surface_fan_speed = 100 +raft_base_fan_speed = 0 +raft_interface_fan_speed = 0 +cool_fan_speed = 100 +cool_fan_speed_0 = 100 \ No newline at end of file diff --git a/resources/quality/alya3dp/alya3dp_generic_pla_normal.inst.cfg b/resources/quality/katihal/kupido_normal.inst.cfg similarity index 53% rename from resources/quality/alya3dp/alya3dp_generic_pla_normal.inst.cfg rename to resources/quality/katihal/kupido_normal.inst.cfg index 096d49418a..8e0dba6289 100644 --- a/resources/quality/alya3dp/alya3dp_generic_pla_normal.inst.cfg +++ b/resources/quality/katihal/kupido_normal.inst.cfg @@ -1,36 +1,36 @@ [general] version = 4 -definition = alya3dp name = Normal +definition = kupido [metadata] setting_version = 5 type = quality -quality_type = alya_normal -weight = 3 -material = generic_pla +quality_type = kupido_normal +weight = 0 +global_quality = True [values] -adhesion_type = raft +layer_height = 0.16 layer_height_0 = 0.1 +adhesion_type = raft skirt_line_count = 2 skirt_gap = 2 fill_outline_gaps = True infill_angles = [0,90 ] infill_sparse_density = 15 -material_diameter = 1.75 retraction_min_travel = 0.8 skin_angles = [0,90] top_layers = 6 wall_line_count = 2 infill_pattern = grid -skin_line_width = 0.35 -raft_airgap = 0.18 -raft_base_line_spacing = 1.5 -raft_base_line_width = 0.9 -raft_base_thickness = 0.4 +skin_line_width = 0.4 +raft_base_line_spacing = 2.6 +raft_base_line_width = 1.2 +raft_base_thickness = 0.3 raft_interface_line_width = 0.4 raft_interface_thickness = 0.3 +raft_interface_line_spacing = 0.8 raft_margin = 5 raft_surface_layers = 3 raft_surface_line_width = 0.4 @@ -38,38 +38,20 @@ raft_surface_thickness = 0.2 retract_at_layer_change = true retraction_hop = 0.5 retraction_hop_enabled = true -support_enable = True support_type = everywhere -support_top_distance = 0.25 +support_interface_pattern =lines +support_top_distance = 0.15 support_z_distance = 0.25 -support_bottom_distance = 0.25 +support_bottom_distance = 0.15 support_brim_width = 6 support_infill_rate = 15 support_line_distance = 1.7 support_line_width = 0.25 support_initial_layer_line_distance = 2.7 -support_xy_distance = 0.71 +support_xy_distance = 0.7 infill_line_width = 0.4 line_width = 0.4 optimize_wall_printing_order = True support_angle = 70 wall_line_width_x = 0.4 -layer_0_z_overlap = 0.0 -speed_print = 40 -speed_topbottom = 30 -speed_wall_0 = 35 -speed_infill = 45 -speed_layer_0 = 25 -speed_support = 45 -speed_support_interface = 35 -speed_travel = 60 -raft_base_speed = 15 -raft_interface_speed = 20 -raft_surface_speed = 35 -raft_surface_fan_speed = 100 -raft_base_fan_speed = 0 -raft_interface_fan_speed = 0 -retraction_amount = 1.5 -retraction_speed = 40.0 -cool_fan_speed = 100 -cool_fan_speed_0 = 100 \ No newline at end of file +wall_line_width_0 = 0.35 \ No newline at end of file diff --git a/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg b/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg new file mode 100644 index 0000000000..674b620174 --- /dev/null +++ b/resources/quality/katihal/kupido_normal_generic_abs.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +definition = kupido +name = Normal + +[metadata] +setting_version = 5 +type = quality +quality_type = kupido_normal +weight = 3 +material = generic_abs + +[values] +material_diameter = 1.75 +speed_print = 40 +speed_topbottom = 30 +speed_wall_0 = 35 +speed_infill = 45 +speed_layer_0 = 25 +speed_support = 45 +speed_support_interface = 35 +speed_travel = 60 +raft_airgap = 0.1 +layer_0_z_overlap = 0.04 +raft_base_speed = 15 +raft_interface_speed = 20 +raft_surface_speed = 35 +raft_surface_fan_speed = 100 +raft_base_fan_speed = 0 +raft_interface_fan_speed = 0 +cool_fan_speed = 30 +cool_fan_speed_0 = 30 \ No newline at end of file diff --git a/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg b/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg new file mode 100644 index 0000000000..a6f6fa47a3 --- /dev/null +++ b/resources/quality/katihal/kupido_normal_generic_pla.inst.cfg @@ -0,0 +1,32 @@ +[general] +version = 4 +definition = kupido +name = Normal + +[metadata] +setting_version = 5 +type = quality +quality_type = kupido_normal +weight = 3 +material = generic_pla + +[values] +material_diameter = 1.75 +speed_print = 40 +speed_topbottom = 30 +speed_wall_0 = 35 +speed_infill = 45 +speed_layer_0 = 25 +speed_support = 45 +speed_support_interface = 35 +speed_travel = 60 +raft_airgap = 0.15 +layer_0_z_overlap = 0.04 +raft_base_speed = 15 +raft_interface_speed = 20 +raft_surface_speed = 35 +raft_surface_fan_speed = 100 +raft_base_fan_speed = 0 +raft_interface_fan_speed = 0 +cool_fan_speed = 100 +cool_fan_speed_0 = 100 \ No newline at end of file