From f9836c0303a3d8c4093707a461d402fa3f4fa743 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Thu, 25 Jan 2024 15:43:46 +0100 Subject: [PATCH 01/56] Initial commit of zyyx profiles --- resources/definitions/zyyx_plus.def.json | 63 +++++++++++ resources/definitions/zyyx_pro.def.json | 99 ++++++++++++++++++ resources/definitions/zyyx_pro_ii.def.json | 99 ++++++++++++++++++ .../extruders/zyyx_plus_extruder_0.def.json | 16 +++ .../extruders/zyyx_pro_extruder.def.json | 19 ++++ .../extruders/zyyx_pro_ii_extruder.def.json | 19 ++++ resources/meshes/zyyx_pro_platform.stl | Bin 0 -> 104184 bytes .../zyyx/zyyx_plus_flex_normal.inst.cfg | 27 +++++ .../zyyx/zyyx_plus_global_normal.inst.cfg | 14 +++ .../zyyx/zyyx_plus_pla_normal.inst.cfg | 27 +++++ .../zyyx/zyyx_pro_02_normal_pla.inst.cfg | 44 ++++++++ .../zyyx/zyyx_pro_04_normal_pla.inst.cfg | 44 ++++++++ .../zyyx/zyyx_pro_06_normal_pla.inst.cfg | 43 ++++++++ .../zyyx/zyyx_pro_08_normal_pla.inst.cfg | 44 ++++++++ .../zyyx/zyyx_pro_ii_02_pla_normal.inst.cfg | 47 +++++++++ .../zyyx/zyyx_pro_ii_04_pla_fine.inst.cfg | 47 +++++++++ .../zyyx/zyyx_pro_ii_04_pla_normal.inst.cfg | 47 +++++++++ .../zyyx/zyyx_pro_ii_04_pla_quick.inst.cfg | 47 +++++++++ .../zyyx/zyyx_pro_ii_06_pla_fine.inst.cfg | 46 ++++++++ .../zyyx/zyyx_pro_ii_06_pla_normal.inst.cfg | 46 ++++++++ .../zyyx/zyyx_pro_ii_06_pla_quick.inst.cfg | 46 ++++++++ .../zyyx/zyyx_pro_ii_12_pla_normal.inst.cfg | 46 ++++++++ .../zyyx/zyyx_pro_ii_global_normal.inst.cfg | 14 +++ resources/variants/zyyx_plus_0.4.inst.cfg | 14 +++ .../variants/zyyx_pro_carbon0.6.inst.cfg | 16 +++ .../variants/zyyx_pro_ii_carbon0.4.inst.cfg | 16 +++ .../variants/zyyx_pro_ii_carbon0.6.inst.cfg | 16 +++ .../variants/zyyx_pro_ii_carbon1.2.inst.cfg | 67 ++++++++++++ .../variants/zyyx_pro_ii_multi0.2.inst.cfg | 50 +++++++++ resources/variants/zyyx_pro_multi0.2.inst.cfg | 50 +++++++++ resources/variants/zyyx_pro_multi0.4.inst.cfg | 16 +++ resources/variants/zyyx_pro_multi0.8.inst.cfg | 67 ++++++++++++ 32 files changed, 1256 insertions(+) create mode 100644 resources/definitions/zyyx_plus.def.json create mode 100644 resources/definitions/zyyx_pro.def.json create mode 100644 resources/definitions/zyyx_pro_ii.def.json create mode 100644 resources/extruders/zyyx_plus_extruder_0.def.json create mode 100644 resources/extruders/zyyx_pro_extruder.def.json create mode 100644 resources/extruders/zyyx_pro_ii_extruder.def.json create mode 100644 resources/meshes/zyyx_pro_platform.stl create mode 100644 resources/quality/zyyx/zyyx_plus_flex_normal.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_plus_global_normal.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_plus_pla_normal.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_02_normal_pla.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_04_normal_pla.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_06_normal_pla.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_08_normal_pla.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_02_pla_normal.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_04_pla_fine.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_04_pla_normal.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_04_pla_quick.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_06_pla_fine.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_06_pla_normal.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_06_pla_quick.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_12_pla_normal.inst.cfg create mode 100644 resources/quality/zyyx/zyyx_pro_ii_global_normal.inst.cfg create mode 100644 resources/variants/zyyx_plus_0.4.inst.cfg create mode 100644 resources/variants/zyyx_pro_carbon0.6.inst.cfg create mode 100644 resources/variants/zyyx_pro_ii_carbon0.4.inst.cfg create mode 100644 resources/variants/zyyx_pro_ii_carbon0.6.inst.cfg create mode 100644 resources/variants/zyyx_pro_ii_carbon1.2.inst.cfg create mode 100644 resources/variants/zyyx_pro_ii_multi0.2.inst.cfg create mode 100644 resources/variants/zyyx_pro_multi0.2.inst.cfg create mode 100644 resources/variants/zyyx_pro_multi0.4.inst.cfg create mode 100644 resources/variants/zyyx_pro_multi0.8.inst.cfg diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json new file mode 100644 index 0000000000..378ec9bd9f --- /dev/null +++ b/resources/definitions/zyyx_plus.def.json @@ -0,0 +1,63 @@ +{ + "version": 2, + "name": "ZYYX+", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "ZYYX Labs AB", + "manufacturer": "ZYYX Labs AB", + "file_formats": "application/x3g", + "platform": "zyyx_platform.3mf", + "has_machine_quality": true, + "machine_extruder_trains": { "0": "zyyx_plus_extruder_0" }, + "machine_x3g_variant": "z", + "preferred_material": "zyyx_pla", + "preferred_quality_type": "normal", + "quality_definition": "zyyx_plus" + }, + "overrides": + { + "gantry_height": { "value": "10" }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 225 }, + "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-37, 50], + [25, 50], + [25, -40], + [-37, -40] + ] + }, + "machine_height": { "default_value": 195 }, + "machine_name": { "default_value": "ZYYX+" }, + "machine_start_gcode": { "default_value": "; ZYYX 3D Printer start gcode\nM73 P0; enable build progress\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\nG162 X Y F3000; home XY axes maximum\nM133 T0 ; stabilize extruder temperature\nG161 Z F450\nG161 Z F450; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F200\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0\nM131 A; store surface calibration point 1\nG1 X0 Y0 Z5 F200\nG1 X-177 Y0 Z5 F3000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0 E0\nG1 X-177 Y0 Z5 F200\nG1 X0 Y0 Z5 F3000; move to home point\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0; set reference again\nG1 X0 Y0 Z5 F200; clear Z\nG1 X0 Y-225 Z5 F3000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG92 X0 Y-225 Z0 E0\nG1 X0 Y-225 Z5 F200\nG162 X Y F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 X135 Y115 Z5 F450; clear nozzle from hole\nG1 X0 Y115 Z5 F3000; clear nozzle from hole\nG92 E0 ; Set E to 0" }, + "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, + "machine_steps_per_mm_x": { "default_value": 88.888889 }, + "machine_steps_per_mm_y": { "default_value": 88.888889 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_width": { "default_value": 265 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 0.7 }, + "retraction_speed": { "default_value": 15 }, + "speed_layer_0": { "value": 15 }, + "speed_print": { "default_value": 50 }, + "speed_travel": { "value": 80 }, + "speed_wall": { "value": 25 }, + "speed_wall_x": { "value": 35 }, + "support_interface_density": { "default_value": 80 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_pattern": { "default_value": "grid" }, + "travel_avoid_other_parts": { "default_value": false }, + "travel_retract_before_outer_wall": { "default_value": true } + } +} \ No newline at end of file diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json new file mode 100644 index 0000000000..7f720f7a62 --- /dev/null +++ b/resources/definitions/zyyx_pro.def.json @@ -0,0 +1,99 @@ +{ + "version": 2, + "name": "ZYYX Pro", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "ZYYX Labs AB", + "manufacturer": "ZYYX Labs AB", + "file_formats": "text/x-gcode", + "platform": "zyyx_pro_platform.stl", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine": "zyyx_pro", + "machine_extruder_trains": { "0": "zyyx_pro_extruder" }, + "machine_x3g_variant": "z", + "preferred_material": "zyyx_procarbon", + "preferred_quality_type": "normal", + "preferred_variant_name": "Carbon0.6", + "quality_definition": "zyyx_pro", + "variants_name": "SwiftTool" + }, + "overrides": + { + "gantry_height": { "value": "10" }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 225 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-58, 117.5], + [-58, 108], + [-50, 108], + [-50, 117.5] + ], + [ + [119, 117.5], + [119, 108], + [140, 108], + [140, 117.5] + ], + [ + [-58, -117.5], + [-58, -108], + [-50, -108], + [-50, -117.5] + ], + [ + [119, -117.5], + [119, -108], + [140, -108], + [140, -117.5] + ] + ] + }, + "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-37, 50], + [25, 50], + [25, -40], + [-37, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 195 }, + "machine_name": { "default_value": "ZYYX Pro" }, + "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\n M73 P0; enable build progress\n G21; set units to mm\n G90; set positioning to absolute\n G130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z20 F3000\n G1 X-120 Y-110 Z10 F3000\n G130 X0 Y0 Z3 A0 B0 ; Set Stepper Vref to low value\n M420 P10; set back fan speed 10 off 11-20 10-100%\n M140 S10 T0; set 100% heater power\n M140 S99 T0; set chamber heater negative hysteresis 19 degrees\n M140 S102 T0; set chamber heater positive hysteresis 2 degrees\n M140 S{material_bed_temperature_layer_0} T0; set chamber temperature\n M104 S100 T0; set extruder temp 100 while heating\n M134 T0; wait for heated chamber temperature\n M420 P13; set fan speed 10 off 11-20 10-100%\n G130 X80 Y80 Z64 A127 B127 ; Set Stepper Vref to default value\n ; Perform probing of build plate\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z5 F200\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0\n M131 A; store surface calibration point 1\n G1 X0 Y0 Z5 F200\n G1 X-182 Y0 Z5 F3000; move to 2nd probing point\n G161 Z F200\n M131 B; store surface calibration point 2\n G92 X-182 Y0 Z0 E0\n G1 X-182 Y0 Z5 F200\n G1 X0 Y0 Z5 F3000; move to home point\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0; set reference again\n G1 X0 Y0 Z5 F200; clear Z\n G1 X0 Y-228 Z5 F3000; move to 3rd calibration point\n G161 Z F200\n M131 AB; store surface calibration point 3\n M132 AB; activate auto leveling\n G92 X0 Y-228 Z0 E0\n G1 X0 Y-228 Z5 F200\n G162 X Y F3000\n G161 Z F200\n G92 X135 Y115 Z0 E0\n M132 Z; Recall stored home offset for Z axis\n G1 X135 Y115 Z5 F450; clear nozzle from hole\n G1 X0 Y115 Z5 F3000; clear nozzle from hole\n ; end of ZYYX pro build plate calibration\n M127; turn off fan\n M104 S{material_print_temperature_layer_0} T0\n M133 T0 ; stabilize extruder temperature\n ;SET_ZXPARAM\n ;SET_SUPPORT_BUMPMAP\n G92 E0 ; Set E to 0\n ; end of ZYYX Pro start code" }, + "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, + "machine_steps_per_mm_x": { "default_value": 88.888889 }, + "machine_steps_per_mm_y": { "default_value": 88.888889 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_width": { "default_value": 265 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 0.7 }, + "retraction_speed": { "default_value": 15 }, + "speed_layer_0": { "value": 15 }, + "speed_print": { "default_value": 50 }, + "speed_travel": { "value": 80 }, + "speed_wall": { "value": 25 }, + "speed_wall_x": { "value": 35 }, + "support_interface_density": { "default_value": 80 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_pattern": { "default_value": "grid" }, + "travel_avoid_other_parts": { "default_value": false }, + "travel_retract_before_outer_wall": { "default_value": true } + } +} \ No newline at end of file diff --git a/resources/definitions/zyyx_pro_ii.def.json b/resources/definitions/zyyx_pro_ii.def.json new file mode 100644 index 0000000000..f965c5c276 --- /dev/null +++ b/resources/definitions/zyyx_pro_ii.def.json @@ -0,0 +1,99 @@ +{ + "version": 2, + "name": "ZYYX Pro II", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "ZYYX Labs AB", + "manufacturer": "ZYYX Labs AB", + "file_formats": "text/x-gcode", + "platform": "zyyx_pro_platform.stl", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine": "zyyx_pro_ii", + "machine_extruder_trains": { "0": "zyyx_pro_ii_extruder" }, + "machine_x3g_variant": "z", + "preferred_material": "zyyx_pla", + "preferred_quality_type": "normal", + "preferred_variant_name": "Carbon0.4", + "quality_definition": "zyyx_pro_ii", + "variants_name": "SwiftTool24" + }, + "overrides": + { + "gantry_height": { "value": "10" }, + "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, + "machine_center_is_zero": { "default_value": true }, + "machine_depth": { "default_value": 235 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-58, 117.5], + [-58, 108], + [-50, 108], + [-50, 117.5] + ], + [ + [119, 117.5], + [119, 108], + [140, 108], + [140, 117.5] + ], + [ + [-58, -117.5], + [-58, -108], + [-50, -108], + [-50, -117.5] + ], + [ + [119, -117.5], + [119, -108], + [140, -108], + [140, -117.5] + ] + ] + }, + "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" }, + "machine_gcode_flavor": { "default_value": "Makerbot" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-37, 50], + [25, 50], + [25, -40], + [-37, -40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 210 }, + "machine_name": { "default_value": "ZYYX Pro II" }, + "machine_start_gcode": { "default_value": ";start of ZYYX Pro II startcode\n M73 P0; enable build progress\n G21; set units to mm\n G90; set positioning to absolute\n G130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z20 F3000\n G1 X-120 Y-110 Z10 F3000\n G130 X0 Y0 Z3 A0 B0 ; Set Stepper Vref to low value\n M420 P10; set back fan speed 10 off 11-20 10-100%\n M140 S10 T0; set 100% heater power\n M140 S99 T0; set chamber heater negative hysteresis 19 degrees\n M140 S110 T0; set chamber heater positive hysteresis 10 degrees\n M140 S{material_bed_temperature_layer_0} T0; set chamber temperature\n M104 S100 T0; set extruder temp 100 while heating\n M134 T0; wait for heated chamber temperature\n M420 P13; set fan speed 10 off 11-20 10-100%\n G130 X80 Y80 Z64 A127 B127 ; Set Stepper Vref to default value\n ; Perform probing of build plate\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z5 F200\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0\n M131 A; store surface calibration point 1\n G1 X0 Y0 Z5 F200\n G1 X-182 Y0 Z5 F3000; move to 2nd probing point\n G161 Z F200\n M131 B; store surface calibration point 2\n G92 X-182 Y0 Z0 E0\n G1 X-182 Y0 Z5 F200\n G1 X0 Y0 Z5 F3000; move to home point\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0; set reference again\n G1 X0 Y0 Z5 F200; clear Z\n G1 X0 Y-228 Z5 F3000; move to 3rd calibration point\n G161 Z F200\n M131 AB; store surface calibration point 3\n M132 AB; activate auto leveling\n G92 X0 Y-228 Z0 E0\n G1 X0 Y-228 Z5 F200\n G162 X Y F3000\n G161 Z F200\n G92 X135 Y115 Z0 E0\n M132 Z; Recall stored home offset for Z axis\n G1 X135 Y115 Z5 F450; clear nozzle from hole\n G1 X0 Y115 Z5 F3000; clear nozzle from hole\n ; end of ZYYX pro build plate calibration\n M127; turn off fan\n M104 S{material_print_temperature_layer_0} T0\n M133 T0 ; stabilize extruder temperature\n ;SET_ZXPARAM\n ;SET_SUPPORT_BUMPMAP\n G92 E0 ; Set E to 0\n ; end of ZYYX Pro II start code" }, + "machine_steps_per_mm_e": { "default_value": 415 }, + "machine_steps_per_mm_x": { "default_value": 88.888889 }, + "machine_steps_per_mm_y": { "default_value": 88.888889 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_width": { "default_value": 285 }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "raft_airgap": { "default_value": 0.15 }, + "raft_margin": { "default_value": 6 }, + "retract_at_layer_change": { "default_value": true }, + "retraction_amount": { "default_value": 0.7 }, + "retraction_speed": { "default_value": 15 }, + "speed_layer_0": { "value": 15 }, + "speed_print": { "default_value": 50 }, + "speed_travel": { "value": 80 }, + "speed_wall": { "value": 25 }, + "speed_wall_x": { "value": 35 }, + "support_interface_density": { "default_value": 80 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_pattern": { "default_value": "grid" }, + "travel_avoid_other_parts": { "default_value": false }, + "travel_retract_before_outer_wall": { "default_value": true } + } +} \ No newline at end of file diff --git a/resources/extruders/zyyx_plus_extruder_0.def.json b/resources/extruders/zyyx_plus_extruder_0.def.json new file mode 100644 index 0000000000..f87248832c --- /dev/null +++ b/resources/extruders/zyyx_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "zyyx_plus", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/zyyx_pro_extruder.def.json b/resources/extruders/zyyx_pro_extruder.def.json new file mode 100644 index 0000000000..e885e5008c --- /dev/null +++ b/resources/extruders/zyyx_pro_extruder.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "zyyx_pro", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/extruders/zyyx_pro_ii_extruder.def.json b/resources/extruders/zyyx_pro_ii_extruder.def.json new file mode 100644 index 0000000000..403114fa56 --- /dev/null +++ b/resources/extruders/zyyx_pro_ii_extruder.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "zyyx_pro_ii", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": "1" + }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/meshes/zyyx_pro_platform.stl b/resources/meshes/zyyx_pro_platform.stl new file mode 100644 index 0000000000000000000000000000000000000000..16b2ef7abc18569a572bcba40875de9ebde7ebcb GIT binary patch literal 104184 zcmb513A|3#_y2ctOS4Kv3JsEZF5y1MJy$A(G%8b)T$Q=Zb&W}sMiOYH>%Z37XFdC~&vUNV@9*`xwO{A6-e>J$?deRoKH$^GXeB)vZ;pQq4;L*ME0*=x|4+cK!QQy0ny1r~PzivdyxRNk#wW z)Hx&PyqP(KnO`sA-Fs)Qh<&w!2Id=sMIM71_~fe$1k z%~pGEytG-zDN5=Uqsch8-YSU756-~$OsvsK4=Q=9D@ z&@}Xc1S)Za_ECHPHQxK)u)qfrl4h%cdp9)Ovrc>O2$Y z0~I7BVlsUofmW@5E1UD~gt(HUg2dJyIXNA>#kB`2NJxxj<_Zb48uMZ2oFjX6ESUD= zHb(^siLp!{NT5~An!R&Q{ZYn5<0U_d3KCab)H~;Bmdpl7pn?SU0%OnRKmx7&XFKQI zdrW3d!{jGXK|*Hg%#tI4RvpXbYr+$-k24Cz&-$e#)eA#>uBy4GA;j6i4tpcv8Ld zlQ*_)8~8xNqzh7JUSS_dpb}58kN+mm@E&}2K;Q!jlP*Y^d4+u-fl55VKED6>?Z&?y z(<^->Ou8Ut<`wpV1S;_a`zW*Rc6f zU63*}5&J*_m3V@E)Nb3>sZH(9K9Df!f|Qww*as4*#1rge*s}wiS=8?A0|}EZNSV2d zeIS8KJi$Jwy`9tBz1^67AYsx4DKmGm4CnlN8>7Qf55HCK9Df!f|Qvb*#{D+#1rh}ylpRg)XxJS zNSHKPrRQ4qfdne?1pBD8;{4=U)b3mkBuu&>W#&irfrO=`bAkl>pkAA#ejfNh!lVmQ zW=3TnNT3o=u#cfMuD?a?&c#5&q-oqu&(7=v2~^?<_QB)&qj$dj0sBD0qzh7JMr9vJ zpb}58kG3?fUqtQBK9Df!0+@H%2NGsR&WD^J!9L8te8ObI2@c7Ez@d&gseI-huf<&XyRhoTO;o2A< zNLW_sJ|FdA#*h3I5@sZd5~v`ts^OGobr;0t3JJ6_BWlzKDoC7u&DLfkJH+`w0qjDAUr9v*l{iAz?yHxb<`nI?E%1Sa zq}fXPy!L?vDshDNad=~e#HYK52R@LHG+W`=rBtU+hC3T3ToSB(B=789`bV@D;t4)4 z5|Y-rn$T&G^U}AYgLMfil4c(g`MTuA5ojf8?Zd5howH?Ar6jjLDv}O-gndQ(D3$;# z>?=wo&-gh};kSFV59oJd#pjjC*FK6P&`Q#}97XHz%6{s9`WgT#lIHVD9BUuN5ojf8 z?c=ep-}PRt&?hJdDw5{&O8?M4iX+fU(%Q!bA2mpR;5H0=pdx8LudL3rkKzcllC<_w z@O|&(`ie_~xI#tJ!Fj{AmiAE`A*((lw2$}ZKAJq~$9CDlsDkS@Ja4$x(mskM&n6RrVmt*z!}wu+XoV8CHFiteV~E_&eXOKB+yFkd1m@R1qobn z*gh;G+)eO#z|6?@!&dBA#Fc2}x_B-{1kxkgN3-FFe=f4YS;tCEoMdN{+K{rQ!%y zkdSnmNQw{f&dLqFK1i_-PRsFht}+N#kdU+{r0jgR5A%yT5g$5NNT7m*_{bzsL1Ovb z8*`2>-4K+?c;H+ifmR3SUbP~gsQ2-|IY%2MgL92}eRs~9M^*=E^k@4(1&I%S`6OrN zsC6;9LISPUeLO#>^$B0Z5U5-_bwWbTTGk>QiCvCriAqjOJ7q+>g9;Lo ztK$=BCGC+(pn`<7Qzn5564ExA1S&{K+hh``AR+CPNuYv+v`r>~3KG(SnFQ9AL_1qy zJK1fH3KG)OGJPO{R?>qr2~=cc_`l~02^p2NkBheDB|mr82RlfqA092GemE`1iziq? zLeiS}sC?VxX+!j#YE&f6KBS%WNL?I(R+0{L)w+7}!$cz3ZKEP-KCeWN_Hj`$1X@X2 z`zTEpKt6k?Q{V#?N%MInrnQga2(*&4_VFmq<$VY1rxQ?-G@n;`n)Xo~fmV{%K2AAj zQ=xkCk)Rx?NSemN1>G**FNG1%n6@YXiZS;Iug6sqcFnd zc<}@)NJv@}6p4YabMe zj>Il1l4c(`5-C+2fmV{%J}43s61%8KntkB-s8n$TT1i^_ph(P?*hNLs>_g&;(@GUb zpp~Sx4~#^m?)BUCtwr|-=F{3)r(b;WZdc{cgyR-rDVan-YasY9?GKQkbiwvtT=b{Y z2H_nA3W$KdE?4ISa!AIRgt0=R4$*lopZ$1*Sh0`Vxz{|_Glnqvy*DiR z(R58q$uoUO{b*VUexi}nak&zrU0<={TuGUt#M0`l+)Mdos}^D2k4KnuMTu*Rtt;`) zgjjJ}>MfcpQ;YZddluJ%9CDhX68`bntMjYt1Zp>kH>m}K5Me1cVQN|vdTeJOMv*l2 zm2_0<_FyI?EG3TMo~HjvyX$gbBnD*)bBiSp2}^-m2#@O;S@Fb`UbRufgE{JrTgLhm z_UBS9)^$yqB0T>IYLDi@aix$zC7$5^K}14)AYsyZ?j7@+-mz~__to09r{25m3V@ERIBu;b7I9ef_F@iFzGzEd!Lv6 zVO1K3K9E2qo?ss@RU7QQ-*s4UHvIFzGxuugiGwfdne?L|6__%7KJQ z=eb1#M?qatIno3w@kH1jNofxxOghiqe(Er2b83$?fl55VJ}63(5?4r=be`L>{y>Ob zBv6Sb*at;>Qu+rHCY|RtzN8=YK_pO#C)fw|+NAVzBuqNbonN&-j3r2*5>K!X8hw&7 zULj%9dG6_T2Emw!1S;_a`=C)YDdR2@CY|RVobxD*?MR>!Pp}V~4Lq4YkTB^ym=o(p z2s8K9g`6P4KFq&-$ILQy?Y^C!;n;`yM?Du5(+BIu_FCp_!t^Md+oL|P97veHay$a9 zOua=3RFE)z<#+^InbwRFs32kb%JB%aGEo^NP(i}=PwWLBgybjz^%CnMI=nDoB|1!|@2TGOGbi$O@bTUhhVOl`yV-!{h0FR5IPGP{|<7 z-XPOQaITP$Rk+y!q*wVtH=Jp9DFG4g0Yl%iZqM{#%7FyziZaS!h|ntVA$zK5u6Rdp zh|nr5Q*pTp_iA|FAT4{tOdm*uRz#ScWt2$QB3bFQ-bb114_v8tjUM9_wcuw=cwZyC zYEJ8tFWNN~jw4|!hS1StYS;L%h@iAsyW*RD94^@~NqSpQ++fBDBE!sNk}EyJ znR(CFvy;0PC_(Fe~qX2ubP&#TjXCY)=7IVw#U#Sq+r<~ZkzOD!{w zQP7HMxr&Q~js{!-=yYbTVtoX4WoYA@ePGGc3K5dF>o7`4{qU$JgdX9f4r_P3H*rVP zb%k?k4^Cb;T)9UZrF>rX-FsOncWc4YAYJ=^r@4(9E%U#xFqf{@=5`;N_^ZTQg%xOq zMg@uFuG8Iu9`A=lqC|D)v;_}(rBp+UK&zj-ly-X_d7u2fN?GPm*E?{S6a=p2(-HX+LPRpU#tpq)nNHe&h~z%Cd*%u>!E_g!S|Ir=f}07 zk6ouEoQ>tqO*Zelz#`D(<0Dn`tC(JrO(_P`dIwzH;F1g-JN`LRvQl$Bp&HFFK5m8Z$clRRDC)z z^w#^5B|6Ns2(%jY*~A=m+Lq8q*1Ka8r}ycbeCO339x6yQS~ouD`h84rl-yEcb@qsR z2P7x2c)=pjszHsGIr(R74SiJTx-h$9hli6pPaNZ+5+#l>ID7pBQTDg2YMde#zO;|C7+i_|a!MXV%>24UQ0Kg}qs+ zQAGS+W1BaY2vm?LQ|&~z&NnMV9~T_F)EV;4D;}2v3ADm-OsOhFOedlj5vU-6<1u|( zp$&%+Eqi3*CL89g8&)sv&{_NKNZ8i}r zh`2L`K&u7$o_nltaY(%PO?&6Nl8<{6=vgmRknoo!-B)g3>>m4j2KiV@#MeYT9wE@G z+WT+0W&eFNB&yxh&pEJly4PTCmWK)wUmiIjx5+pBW--qO2_lXXG5d9!Kr39M&`AC7 zp~TxwF7cXBU11wwYYrd(n_FS`mASgE#@|=N`Db}YZ!}%WK?R8xvrowV;4tTkS7d9Z zwReV%o8a9|B}W3SCa*l?{<7%GTwPaZ-G9Gx^G#E{xpWN+6(q1sO5I2$Kl!`q-siKj zECQ|mT=9duYwVe!k6J|hLUpzBjVuopBszNQ-FFu5ffn2pwmA}LwPWmdx6J!zhIPel zE(9t_V8qz5iv(I>94oc(Krg4{t<${MsjhIvdfOfK-Oa1U`dp)Sn>$qUA}aYa6eXx2 zF}~BS?)Z(D2DDNwh&X|2cj0WCK&!%TgWUYFJyRyyzYU`u6(pYDKhVu@e{V|1mDCmY z4vTN3lbDJM#SI1t2<|`>gGL1eGnBSaEGMSn|~fobZSuEyPE0>3A8GFxrTe?n`3-kSLdHQ zEb-NsZxp^wV>>EHV40M1X{4@5BlRFEITC1f@U=GXm9r~_K9E2KiOO&Eb=8_KDV?in z)PhZ^1xHXhkU*>MKecz)l)5ymt0_b@CgKqyP(cDCMvv4IyGWoF#xcE@NbSt%LoTJB*LLxTD5NL%XhEly~yedQE)lIKvd8iYAKVhoA2`=y@4~f&Qj;il8&d3!q}W9T3A+#Sj3Yj9m4W{7OiJOZ z4_9G0JLBB0lt(^zEO|7t>cjOMwkDZ{#3PhM1&PV;&TtR5xFB4YEDQU`*a(4Ec9eWT z1oy$wM4*BM_7&Y8--PXfa}>6w-GW?KTykC^BY{@-C^~|AZ4F*!yprYNDhzAduHC9c z{7EaB`m{pE{)~CYGSQRdL|j5X7LX5Auy*lGNbG0aCfMUF zfAJ0fkMr6DyOiK~-y6d{4qr)aH8U$QgvMP|kQn;R18JJ=X$2cYpw)=qvLeJdYGA*AFM0akoGzOGQg z^K#lIOnaDfp%tG=VocW+5~3i%X*sS5i9|dXS_QRGOzcvO|a&$($@hh?rLpO4Qk16(5%x(b0~CC`jPgW%npN7h3UgyGP0BgXhI^;Mk>o2!RR`7(JSZ?X^4(hW(Mp zN;_9Vpc0%{dN9vjvHjd8j1}iL-Uli{Il}XDjo5^YS4f~0AD4D2zCExFINsuY;JAyU z9hT4bfePl3kH_Z<6(lmtA(0p*`j&`Z5=olrX#WC0}2NGz-Y4N8C$rabAc*n@+ z+O-LjE2BgS$)W87M+Wql=|ghGwJ5p5K8QWd_QCCJ2s4Xft=n~l3Pubck1q%MK$_Fy z+s+lv0MWLwYgbB+1hyKdjSsrVvRv-5EIM`X3b~iEVZoL3Z3%r>=FD3UtT6ZP=swPJ zxsQVi5htQmliTX-Tp@QuZG!HM7RsGb zRFF8S@!=Kb?&~udQ#N{V9OPPC+bU&(4?nfbk zR#@x7{is5@AB74MXTI2!z7Yraqdd7Eg$fc=3Pz^PT}!$jdEuy`H~ap`4Uu+SXuG2lzG0S z2@ws6I5|R~)tAZjDf0{qJ&}^UHhdxl6(s7l{wifXk&@&mQa+<6Qcyu+YJ(3`))Og7 zc_IZBBqmQ-p0b`uN%9jZ<>-kNB+zR6fQ2dRiIgNik3kYQj+pS3Mxp{{CsT6dLkt$PoyA$R%LG;l(L>k@#KjVRFG)=>9r~A zi4>2YNSRDeq#%J-N0(leGEbzetNOGzBzz(T6(n%%Qi`5P@#KjVB+v>+RHa_OVu5!r zJu}gQMo}CMaP&cc^eYJMJ9sbCD4I(IDoCI|r3xP0@BK|rS&SkAM+5YS^+tD>C|B8( zD<)7u0(~nrar9Zqlj$joK}6tafc~)k>B=4DN`+5ypn?SYrnj9AUYZ;qK4pP@8~tG% z)3qhaRZ;jP2P#OQZ~A2i@-ZoVE(7}=`olBP?=#+ie{#l+Q@q)(HmUwv~=_|AL!CC{fTUT4nC@=!sd@$OIkCP}z6n&dm9g>+2@3A7si{c?Zi z1wV&ZAV2)3ee!#{*4LkQ+o&MXYvwZl#7E?gdvOF>&7U#XuY19g@ap-%A&0$6;k^k| zkT^7Kjz4ORzI&onaRgdj_0SZ5!QFDl}4%(~HEQK@@)hnMdB zB)3tNRFHUfSX+O=&G&`(ooiCG9}Z&|3ADob zk$(Av2!3YbKe`)^3KC^|*Yqd9DtE(M62W)Fv*~U)5@_{u*VFuqmg>9j!PWDmJo|wP z5`*`a@|WKvcX-Q`y*ZgZTHg~!0^^$(i0=XxA^SQ&kj$i0|!bqSM#+Xvs6p0s6B=S9BRFKGDe1%_UfZP+F zLj7Yd^^c(u0aK;~`5P)% z4X>VG+OtM-@{*3;NUB{_kofD#1HL=~rPSO19P-Z3y~MkQa)kt1RhzuUAO47bPKvHs zo;t#-xMW7*0$Pirf&`8d^b0OjyJv;9iv(Kre*9zq+*a~5)g?rn6cVT)v0&8u{w=ll zhIf(auB9hWQz3y?SIk@I_c|m`z0lKCX#y1_aMV@`X9FbA3g;5KGkTy`^7UKvQ!g0p z*dMXqDAk2}?OD`oUw$pi!;t}r=AS(7cU&#^)#z!eU}WH@sZc=z=SOsmW-HZ z6KGZ9%W1x9nIF!a1Bkeca&@#I%R>c;6`SYzUoMd6$mot@atDo~BPe!}K&xL~c+u~= zK<+!QBH||^`VoN&5;&s}g8T^H<4V!;uJxG4m0B0O*e{5N$kU#}%y6)uh{zcEq6A(PBi4Rnez&Z@>>Zkh$ z5@>}h1Kl3d2T?)7ZjVnWSG%d?J*eb3%iyeb_((N>{l-he=VY)Ps32jFqB!m%fmS#M z>yqC=BQ-xKgJTIs433q-9rxr`D#zng4pfk^UAsT^7~`F>vP$9iXAiOnoCllk z-RHME$iF4TPyFs8q6`t+i9p37di@d*`b{JzPFYzcJ4!SKE6!~}&h?>>-9%hSgyc#T zB-r2Rnb!x;2hcCp{m|QU`y38@;JMIh>*+uHTkqiCedThzNyNn7hqHg8a-f35tLNp%2P1myq)iC5e2@ZWOvvlO(irPh11$CwNP zt?*70J*Q6uwPHfIpt)<6L8R|HFFClg@SY#*J8$i(Pf=o?^XOXM!{-@olF z%p!vRECQ|gOmbgUsr$EH=zZOLp!4Q`qv$TOQIP0ScBfx*fIQD|8WH=5s2d^BD#&g6 z?rUSp%_u6%*HjLSa9oRGRMM{^5|JMgs374b4u(C7@1KW0ve^d`XoXR!iIE3)1_UZd zu)p2=xks^&mN#6QoYQqy;-jz}(sR%Xqf)8ciTIj`1w^2N#N0{y{aG)!3Vn?FSS4qE ztem$a1X^KKDm8=%`g1lAfeI44TkP>q_Bq5tZAh-6ET#Cy+ojb1l=DF+nnDX_?C!fTP{rO zix6mqHLcVSL_A8woG@3?wn(tQdr#)ysb(K9jqI2_W6Ac!>pc z8s(vaM31ru{L{YRHfJ9*i)tn5&)GvhkU%S}X{BZmv5JWMh(HC2Mf3JhIogCi{#?A> zn?JIn(>X$*mED4;EZOc&CxT0k3KH1ol{!GP4Ucdpvg~iy%pWCbMmt1=o(+tG#HjlJx@P`p zPP5JF=^4imXtnk9|6DT<&ZQY`3;pfka)5$F!8ylVGY?Lt9BrqvL14rrswpD z*hU1G0~I9rofa9Dl%jP>g4QMB3c#ETt(xvV=348L1kF?7D#Iv9RA_iYE)(f>NrKiT z;Y!93XoXLI)73%B6|GCc)slJF3JH8SCm5+6nLkiLqD#dRL9X-&N3(%LV|y^;Ac0o+ zZcZ?kI5d`cJeHt>M1_aM2lrYUOB@2FhnKr4(&rJf;c{^R)r6(lyaP`PFv>_R!BStr43A0*HUqmpWu2%6av zJgcFC1hq*Xk8Kzs33t6qtwG&FHHPIky4AI1Y0c_;ldRX*0fS5 z5V3`bdBM1A+7^i(WskUKMRtH@o7ZTh=D8Nng;rS8N}WwJ+AJcv5`hX53+5el&HS;D zW*h$N9wE>QYnraslJ!#h+f4*2NYtOGa?LzAnR0Xj<*X#loJgP*)-=tWMEp#p=aQp> z1ouHRpVPX;p>;_HfmU`4(z?WjXYfku>|j zFGwg=9D!Dn);^}szSVi^Z|{mHHDC0+l#I`=BUEN?ai!XPv)|{AyCO6 z(of?u5q>!`c<$Bu4ohgow0Ro$c!XHt6SQm}e8DWqWkChc8{{zk)uH1N@@*nrKKV`& z&74V@Yo!*sJ@7d~Ij(Crj$j1|No#^u07+RhpdxAZhtCuSYlc_?tt72|&`KsLYadi3 z%|7s%!eH$aOQ4mcwGUd6C1nkVilo^GK2sR1;bIB2lC<_gD@#w-qNqrkec&^N!CEwy zKr2aWAGAXDWKE5Vq}hl4d}46~T1i^_pp|~1>3ZJdFeV~F*$K#o70u?0ix%c7;w8E#@Z2}d14jp~l1l}1{`Lk$#tx8v#=ckG% zECmRq?n%?O4~syn{IRb1vk7G>cwS2PmAjUPp)Yht39;hik~RSU){mu_^U~a&e%lRz z2w_>}zhA5mqht_aO-FqY5h_U7*Io_7&e#R4Gt*4=O<@Ln+h zysis8|F?emnsR z64?GGPr3z7jN<(kY=4_T1qu5ei($B~%r$+q!uuk|o^yo?({j%P&twy*AYtFlFigJn zEGPE);-lSCaFl?4qtvi1pJm^4;=|4Z8%HM&E~l{OjG+g7f*y!|dZHA}%AMTZBNXn!Del_wM9d#X0}p?OfV; zZK59$s30-zyVa@fRr#CC?Bix4E+gVFl^hAQnzZAiR2hc}F2~ZkS&5Gp^#~#nqtC3b z3Q`y`N{u99I1w*V?4p9i<=G=sfBpJ-7`wS+mL#UvyV&VOk%$CZVf!of+2|#STZnj{ z2vm^3)>JCTsh3#x=e3Dxlq<}MSpgQLkXGtJB6bilg$PuTsQ=ZB)cpLlVL2|^dnnO) z*GbL-$`ul5W#?)M5ib*QBN3<|fe}Od|53NoJ^G7+TwzYk>a`$+v{F?^-=3&U1dk=C zAknGMV%kNf!gBoYn{%9b-8Lp#QLd0cD?3-Ch?q#kgG8W$1V$x&U-Yg4iHqOaoXxqy zoS3z5K?-TQQ%%HOL`)(A6(r`BSw(TRG%QEz%gWC4bDmA~qFfdP(h;i;U{v;N@nPm&kEbqN~TAIKr6kE z*6Sdp8WE98#P>v?5+%&qXZ_kKg*QKTIS@RzfXr+D2 z+Go+KZOh*c*FLBqVXiswO6Kv@w&m-?wGR?#rH}Jf114VivT|}1^{7ddD~#~lPCeC? zo{CXP&z=*(z4m@0P(k9Yt4p|MyrR)3DWeY(XoXR!)C3})qw%Uc`9KAUdS4yLF=PAl zdk=X}(Ma7bLZB5!C0{W=j#=W# z%!vvTr4GEEW7dgpcIxWwq*Wi!wMd{9#+Xu<6Y(+;ZxDeB5*RT`eSOyeuR}OeW2>2+ zML`N{I+zVSnGH}u;=1%NS8!ZiG5U6|S~#mAfmT@4^lfz_s)htANSNz>?BhwNo~Mpn z8_b+YpcU41u*&dcm4ONp=1L*^pw*Hmt0g4R3Trx8k$JKrLj?(QosoUeZlds&a5sSj zTG=gl+02=Rm1xH@h~`>Ukib4qdz^mvC!eW4CE?K*_>SeN+!1&3m&B*1Dt!5mTYK#_ zx!-S_mU?-D%H7qLkMqj1HoaH$_txo&!EaqFB(}Y{%boK>x!kiJP;R29*qbyjHHLaC61V*$0R~1&LqY|J?01 z=CG^FF_6kJn#!?>N{$3tjeq=WcgM{o!@62T#3CYA5`hX5jhz-@Ex)S0*gg~p7i?F z5|JVT6(l-tnC&)r^xlxTm0GY7wcr+tL?qB^@pW&xf2#3eo4-xOI3gaW7DNS!?(JW9 zTi3idB)+5Ay{cLR5=CO_2|E&zDATFHU2sR^&7U(_=sW>K3@rZ!(gZH@{O8!n&Vw%gk) zM~{iG5-}@=K&vseN4w3sJkm@P$0*u=q-cMaViy%8a2-Tz>Iy}Lr7x?Ty(vPV)q?{E zyImjpdWH6Z1S&|Zd%TxBdE65zP2^HJI#D@(q>>|nRwq;)>Q>sdWreQYwnW@V#1BNE zf<)KE1Mc;&PE2WH47EpBYLDvFKafDHvnvmCyAIg4Lbv%KB5om~BN3<|(YNt~Zs``2 zQkv*Qu}g20C)T}|Wf5qF@kT2dB7UUU-89dRL?qU??c%okbw}usw#s>s)ckJ5f2RQ8`dS;_|$9Zr6Xx`=+kq2(%jWi0i7)TZF{J)E*XORYJ1G)TK>}lp-YdGes4(x+ z%Gp~Y1X?Zn{c^X?ACp2KNT7nmxu;&>=6885B;KKN%%O7dDgz0$YVpPuZl$JAhIQ4S zh(SbrO#~`PyzZ5C`_6t1+T+eJc9B4ZNWA+&Ik)TQ zuZ2V|#nrzQiI=>dWf5qF@kYN;@oTT-kk-=@chV{x6(n#MPJ5gSZcZL~;<3c{G~=Lx z1m=*gA@8f6JpG++iBepT?sCZpuYZjh*)LH!P(cFMD0GE| z#`a&Se|$~-0|~SmKIV{nq*d+E$M>{1=t=ALgG8W$M2)BRx$9rJJR}ZMwC|v3=N$_Y zXtk#EVRz(}wZppN{xLG_AE+RK`yHiZEy}A`B+v?XVM<+dR#9QOa+R~o(>f8?R9Ftb zXipn`-QCC{8wR9LHgG4%P)M|?ONfJm=ypLXyyGp)%|_rS*{-2=TYs>r`r9H+5;6NaK%C2tf8@F z42>ldsCJP+D_jSe_Taq%wg3TR@gsymwFZX_>ppj1X^JZ?Q)=kgk28YP2e67_ndoQ zUh7`*)pucBVXja?0(ZqqEul!9L6OKaClY8?uxgEa?uFaJ{(-w9RFJ^ky;A?Xw5YJ4 za^>s~sYfA!R@j4;>O@g;H$}<5m08wKxP86l?sFR#1v?0PkMj}jCQhYYQTvDOxI&^t z_7b=G{WAiZe*27k%po5WXvc!*LMz;n=@#Vu2S*|*NZ_tdDQpki(c?ZEbEtjD4iXh4 zj(UsTM$gR%+Z=b0NT3zwP^ot)cE?gVhEo4P1qr(x>|-<$<0GRFjySl}v+D{K+;g7( z{VVQsa~p@{SVBH{Cp?gRpn?SMij{heVpn!vNT3yt`Lr$}g0DvT6z!-Wfin^PE&xSI zQ;L$8KFdnrp7V+kPq^*wzc1LC;<}5j6wxSJmPXObB6|ZQHa#}RZFW!JW_oYHM0p}E zju2>tdmp8EH_?Uaigy#JAc6ZUDmf945%Dn9E|vrLxR^stj39!e1QjIKpEAbHANf!- zJ*$l+AGZ=wlX8UwT44_Da-f2QT@Ktq;@%1OYW~fg-TYQN!aXPMAW=aAcau6wIIeh1 zL;|g9z0%QLU;Bq}?|d`G)tyA}P8by=a92$4@Lo_<*qE;G9-%Q23ADl$2Ys)PqU0Zn z#LsDV#vSCdLv!6dm97hR5OyS9M8sYqqWfATet)W=oBv0@aR0%?&oKmA;Z8=kpzP>T zK>~M6nuy!i;*J$_X!}3~i65VB;1;~r&)1PSD(oM%DH4%DE6kzo0~I9favY{Mm%9MC zrpC1v?iuVm4X7YtugC_GkKPnlyrajx0s6x;DK(skene~}0`C>zDje7FN}&(DrjKh8 zT%*wM#E}oVE{X(N;XMnQafpzs&Zr=PYb|>o#I+BuQLJm$>i0qP6JSkX!@5ER30!d~#n(ljA%d@q;vNV0A~*-@ z7UUH&ua;0j0#^p~eFpOJ0{K`S@qskX+Isc+5)nL7qk@DzM{%^jPCmFj&nlqCXd5#!j7-9r_N3ir`nfG;RlNMKFdwcF^tR!#VuwRP$0AU`)> zvJHPFX?m*7{?-1J`{)aAbT?E#PcL6j;wQa zgVQ3!jf*=a@1v0cl_+s*7No4v#lOpDdHLu1luovTyn+lgONB%%@}o>_Ebc#Vvi zID%=hs`qoJbXxmxre=BHQ+uF-gn3(m@6q$WI0CJ1KTx+AAE+R~zriCp)IOvfNT3xT zmwL-2L_vbna$FPA9(XRa;^PuynS>}va9WOQLLw2*g;p4$hG-XwL?o`=_f9I)N0dOT zN=Lb-_{WZU z6KTzW3Z9qK5|wnNsCuhqw6^l7EE$AY1!oH0wTzCUsNi|I-h@^vuXL+rCsWBUppxS% zjORY7A3iQ+qVMTn-l~a|92F#jnKNDTvr4pDwlXYvlxP=P@o|%@cdEB)QZFnyDtO)? z9b57YBDCTapz*=6D037lcwS!5*@W~cB+!bFo4R5jNQi<2t{K_htVQu$XvN3v9wp_# zHn-R=l}&KHX)CVjcps?XdAZ(fLQ0MVTJdqIH@mJd zt}vFk-`GB+t~mNc;r)lCF^Ad*6Vdf9619x2D=hdr3365Qch_3XJ;B~Oj#S>_SYdcLyd!P~}q~2^IS`M+o z9NGjboEC!pNxFCftuTi+feI2_zIY$em7dfnu4HW=NT3y`Z66X>Jf2JZ;5g4?yG=-Y zpb{k{hdNi{1J_sR56@&1JaS5|a3#ZOIc^g?_KAYyAdZj46KKV0Ig?GGf&`B9Ho+sO zoC{YRoR;G@!DEytIBIiRj@tw(NZ<%=6FfT0xp36Ru~HM#=BPx8_%=r$NdMo)T^t{A zuWpwEl_(+QE1qClthmohS`#vgqJl)`C@Rs8R+uXskL_IX2q4~ZG{8}!cml0BEoZU` zRFJ^Y&L(gV7#&yakwHq11dceIwsYmi>?Wdp-X@yI5YgUc6Vig%Qqi_C#0_1CJGbww zn0TxH(Cnsr573vf_&0;-8ER&`DoB_wTd|L6M}{V@c%i-5^@;u#fmUVd7mjM2-8%Gf)~{6(-~Cd>J0)v~ zg9;MnyIAbw++_L04L^+Y+H4zO5omSAJv;o*2Fi7x-79xw|2wX;_e=A^4k}2PuV=B3 zdUv$UuGRl3@4x#WvIw*ac3$Z#Ea5MPc=U@Qbft*D(yP5^5b5hB)w=zcy{DjllKw1$ zX}Ru$xus`{?)fkKs{hqbK1T#9NF-j{;cr>TzmLOThk2>TyNOr+yf`^0LZB7ax>5-u z`V#Ro5vU;Xbb|pI8)iv36VWR|Ewb--UU%sAOZEDIU+UD*{Jm9rTHvMjG0u>~%ZRpEi zZ`F5BdaHi&%sGE$qg9!Cd;ME~%v%_e`6cYvDYLNB*z=Do?XOgu+`iSxmD(H?B(7hia;2SuHc!&JBxrLa z(5k{8D*O!|{;mPFd6HLh+~%kt!D-Xx6j$scSo=f?vBGE4gSAgm);_4TAv$5NMg}Z6(Lw~`2H5mtyz>$dFF(IM}t$m&)0u>}Mhf0m;@vb+URx)oy2(-eH zNU1xC=t0C@B2YmBYg(y4-#;yR4y|N1MhLXRkw~em4^B&Fhie~HkidwcUq$RuJ-M1z zG7HHE5@>}Z5j`VJ#24Y(2Nfjj9z`peV1(mxAc0oaxWa3nfZ)}Vr9h9uaYd;+N{&b@ z{(eUA1}N^G8hg9^A=?`TPif%}iJlj|s3`kWdKa0Wzd{9xO6$M#@4u>6_>5QT;-c&! z^hD#g5dy7B?bzgZo_JYEJT&-lLf()@1&Q{{zxIFXd6{{0GBJssf#helkwB})pRM=5 z^~#1sy>Ht){LW9CW5*JxAmO(D!tXk_Z1@&keIodsxEmt`T3y-sW52zU_wJs(r=OEe z@0e_uo|Qla3EW33HLzPhhrf7oVag`Zs&wC#{ zbH{JtJ6QC7l+%LB!QXm80J|R3Qb7u>2HyCl zU#`+eAwgg3N$?j>I1*7o!mIL@U;UfaVO`Pp022LU2(+4g&Fg;Yu?wYksXYc#d+=LA zs37syd$0Q!cU%~@`MV)8EJC2w3u_Df5~Zex#CLc1b55m5-1Ajd0u>}M#_0EJyZ3Vz zQzRZ6YZGWSe9Mdeo_EHDKBkk8?OUcNj%=ZCnSz2u_XE%PQ$tG4B-*!8w4;JV$3D;a`Dfn~67()W5WD=8Hxg)7WAs#i&1H{;ZBB1mB>2r@egYd6 zB+hyMY5$H_?g@!<=NDx^K~F9prAR~qt?bxcOVQpgeE%F3B>tH_!LM|rQRrg@jntcC zMryReuX@s#zs@Ym&MsRyyAnk^DoFgWbhN*}&6%MO?oqj6k3s^iCO<#K?|I`#;d|S& zsjg;IU42A#g$fdvw;bj#t-Ct>I?Nm*_$`PifmXji_@F=8zdIxrQMC7^{=sifqJl(; zUcG%atZVQtAwAztL_Z?~r!!}0(t>$$ z8O7Cxm$MS6Ab~MP-wGq*BqAoyvI(^Mz4Wov;HTv~EJ&b~s7Og;Cbe1`=~js#k5 zD*In*d{6nF436!nAkn|;52=FX@;#Yzs0FX1Nc^255ec-K|MuUhsh2z%ws{{ScrCh_ z2vm@0dE~p);)mqBIIq%rSH8W21X^Ld(Qo};Ff1|ry*IMw(-V!TAc5aTrmuJ$KAiX~ zr+nfW$`vX|U=Haz!@lay1@CrCtfVJ1kw7c^o6FNLxY=np;jzSI8W~VQ0&7~S9l!K) zO0}7m=s<72Ac0oc{z_f?-=V~e8kZ!VrE=g70{0?grvB)cC~Oq2Ma%T4;WYoaV`2xD z0~I9jP7}RfGNZk7b^e6J`$vx@kU*;m=kN9(pVKH@Q}52Z-+AbcDT$R-4pfl9HA?U$ zHfI`*?IqsJvIw;5f93c7u%eowj}g?PuA&|_;gzfeDoEVfc(dR8mdiq-9`$qCu^@p~ zz2g9bt#B7c@2gQcN>Dk*&!%^m z;4UJzGp@C0w@vflHB?vQ=Zw8FI({gMFfSgI3o!s1R2DoEhUiSEjfk1t|s z7i$!Ifl}3J9vn*Z;14uM;lB3Z;m`ecJIcoF&o8>LD7$8*%GrA(dmJP-Wv%tyMrVdQ zFJ8mdjM){T74EN;!rdJzNZ_tdsb8q%pHaydQte_naOaIVr1xtf5>Y|o((P;gb!E;B zqaAmUNT3zwkiHO0Em)6o#qaQ>s#4M+FJotJC#%>Vxg54-TcZC=zIey_xPVT~U;MkiMU|gyIVK zwH>?6_KQAQ80-gdUqZjaN9(Iq;hU_eAknd%hxOQ+5VbA{s-DoEhiMfam<6wRekbT5s& zNT5~yv&Z^1`kVog$or@*f_L?Us|LJFMFk1mEh$Cc z{!H9OZO(73V>xjDi8)lN6%oCN*g*s;Ncc~8@zrA;!>_}-=XHMJ+;m)h}e+~VfU3Y~$NZb#if&}gjgLn1QyCNjeD)IMK zew~s(hC5-|*H)$2MFk1m)bpV~g5wIyfxAh}p;EVy5B>`6b|O$gVtUWh{mobQ_w`P=I0CIOhx9EA^3gT)feI3K zIb?;*SLkttj4N5(0Vvgvd`u)CJhr2PguNo;H8p>g>tq_?aBqPA@JveKDjcu;* z0s7<28M>!aET3yJS=j{_Z(n5k>_GTx$hibV$foBXI45 zYZSZ!O!x!V=C=GI@1@eQ9;69$nHsNnDn;MycbZc<_?!KxAkm=3aDUIF55w!CZHeHW7k_aP3ADm1o=VlBmE~hl|TgvdlbEqe7NM}0Qo>G%oVN-%xn<7%8Bz5&R2GO;B`^7!mGH3;68{75;*S$ z-^EE^9mIJM=PSI5M|bWrx3@dJ&Nyl-buang-D zyHAjhsx)3zr)#fBU`^Y#yRUX7uj)6$gFE~Bi4FZsV)Q9Aev4B7LU$a&3KEjm#E^b_ zyklj%2R=}dG(XpePo&X4su%*TB&~g%menx1h29P4r?ya$H2aVz(lQBD;s~bcssWYZ z70Ma=Ktj@NCC`^>A4s4QM`$117F@&Z0|`m96+T}^PnZ@%pp~R`u0kSs{u~uaOF873 z{j`q^f^#KSlGZ-@4IYpjdiBczAqt-tzh@}Niziq?LeiQjzb!Ah!C4>pKtCb7k1DOJCzmG@fe$1k%~tYTd)fyQ zsKgQ4M-~-j1Fb{397sr-t>oAFv=1aui6gX+R#(654IVro@PUM+*-Cz$Py0Xul{iBC z=y>j?!lP3k3497#-Kr{xy_Y1KFM_9n-uJSBKb}OUFPn0;iR9o@!{Orx){iu0UZePY_;Ig2C=hbQXZ9uLo zdP^w5Pi$op+RFYVMbc7qij!MJi>-VFCfY`O-%>dE5f->QiFaU_K6|4m)A0QDT-&o-t z2mpdMH_!DcAgmezgrmd|Xoc^U0YEI8#CWj@w89bG z*z-MgY$;imAnWet<>pn?ScX1TFvAE+RKzYcB_s33vA!)+6&Ac4PlZ4=lY z_-mV3(>8$$68L+d#S>_Szfx)wsNnCVqHmkPh{HE0F+yzu6(sQ8&f*EQ;xiRD?iwZf z?yEdO8|+vd+D8R@1KgkETU&BmuM=rkltHj!5#d|S7U6M;#43Y;cg)hc$|S&wbH#5v zX&a zpY8Un@jeWFMVb4kXa3^|Vvn{9b;H4^)tleRQS|B+%;M`^ug3s30Nx z=u96-pw;C0dvaQLT_58E6(nRIo#_J!w3;~glblMkHpcis1qsva7F1wn`6p>1X>+kdQ~dE1yMnwbot!WsyT6Sg#=oay>(D3 zJ`zzu;*=?)Q)QBI{R0WKdV2oURD6#@1&La;fBvib$1!z<1X^t$urL)rGN6J)&E4;% zjy8%LuaH2isSQ3%#gA~PAR$-oGvf*gw5r$ot5p0*jS3RH8sICpnLdy}tC_$4>c`JG zs33uBA~TZky4@mRO+|Ae?JTd2$rUPiUOv;kC*Kf5pn`;~gEC8Q5wHsDQTBj;+83>2 ze4v8om32_24MaF9_i9TFw znNo1Hqk;sloXkq!F!>HDNYtOGa^oWr3AB=8FU5|Kcw;@bliBuk-c1isurzZDUkdQQ6;k;`TsKgQ4M=83b|5bRe2nk8E70$bKM+pd2 z;t1`7?qE4`&kG4jvlY&}N+E$t9HD*Coj6DC-60`qw!(QgxZ9T|P>Cb7kBhhEIcvjv zkVr_Ht?al$0+l#I`_LnU-gC;zk`-CWa$1gKAG8TpkdU+xbiY9U@pVeM2LabCgX@>U z@%h1>hB$(hC=py+&Lqs;4C`uk`YuQD1p9z1+v&6>xDa8^Feh+D*yONyf)%(ToK9yF zm=n5tl5r)yc!Ct`n!eCL1lJj?tK`@=oGWOLpyUyPeMDLl2pu81*(0Tu_K%c2j^O-C zPWXO=q%+FFrIquh+nMh)$noL{E=MF{;>!`O(X>CicA*?;f_+F%ipf>bM`RDk{SHTJ zIW9fQL?S9kNZKNF3+6ASx~fI@=r~t8{o;#vyDER2Ij$Qnyc%UGF+@OzM3^%?7o`if z|Kg&*ARQqvS2mHRiNKKo2~J;^tIGjpiY1H{5_O2qbHn^g-mKE{c|)tV(p!t~hp0T?xblC=nt}hvs3=wXDPk z_Z5js-5v}H0ZN)ig3{t6=;u-nj6_`~om(uq%s8Nsk929Vd}_rLS9;Y(>FdyGT>hUGv4m3V@E^u430)3RI5zy}g0o#&o3^(ps}OPhs0kU%A# zU>}wG_Hs(h`!u*KgM>-vxtq#Na&NshJM@7BD)9vSs8;Dw=fsL{6mozeVbXc-^vM(5 zVO1K3K9E2qo?ss@RU7QQ-*s4U&kG5Y&U4=?_oUms;?^W36=FSvc4uNV420+o1zee`o? zCr-Gef8YZNlg@K{cA4%Dd%AAu0|`{(3HG7?>5%~mlg@KrD0mfoAc0Ce5thS~av)*S zd2Wd(=0IIhIno3w@kH1jNofxxOghhQu+rHCY|SY>$3>@AQGs=6YPU}ZBqI<5+!Pp}V~4Lq4YkTB^ym=o(p z2s8K9g`6P4KFq&-$ILQy?Y^C!;n;`yM?Du5(+BIu_FCp_!t^Md+oL|P97veHay$a9 zOua=3RFE)z<#+^InbwRFs32kb%JB%aGEo^NP(i}=PwWLBgybjz^%CnMI=nDoB|1!|@2TGOGbigzM=b;Ca0p?g7Fzu3jzc5j*vI@t&ft@R}OX2g%?nUQH*6lW7mjemd6=meglvehf>;raQ$020r zrAuC1u4JzU=MCyG-0AVC6Y+tB><7oW>78W;k*-BLuTJY-QTqBr(0F&zZvz(5bK!bd zB=uu<+il7}V`|zWEG5_#VO^QprSGeUK5T+Zjzs7?@Nt;l`Jq22lh9UtJRJ)eL|O@I zRLV3iLQtubl(U3&E+T9icfvx*H5nZxTvyu4I#ZA$MrQ6H89gc(tz zgrxvs#>XgODL|O~aIW)6-LmI8#1vAB}kgc*Iz$|>r@QegBk>!2uMDL|N2O_Z<{Aj}#iN>~aIW+f9P zECmRwKUzI1lhD1^tfHbmEG6)v3A46~5|#plS#d@QO98?fV}f$f0aif{(Fe~qX2y|RF`?6ZCY)=PLL#l;c`2Pf9^{Hk zEi+D9L92ic=Xs0J(SR!eozBcvybrEvL#KTQKH|$^Ru)zrW)M<8JgTM78?=q7U0BJe zi&vg>-EQ~Le?wL%O8>R=M_d}_{$Y<7`JXvHR&*2mk_spM6rC%uF0sdLH4KjFD_ znthyi!TBruwEjChj)bjb5;}+N=^f!y%5@KXAR%eCTDHCH%DNBz8Tvp1l{iBCC`Io( ze@~IfExx*X+K4li{m^nt{A7Z@du&^}Hm*F8Cap4(<0NJyHk7LU4!%CSH6fdndX zg!WO1p4Z+`M?a^Jgrv2Vjs@Ll!NT3o&Xdhe#&KdhaLegxt@r$v(>4Qk15=Uqs+!kEJ>;nl& zYb$JXBrqD{2u+)qVlUikTf?|AEhxt&uJqMlwzriiA<^@|>gy8kmKhe5L#dAB1b3XS})j79* zoVq=pfB4BiF8=(xear}HNJKXA?$;hW`pWIgTOZU!R&T$5_`~yCU%s{YTO(){**-qs zo`1LbQNO8)EFa&z{-g8n{rLUG#~MMa$oBDi8>gSY`OJ2{q9(GV<~WT6<1r%=bM+um zynGQ4#-{xXR@>k0L-xCbH5JX!{{7X@ys-I1i@V9MU*y$mFMR{!`N*(2M7M$t!nY!IC}aoHM_(I%gWhipR>$Y2M13!AK8~!R!gp2J;ahdglRpyW`_5UYhO|kY`4YR-;-A( zVGRk({#`khejFU!ZO_WeVp%Qu!9#yPp6^R~%}BT($|nLZn_W#4!o^`gYUY6C8 zU%&X+$(Mfe#_~IfUNaKz2j>zJk!AJx6OW$!?BU`205%$q46PHrUAQ9PCj5!Hr z!;COp8KP|Y)XDuDubo>{5zOz&t7Ksj*7QVW&%atfKDYecwpw-n#@pv6EX$u-_}tka zmfuPAnvrm8m(kts%1A_(l}7sT&hHl=B&eAY_OWEi)(45m?#H7i*RKC|@j*hl6wQpV zkLCS1)7X-TEGuRH;hmd{4-(YO2>WQUIBFxj^+6)Ct(*&v6A5O+j4-YCx7=EG$@h*G zb89Msn!73&X2fom^x5-9Tc57H`OLN-nnmy5xV`nES@b&}{%P^&-~FT+Aq|PhCYIG; z+Yf3Yt4~@>e)ICXi@!C3R*~&vS=F{asEI5eS`*)Y;hn|D8bPbb_MvlgTc@@@sEO>@ zFdifrsTpCqpG!3Esp(d19H&%kXN23kOWalc23Wo-JcM> zW+dE?WuLh9K_arOv;#c6^WVh>32J79eQ14Zv%}U0iO90jPWIaM|13U8P%|U!L+ewU z<+kq!iO90jj{NY>KNcS(sF@M=q4lY)I$IwkBHPNj;K-6-Hp~dq{mk&>xngcjMNntz z%7qzW?<6c=v}%)n=yX>%3YO(hC%qc0){hIK*NlW)+eUYjc#w!JE1g&?<|L?@5%$rt zWRtui5m{C`c~|a|pk_wcN6U8A8Me7gBC`8&cwX-y3Dp*&nGyEU-t)7(=OiNAiZLg_ zY?u+IYkg9_C~96m5`SCycW23ru%==j+P^>F)~B1xysK(d)x48UBAZyM zYTI~F6IuOGO|I6cHG)==?W3(~swZxJP!m}`R9mcdca5M`WcxU4<8*6T$##)Cv6 zsAtUx)BVhF^&%dOjjFY4`x0s@nxWl~ewT6WBCk|+uJQ5j>x48UBAZyM=i7Kt6Is1g z?Y&~YM$jsBg+)b`sRg z2>akJgG6Lm>E^H2C=%4n2>akJgG6Lm=?1gbS`yUE2>akJgG6LoF|s6>4Ku=YKbL&E zeZ!D_Nky=I1;72>**+tzAz|6S>)f2PTE3I8roMpC&3KI!iC!}j?gw`nBqGa7H~bZI z64cBH`&e!PwsQ%I$gSM{d?>^Z&6c3R)+lqtuoJ#1Y4DOj4kY2RV^Wr zksf_;tZ0>S+fV3*KXWkqRBh5&^_n95{%3A4M(c=I0DIph>RcNpL^MTYUK#t*Yl_Hh zHxj+3h|Iww(QAsx$}kelhOD)=V!ox{yO~HrvhEN@ADrQOtNIS8Jj6%tyhy0Ex;L2n z2th05f^Gpuf^Fa3am@R{mXMIF%Khl0*KohXvqAM;dBtbZinrlCK}``kC(K$^1g#{` zdrl3BREZ<{hbASPNKKs{RfHMtGK`(Nu_w3_yzj~OOjC;!`^+ah%q}no$6i?S*4z6qDH-X z;hvX{E zwVcjfSTV{(-oDU^w`U}BYb77KU2<>N2;QZT$i2~Qtm;{`$}P}H^cwc5o>aY1UUBYI ztLl!HvuiOLtJ09rh}7*XiQN?^tBmHZ`JRCqt|gjXKc1kKW}^8ngBlXb#E&O>D}Euw zo@*}2muEe}FH(A#Lx8QrW9jnrmaFIk=u%quvvY2MNvdYyGHa(MoGcjazwX z|6X{f;TLW7q_X$uQbWRDH_jrsOE~7t>0KY!S|%nl>O1ZAU3jl4Lg&QfLhqv|X!Rhc z2|icn-TCPDn)0DD?mU9MrU;#JD`ToBr$@b}2%UtJZ)NWYa&#rNlDd!HJPEpvPqp`mq?XjKS8ThMMk36 zR2`1KtKThxU8`~`)^nB9b%#()PxMwk-H)wGjbwbTYaIKDR6=YeB31RiReslGl~b_^ zj>0aHXOYM$eAcRZ7OhgT7>T^K*7%J|tMsmnME(+Km&hEmpP*H04kN)4q8J6RsMKK2m{_W|ye%Na=$_>P&vF>p`QB z?5U+monb$bzs;Btxh1bQIos)-x36nG&%RwgvZsze?fTuq@^ZRiKS*TPzn`F0KMK1( za%W0Ha(*v+^_(aJT4(FZewIVOMgB{_XiLn1rm(Fcj%%IA-f$QehPp78E` zMwF%}ywl%Ls4iB2d*E}zj3`acBDN~uHBx@hOG6^(otcj!Xq7Y7NKlh=+x}MN3@EFd z4NW{qJV@mHIkt)sq*cziBhhPo!hY~p<>YO`XZ6tsTa^>NteByF1UchKuDO=qh!>;X zYiWAoUaKJZZ%@kJSyDu*^=`ZCL1RBs5t1gAqWwf_OS?p>RHF|Pv`T${Bzg_|wAK%f zRVsygE=Ro|t6sye{9RidTa_< zrK1mJc+MYsyYyv+t!iB<56;BWkkA{fZzg6wilCKd34H-E64azxzrR(f{L4zST|M_f z)>;ypQP=uW&!UxP?Haclt9!FMM;pY1io)mR@ wDXThJ?zXB Date: Sat, 10 Feb 2024 23:37:54 +0100 Subject: [PATCH 02/56] Manufacturer name change --- resources/definitions/zyyx_agile.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index 4f57045e40..21c511f9a6 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -1,12 +1,12 @@ { - "version": 2, + "version": 3, "name": "Zyyx Agile", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "Magicfirm Europe", - "manufacturer": "Magicfirm Europe", + "manufacturer": "ZYYX Labs AB", "file_formats": "application/x3g", "platform": "zyyx_platform.3mf", "has_machine_quality": true, From bfe4f3144417f1ac48072bbe84b4e36f8f508a88 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Sat, 10 Feb 2024 23:41:16 +0100 Subject: [PATCH 03/56] Moved profiles to another folder --- resources/variants/{ => zyyx}/zyyx_plus_0.4.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_carbon0.6.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_ii_carbon0.4.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_ii_carbon0.6.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_ii_carbon1.2.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_ii_multi0.2.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_multi0.2.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_multi0.4.inst.cfg | 0 resources/variants/{ => zyyx}/zyyx_pro_multi0.8.inst.cfg | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename resources/variants/{ => zyyx}/zyyx_plus_0.4.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_carbon0.6.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_ii_carbon0.4.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_ii_carbon0.6.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_ii_carbon1.2.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_ii_multi0.2.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_multi0.2.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_multi0.4.inst.cfg (100%) rename resources/variants/{ => zyyx}/zyyx_pro_multi0.8.inst.cfg (100%) diff --git a/resources/variants/zyyx_plus_0.4.inst.cfg b/resources/variants/zyyx/zyyx_plus_0.4.inst.cfg similarity index 100% rename from resources/variants/zyyx_plus_0.4.inst.cfg rename to resources/variants/zyyx/zyyx_plus_0.4.inst.cfg diff --git a/resources/variants/zyyx_pro_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_carbon0.6.inst.cfg rename to resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg diff --git a/resources/variants/zyyx_pro_ii_carbon0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_ii_carbon0.4.inst.cfg rename to resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg diff --git a/resources/variants/zyyx_pro_ii_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_ii_carbon0.6.inst.cfg rename to resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg diff --git a/resources/variants/zyyx_pro_ii_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_ii_carbon1.2.inst.cfg rename to resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg diff --git a/resources/variants/zyyx_pro_ii_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_ii_multi0.2.inst.cfg rename to resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg diff --git a/resources/variants/zyyx_pro_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_multi0.2.inst.cfg rename to resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg diff --git a/resources/variants/zyyx_pro_multi0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_multi0.4.inst.cfg rename to resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg diff --git a/resources/variants/zyyx_pro_multi0.8.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg similarity index 100% rename from resources/variants/zyyx_pro_multi0.8.inst.cfg rename to resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg From f1f0f044c45b1cb509c151fc7553988467ee29b2 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Sat, 10 Feb 2024 23:59:33 +0100 Subject: [PATCH 04/56] moved zyyx profiles into subdirectories --- .../quality/{zyyx => zyyx_agile}/zyyx_agile_global_fast.inst.cfg | 0 .../quality/{zyyx => zyyx_agile}/zyyx_agile_global_fine.inst.cfg | 0 .../{zyyx => zyyx_agile}/zyyx_agile_global_normal.inst.cfg | 0 .../{zyyx => zyyx_agile}/zyyx_agile_pro_flex_fast.inst.cfg | 0 .../{zyyx => zyyx_agile}/zyyx_agile_pro_flex_fine.inst.cfg | 0 .../{zyyx => zyyx_agile}/zyyx_agile_pro_flex_normal.inst.cfg | 0 .../quality/{zyyx => zyyx_agile}/zyyx_agile_pro_pla_fast.inst.cfg | 0 .../quality/{zyyx => zyyx_agile}/zyyx_agile_pro_pla_fine.inst.cfg | 0 .../{zyyx => zyyx_agile}/zyyx_agile_pro_pla_normal.inst.cfg | 0 .../quality/{zyyx => zyyx_plus}/zyyx_plus_flex_normal.inst.cfg | 0 .../quality/{zyyx => zyyx_plus}/zyyx_plus_global_normal.inst.cfg | 0 .../quality/{zyyx => zyyx_plus}/zyyx_plus_pla_normal.inst.cfg | 0 .../quality/{zyyx => zyyx_pro}/zyyx_pro_02_normal_pla.inst.cfg | 0 .../quality/{zyyx => zyyx_pro}/zyyx_pro_04_normal_pla.inst.cfg | 0 .../quality/{zyyx => zyyx_pro}/zyyx_pro_06_normal_pla.inst.cfg | 0 .../quality/{zyyx => zyyx_pro}/zyyx_pro_08_normal_pla.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_02_pla_normal.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_04_pla_fine.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_04_pla_normal.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_04_pla_quick.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_06_pla_fine.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_06_pla_normal.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_06_pla_quick.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_12_pla_normal.inst.cfg | 0 .../{zyyx => zyyx_pro_ii}/zyyx_pro_ii_global_normal.inst.cfg | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_global_fast.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_global_fine.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_global_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_pro_flex_fast.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_pro_flex_fine.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_pro_flex_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_pro_pla_fast.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_pro_pla_fine.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_agile}/zyyx_agile_pro_pla_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_plus}/zyyx_plus_flex_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_plus}/zyyx_plus_global_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_plus}/zyyx_plus_pla_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro}/zyyx_pro_02_normal_pla.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro}/zyyx_pro_04_normal_pla.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro}/zyyx_pro_06_normal_pla.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro}/zyyx_pro_08_normal_pla.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_02_pla_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_04_pla_fine.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_04_pla_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_04_pla_quick.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_06_pla_fine.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_06_pla_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_06_pla_quick.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_12_pla_normal.inst.cfg (100%) rename resources/quality/{zyyx => zyyx_pro_ii}/zyyx_pro_ii_global_normal.inst.cfg (100%) diff --git a/resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_global_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_global_fast.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_global_fast.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_global_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_global_fine.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_global_fine.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_global_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_global_normal.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_global_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_pro_flex_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_pro_flex_fast.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_pro_flex_fast.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_pro_flex_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_pro_flex_fine.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_pro_flex_fine.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_pro_flex_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_pro_flex_normal.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_pro_flex_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_pro_pla_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_pro_pla_fast.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_pro_pla_fast.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_pro_pla_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_pro_pla_fine.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_pro_pla_fine.inst.cfg diff --git a/resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_pro_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_agile_pro_pla_normal.inst.cfg rename to resources/quality/zyyx_agile/zyyx_agile_pro_pla_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_flex_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_plus_flex_normal.inst.cfg rename to resources/quality/zyyx_plus/zyyx_plus_flex_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_plus_global_normal.inst.cfg rename to resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_plus_pla_normal.inst.cfg rename to resources/quality/zyyx_plus/zyyx_plus_pla_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_02_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_02_normal_pla.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_02_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_02_normal_pla.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_04_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_04_normal_pla.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_04_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_04_normal_pla.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_06_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_06_normal_pla.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_06_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_06_normal_pla.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_08_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_08_normal_pla.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_08_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_08_normal_pla.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_02_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_04_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_04_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_04_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_04_pla_quick.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_06_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_06_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_06_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_06_pla_quick.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_12_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg diff --git a/resources/quality/zyyx/zyyx_pro_ii_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_global_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx/zyyx_pro_ii_global_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/zyyx_pro_ii_global_normal.inst.cfg From 96e76eaa50658dcb8f994bc930feea87ce96d9ac Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Sun, 11 Feb 2024 00:16:45 +0100 Subject: [PATCH 05/56] zyyx+ and agile quality now has subfolders --- .../zyyx_agile/{ => fast}/zyyx_agile_pro_flex_fast.inst.cfg | 0 .../zyyx_agile/{ => fast}/zyyx_agile_pro_pla_fast.inst.cfg | 0 .../zyyx_agile/{ => fine}/zyyx_agile_pro_flex_fine.inst.cfg | 0 .../zyyx_agile/{ => fine}/zyyx_agile_pro_pla_fine.inst.cfg | 0 .../zyyx_agile/{ => normal}/zyyx_agile_pro_flex_normal.inst.cfg | 0 .../zyyx_agile/{ => normal}/zyyx_agile_pro_pla_normal.inst.cfg | 0 .../quality/zyyx_plus/{ => normal}/zyyx_plus_flex_normal.inst.cfg | 0 .../quality/zyyx_plus/{ => normal}/zyyx_plus_pla_normal.inst.cfg | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/zyyx_agile/{ => fast}/zyyx_agile_pro_flex_fast.inst.cfg (100%) rename resources/quality/zyyx_agile/{ => fast}/zyyx_agile_pro_pla_fast.inst.cfg (100%) rename resources/quality/zyyx_agile/{ => fine}/zyyx_agile_pro_flex_fine.inst.cfg (100%) rename resources/quality/zyyx_agile/{ => fine}/zyyx_agile_pro_pla_fine.inst.cfg (100%) rename resources/quality/zyyx_agile/{ => normal}/zyyx_agile_pro_flex_normal.inst.cfg (100%) rename resources/quality/zyyx_agile/{ => normal}/zyyx_agile_pro_pla_normal.inst.cfg (100%) rename resources/quality/zyyx_plus/{ => normal}/zyyx_plus_flex_normal.inst.cfg (100%) rename resources/quality/zyyx_plus/{ => normal}/zyyx_plus_pla_normal.inst.cfg (100%) diff --git a/resources/quality/zyyx_agile/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx_agile/fast/zyyx_agile_pro_flex_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx_agile/zyyx_agile_pro_flex_fast.inst.cfg rename to resources/quality/zyyx_agile/fast/zyyx_agile_pro_flex_fast.inst.cfg diff --git a/resources/quality/zyyx_agile/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx_agile/fast/zyyx_agile_pro_pla_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx_agile/zyyx_agile_pro_pla_fast.inst.cfg rename to resources/quality/zyyx_agile/fast/zyyx_agile_pro_pla_fast.inst.cfg diff --git a/resources/quality/zyyx_agile/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx_agile/fine/zyyx_agile_pro_flex_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx_agile/zyyx_agile_pro_flex_fine.inst.cfg rename to resources/quality/zyyx_agile/fine/zyyx_agile_pro_flex_fine.inst.cfg diff --git a/resources/quality/zyyx_agile/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx_agile/fine/zyyx_agile_pro_pla_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx_agile/zyyx_agile_pro_pla_fine.inst.cfg rename to resources/quality/zyyx_agile/fine/zyyx_agile_pro_pla_fine.inst.cfg diff --git a/resources/quality/zyyx_agile/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx_agile/normal/zyyx_agile_pro_flex_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx_agile/zyyx_agile_pro_flex_normal.inst.cfg rename to resources/quality/zyyx_agile/normal/zyyx_agile_pro_flex_normal.inst.cfg diff --git a/resources/quality/zyyx_agile/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx_agile/normal/zyyx_agile_pro_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx_agile/zyyx_agile_pro_pla_normal.inst.cfg rename to resources/quality/zyyx_agile/normal/zyyx_agile_pro_pla_normal.inst.cfg diff --git a/resources/quality/zyyx_plus/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/zyyx_plus_flex_normal.inst.cfg rename to resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg diff --git a/resources/quality/zyyx_plus/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/zyyx_plus_pla_normal.inst.cfg rename to resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg From 9de934057b12fde57aed2e36d6399cd91a63cace Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 20:56:51 +0100 Subject: [PATCH 06/56] restricted Zyyx+ materials --- resources/definitions/zyyx_plus.def.json | 177 ++++++++++++++++++++++- 1 file changed, 176 insertions(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 378ec9bd9f..e205c7f2f1 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -14,7 +14,182 @@ "machine_x3g_variant": "z", "preferred_material": "zyyx_pla", "preferred_quality_type": "normal", - "quality_definition": "zyyx_plus" + "quality_definition": "zyyx_plus", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pla", + "generic_pva_175", + "generic_tpu_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pa6cf", + "emotiontech_pa6gf", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "ideagen3D_ToughPLA", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "ultimaker_abscf_175", + "ultimaker_absr_175", + "ultimaker_rapidrinse_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_pahtcf15", + "xyzprinting_pc", + "xyzprinting_petcf15", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_ppgf30", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_petg", + "zyyx_petg-cf", + "zyyx_pro_flex", + "zyyx_pro_pla", + "zyyx_procarbon", + "zyyx_proglass", + "zyyx_pronylon" + ] }, "overrides": { From 66c6f5967502e9ba6724635e26e86d098c50c3e2 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 21:56:21 +0100 Subject: [PATCH 07/56] Added quality presets to zyyx+ --- .../fast/zyyx_plus_abs_fast.inst.cfg | 26 +++++++++++++++++++ .../fast/zyyx_plus_flex_fast.inst.cfg | 26 +++++++++++++++++++ .../fast/zyyx_plus_pla_fast.inst.cfg | 26 +++++++++++++++++++ .../fine/zyyx_plus_abs_fine.inst.cfg | 26 +++++++++++++++++++ .../fine/zyyx_plus_flex_fine.inst.cfg | 26 +++++++++++++++++++ .../fine/zyyx_plus_pla_fine.inst.cfg | 26 +++++++++++++++++++ .../zyyx_plus/normal/zyyx_plus_abs.inst.cfg | 26 +++++++++++++++++++ .../normal/zyyx_plus_flex_normal.inst.cfg | 3 +-- .../normal/zyyx_plus_pla_normal.inst.cfg | 3 +-- .../zyyx_plus/zyyx_plus_global_fast.inst.cfg | 14 ++++++++++ .../zyyx_plus/zyyx_plus_global_fine.inst.cfg | 14 ++++++++++ .../zyyx_plus_global_normal.inst.cfg | 2 +- 12 files changed, 213 insertions(+), 5 deletions(-) create mode 100644 resources/quality/zyyx_plus/fast/zyyx_plus_abs_fast.inst.cfg create mode 100644 resources/quality/zyyx_plus/fast/zyyx_plus_flex_fast.inst.cfg create mode 100644 resources/quality/zyyx_plus/fast/zyyx_plus_pla_fast.inst.cfg create mode 100644 resources/quality/zyyx_plus/fine/zyyx_plus_abs_fine.inst.cfg create mode 100644 resources/quality/zyyx_plus/fine/zyyx_plus_flex_fine.inst.cfg create mode 100644 resources/quality/zyyx_plus/fine/zyyx_plus_pla_fine.inst.cfg create mode 100644 resources/quality/zyyx_plus/normal/zyyx_plus_abs.inst.cfg create mode 100644 resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg create mode 100644 resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg diff --git a/resources/quality/zyyx_plus/fast/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/fast/zyyx_plus_abs_fast.inst.cfg new file mode 100644 index 0000000000..6a03d0f5bf --- /dev/null +++ b/resources/quality/zyyx_plus/fast/zyyx_plus_abs_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fast ZYYX ABS +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fast +weight = 0 +material = zyyx_abs-mm + +[values] +wall_thickness = 0.8 +top_bottom_thickness = 0.8 +infill_sparse_density = 10 +default_material_print_temperature = 240 +material_print_temperature_layer_0 = 250 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +adhesion_type = brim +material_flow = 95 +raft_airgap = 0.15 diff --git a/resources/quality/zyyx_plus/fast/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/fast/zyyx_plus_flex_fast.inst.cfg new file mode 100644 index 0000000000..558fdf6060 --- /dev/null +++ b/resources/quality/zyyx_plus/fast/zyyx_plus_flex_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fast ZYYX Flex95A +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fast +weight = 0 +material = zyyx_flex95 + +[values] +wall_thickness = 1.2 +top_bottom_thickness = 1.0 +infill_sparse_density = 15 +default_material_print_temperature = 210 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.0 +retraction_speed = 15 +speed_print = 20 +speed_wall = =math.ceil(speed_print * 15 / 20) +speed_wall_x = =speed_print +adhesion_type = brim +material_flow = 105 +raft_airgap = 0.2 diff --git a/resources/quality/zyyx_plus/fast/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/fast/zyyx_plus_pla_fast.inst.cfg new file mode 100644 index 0000000000..1e93e732d8 --- /dev/null +++ b/resources/quality/zyyx_plus/fast/zyyx_plus_pla_fast.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fast ZYYX PLA +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fast +weight = 0 +material = zyyx_pla + +[values] +wall_thickness = 0.8 +top_bottom_thickness = 0.8 +infill_sparse_density = 10 +default_material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +adhesion_type = brim +material_flow = 95 +raft_airgap = 0.15 diff --git a/resources/quality/zyyx_plus/fine/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/fine/zyyx_plus_abs_fine.inst.cfg new file mode 100644 index 0000000000..a1ef9dfafc --- /dev/null +++ b/resources/quality/zyyx_plus/fine/zyyx_plus_abs_fine.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fine ZYYX ABS +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fine +weight = 0 +material = zyyx_abs-mm + +[values] +wall_thickness = 1.2 +top_bottom_thickness = 1.0 +infill_sparse_density = 15 +default_material_print_temperature = 240 +material_print_temperature_layer_0 = 250 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +adhesion_type = brim +material_flow = 95 +raft_airgap = 0.15 diff --git a/resources/quality/zyyx_plus/fine/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/fine/zyyx_plus_flex_fine.inst.cfg new file mode 100644 index 0000000000..38bf0a87b5 --- /dev/null +++ b/resources/quality/zyyx_plus/fine/zyyx_plus_flex_fine.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fine ZYYX Flex95A +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fine +weight = 0 +material = zyyx_flex95 + +[values] +wall_thickness = 1.2 +top_bottom_thickness = 1.0 +infill_sparse_density = 15 +default_material_print_temperature = 210 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.0 +retraction_speed = 15 +speed_print = 15 +speed_wall = =math.ceil(speed_print * 15 / 20) +speed_wall_x = =speed_print +adhesion_type = brim +material_flow = 105 +raft_airgap = 0.2 diff --git a/resources/quality/zyyx_plus/fine/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/fine/zyyx_plus_pla_fine.inst.cfg new file mode 100644 index 0000000000..960c603302 --- /dev/null +++ b/resources/quality/zyyx_plus/fine/zyyx_plus_pla_fine.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Fine ZYYX PLA +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fine +weight = 0 +material = zyyx_pla + +[values] +wall_thickness = 1.2 +top_bottom_thickness = 1.0 +infill_sparse_density = 15 +default_material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +adhesion_type = brim +material_flow = 95 +raft_airgap = 0.15 diff --git a/resources/quality/zyyx_plus/normal/zyyx_plus_abs.inst.cfg b/resources/quality/zyyx_plus/normal/zyyx_plus_abs.inst.cfg new file mode 100644 index 0000000000..83d6efcbad --- /dev/null +++ b/resources/quality/zyyx_plus/normal/zyyx_plus_abs.inst.cfg @@ -0,0 +1,26 @@ +[general] +version = 4 +name = Normal ZYYX ABS +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = normal +weight = 0 +material = zyyx_abs-mm + +[values] +wall_thickness = 1.2 +top_bottom_thickness = 1.0 +infill_sparse_density = 15 +default_material_print_temperature = 240 +material_print_temperature_layer_0 = 250 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +adhesion_type = brim +material_flow = 95 +raft_airgap = 0.15 diff --git a/resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg index 61b629c815..bc4b4208af 100644 --- a/resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg +++ b/resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg @@ -4,14 +4,13 @@ name = Normal ZYYX Flex95A definition = zyyx_plus [metadata] -setting_version = 19 +setting_version = 20 type = quality quality_type = normal weight = 0 material = zyyx_flex95 [values] -layer_height = 0.2 wall_thickness = 1.2 top_bottom_thickness = 1.0 infill_sparse_density = 15 diff --git a/resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg index 41a2acdbee..6dc488c722 100644 --- a/resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg +++ b/resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg @@ -4,14 +4,13 @@ name = Normal ZYYX PLA definition = zyyx_plus [metadata] -setting_version = 17 +setting_version = 18 type = quality quality_type = normal weight = 0 material = zyyx_pla [values] -layer_height = 0.2 wall_thickness = 1.2 top_bottom_thickness = 1.0 infill_sparse_density = 15 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg new file mode 100644 index 0000000000..d9b586b5b9 --- /dev/null +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Fast +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fast +weight = 0 +global_quality = True + +[values] +layer_height = 0.2 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg new file mode 100644 index 0000000000..084742cad4 --- /dev/null +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Fine +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fine +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index 43c4ce8bca..62ae1b30cf 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -11,4 +11,4 @@ weight = 0 global_quality = True [values] -layer_height = 0.2 +layer_height = 0.15 From 6feeaf0f0c1d1e6ec3cbee00a42b98510fb9891f Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 23:16:01 +0100 Subject: [PATCH 08/56] removed generic pla from zyyx --- resources/definitions/zyyx_plus.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index e205c7f2f1..c77a7fcbcd 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -32,7 +32,7 @@ "generic_nylon_175", "generic_pc_175", "generic_petg_175", - "generic_pla", + "generic_pla_175", "generic_pva_175", "generic_tpu_175", "goofoo_abs", From 81203b6eff7f40289a683756cc12372dc8950468 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 23:18:36 +0100 Subject: [PATCH 09/56] removed obsolete settings --- resources/definitions/zyyx_agile.def.json | 1 - resources/definitions/zyyx_plus.def.json | 1 - resources/definitions/zyyx_pro.def.json | 1 - resources/definitions/zyyx_pro_ii.def.json | 1 - 4 files changed, 4 deletions(-) diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index 21c511f9a6..e245e48871 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -55,7 +55,6 @@ "speed_wall_x": { "value": 35 }, "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true }, - "support_interface_height": { "default_value": 0.8 }, "support_interface_pattern": { "default_value": "grid" }, "travel_avoid_other_parts": { "default_value": false }, "travel_retract_before_outer_wall": { "default_value": true } diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index c77a7fcbcd..e209ce5ed5 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -230,7 +230,6 @@ "speed_wall_x": { "value": 35 }, "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true }, - "support_interface_height": { "default_value": 0.8 }, "support_interface_pattern": { "default_value": "grid" }, "travel_avoid_other_parts": { "default_value": false }, "travel_retract_before_outer_wall": { "default_value": true } diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 7f720f7a62..a96f303e92 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -91,7 +91,6 @@ "speed_wall_x": { "value": 35 }, "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true }, - "support_interface_height": { "default_value": 0.8 }, "support_interface_pattern": { "default_value": "grid" }, "travel_avoid_other_parts": { "default_value": false }, "travel_retract_before_outer_wall": { "default_value": true } diff --git a/resources/definitions/zyyx_pro_ii.def.json b/resources/definitions/zyyx_pro_ii.def.json index f965c5c276..340bbf4711 100644 --- a/resources/definitions/zyyx_pro_ii.def.json +++ b/resources/definitions/zyyx_pro_ii.def.json @@ -91,7 +91,6 @@ "speed_wall_x": { "value": 35 }, "support_interface_density": { "default_value": 80 }, "support_interface_enable": { "default_value": true }, - "support_interface_height": { "default_value": 0.8 }, "support_interface_pattern": { "default_value": "grid" }, "travel_avoid_other_parts": { "default_value": false }, "travel_retract_before_outer_wall": { "default_value": true } From 7a415d7f330cc02596b25ea90049dc878ec069f9 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 23:37:10 +0100 Subject: [PATCH 10/56] Removed settings that belong in print profiles --- resources/definitions/zyyx_agile.def.json | 19 +------------------ resources/definitions/zyyx_plus.def.json | 19 +------------------ resources/definitions/zyyx_pro.def.json | 19 +------------------ resources/definitions/zyyx_pro_ii.def.json | 19 +------------------ 4 files changed, 4 insertions(+), 72 deletions(-) diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json index e245e48871..bbbde07370 100644 --- a/resources/definitions/zyyx_agile.def.json +++ b/resources/definitions/zyyx_agile.def.json @@ -40,23 +40,6 @@ "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_width": { "default_value": 265 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 }, - "retract_at_layer_change": { "default_value": true }, - "retraction_amount": { "default_value": 0.7 }, - "retraction_speed": { "default_value": 15 }, - "speed_layer_0": { "value": 15 }, - "speed_print": { "default_value": 50 }, - "speed_travel": { "value": 80 }, - "speed_wall": { "value": 25 }, - "speed_wall_x": { "value": 35 }, - "support_interface_density": { "default_value": 80 }, - "support_interface_enable": { "default_value": true }, - "support_interface_pattern": { "default_value": "grid" }, - "travel_avoid_other_parts": { "default_value": false }, - "travel_retract_before_outer_wall": { "default_value": true } + "machine_width": { "default_value": 265 } } } \ No newline at end of file diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index e209ce5ed5..698d050bf1 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -215,23 +215,6 @@ "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_width": { "default_value": 265 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 }, - "retract_at_layer_change": { "default_value": true }, - "retraction_amount": { "default_value": 0.7 }, - "retraction_speed": { "default_value": 15 }, - "speed_layer_0": { "value": 15 }, - "speed_print": { "default_value": 50 }, - "speed_travel": { "value": 80 }, - "speed_wall": { "value": 25 }, - "speed_wall_x": { "value": 35 }, - "support_interface_density": { "default_value": 80 }, - "support_interface_enable": { "default_value": true }, - "support_interface_pattern": { "default_value": "grid" }, - "travel_avoid_other_parts": { "default_value": false }, - "travel_retract_before_outer_wall": { "default_value": true } + "machine_width": { "default_value": 265 } } } \ No newline at end of file diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index a96f303e92..4beb3b0deb 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -76,23 +76,6 @@ "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, "machine_width": { "default_value": 265 }, - "material_diameter": { "default_value": 1.75 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 }, - "retract_at_layer_change": { "default_value": true }, - "retraction_amount": { "default_value": 0.7 }, - "retraction_speed": { "default_value": 15 }, - "speed_layer_0": { "value": 15 }, - "speed_print": { "default_value": 50 }, - "speed_travel": { "value": 80 }, - "speed_wall": { "value": 25 }, - "speed_wall_x": { "value": 35 }, - "support_interface_density": { "default_value": 80 }, - "support_interface_enable": { "default_value": true }, - "support_interface_pattern": { "default_value": "grid" }, - "travel_avoid_other_parts": { "default_value": false }, - "travel_retract_before_outer_wall": { "default_value": true } + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/definitions/zyyx_pro_ii.def.json b/resources/definitions/zyyx_pro_ii.def.json index 340bbf4711..347a2475f6 100644 --- a/resources/definitions/zyyx_pro_ii.def.json +++ b/resources/definitions/zyyx_pro_ii.def.json @@ -76,23 +76,6 @@ "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, "machine_width": { "default_value": 285 }, - "material_diameter": { "default_value": 1.75 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "raft_airgap": { "default_value": 0.15 }, - "raft_margin": { "default_value": 6 }, - "retract_at_layer_change": { "default_value": true }, - "retraction_amount": { "default_value": 0.7 }, - "retraction_speed": { "default_value": 15 }, - "speed_layer_0": { "value": 15 }, - "speed_print": { "default_value": 50 }, - "speed_travel": { "value": 80 }, - "speed_wall": { "value": 25 }, - "speed_wall_x": { "value": 35 }, - "support_interface_density": { "default_value": 80 }, - "support_interface_enable": { "default_value": true }, - "support_interface_pattern": { "default_value": "grid" }, - "travel_avoid_other_parts": { "default_value": false }, - "travel_retract_before_outer_wall": { "default_value": true } + "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file From 14909f4f1be1fec65db419c15a53a37d287270ef Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 23:38:42 +0100 Subject: [PATCH 11/56] Allowed woodfill for ZYYX+ --- resources/definitions/zyyx_plus.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 698d050bf1..a4126e9ff4 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -126,7 +126,6 @@ "polyflex_pla", "polymax_pla", "polyplus_pla", - "polywood_pla", "redd_abs", "redd_asa", "redd_hips", From cca86715eb63baa2edd492f88159d0a1be44cead Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 23:55:11 +0100 Subject: [PATCH 12/56] Limited materials for ZYYX Pro --- resources/definitions/zyyx_pro.def.json | 142 +++++++++++++++++++++++- 1 file changed, 141 insertions(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 4beb3b0deb..2ca779928c 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -19,7 +19,147 @@ "preferred_quality_type": "normal", "preferred_variant_name": "Carbon0.6", "quality_definition": "zyyx_pro", - "variants_name": "SwiftTool" + "variants_name": "SwiftTool", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pa6cf", + "emotiontech_pa6gf", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_matte", + "eryone_pla", + "eryone_tpu", + "eSUN_PETG_Black", + "eSUN_PETG_Grey", + "eSUN_PETG_Purple", + "eSUN_PLA_PRO_Black", + "eSUN_PLA_PRO_Grey", + "eSUN_PLA_PRO_Purple", + "eSUN_PLA_PRO_White", + "Extrudr_GreenTECPro_Anthracite_175", + "Extrudr_GreenTECPro_Black_175", + "Extrudr_GreenTECPro_Blue_175", + "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", + "Extrudr_GreenTECPro_Silver_175", + "Extrudr_GreenTECPro_White_175", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "ideagen3D_ToughPLA", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "ultimaker_abscf_175", + "ultimaker_absr_175", + "ultimaker_rapidrinse_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "volumic_abs_ultra", + "volumic_arma_ultra", + "volumic_asa_ultra", + "volumic_br80_ultra", + "volumic_bumper_ultra", + "volumic_cu80_ultra", + "volumic_flex93_ultra", + "volumic_medical_ultra", + "volumic_nylon_ultra", + "volumic_pekk_carbone", + "volumic_petg_ultra", + "volumic_petgcarbone_ultra", + "volumic_pla_ultra", + "volumic_pp_ultra", + "volumic_strong_ultra", + "volumic_support_ultra", + "xyzprinting_abs", + "xyzprinting_antibact_pla", + "xyzprinting_carbon_fiber", + "xyzprinting_colorinkjet_pla", + "xyzprinting_flexible", + "xyzprinting_metallic_pla", + "xyzprinting_nylon", + "xyzprinting_pahtcf15", + "xyzprinting_pc", + "xyzprinting_petcf15", + "xyzprinting_petg", + "xyzprinting_pla", + "xyzprinting_ppgf30", + "xyzprinting_tough_pla", + "xyzprinting_tpu", + "zyyx_pro_flex", + "zyyx_pro_pla" + ] }, "overrides": { From ca5caefa516399e72d1187a3b07aa630736e4f63 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Mon, 12 Feb 2024 23:56:26 +0100 Subject: [PATCH 13/56] Allowed generic materials for ZYYX+ --- resources/definitions/zyyx_plus.def.json | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index a4126e9ff4..44317e62c3 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -24,17 +24,6 @@ "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pla_175", - "generic_pva_175", - "generic_tpu_175", "goofoo_abs", "goofoo_asa", "goofoo_bronze_pla", @@ -51,7 +40,6 @@ "goofoo_tpe_83a", "goofoo_tpu_87a", "goofoo_tpu_95a", - "goofoo_wood_pla", "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", @@ -126,6 +114,7 @@ "polyflex_pla", "polymax_pla", "polyplus_pla", + "polywood_pla", "redd_abs", "redd_asa", "redd_hips", From 7c9d5d2faf98fd5327fbdb087cfd6b33f4540854 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 13 Feb 2024 00:16:05 +0100 Subject: [PATCH 14/56] Updated infill pattern for some ZYYX+ profiles --- resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg | 1 + resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg index 084742cad4..c994ded909 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -12,3 +12,4 @@ global_quality = True [values] layer_height = 0.1 +infill_pattern = gyroid \ No newline at end of file diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index 62ae1b30cf..579fc8551b 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -12,3 +12,4 @@ global_quality = True [values] layer_height = 0.15 +infill_pattern = gyroid From 37398b234536b999f9c91ae4f3a9d0104393614b Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 13 Feb 2024 14:11:12 +0100 Subject: [PATCH 15/56] Added 1.2 profile to ZYYZ Pro --- .../zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg | 44 ++++++++++++ .../variants/zyyx/zyyx_pro_carbon1.2.inst.cfg | 67 +++++++++++++++++++ 2 files changed, 111 insertions(+) create mode 100644 resources/quality/zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg create mode 100644 resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg diff --git a/resources/quality/zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg new file mode 100644 index 0000000000..7473bea4b8 --- /dev/null +++ b/resources/quality/zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg @@ -0,0 +1,44 @@ +[general] +version = 4 +name = Normal ZYYX PLA +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = normal_pla +weight = -2 +global_quality = True +variant = Carbon1.2 (experimental) + +[values] +layer_height = 0.5 +brim_width = 7 +skirt_line_count = 2 +adhesion_type = skirt +infill_overlap = -2 +wall_thickness = =line_width *2 + +material_print_temperature_layer_0 = 230 +material_bed_temperature = 35 + +skin_overlap = 15 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +infill_pattern = quarter_cubic +top_bottom_thickness = =layer_height*3 + +retraction_amount = 1.5 +retraction_speed = 20 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed + +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 + diff --git a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg new file mode 100644 index 0000000000..72a06ff1e1 --- /dev/null +++ b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg @@ -0,0 +1,67 @@ +[general] +name = Carbon1.2 (experimental) +version = 4 +definition = zyyx_pro + +[metadata] +setting_version = 17 +type = variant +hardware_type = nozzle + +[values] +acceleration_enabled = True +acceleration_print = 4000 +brim_width = 7 +cool_fan_speed = 7 +cool_fan_speed_max = 100 +cool_min_speed = 5 +default_material_print_temperature = 200 +infill_before_walls = False +infill_line_width = =round(line_width * 0.6 / 0.7, 2) +infill_overlap = 0 +infill_pattern = triangles +infill_wipe_dist = 0 +jerk_enabled = True +jerk_print = 25 +jerk_topbottom = =math.ceil(jerk_print * 25 / 25) +jerk_wall = =math.ceil(jerk_print * 25 / 25) +jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) +layer_height = 0.2 +line_width = =machine_nozzle_size +machine_min_cool_heat_time_window = 15 +machine_nozzle_cool_down_speed = 0.85 +machine_nozzle_heat_up_speed = 1.5 +machine_nozzle_id = Multi0.8 +machine_nozzle_size = 0.8 +machine_nozzle_tip_outer_diameter = 1.8 +material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_standby_temperature = 100 +multiple_mesh_overlap = 0 +prime_tower_enable = False +prime_tower_wipe_enabled = True +retract_at_layer_change = =not magic_spiralize +retraction_amount = 6.5 +retraction_count_max = 25 +retraction_extrusion_window = 1 +retraction_hop = 2 +retraction_hop_only_when_collides = True +retraction_min_travel = =line_width * 2 +skin_overlap = 5 +speed_equalize_flow_enabled = True +speed_layer_0 = 20 +speed_print = 35 +speed_topbottom = =math.ceil(speed_print * 25 / 35) +speed_wall_0 = =math.ceil(speed_wall * 25 / 30) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = 20 +switch_extruder_retraction_amount = 16.5 +top_bottom_thickness = 1.4 +wall_0_inset = 0 +wall_line_width_0 = =wall_line_width +wall_line_width_x = =wall_line_width +wall_thickness = 2 From 646870fa1dda0bc6b266a44b9a3d0e8f867c1b70 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 13 Feb 2024 18:03:54 +0100 Subject: [PATCH 16/56] Update ZYYX Pro startup routine --- resources/definitions/zyyx_pro.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 2ca779928c..d69f131c75 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -7,7 +7,7 @@ "visible": true, "author": "ZYYX Labs AB", "manufacturer": "ZYYX Labs AB", - "file_formats": "text/x-gcode", + "file_formats": "application/x3g", "platform": "zyyx_pro_platform.stl", "has_machine_quality": true, "has_materials": true, @@ -15,7 +15,7 @@ "machine": "zyyx_pro", "machine_extruder_trains": { "0": "zyyx_pro_extruder" }, "machine_x3g_variant": "z", - "preferred_material": "zyyx_procarbon", + "preferred_material": "zyyx_pla", "preferred_quality_type": "normal", "preferred_variant_name": "Carbon0.6", "quality_definition": "zyyx_pro", @@ -210,7 +210,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX Pro" }, - "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\n M73 P0; enable build progress\n G21; set units to mm\n G90; set positioning to absolute\n G130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z20 F3000\n G1 X-120 Y-110 Z10 F3000\n G130 X0 Y0 Z3 A0 B0 ; Set Stepper Vref to low value\n M420 P10; set back fan speed 10 off 11-20 10-100%\n M140 S10 T0; set 100% heater power\n M140 S99 T0; set chamber heater negative hysteresis 19 degrees\n M140 S102 T0; set chamber heater positive hysteresis 2 degrees\n M140 S{material_bed_temperature_layer_0} T0; set chamber temperature\n M104 S100 T0; set extruder temp 100 while heating\n M134 T0; wait for heated chamber temperature\n M420 P13; set fan speed 10 off 11-20 10-100%\n G130 X80 Y80 Z64 A127 B127 ; Set Stepper Vref to default value\n ; Perform probing of build plate\n G162 X Y F3000; home XY axes maximum\n G161 Z F450\n G161 Z F450; home Z axis minimum\n G92 X0 Y0 Z0 E0\n G1 X0 Y0 Z5 F200\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0\n M131 A; store surface calibration point 1\n G1 X0 Y0 Z5 F200\n G1 X-182 Y0 Z5 F3000; move to 2nd probing point\n G161 Z F200\n M131 B; store surface calibration point 2\n G92 X-182 Y0 Z0 E0\n G1 X-182 Y0 Z5 F200\n G1 X0 Y0 Z5 F3000; move to home point\n G161 Z F200; home Z axis minimum again\n G92 X0 Y0 Z0 E0; set reference again\n G1 X0 Y0 Z5 F200; clear Z\n G1 X0 Y-228 Z5 F3000; move to 3rd calibration point\n G161 Z F200\n M131 AB; store surface calibration point 3\n M132 AB; activate auto leveling\n G92 X0 Y-228 Z0 E0\n G1 X0 Y-228 Z5 F200\n G162 X Y F3000\n G161 Z F200\n G92 X135 Y115 Z0 E0\n M132 Z; Recall stored home offset for Z axis\n G1 X135 Y115 Z5 F450; clear nozzle from hole\n G1 X0 Y115 Z5 F3000; clear nozzle from hole\n ; end of ZYYX pro build plate calibration\n M127; turn off fan\n M104 S{material_print_temperature_layer_0} T0\n M133 T0 ; stabilize extruder temperature\n ;SET_ZXPARAM\n ;SET_SUPPORT_BUMPMAP\n G92 E0 ; Set E to 0\n ; end of ZYYX Pro start code" }, + "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n; Perform probing of build plate\nG162 X Y F3000; home XY axes maximum\nG161 Z F600; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F3000\nG1 X-5 Y-5 Z5 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F100; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F5000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F5000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F5000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F5000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM127; turn off fan\nM133 T0 ; stabilize extruder temperature\nM134 T0; wait for heated chamber temperature\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, From 4ca69d94a66c36e1b152f32a5856c409e3a9adc1 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 13 Feb 2024 18:56:17 +0100 Subject: [PATCH 17/56] Updated ZYYX Pro profiles --- ...rmal_pla.inst.cfg => zyyx_pro_global_02_normal.inst.cfg} | 6 +++--- ...rmal_pla.inst.cfg => zyyx_pro_global_04_normal.inst.cfg} | 4 ++-- ...rmal_pla.inst.cfg => zyyx_pro_global_06_normal.inst.cfg} | 4 ++-- ...rmal_pla.inst.cfg => zyyx_pro_global_08_normal.inst.cfg} | 4 ++-- ...rmal_pla.inst.cfg => zyyx_pro_global_12_normal.inst.cfg} | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) rename resources/quality/zyyx_pro/{zyyx_pro_02_normal_pla.inst.cfg => zyyx_pro_global_02_normal.inst.cfg} (92%) rename resources/quality/zyyx_pro/{zyyx_pro_04_normal_pla.inst.cfg => zyyx_pro_global_04_normal.inst.cfg} (94%) rename resources/quality/zyyx_pro/{zyyx_pro_06_normal_pla.inst.cfg => zyyx_pro_global_06_normal.inst.cfg} (95%) rename resources/quality/zyyx_pro/{zyyx_pro_08_normal_pla.inst.cfg => zyyx_pro_global_08_normal.inst.cfg} (94%) rename resources/quality/zyyx_pro/{zyyx_pro_12_normal_pla.inst.cfg => zyyx_pro_global_12_normal.inst.cfg} (95%) diff --git a/resources/quality/zyyx_pro/zyyx_pro_02_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_02_normal.inst.cfg similarity index 92% rename from resources/quality/zyyx_pro/zyyx_pro_02_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_global_02_normal.inst.cfg index 6a09671856..24448fbb90 100644 --- a/resources/quality/zyyx_pro/zyyx_pro_02_normal_pla.inst.cfg +++ b/resources/quality/zyyx_pro/zyyx_pro_global_02_normal.inst.cfg @@ -1,18 +1,18 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal Multi0.2 definition = zyyx_pro [metadata] setting_version = 17 type = quality -quality_type = normal_pla +quality_type = normal weight = -2 global_quality = True variant = Multi0.2 [values] -layer_height = 0.12 +layer_height = 0.1 brim_width = 7 skirt_line_count = 2 adhesion_type = skirt diff --git a/resources/quality/zyyx_pro/zyyx_pro_04_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_04_normal.inst.cfg similarity index 94% rename from resources/quality/zyyx_pro/zyyx_pro_04_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_global_04_normal.inst.cfg index c25b455dcd..3a061a36d6 100644 --- a/resources/quality/zyyx_pro/zyyx_pro_04_normal_pla.inst.cfg +++ b/resources/quality/zyyx_pro/zyyx_pro_global_04_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal Multi0.4 definition = zyyx_pro [metadata] setting_version = 17 type = quality -quality_type = normal_pla +quality_type = normal weight = -2 global_quality = True variant = Multi0.4 diff --git a/resources/quality/zyyx_pro/zyyx_pro_06_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_06_normal.inst.cfg similarity index 95% rename from resources/quality/zyyx_pro/zyyx_pro_06_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_global_06_normal.inst.cfg index 2fe6f74795..9240f2a61d 100644 --- a/resources/quality/zyyx_pro/zyyx_pro_06_normal_pla.inst.cfg +++ b/resources/quality/zyyx_pro/zyyx_pro_global_06_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Normal PLA +name = Normal Carbon0.6 definition = zyyx_pro [metadata] setting_version = 17 type = quality -quality_type = normal_pla +quality_type = normal weight = -2 global_quality = True variant = Carbon0.6 diff --git a/resources/quality/zyyx_pro/zyyx_pro_08_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_08_normal.inst.cfg similarity index 94% rename from resources/quality/zyyx_pro/zyyx_pro_08_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_global_08_normal.inst.cfg index 51011ac53b..848cabffcf 100644 --- a/resources/quality/zyyx_pro/zyyx_pro_08_normal_pla.inst.cfg +++ b/resources/quality/zyyx_pro/zyyx_pro_global_08_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal Multi0.8 definition = zyyx_pro [metadata] setting_version = 17 type = quality -quality_type = normal_pla +quality_type = normal weight = -2 global_quality = True variant = Multi0.8 diff --git a/resources/quality/zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_12_normal.inst.cfg similarity index 95% rename from resources/quality/zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg rename to resources/quality/zyyx_pro/zyyx_pro_global_12_normal.inst.cfg index 7473bea4b8..eaa4efee42 100644 --- a/resources/quality/zyyx_pro/zyyx_pro_12_normal_pla.inst.cfg +++ b/resources/quality/zyyx_pro/zyyx_pro_global_12_normal.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal Carbon0.6 definition = zyyx_pro [metadata] setting_version = 1 type = quality -quality_type = normal_pla +quality_type = normal weight = -2 global_quality = True variant = Carbon1.2 (experimental) From 29e8fed39562faff235376bf452832ea92650e80 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 13 Feb 2024 19:06:31 +0100 Subject: [PATCH 18/56] Fixed error in ZYYX Pro 1.2 nozzle --- resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg index 72a06ff1e1..2c8a13a437 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg @@ -31,8 +31,8 @@ line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -machine_nozzle_id = Multi0.8 -machine_nozzle_size = 0.8 +machine_nozzle_id = Carbon1.2 +machine_nozzle_size = 1.2 machine_nozzle_tip_outer_diameter = 1.8 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 From 4d9f192a2aeb2e2389fc2488d0f479298167b671 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 13 Feb 2024 19:24:20 +0100 Subject: [PATCH 19/56] Updated ZYYX Pro start gcode --- resources/definitions/zyyx_pro.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index d69f131c75..5898a8a018 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -210,7 +210,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX Pro" }, - "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n; Perform probing of build plate\nG162 X Y F3000; home XY axes maximum\nG161 Z F600; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F3000\nG1 X-5 Y-5 Z5 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F100; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F5000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F5000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F5000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F5000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM127; turn off fan\nM133 T0 ; stabilize extruder temperature\nM134 T0; wait for heated chamber temperature\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, + "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n; Perform probing of build plate\nG162 X Y F3000; home XY axes maximum\nG161 Z F600; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F3000\nG1 X-5 Y-5 Z5 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F100; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F8000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F8000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F8000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F8000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM127; turn off fan\nM133 T0 ; stabilize extruder temperature\nM134 T0; wait for heated chamber temperature\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, From 63b71e6a7d4e1d815a22def6355cd766d6366ba7 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 14 Feb 2024 00:18:57 +0100 Subject: [PATCH 20/56] Updated ZYYX Pro profiles --- .../carbon06/zyyx_pro_06_global_fine.inst.cfg | 19 ++++++ .../zyyx_pro_06_global_normal.inst.cfg | 19 ++++++ .../zyyx_pro_06_global_quick.inst.cfg | 19 ++++++ .../carbon12/zyyx_pro_12_global_fine.inst.cfg | 19 ++++++ .../zyyx_pro_12_global_normal.inst.cfg | 19 ++++++ .../zyyx_pro_12_global_quick.inst.cfg | 19 ++++++ .../multi02/zyyx_pro_02_global_fine.inst.cfg | 20 +++++++ .../zyyx_pro_02_global_normal.inst.cfg | 20 +++++++ .../multi02/zyyx_pro_02_global_quick.inst.cfg | 20 +++++++ .../multi04/zyyx_pro_04_global_fine.inst.cfg | 19 ++++++ .../zyyx_pro_04_global_normal.inst.cfg | 19 ++++++ .../multi04/zyyx_pro_04_global_quick.inst.cfg | 19 ++++++ .../multi08/zyyx_pro_08_global_fine.inst.cfg | 19 ++++++ .../zyyx_pro_08_global_normal.inst.cfg | 19 ++++++ .../multi08/zyyx_pro_08_global_quick.inst.cfg | 19 ++++++ .../zyyx_pro_global_02_normal.inst.cfg | 44 -------------- .../zyyx_pro_global_04_normal.inst.cfg | 44 -------------- .../zyyx_pro_global_06_normal.inst.cfg | 43 -------------- .../zyyx_pro_global_08_normal.inst.cfg | 44 -------------- .../zyyx_pro_global_12_normal.inst.cfg | 44 -------------- .../variants/zyyx/zyyx_pro_carbon1.2.inst.cfg | 59 +------------------ 21 files changed, 291 insertions(+), 275 deletions(-) create mode 100644 resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_quick.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_quick.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg delete mode 100644 resources/quality/zyyx_pro/zyyx_pro_global_02_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro/zyyx_pro_global_04_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro/zyyx_pro_global_06_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro/zyyx_pro_global_08_normal.inst.cfg delete mode 100644 resources/quality/zyyx_pro/zyyx_pro_global_12_normal.inst.cfg diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg new file mode 100644 index 0000000000..0e453dabe3 --- /dev/null +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = fine06 +weight = -2 +global_quality = True +variant = Carbon0.6 + +[values] +layer_height = 0.15 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 40 +infill_pattern = gyroid \ No newline at end of file diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg new file mode 100644 index 0000000000..487400e4fa --- /dev/null +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = normal06 +weight = -2 +global_quality = True +variant = Carbon0.6 + +[values] +layer_height = 0.2 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 50 +infill_pattern = gyroid \ No newline at end of file diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg new file mode 100644 index 0000000000..c24c75b632 --- /dev/null +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Quick +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = quick06 +weight = -2 +global_quality = True +variant = Carbon0.6 + +[values] +layer_height = 0.3 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 60 +infill_pattern = cubic \ No newline at end of file diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg new file mode 100644 index 0000000000..ecac6aaf07 --- /dev/null +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine (Experimental) +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = fine12 +weight = -2 +global_quality = True +variant = Carbon1.2 + +[values] +layer_height = 0.3 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 40 +infill_pattern = cubic \ No newline at end of file diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg new file mode 100644 index 0000000000..7786fbd07f --- /dev/null +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Normal (Experimental) +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = normal12 +weight = -2 +global_quality = True +variant = Carbon1.2 + +[values] +layer_height = 0.45 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 50 +infill_pattern = cubic \ No newline at end of file diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg new file mode 100644 index 0000000000..a1c11dbe8f --- /dev/null +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Quick (Experimental) +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = quick12 +weight = -2 +global_quality = True +variant = Carbon1.2 + +[values] +layer_height = 0.6 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 60 +infill_pattern = cubic diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg new file mode 100644 index 0000000000..5cfae7cbb0 --- /dev/null +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = fine02 +weight = -2 +global_quality = True +variant = Multi0.2 + +[values] +layer_height = 0.05 +wall_thickness = =line_width*3 +top_bottom_thickness = =line_width*2.5 +speed_print = 30 +infill_pattern = gyroid +infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg new file mode 100644 index 0000000000..00019dc2dd --- /dev/null +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = normal02 +weight = -2 +global_quality = True +variant = Multi0.2 + +[values] +layer_height = 0.075 +wall_thickness = =line_width*3 +top_bottom_thickness = =line_width*2.5 +speed_print = 40 +infill_pattern = gyroid +infill_sparse_density = 10 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_quick.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_quick.inst.cfg new file mode 100644 index 0000000000..e3a456629e --- /dev/null +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_quick.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Quick +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = quick02 +weight = -2 +global_quality = True +variant = Multi0.2 + +[values] +layer_height = 0.1 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2.5 +speed_print = 50 +infill_pattern = cubic +infill_sparse_density = 5 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg new file mode 100644 index 0000000000..cd987f3afd --- /dev/null +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = fine04 +weight = -2 +global_quality = True +variant = Multi0.4 + +[values] +layer_height = 0.1 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 40 +infill_pattern = gyroid \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg new file mode 100644 index 0000000000..7921f12d0e --- /dev/null +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = normal04 +weight = -2 +global_quality = True +variant = Multi0.4 + +[values] +layer_height = 0.15 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 50 +infill_pattern = gyroid \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_quick.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_quick.inst.cfg new file mode 100644 index 0000000000..43bd9ba485 --- /dev/null +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_quick.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Quick +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = quick04 +weight = -2 +global_quality = True +variant = Multi0.4 + +[values] +layer_height = 0.2 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 60 +infill_pattern = cubic \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg new file mode 100644 index 0000000000..da3b5eded5 --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = fine08 +weight = -2 +global_quality = True +variant = Multi0.8 + +[values] +layer_height = 0.2 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 40 +infill_pattern = cubic diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg new file mode 100644 index 0000000000..b37f1d553b --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = normal08 +weight = -2 +global_quality = True +variant = Multi0.8 + +[values] +layer_height = 0.3 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 50 +infill_pattern = cubic \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg new file mode 100644 index 0000000000..1f768b9591 --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Quick +definition = zyyx_pro + +[metadata] +setting_version = 1 +type = quality +quality_type = quick08 +weight = -2 +global_quality = True +variant = Multi0.8 + +[values] +layer_height = 0.4 +wall_thickness = =line_width*2 +top_bottom_thickness = =line_width*2 +speed_print = 60 +infill_pattern = cubic diff --git a/resources/quality/zyyx_pro/zyyx_pro_global_02_normal.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_02_normal.inst.cfg deleted file mode 100644 index 24448fbb90..0000000000 --- a/resources/quality/zyyx_pro/zyyx_pro_global_02_normal.inst.cfg +++ /dev/null @@ -1,44 +0,0 @@ -[general] -version = 4 -name = Normal Multi0.2 -definition = zyyx_pro - -[metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 -global_quality = True -variant = Multi0.2 - -[values] -layer_height = 0.1 -brim_width = 7 -skirt_line_count = 2 -adhesion_type = skirt -infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 -material_bed_temperature = 35 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - -retraction_amount = 1.2 -retraction_speed = 20 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed - -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 - diff --git a/resources/quality/zyyx_pro/zyyx_pro_global_04_normal.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_04_normal.inst.cfg deleted file mode 100644 index 3a061a36d6..0000000000 --- a/resources/quality/zyyx_pro/zyyx_pro_global_04_normal.inst.cfg +++ /dev/null @@ -1,44 +0,0 @@ -[general] -version = 4 -name = Normal Multi0.4 -definition = zyyx_pro - -[metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 -global_quality = True -variant = Multi0.4 - -[values] -layer_height = 0.2 -brim_width = 7 -skirt_line_count = 2 -adhesion_type = skirt -infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 -material_bed_temperature = 35 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - -retraction_amount = 1.5 -retraction_speed = 20 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed - -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 - diff --git a/resources/quality/zyyx_pro/zyyx_pro_global_06_normal.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_06_normal.inst.cfg deleted file mode 100644 index 9240f2a61d..0000000000 --- a/resources/quality/zyyx_pro/zyyx_pro_global_06_normal.inst.cfg +++ /dev/null @@ -1,43 +0,0 @@ -[general] -version = 4 -name = Normal Carbon0.6 -definition = zyyx_pro - -[metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 -global_quality = True -variant = Carbon0.6 - -[values] -layer_height = 0.2 -brim_width = 4 -skirt_line_count = 2 -adhesion_type = skirt -infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 -material_bed_temperature = 35 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - -retraction_amount = 1.2 -retraction_speed = 20 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed - -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 diff --git a/resources/quality/zyyx_pro/zyyx_pro_global_08_normal.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_08_normal.inst.cfg deleted file mode 100644 index 848cabffcf..0000000000 --- a/resources/quality/zyyx_pro/zyyx_pro_global_08_normal.inst.cfg +++ /dev/null @@ -1,44 +0,0 @@ -[general] -version = 4 -name = Normal Multi0.8 -definition = zyyx_pro - -[metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 -global_quality = True -variant = Multi0.8 - -[values] -layer_height = 0.3 -brim_width = 7 -skirt_line_count = 2 -adhesion_type = skirt -infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 230 -material_bed_temperature = 35 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - -retraction_amount = 1.5 -retraction_speed = 20 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed - -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 - diff --git a/resources/quality/zyyx_pro/zyyx_pro_global_12_normal.inst.cfg b/resources/quality/zyyx_pro/zyyx_pro_global_12_normal.inst.cfg deleted file mode 100644 index eaa4efee42..0000000000 --- a/resources/quality/zyyx_pro/zyyx_pro_global_12_normal.inst.cfg +++ /dev/null @@ -1,44 +0,0 @@ -[general] -version = 4 -name = Normal Carbon0.6 -definition = zyyx_pro - -[metadata] -setting_version = 1 -type = quality -quality_type = normal -weight = -2 -global_quality = True -variant = Carbon1.2 (experimental) - -[values] -layer_height = 0.5 -brim_width = 7 -skirt_line_count = 2 -adhesion_type = skirt -infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 230 -material_bed_temperature = 35 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - -retraction_amount = 1.5 -retraction_speed = 20 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed - -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 - diff --git a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg index 2c8a13a437..1f3a9a475f 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg @@ -1,5 +1,5 @@ [general] -name = Carbon1.2 (experimental) +name = Carbon1.2 version = 4 definition = zyyx_pro @@ -9,59 +9,6 @@ type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 -brim_width = 7 -cool_fan_speed = 7 -cool_fan_speed_max = 100 -cool_min_speed = 5 -default_material_print_temperature = 200 -infill_before_walls = False -infill_line_width = =round(line_width * 0.6 / 0.7, 2) -infill_overlap = 0 -infill_pattern = triangles -infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 -jerk_topbottom = =math.ceil(jerk_print * 25 / 25) -jerk_wall = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) -layer_height = 0.2 -line_width = =machine_nozzle_size -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 -machine_nozzle_id = Carbon1.2 machine_nozzle_size = 1.2 -machine_nozzle_tip_outer_diameter = 1.8 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -prime_tower_enable = False -prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize -retraction_amount = 6.5 -retraction_count_max = 25 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 -skin_overlap = 5 -speed_equalize_flow_enabled = True -speed_layer_0 = 20 -speed_print = 35 -speed_topbottom = =math.ceil(speed_print * 25 / 35) -speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = 20 -switch_extruder_retraction_amount = 16.5 -top_bottom_thickness = 1.4 -wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width -wall_thickness = 2 +machine_nozzle_id = Carbon1.2 +machine_nozzle_tip_outer_diameter = 1.8 \ No newline at end of file From fab683a11be15dade25de95f4873a886243fa1da Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 14 Feb 2024 00:42:42 +0100 Subject: [PATCH 21/56] added slight temp increase to zyyx carbon nozzle --- .../zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg | 3 ++- .../zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg | 4 +++- .../zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg | 4 +++- .../zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg | 3 ++- .../zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg | 3 ++- .../zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg | 1 + 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg index 0e453dabe3..8069922b93 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg @@ -16,4 +16,5 @@ layer_height = 0.15 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 40 -infill_pattern = gyroid \ No newline at end of file +infill_pattern = gyroid +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg index 487400e4fa..a500b25914 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg @@ -16,4 +16,6 @@ layer_height = 0.2 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 50 -infill_pattern = gyroid \ No newline at end of file +infill_pattern = gyroid +material_print_temperature = =default_material_print_temperature + 5 + diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg index c24c75b632..a0b3214f19 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg @@ -16,4 +16,6 @@ layer_height = 0.3 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 60 -infill_pattern = cubic \ No newline at end of file +infill_pattern = cubic +material_print_temperature = =default_material_print_temperature + 5 + diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg index ecac6aaf07..698d8d304a 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg @@ -16,4 +16,5 @@ layer_height = 0.3 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 40 -infill_pattern = cubic \ No newline at end of file +infill_pattern = cubic +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg index 7786fbd07f..acf16cf3dd 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -16,4 +16,5 @@ layer_height = 0.45 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 50 -infill_pattern = cubic \ No newline at end of file +infill_pattern = cubic +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg index a1c11dbe8f..a70272a975 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg @@ -17,3 +17,4 @@ wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 60 infill_pattern = cubic +material_print_temperature = =default_material_print_temperature + 5 From f6372ebccd9d934762c5fe4be75dc84bfca5c1f2 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Thu, 15 Feb 2024 17:15:57 +0100 Subject: [PATCH 22/56] Revised ZYYX+ start code and dimensions --- resources/definitions/zyyx_plus.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 44317e62c3..44a6765eb9 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -184,7 +184,7 @@ "gantry_height": { "value": "10" }, "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 225 }, + "machine_depth": { "default_value": 210 }, "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" }, "machine_gcode_flavor": { "default_value": "Makerbot" }, "machine_head_with_fans_polygon": @@ -198,11 +198,11 @@ }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX+" }, - "machine_start_gcode": { "default_value": "; ZYYX 3D Printer start gcode\nM73 P0; enable build progress\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\nG162 X Y F3000; home XY axes maximum\nM133 T0 ; stabilize extruder temperature\nG161 Z F450\nG161 Z F450; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F200\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0\nM131 A; store surface calibration point 1\nG1 X0 Y0 Z5 F200\nG1 X-177 Y0 Z5 F3000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0 E0\nG1 X-177 Y0 Z5 F200\nG1 X0 Y0 Z5 F3000; move to home point\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0; set reference again\nG1 X0 Y0 Z5 F200; clear Z\nG1 X0 Y-225 Z5 F3000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG92 X0 Y-225 Z0 E0\nG1 X0 Y-225 Z5 F200\nG162 X Y F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 X135 Y115 Z5 F450; clear nozzle from hole\nG1 X0 Y115 Z5 F3000; clear nozzle from hole\nG92 E0 ; Set E to 0" }, + "machine_start_gcode": { "default_value": "; ZYYX+ 3D Printer start gcode\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n; Start build plate homing\nG162 X Y F3000; home XY axes maximum\nG161 Z F800; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F3000\nG1 X-5 Y-5 Z5 F3000\nG162 X Y F300; home XY axes maximum\nG161 Z F200; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\nG1 Z5 F3000\n; Homing point 1 complete\nG1 X-177 Y0 Z5 F10000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0\nG1 Z5 F3000\nG1 X0 Y-225 Z5 F10000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG1 Z5 F3000\nG92 X132.5 Y-105 Z5\nG1 X0 Y0 Y15 F10000\nM133 T0 ; stabilize extruder temperature\nG92 E0 ; Set E to 0" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_width": { "default_value": 265 } + "machine_width": { "default_value": 265 }, } } \ No newline at end of file From 8c693729b40fb4712c3e7d32d9d54a7d25d96e82 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Thu, 15 Feb 2024 17:16:33 +0100 Subject: [PATCH 23/56] Updated ZYYX Pro startup code --- resources/definitions/zyyx_pro.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 5898a8a018..3068852db1 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -210,7 +210,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX Pro" }, - "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n; Perform probing of build plate\nG162 X Y F3000; home XY axes maximum\nG161 Z F600; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F3000\nG1 X-5 Y-5 Z5 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F100; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F8000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F8000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F8000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F8000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM127; turn off fan\nM133 T0 ; stabilize extruder temperature\nM134 T0; wait for heated chamber temperature\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, + "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n; Start build plate homing\nG162 X Y F3000; home XY axes maximum\nG161 Z F1200; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z2 F2000\nG1 X-5 Y-5 Z2 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F200; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F10000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F10000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F8000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F8000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM127; turn off fan\nM133 T0 ; stabilize extruder temperature\nM134 T0; wait for heated chamber temperature\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, From 3439dded96cf607c417669032faab6343cf735c5 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Fri, 16 Feb 2024 14:40:12 +0100 Subject: [PATCH 24/56] Updated zyyx pro variant --- resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg index 9b287700f0..7b4e1e6a5f 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg @@ -15,7 +15,6 @@ brim_width = 7 cool_fan_speed = 7 cool_fan_speed_max = 100 cool_min_speed = 5 -default_material_print_temperature = 200 infill_before_walls = False infill_line_width = =round(line_width * 0.6 / 0.7, 2) infill_overlap = 0 From a10b431174bf442973c09f949888beb55c136fe3 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Fri, 16 Feb 2024 14:41:36 +0100 Subject: [PATCH 25/56] removed zyyx+ and zyyx pro profiles --- .../carbon12/zyyx_pro_12_global_fine.inst.cfg | 20 ------------------- .../zyyx_pro_12_global_quick.inst.cfg | 20 ------------------- .../multi08/zyyx_pro_08_global_fine.inst.cfg | 19 ------------------ .../multi08/zyyx_pro_08_global_quick.inst.cfg | 19 ------------------ 4 files changed, 78 deletions(-) delete mode 100644 resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg delete mode 100644 resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg delete mode 100644 resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg deleted file mode 100644 index 698d8d304a..0000000000 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_fine.inst.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[general] -version = 4 -name = Fine (Experimental) -definition = zyyx_pro - -[metadata] -setting_version = 1 -type = quality -quality_type = fine12 -weight = -2 -global_quality = True -variant = Carbon1.2 - -[values] -layer_height = 0.3 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 40 -infill_pattern = cubic -material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg deleted file mode 100644 index a70272a975..0000000000 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_quick.inst.cfg +++ /dev/null @@ -1,20 +0,0 @@ -[general] -version = 4 -name = Quick (Experimental) -definition = zyyx_pro - -[metadata] -setting_version = 1 -type = quality -quality_type = quick12 -weight = -2 -global_quality = True -variant = Carbon1.2 - -[values] -layer_height = 0.6 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 60 -infill_pattern = cubic -material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg deleted file mode 100644 index da3b5eded5..0000000000 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[general] -version = 4 -name = Fine -definition = zyyx_pro - -[metadata] -setting_version = 1 -type = quality -quality_type = fine08 -weight = -2 -global_quality = True -variant = Multi0.8 - -[values] -layer_height = 0.2 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 40 -infill_pattern = cubic diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg deleted file mode 100644 index 1f768b9591..0000000000 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_quick.inst.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[general] -version = 4 -name = Quick -definition = zyyx_pro - -[metadata] -setting_version = 1 -type = quality -quality_type = quick08 -weight = -2 -global_quality = True -variant = Multi0.8 - -[values] -layer_height = 0.4 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 60 -infill_pattern = cubic From 183f0b2569f0934a2a364c2cf27de1560fe18ff4 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Fri, 16 Feb 2024 17:36:04 +0100 Subject: [PATCH 26/56] fix comma in zyyx plus def --- resources/definitions/zyyx_plus.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 44a6765eb9..7753858f61 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -203,6 +203,6 @@ "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_width": { "default_value": 265 }, + "machine_width": { "default_value": 265 } } } \ No newline at end of file From 82e21080e441d72751d36eea0d1c8aac2b1c95c6 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Fri, 16 Feb 2024 17:36:18 +0100 Subject: [PATCH 27/56] disallowed materials in zyyx pro --- resources/definitions/zyyx_pro.def.json | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 3068852db1..98697fc851 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -16,7 +16,6 @@ "machine_extruder_trains": { "0": "zyyx_pro_extruder" }, "machine_x3g_variant": "z", "preferred_material": "zyyx_pla", - "preferred_quality_type": "normal", "preferred_variant_name": "Carbon0.6", "quality_definition": "zyyx_pro", "variants_name": "SwiftTool", @@ -29,6 +28,22 @@ "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", @@ -210,7 +225,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX Pro" }, - "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n; Start build plate homing\nG162 X Y F3000; home XY axes maximum\nG161 Z F1200; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z2 F2000\nG1 X-5 Y-5 Z2 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F200; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F10000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F10000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F8000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F8000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM127; turn off fan\nM133 T0 ; stabilize extruder temperature\nM134 T0; wait for heated chamber temperature\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, + "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM420 P10; set back fan speed 10 off 11-20 10-100%\nM140 S10 T0; set 100% heater power\nM140 S99 T0; set chamber heater negative hysteresis 19 degrees\nM140 S102 T0; set chamber heater positive hysteresis 2 degrees\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n; Start build plate homing\nG162 X Y F3000; home XY axes maximum\nG161 Z F1200; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z2 F2000\nG1 X-5 Y-5 Z2 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F200; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F10000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F10000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F8000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F8000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM133 T0 ; stabilize extruder temperature\nM126; turn on fan to help heat chamber\nM134 T0; wait for heated chamber temperature\nM127; turn off fan when hot\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, From 30a338efd71dbd13e86a542d60fa7c5c7c4300b4 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 3 Sep 2024 15:48:51 +0200 Subject: [PATCH 28/56] removed "experimental" from 1.2 nozzle --- .../zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg index acf16cf3dd..a3c555b72c 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Normal (Experimental) +name = Normal definition = zyyx_pro [metadata] From 679481de6d039e7c7d72b1f17129914cbad07ce6 Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Tue, 3 Sep 2024 13:49:37 +0000 Subject: [PATCH 29/56] Applied printer-linter format --- .../zyyx_pro_12_global_normal.inst.cfg | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg index a3c555b72c..789ebf4376 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -1,20 +1,21 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal12 setting_version = 1 type = quality -quality_type = normal12 -weight = -2 -global_quality = True variant = Carbon1.2 +weight = -2 [values] -layer_height = 0.45 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 50 infill_pattern = cubic +layer_height = 0.45 material_print_temperature = =default_material_print_temperature + 5 +speed_print = 50 +top_bottom_thickness = =line_width*2 +wall_thickness = =line_width*2 + From 22b337f32981c62d3a527b706dd73b1f63de6bc4 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:02:39 +0200 Subject: [PATCH 30/56] Update ZYYX+ Homing --- resources/definitions/zyyx_plus.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 7753858f61..c654b70b1b 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -198,7 +198,7 @@ }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX+" }, - "machine_start_gcode": { "default_value": "; ZYYX+ 3D Printer start gcode\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n; Start build plate homing\nG162 X Y F3000; home XY axes maximum\nG161 Z F800; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F3000\nG1 X-5 Y-5 Z5 F3000\nG162 X Y F300; home XY axes maximum\nG161 Z F200; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\nG1 Z5 F3000\n; Homing point 1 complete\nG1 X-177 Y0 Z5 F10000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0\nG1 Z5 F3000\nG1 X0 Y-225 Z5 F10000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG1 Z5 F3000\nG92 X132.5 Y-105 Z5\nG1 X0 Y0 Y15 F10000\nM133 T0 ; stabilize extruder temperature\nG92 E0 ; Set E to 0" }, + "machine_start_gcode": { "default_value": "; ZYYX+ start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nM126 S0; Turn off fan\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 Z127 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X132.5 Y120\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-44.5 Y120 F9000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X132.5 Y-110 F9000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\nG1 Z1 F1000\n\n; Lay prime strip\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 X100 Y-110 Z0.2 F1000\nG1 X40 E9 F1000\nG1 X0 E12.5 F1000\nG92 E0 ; Set E to 0\n\n; End of start gcode" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, From 2ed1c88bd30caaff7b24e6a53c14849b7a40fc20 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:03:04 +0200 Subject: [PATCH 31/56] ZYYX+ disallow cf-filament --- resources/definitions/zyyx_plus.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index c654b70b1b..238da5d154 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -130,6 +130,7 @@ "tizyx_pva", "ultimaker_abscf_175", "ultimaker_absr_175", + "ultimaker_nylon12-cf_175", "ultimaker_rapidrinse_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", From ba935f33ef6b5a239b4538d85a122fa03aca176b Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Tue, 10 Sep 2024 14:03:51 +0000 Subject: [PATCH 32/56] Applied printer-linter format --- resources/definitions/zyyx_plus.def.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 238da5d154..e645caea52 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -9,12 +9,6 @@ "manufacturer": "ZYYX Labs AB", "file_formats": "application/x3g", "platform": "zyyx_platform.3mf", - "has_machine_quality": true, - "machine_extruder_trains": { "0": "zyyx_plus_extruder_0" }, - "machine_x3g_variant": "z", - "preferred_material": "zyyx_pla", - "preferred_quality_type": "normal", - "quality_definition": "zyyx_plus", "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -178,7 +172,13 @@ "zyyx_procarbon", "zyyx_proglass", "zyyx_pronylon" - ] + ], + "has_machine_quality": true, + "machine_extruder_trains": { "0": "zyyx_plus_extruder_0" }, + "machine_x3g_variant": "z", + "preferred_material": "zyyx_pla", + "preferred_quality_type": "normal", + "quality_definition": "zyyx_plus" }, "overrides": { From 3acc9ebf483132a5888dc938845d9fff2bbf97e2 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:13:53 +0200 Subject: [PATCH 33/56] moved ZYYX+ quality folder location --- .../quality/zyyx_plus/{fast => ABS}/zyyx_plus_abs_fast.inst.cfg | 0 .../quality/zyyx_plus/{fine => ABS}/zyyx_plus_abs_fine.inst.cfg | 0 .../zyyx_plus_abs.inst.cfg => ABS/zyyx_plus_abs_normal.inst.cfg} | 0 .../quality/zyyx_plus/{fast => FLEX}/zyyx_plus_flex_fast.inst.cfg | 0 .../quality/zyyx_plus/{fine => FLEX}/zyyx_plus_flex_fine.inst.cfg | 0 .../zyyx_plus/{normal => FLEX}/zyyx_plus_flex_normal.inst.cfg | 0 .../quality/zyyx_plus/{fast => PLA}/zyyx_plus_pla_fast.inst.cfg | 0 .../quality/zyyx_plus/{fine => PLA}/zyyx_plus_pla_fine.inst.cfg | 0 .../zyyx_plus/{normal => PLA}/zyyx_plus_pla_normal.inst.cfg | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename resources/quality/zyyx_plus/{fast => ABS}/zyyx_plus_abs_fast.inst.cfg (100%) rename resources/quality/zyyx_plus/{fine => ABS}/zyyx_plus_abs_fine.inst.cfg (100%) rename resources/quality/zyyx_plus/{normal/zyyx_plus_abs.inst.cfg => ABS/zyyx_plus_abs_normal.inst.cfg} (100%) rename resources/quality/zyyx_plus/{fast => FLEX}/zyyx_plus_flex_fast.inst.cfg (100%) rename resources/quality/zyyx_plus/{fine => FLEX}/zyyx_plus_flex_fine.inst.cfg (100%) rename resources/quality/zyyx_plus/{normal => FLEX}/zyyx_plus_flex_normal.inst.cfg (100%) rename resources/quality/zyyx_plus/{fast => PLA}/zyyx_plus_pla_fast.inst.cfg (100%) rename resources/quality/zyyx_plus/{fine => PLA}/zyyx_plus_pla_fine.inst.cfg (100%) rename resources/quality/zyyx_plus/{normal => PLA}/zyyx_plus_pla_normal.inst.cfg (100%) diff --git a/resources/quality/zyyx_plus/fast/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/fast/zyyx_plus_abs_fast.inst.cfg rename to resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg diff --git a/resources/quality/zyyx_plus/fine/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/fine/zyyx_plus_abs_fine.inst.cfg rename to resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg diff --git a/resources/quality/zyyx_plus/normal/zyyx_plus_abs.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/normal/zyyx_plus_abs.inst.cfg rename to resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg diff --git a/resources/quality/zyyx_plus/fast/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/fast/zyyx_plus_flex_fast.inst.cfg rename to resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg diff --git a/resources/quality/zyyx_plus/fine/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/fine/zyyx_plus_flex_fine.inst.cfg rename to resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg diff --git a/resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/normal/zyyx_plus_flex_normal.inst.cfg rename to resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg diff --git a/resources/quality/zyyx_plus/fast/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/fast/zyyx_plus_pla_fast.inst.cfg rename to resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg diff --git a/resources/quality/zyyx_plus/fine/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/fine/zyyx_plus_pla_fine.inst.cfg rename to resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg diff --git a/resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg similarity index 100% rename from resources/quality/zyyx_plus/normal/zyyx_plus_pla_normal.inst.cfg rename to resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg From 6eb383013df9bc7699f45cdf068c154b8ecc626e Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Tue, 10 Sep 2024 14:14:46 +0000 Subject: [PATCH 34/56] Applied printer-linter format --- .../zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg | 21 ++++++++++--------- .../zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg | 21 ++++++++++--------- .../ABS/zyyx_plus_abs_normal.inst.cfg | 21 ++++++++++--------- .../FLEX/zyyx_plus_flex_fast.inst.cfg | 21 ++++++++++--------- .../FLEX/zyyx_plus_flex_fine.inst.cfg | 21 ++++++++++--------- .../FLEX/zyyx_plus_flex_normal.inst.cfg | 21 ++++++++++--------- .../zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg | 21 ++++++++++--------- .../zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg | 21 ++++++++++--------- .../PLA/zyyx_plus_pla_normal.inst.cfg | 21 ++++++++++--------- 9 files changed, 99 insertions(+), 90 deletions(-) diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg index 6a03d0f5bf..6b068f93f1 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Fast ZYYX ABS definition = zyyx_plus +name = Fast ZYYX ABS +version = 4 [metadata] +material = zyyx_abs-mm +quality_type = fast setting_version = 1 type = quality -quality_type = fast weight = 0 -material = zyyx_abs-mm [values] -wall_thickness = 0.8 -top_bottom_thickness = 0.8 -infill_sparse_density = 10 +adhesion_type = brim default_material_print_temperature = 240 +infill_sparse_density = 10 +material_flow = 95 material_print_temperature_layer_0 = 250 +raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 55 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 0.8 +wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg index a1ef9dfafc..8b8b6cb50c 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Fine ZYYX ABS definition = zyyx_plus +name = Fine ZYYX ABS +version = 4 [metadata] +material = zyyx_abs-mm +quality_type = fine setting_version = 1 type = quality -quality_type = fine weight = 0 -material = zyyx_abs-mm [values] -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 240 +infill_sparse_density = 15 +material_flow = 95 material_print_temperature_layer_0 = 250 +raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 40 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg index 83d6efcbad..8cfa971135 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Normal ZYYX ABS definition = zyyx_plus +name = Normal ZYYX ABS +version = 4 [metadata] +material = zyyx_abs-mm +quality_type = normal setting_version = 1 type = quality -quality_type = normal weight = 0 -material = zyyx_abs-mm [values] -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 240 +infill_sparse_density = 15 +material_flow = 95 material_print_temperature_layer_0 = 250 +raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 50 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg index 558fdf6060..154c9e770c 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Fast ZYYX Flex95A definition = zyyx_plus +name = Fast ZYYX Flex95A +version = 4 [metadata] +material = zyyx_flex95 +quality_type = fast setting_version = 1 type = quality -quality_type = fast weight = 0 -material = zyyx_flex95 [values] -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 15 +material_flow = 105 material_print_temperature_layer_0 = 235 +raft_airgap = 0.2 retraction_amount = 1.0 retraction_speed = 15 speed_print = 20 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print -adhesion_type = brim -material_flow = 105 -raft_airgap = 0.2 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg index 38bf0a87b5..74e011da4f 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Fine ZYYX Flex95A definition = zyyx_plus +name = Fine ZYYX Flex95A +version = 4 [metadata] +material = zyyx_flex95 +quality_type = fine setting_version = 1 type = quality -quality_type = fine weight = 0 -material = zyyx_flex95 [values] -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 15 +material_flow = 105 material_print_temperature_layer_0 = 235 +raft_airgap = 0.2 retraction_amount = 1.0 retraction_speed = 15 speed_print = 15 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print -adhesion_type = brim -material_flow = 105 -raft_airgap = 0.2 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg index bc4b4208af..d1c66fffb5 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Normal ZYYX Flex95A definition = zyyx_plus +name = Normal ZYYX Flex95A +version = 4 [metadata] +material = zyyx_flex95 +quality_type = normal setting_version = 20 type = quality -quality_type = normal weight = 0 -material = zyyx_flex95 [values] -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 15 +material_flow = 105 material_print_temperature_layer_0 = 235 +raft_airgap = 0.2 retraction_amount = 1.0 retraction_speed = 15 speed_print = 20 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print -adhesion_type = brim -material_flow = 105 -raft_airgap = 0.2 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg index 1e93e732d8..0391586281 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Fast ZYYX PLA definition = zyyx_plus +name = Fast ZYYX PLA +version = 4 [metadata] +material = zyyx_pla +quality_type = fast setting_version = 1 type = quality -quality_type = fast weight = 0 -material = zyyx_pla [values] -wall_thickness = 0.8 -top_bottom_thickness = 0.8 -infill_sparse_density = 10 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 10 +material_flow = 95 material_print_temperature_layer_0 = 225 +raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 55 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 0.8 +wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg index 960c603302..247243d08c 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Fine ZYYX PLA definition = zyyx_plus +name = Fine ZYYX PLA +version = 4 [metadata] +material = zyyx_pla +quality_type = fine setting_version = 1 type = quality -quality_type = fine weight = 0 -material = zyyx_pla [values] -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 15 +material_flow = 95 material_print_temperature_layer_0 = 225 +raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 40 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg index 6dc488c722..fde2542074 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg @@ -1,26 +1,27 @@ [general] -version = 4 -name = Normal ZYYX PLA definition = zyyx_plus +name = Normal ZYYX PLA +version = 4 [metadata] +material = zyyx_pla +quality_type = normal setting_version = 18 type = quality -quality_type = normal weight = 0 -material = zyyx_pla [values] -wall_thickness = 1.2 -top_bottom_thickness = 1.0 -infill_sparse_density = 15 +adhesion_type = brim default_material_print_temperature = 210 +infill_sparse_density = 15 +material_flow = 95 material_print_temperature_layer_0 = 225 +raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 50 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) -adhesion_type = brim -material_flow = 95 -raft_airgap = 0.15 +top_bottom_thickness = 1.0 +wall_thickness = 1.2 + From 25b44e28be2528234460e9b6ef1c209c35d2eee4 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:25:23 +0200 Subject: [PATCH 35/56] update and add zyyx qualities --- .../definitions/Zyyx plus start gcode.txt | 1 + .../Zyyx pro start gcode legacy.txt | 60 +++++++++++++++++++ .../definitions/Zyyx pro start gcode.txt | 52 ++++++++++++++++ resources/definitions/zyyx_testing.txt | 51 ++++++++++++++++ .../zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg | 1 - .../zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg | 1 - .../ABS/zyyx_plus_abs_normal.inst.cfg | 1 - .../zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg | 1 - .../zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg | 1 - .../PLA/zyyx_plus_pla_normal.inst.cfg | 1 - .../zyyx_plus/zyyx_plus_global_draft.inst.cfg | 24 ++++++++ .../zyyx_plus/zyyx_plus_global_fast.inst.cfg | 10 ++++ .../zyyx_plus/zyyx_plus_global_fine.inst.cfg | 12 +++- .../zyyx_plus_global_normal.inst.cfg | 10 ++++ 14 files changed, 219 insertions(+), 7 deletions(-) create mode 100644 resources/definitions/Zyyx plus start gcode.txt create mode 100644 resources/definitions/Zyyx pro start gcode legacy.txt create mode 100644 resources/definitions/Zyyx pro start gcode.txt create mode 100644 resources/definitions/zyyx_testing.txt create mode 100644 resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg diff --git a/resources/definitions/Zyyx plus start gcode.txt b/resources/definitions/Zyyx plus start gcode.txt new file mode 100644 index 0000000000..2e45c726ec --- /dev/null +++ b/resources/definitions/Zyyx plus start gcode.txt @@ -0,0 +1 @@ +; ZYYX+ start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nM126 S0; Turn off fan\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 Z127 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X132.5 Y120\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-44.5 Y120 F9000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X132.5 Y-110 F9000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\nG1 Z1 F1000\n\n; Lay prime strip\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 X100 Y-110 Z0.2 F1000\nG1 X40 E9 F1000\nG1 X0 E12.5 F1000\nG92 E0 ; Set E to 0\n\n; End of start gcode \ No newline at end of file diff --git a/resources/definitions/Zyyx pro start gcode legacy.txt b/resources/definitions/Zyyx pro start gcode legacy.txt new file mode 100644 index 0000000000..01ef5dc277 --- /dev/null +++ b/resources/definitions/Zyyx pro start gcode legacy.txt @@ -0,0 +1,60 @@ +;start of ZYYX Pro startcode +M73 P0; enable build progress +G21; set units to mm +G90; set positioning to absolute +G130 X80 Y80 A127 B127 ; Set Stepper Vref to default value +G162 X Y F3000; home XY axes maximum +G161 Z F450 +G161 Z F450; home Z axis minimum +G92 X0 Y0 Z0 E0 +G1 X0 Y0 Z20 F3000 +G1 X-120 Y-110 Z10 F3000 +G130 X0 Y0 Z3 A0 B0 ; Set Stepper Vref to low value +M420 P10; set back fan speed 10 off 11-20 10-100% +M140 S10 T0; set 100% heater power +M140 S99 T0; set chamber heater negative hysteresis 19 degrees +M140 S102 T0; set chamber heater positive hysteresis 2 degrees +M140 S{material_bed_temperature_layer_0} T0; set chamber temperature +M104 S100 T0; set extruder temp 100 while heating +M134 T0; wait for heated chamber temperature +M420 P13; set fan speed 10 off 11-20 10-100% +G130 X80 Y80 Z64 A127 B127 ; Set Stepper Vref to default value +; Perform probing of build plate +G162 X Y F3000; home XY axes maximum +G161 Z F450 +G161 Z F450; home Z axis minimum +G92 X0 Y0 Z0 E0 +G1 X0 Y0 Z5 F200 +G161 Z F200; home Z axis minimum again +G92 X0 Y0 Z0 E0 +M131 A; store surface calibration point 1 +G1 X0 Y0 Z5 F200 +G1 X-182 Y0 Z5 F3000; move to 2nd probing point +G161 Z F200 +M131 B; store surface calibration point 2 +G92 X-182 Y0 Z0 E0 +G1 X-182 Y0 Z5 F200 +G1 X0 Y0 Z5 F3000; move to home point +G161 Z F200; home Z axis minimum again +G92 X0 Y0 Z0 E0; set reference again +G1 X0 Y0 Z5 F200; clear Z +G1 X0 Y-228 Z5 F3000; move to 3rd calibration point +G161 Z F200 +M131 AB; store surface calibration point 3 +M132 AB; activate auto leveling +G92 X0 Y-228 Z0 E0 +G1 X0 Y-228 Z5 F200 +G162 X Y F3000 +G161 Z F200 +G92 X135 Y115 Z0 E0 +M132 Z; Recall stored home offset for Z axis +G1 X135 Y115 Z5 F450; clear nozzle from hole +G1 X0 Y115 Z5 F3000; clear nozzle from hole +; end of ZYYX pro build plate calibration +M127; turn off fan +M104 S{material_print_temperature_layer_0} T0 +M133 T0 ; stabilize extruder temperature +;SET_ZXPARAM +;SET_SUPPORT_BUMPMAP +G92 E0 ; Set E to 0 +; end of ZYYX Pro start code \ No newline at end of file diff --git a/resources/definitions/Zyyx pro start gcode.txt b/resources/definitions/Zyyx pro start gcode.txt new file mode 100644 index 0000000000..0876750b93 --- /dev/null +++ b/resources/definitions/Zyyx pro start gcode.txt @@ -0,0 +1,52 @@ +;start of ZYYX Pro startcode +M73 P0; enable build progress +M420 P10; set back fan speed 10 off 11-20 10-100% +M140 S10 T0; set 100% heater power +M140 S99 T0; set chamber heater negative hysteresis 19 degrees +M140 S102 T0; set chamber heater positive hysteresis 2 degrees +M140 S60 T0; set chamber temperature +M104 S{material_print_temperature_layer_0} T0; set nozzle temperature +G21; set units to mm +G90; set positioning to absolute +G130 X80 Y90 A127 B127 ; Set Stepper Vref to default value +; Start build plate homing +G162 X Y F3000; home XY axes maximum +G161 Z F1200; home Z axis minimum +G92 X0 Y0 Z0 E0 +G1 X0 Y0 Z2 F2000 +G1 X-5 Y-5 Z2 F5000 +G162 X Y F300; home XY axes maximum +G161 Z F200; home Z axis minimum +G92 X0 Y0 Z0 +M131 A; store surface calibration point 1 +; Homing point 1 complete +G1 X0 Y0 Z5 F3000; +G1 X-182 Y0 Z5 F10000; move to 2nd probing point +G161 Z F200 +M131 B; store surface calibration point 2 +G92 X-182 Y0 Z0 E0 +G1 X-182 Y0 Z5 F10000 +; Homing point 2 complete +G1 X0 Y-228 Z5 F8000; move to 3rd calibration point +G161 Z F200 +M131 AB; store surface calibration point 3 +M132 AB; activate auto leveling +; Homing point 2 complete +G1 Z5 F3000 +G1 X-5 Y-5 F5000 +G162 X Y F300 +G1 Z5 F3000 +G161 Z F200 +G92 X135 Y115 Z0 E0 +M132 Z; Recall stored home offset for Z axis +G1 Z10 F3000; clear nozzle from hole +G1 X0 Y0 Z10 F8000; move to middle of plate +; end of ZYYX pro build plate calibration +M133 T0 ; stabilize extruder temperature +M126; turn on fan to help heat chamber +M134 T0; wait for heated chamber temperature +M127; turn off fan when hot +;SET_ZXPARAM +;SET_SUPPORT_BUMPMAP +G92 E0 ; Set E to 0 +; end of ZYYX Pro start code \ No newline at end of file diff --git a/resources/definitions/zyyx_testing.txt b/resources/definitions/zyyx_testing.txt new file mode 100644 index 0000000000..52be7545fa --- /dev/null +++ b/resources/definitions/zyyx_testing.txt @@ -0,0 +1,51 @@ +;RIGHT EXTRUDER +; Replicator 1 dual start.gcode +M73 P0 ; Enable build progress +G21; set units to mm +G90 ; absolute positioning +G162 Z F3000 ; Home Z maximum +G28 X Y ; Home X Y maximum +G92 X0 Y0 +M140 S[bed0_temperature] T0 ; Heat buildplate +M134 T0 ; Stabilize bed temperature +M104 S180 T0 ; Heat right extruder +M104 S70 T1 ; Heat lightly left extruder +M133 T0 ; Stabilize right extruder temperature +M133 T1 ; Stabilize left extruder temperature +M104 S0 T1 ; cool down left extruder +G0 X-45 Y-15; estrema destra in fondo punto di calibrazione ZERO prende offset primario di asse Z +G161 Z F800 +G92 Z-5 ; Set Z to 5 +G4 P20000 ; 20 seconds wait, before beginning, to stabilize ambient temps +G1 Z0 +G161 Z F50 ; Home Z maximum slowly +M132 Z ; Recall home offsets for Z +G1 Z10 +G28 X Y ; Home X Y maximum +M132 X Y A B ; Recall home offsets for everything but Z +G1 X-80 Y65 Z10 F2000 ; Prima posizione di calibrazione +G161 Z F100 +M131 A ; prima posizione memorizzata +G1 X100 Y-10 Z10 F2000 ; Seconda posizione di calibrazione +G161 Z F100 +M131 B ; seconda posizione memorizzata +G1 X-70 Y-10 Z10 F2000 ; Terza posizione di calibrazione +G161 Z F100 +M131 AB ; Terza posizione memorizzata +M132 AB ; avvio del livellamento automatico +M135 T0 ; Load right extruder offsets +G1 X-120 Y-75 Z30 F9000 ; Move to wait position off table +G130 X20 Y20 Z20 A20 B20 ; Lower stepper Vrefs while heating +M126 S[fan_speed_pwm] ; Set fan speed +M104 S[extruder0_temperature] T0 ; Heat right extruder +M133 T0 ; Stabilize right extruder temperature +G130 X127 Y127 Z40 A127 B127 ; Default stepper Vrefs +G92 A0 B0 ; Zero extruders +G1 X100 Y-75 F9000 ; Move to front right corner of bed +G1 Z0.4 F6000 ; Move down to purge +G1 X-90 Y-75 E24 F2000 ; Extrude a line of filament across the front edge of the bed +G1 X-100 Y-75 F180 ; Wait for ooze +G1 X-110 Y-75 F5000 ; Fast wipe +G1 Z0.2 F100 ; Lift +M73 P1 ;@body (notify GPX body has started) +; end of start.gcode \ No newline at end of file diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg index 6b068f93f1..d77ba343f4 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg @@ -14,7 +14,6 @@ weight = 0 adhesion_type = brim default_material_print_temperature = 240 infill_sparse_density = 10 -material_flow = 95 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg index 8b8b6cb50c..d787b89af6 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg @@ -14,7 +14,6 @@ weight = 0 adhesion_type = brim default_material_print_temperature = 240 infill_sparse_density = 15 -material_flow = 95 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg index 8cfa971135..0222acec12 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg @@ -14,7 +14,6 @@ weight = 0 adhesion_type = brim default_material_print_temperature = 240 infill_sparse_density = 15 -material_flow = 95 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg index 0391586281..e5bcfcf6a2 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg @@ -14,7 +14,6 @@ weight = 0 adhesion_type = brim default_material_print_temperature = 210 infill_sparse_density = 10 -material_flow = 95 material_print_temperature_layer_0 = 225 raft_airgap = 0.15 retraction_amount = 1.2 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg index 247243d08c..25f965eee4 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg @@ -14,7 +14,6 @@ weight = 0 adhesion_type = brim default_material_print_temperature = 210 infill_sparse_density = 15 -material_flow = 95 material_print_temperature_layer_0 = 225 raft_airgap = 0.15 retraction_amount = 1.2 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg index fde2542074..27e4166972 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg @@ -14,7 +14,6 @@ weight = 0 adhesion_type = brim default_material_print_temperature = 210 infill_sparse_density = 15 -material_flow = 95 material_print_temperature_layer_0 = 225 raft_airgap = 0.15 retraction_amount = 1.2 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg new file mode 100644 index 0000000000..1cc4d4df13 --- /dev/null +++ b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Draft +definition = zyyx_plus + +[metadata] +setting_version = 1 +type = quality +quality_type = fast +weight = 0 +global_quality = True + +[values] +layer_height = 0.3 +adhesion_type = brim +infill_sparse_density = 10 +raft_airgap = 0.15 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +top_bottom_thickness = 0.9 +wall_thickness = 0.8 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg index d9b586b5b9..fa9c5c00fa 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg @@ -12,3 +12,13 @@ global_quality = True [values] layer_height = 0.2 +adhesion_type = brim +infill_sparse_density = 10 +raft_airgap = 0.15 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 0.8 \ No newline at end of file diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg index c994ded909..c4fefa9b52 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -12,4 +12,14 @@ global_quality = True [values] layer_height = 0.1 -infill_pattern = gyroid \ No newline at end of file +infill_pattern = gyroid +adhesion_type = brim +infill_sparse_density = 15 +raft_airgap = 0.15 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 40 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +top_bottom_thickness = 1.0 +wall_thickness = 1.2 \ No newline at end of file diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index 579fc8551b..70341ff98e 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -13,3 +13,13 @@ global_quality = True [values] layer_height = 0.15 infill_pattern = gyroid +adhesion_type = brim +infill_sparse_density = 15 +raft_airgap = 0.15 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +top_bottom_thickness = 1.0 +wall_thickness = 1.2 \ No newline at end of file From 24b0681fb025e008edc233ae22491a00160a9c04 Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Tue, 10 Sep 2024 14:26:17 +0000 Subject: [PATCH 36/56] Applied printer-linter format --- .../zyyx_plus/zyyx_plus_global_draft.inst.cfg | 11 ++++++----- .../zyyx_plus/zyyx_plus_global_fast.inst.cfg | 13 +++++++------ .../zyyx_plus/zyyx_plus_global_fine.inst.cfg | 15 ++++++++------- .../zyyx_plus/zyyx_plus_global_normal.inst.cfg | 15 ++++++++------- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg index 1cc4d4df13..8440364356 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = Draft definition = zyyx_plus +name = Draft +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 1 type = quality -quality_type = fast weight = 0 -global_quality = True [values] -layer_height = 0.3 adhesion_type = brim infill_sparse_density = 10 +layer_height = 0.3 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 @@ -22,3 +22,4 @@ speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 0.9 wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg index fa9c5c00fa..94d2b6dbcf 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg @@ -1,19 +1,19 @@ [general] -version = 4 -name = Fast definition = zyyx_plus +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast setting_version = 1 type = quality -quality_type = fast weight = 0 -global_quality = True [values] -layer_height = 0.2 adhesion_type = brim infill_sparse_density = 10 +layer_height = 0.2 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 @@ -21,4 +21,5 @@ speed_print = 55 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 0.8 -wall_thickness = 0.8 \ No newline at end of file +wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg index c4fefa9b52..ed38ad5008 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -1,20 +1,20 @@ [general] -version = 4 -name = Fine definition = zyyx_plus +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine setting_version = 1 type = quality -quality_type = fine weight = 0 -global_quality = True [values] -layer_height = 0.1 -infill_pattern = gyroid adhesion_type = brim +infill_pattern = gyroid infill_sparse_density = 15 +layer_height = 0.1 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 @@ -22,4 +22,5 @@ speed_print = 40 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 1.0 -wall_thickness = 1.2 \ No newline at end of file +wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index 70341ff98e..f97ea72d67 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -1,20 +1,20 @@ [general] -version = 4 -name = Normal definition = zyyx_plus +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 19 type = quality -quality_type = normal weight = 0 -global_quality = True [values] -layer_height = 0.15 -infill_pattern = gyroid adhesion_type = brim +infill_pattern = gyroid infill_sparse_density = 15 +layer_height = 0.15 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 @@ -22,4 +22,5 @@ speed_print = 50 speed_wall = =math.ceil(speed_print * 22 / 50) speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 1.0 -wall_thickness = 1.2 \ No newline at end of file +wall_thickness = 1.2 + From 8ce584d65df844fa9ddeecdb3d12d27981dd2e09 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:28:18 +0200 Subject: [PATCH 37/56] fixed draft typo --- resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg index 1cc4d4df13..52328b5db0 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg @@ -6,7 +6,7 @@ definition = zyyx_plus [metadata] setting_version = 1 type = quality -quality_type = fast +quality_type = draft weight = 0 global_quality = True From bda5123e7b649f243b85112b6988c366e2f7b5d1 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:33:25 +0200 Subject: [PATCH 38/56] merge error --- resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg index 9df8b32ce7..67973a5a72 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg @@ -5,7 +5,6 @@ version = 4 [metadata] global_quality = True -quality_type = fast setting_version = 1 type = quality quality_type = draft From 746eb613c4f10e5903b2cd2821cb23495e8aff64 Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Tue, 10 Sep 2024 14:34:12 +0000 Subject: [PATCH 39/56] Applied printer-linter format --- resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg index 67973a5a72..714ef2ec0d 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg @@ -5,9 +5,9 @@ version = 4 [metadata] global_quality = True +quality_type = draft setting_version = 1 type = quality -quality_type = draft weight = 0 [values] From 069dffc18328d360c54ec16ea7a7b43bcc682e6e Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:52:09 +0200 Subject: [PATCH 40/56] replace zyyx pla/abs with generic --- .../zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg | 4 +-- .../zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg | 4 +-- .../ABS/zyyx_plus_abs_normal.inst.cfg | 4 +-- .../PLA/zyyx_plus_pla_draft.inst.cfg | 26 +++++++++++++++++++ .../zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg | 4 +-- .../zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg | 4 +-- .../PLA/zyyx_plus_pla_normal.inst.cfg | 4 +-- .../zyyx_pro_ii_02_pla_normal.inst.cfg | 4 +-- .../zyyx_pro_ii_04_pla_fine.inst.cfg | 4 +-- .../zyyx_pro_ii_04_pla_normal.inst.cfg | 4 +-- .../zyyx_pro_ii_04_pla_quick.inst.cfg | 4 +-- .../zyyx_pro_ii_06_pla_fine.inst.cfg | 4 +-- .../zyyx_pro_ii_06_pla_normal.inst.cfg | 4 +-- .../zyyx_pro_ii_06_pla_quick.inst.cfg | 4 +-- .../zyyx_pro_ii_12_pla_normal.inst.cfg | 4 +-- 15 files changed, 54 insertions(+), 28 deletions(-) create mode 100644 resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg index d77ba343f4..fc69349cd2 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg @@ -1,10 +1,10 @@ [general] definition = zyyx_plus -name = Fast ZYYX ABS +name = Fast ABS version = 4 [metadata] -material = zyyx_abs-mm +material = generic_abs quality_type = fast setting_version = 1 type = quality diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg index d787b89af6..24e71fcc84 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg @@ -1,10 +1,10 @@ [general] definition = zyyx_plus -name = Fine ZYYX ABS +name = Fine ABS version = 4 [metadata] -material = zyyx_abs-mm +material = generic_abs quality_type = fine setting_version = 1 type = quality diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg index 0222acec12..f88a8be35b 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg @@ -1,10 +1,10 @@ [general] definition = zyyx_plus -name = Normal ZYYX ABS +name = Normal ABS version = 4 [metadata] -material = zyyx_abs-mm +material = generic_abs quality_type = normal setting_version = 1 type = quality diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg new file mode 100644 index 0000000000..1bea36f585 --- /dev/null +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg @@ -0,0 +1,26 @@ +[general] +definition = zyyx_plus +name = Draft PLA +version = 4 + +[metadata] +material = generic_pla +quality_type = draft +setting_version = 1 +type = quality +weight = 0 + +[values] +adhesion_type = brim +default_material_print_temperature = 210 +infill_sparse_density = 10 +material_print_temperature_layer_0 = 225 +raft_airgap = 0.15 +retraction_amount = 1.2 +retraction_speed = 20 +speed_print = 55 +speed_wall = =math.ceil(speed_print * 22 / 50) +speed_wall_x = =math.ceil(speed_print * 33 / 50) +top_bottom_thickness = 0.8 +wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg index e5bcfcf6a2..1020bb10d0 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg @@ -1,10 +1,10 @@ [general] definition = zyyx_plus -name = Fast ZYYX PLA +name = Fast PLA version = 4 [metadata] -material = zyyx_pla +material = generic_pla quality_type = fast setting_version = 1 type = quality diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg index 25f965eee4..3e3adb4e98 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg @@ -1,10 +1,10 @@ [general] definition = zyyx_plus -name = Fine ZYYX PLA +name = Fine PLA version = 4 [metadata] -material = zyyx_pla +material = generic_pla quality_type = fine setting_version = 1 type = quality diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg index 27e4166972..19db6d0e74 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg @@ -1,10 +1,10 @@ [general] definition = zyyx_plus -name = Normal ZYYX PLA +name = Normal PLA version = 4 [metadata] -material = zyyx_pla +material = generic_pla quality_type = normal setting_version = 18 type = quality diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg index 6ae96e9d03..2f6a818a1c 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = normal weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Multi0.2 [values] diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg index 2282d2d42c..38dbddb129 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Fine ZYYX PLA +name = Fine PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = fine weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Carbon0.4 [values] diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg index d130687363..5e0ee08c97 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = normal weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Carbon0.4 [values] diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg index a4e276da53..ffa8ea1559 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Quick ZYYX PLA +name = Quick PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = quick weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Carbon0.4 [values] diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg index eb1c5fc947..0d53ff283c 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Fine ZYYX PLA +name = Fine PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = fine weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Carbon0.6 [values] diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg index 20e7ac31fd..02c5f0008d 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = normal weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Carbon0.6 [values] diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg index 3a231ffbfa..9b2a8c33c3 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Quick ZYYX PLA +name = Quick PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = quick weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Carbon0.6 [values] diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg index fd492adaaf..83bd551bed 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Normal ZYYX PLA +name = Normal PLA definition = zyyx_pro_ii [metadata] @@ -9,7 +9,7 @@ type = quality quality_type = normal weight = -2 global_quality = True -material = zyyx_pla +material = generic_pla variant = Carbon1.2 [values] From 89dfd0690ad3178d1fca0508117a629c7f4c3a36 Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Tue, 10 Sep 2024 14:52:59 +0000 Subject: [PATCH 41/56] Applied printer-linter format --- .../zyyx_pro_ii_02_pla_normal.inst.cfg | 40 ++++++++---------- .../zyyx_pro_ii_04_pla_fine.inst.cfg | 40 ++++++++---------- .../zyyx_pro_ii_04_pla_normal.inst.cfg | 40 ++++++++---------- .../zyyx_pro_ii_04_pla_quick.inst.cfg | 40 ++++++++---------- .../zyyx_pro_ii_06_pla_fine.inst.cfg | 41 +++++++++---------- .../zyyx_pro_ii_06_pla_normal.inst.cfg | 41 +++++++++---------- .../zyyx_pro_ii_06_pla_quick.inst.cfg | 41 +++++++++---------- .../zyyx_pro_ii_12_pla_normal.inst.cfg | 41 +++++++++---------- 8 files changed, 148 insertions(+), 176 deletions(-) diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg index 2f6a818a1c..5b62834b08 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -1,47 +1,43 @@ [general] -version = 4 -name = Normal PLA definition = zyyx_pro_ii +name = Normal PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 global_quality = True material = generic_pla +quality_type = normal +setting_version = 17 +type = quality variant = Multi0.2 +weight = -2 [values] -layer_height = 0.2 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.2 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.5 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 60 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg index 38dbddb129..4d76a04f9a 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -1,47 +1,43 @@ [general] -version = 4 -name = Fine PLA definition = zyyx_pro_ii +name = Fine PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = fine -weight = -2 global_quality = True material = generic_pla +quality_type = fine +setting_version = 17 +type = quality variant = Carbon0.4 +weight = -2 [values] -layer_height = 0.15 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.15 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 30 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.5 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 60 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg index 5e0ee08c97..6fbaa2636d 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -1,47 +1,43 @@ [general] -version = 4 -name = Normal PLA definition = zyyx_pro_ii +name = Normal PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 global_quality = True material = generic_pla +quality_type = normal +setting_version = 17 +type = quality variant = Carbon0.4 +weight = -2 [values] -layer_height = 0.2 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.2 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.5 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 60 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg index ffa8ea1559..9fa105ae76 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg @@ -1,47 +1,43 @@ [general] -version = 4 -name = Quick PLA definition = zyyx_pro_ii +name = Quick PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = quick -weight = -2 global_quality = True material = generic_pla +quality_type = quick +setting_version = 17 +type = quality variant = Carbon0.4 +weight = -2 [values] -layer_height = 0.3 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.3 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.5 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 60 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg index 0d53ff283c..ab28610153 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -1,46 +1,43 @@ [general] -version = 4 -name = Fine PLA definition = zyyx_pro_ii +name = Fine PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = fine -weight = -2 global_quality = True material = generic_pla +quality_type = fine +setting_version = 17 +type = quality variant = Carbon0.6 +weight = -2 [values] -layer_height = 0.15 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.15 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 30 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.2 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 50 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg index 02c5f0008d..4051e4d762 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -1,46 +1,43 @@ [general] -version = 4 -name = Normal PLA definition = zyyx_pro_ii +name = Normal PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 global_quality = True material = generic_pla +quality_type = normal +setting_version = 17 +type = quality variant = Carbon0.6 +weight = -2 [values] -layer_height = 0.2 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.2 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.2 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 60 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg index 9b2a8c33c3..839aaddb89 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg @@ -1,46 +1,43 @@ [general] -version = 4 -name = Quick PLA definition = zyyx_pro_ii +name = Quick PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = quick -weight = -2 global_quality = True material = generic_pla +quality_type = quick +setting_version = 17 +type = quality variant = Carbon0.6 +weight = -2 [values] -layer_height = 0.3 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.3 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 70 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.2 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 70 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 60 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg index 83bd551bed..d39cbc6ba5 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -1,46 +1,43 @@ [general] -version = 4 -name = Normal PLA definition = zyyx_pro_ii +name = Normal PLA +version = 4 [metadata] -setting_version = 17 -type = quality -quality_type = normal -weight = -2 global_quality = True material = generic_pla +quality_type = normal +setting_version = 17 +type = quality variant = Carbon1.2 +weight = -2 [values] -layer_height = 0.4 -brim_width = 7 -skirt_line_count = 2 adhesion_type = skirt +brim_width = 7 infill_overlap = -2 -wall_thickness = =line_width *2 - -material_print_temperature_layer_0 = 235 +infill_pattern = quarter_cubic +layer_height = 0.4 material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 - -skin_overlap = 15 -speed_print = 40 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -infill_pattern = quarter_cubic -top_bottom_thickness = =layer_height*3 - +material_print_temperature_layer_0 = 235 retraction_amount = 1.2 -retraction_speed = 20 retraction_count_max = 25 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed - +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) support_angle = 60 support_bottom_distance = =support_z_distance / 2 support_pattern = zigzag support_top_distance = =support_z_distance support_use_towers = True support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 + From 6f260fc474a5ae88518ca060bce795334e6b103a Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 17:53:50 +0200 Subject: [PATCH 42/56] updarte zyyx pro start gcode --- resources/definitions/zyyx_pro.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 98697fc851..0b3b7dbe66 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -225,7 +225,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX Pro" }, - "machine_start_gcode": { "default_value": ";start of ZYYX Pro startcode\nM73 P0; enable build progress\nM420 P10; set back fan speed 10 off 11-20 10-100%\nM140 S10 T0; set 100% heater power\nM140 S99 T0; set chamber heater negative hysteresis 19 degrees\nM140 S102 T0; set chamber heater positive hysteresis 2 degrees\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n; Start build plate homing\nG162 X Y F3000; home XY axes maximum\nG161 Z F1200; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z2 F2000\nG1 X-5 Y-5 Z2 F5000\nG162 X Y F300; home XY axes maximum\nG161 Z F200; home Z axis minimum\nG92 X0 Y0 Z0\nM131 A; store surface calibration point 1\n; Homing point 1 complete\nG1 X0 Y0 Z5 F3000; \nG1 X-182 Y0 Z5 F10000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-182 Y0 Z0 E0\nG1 X-182 Y0 Z5 F10000\n; Homing point 2 complete\nG1 X0 Y-228 Z5 F8000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\n; Homing point 2 complete\nG1 Z5 F3000\nG1 X-5 Y-5 F5000\nG162 X Y F300\nG1 Z5 F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 Z10 F3000; clear nozzle from hole\nG1 X0 Y0 Z10 F8000; move to middle of plate\n; end of ZYYX pro build plate calibration\nM133 T0 ; stabilize extruder temperature\nM126; turn on fan to help heat chamber\nM134 T0; wait for heated chamber temperature\nM127; turn off fan when hot\n;SET_ZXPARAM\n;SET_SUPPORT_BUMPMAP\nG92 E0 ; Set E to 0\n; end of ZYYX Pro start code" }, + "machine_start_gcode": { "default_value": "; ZYYX Pro start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM420 P20; set back fan speed 10 off 11-20 10-100%\nM140 S10 T0; set 100% heater power\nM140 S99 T0; set chamber heater negative hysteresis 19 degrees\nM140 S102 T0; set chamber heater positive hysteresis 2 degrees\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X135 Y114\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-47 F7000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X135 Y-114 F7000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\n\n; Extrude material over hole\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 Z0.10 E500 F50\nG1 X115 Y-95 F1000\nG92 E0 ; Set E to 0\n; End of start gcode" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, From 579ab394123acac04ec00917aaa9a184ddea8af0 Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Tue, 10 Sep 2024 15:54:42 +0000 Subject: [PATCH 43/56] Applied printer-linter format --- resources/definitions/zyyx_pro.def.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 0b3b7dbe66..33bd8da370 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -9,16 +9,6 @@ "manufacturer": "ZYYX Labs AB", "file_formats": "application/x3g", "platform": "zyyx_pro_platform.stl", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine": "zyyx_pro", - "machine_extruder_trains": { "0": "zyyx_pro_extruder" }, - "machine_x3g_variant": "z", - "preferred_material": "zyyx_pla", - "preferred_variant_name": "Carbon0.6", - "quality_definition": "zyyx_pro", - "variants_name": "SwiftTool", "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -174,7 +164,17 @@ "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine": "zyyx_pro", + "machine_extruder_trains": { "0": "zyyx_pro_extruder" }, + "machine_x3g_variant": "z", + "preferred_material": "zyyx_pla", + "preferred_variant_name": "Carbon0.6", + "quality_definition": "zyyx_pro", + "variants_name": "SwiftTool" }, "overrides": { From 713b4fb57a033fbb00447f4cb972286b9191cd13 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 17:54:59 +0200 Subject: [PATCH 44/56] removed accidental temp files --- .../definitions/Zyyx plus start gcode.txt | 1 - .../Zyyx pro start gcode legacy.txt | 60 ------------------- .../definitions/Zyyx pro start gcode.txt | 52 ---------------- resources/definitions/zyyx_testing.txt | 51 ---------------- 4 files changed, 164 deletions(-) delete mode 100644 resources/definitions/Zyyx plus start gcode.txt delete mode 100644 resources/definitions/Zyyx pro start gcode legacy.txt delete mode 100644 resources/definitions/Zyyx pro start gcode.txt delete mode 100644 resources/definitions/zyyx_testing.txt diff --git a/resources/definitions/Zyyx plus start gcode.txt b/resources/definitions/Zyyx plus start gcode.txt deleted file mode 100644 index 2e45c726ec..0000000000 --- a/resources/definitions/Zyyx plus start gcode.txt +++ /dev/null @@ -1 +0,0 @@ -; ZYYX+ start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nM126 S0; Turn off fan\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 Z127 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X132.5 Y120\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-44.5 Y120 F9000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X132.5 Y-110 F9000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\nG1 Z1 F1000\n\n; Lay prime strip\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 X100 Y-110 Z0.2 F1000\nG1 X40 E9 F1000\nG1 X0 E12.5 F1000\nG92 E0 ; Set E to 0\n\n; End of start gcode \ No newline at end of file diff --git a/resources/definitions/Zyyx pro start gcode legacy.txt b/resources/definitions/Zyyx pro start gcode legacy.txt deleted file mode 100644 index 01ef5dc277..0000000000 --- a/resources/definitions/Zyyx pro start gcode legacy.txt +++ /dev/null @@ -1,60 +0,0 @@ -;start of ZYYX Pro startcode -M73 P0; enable build progress -G21; set units to mm -G90; set positioning to absolute -G130 X80 Y80 A127 B127 ; Set Stepper Vref to default value -G162 X Y F3000; home XY axes maximum -G161 Z F450 -G161 Z F450; home Z axis minimum -G92 X0 Y0 Z0 E0 -G1 X0 Y0 Z20 F3000 -G1 X-120 Y-110 Z10 F3000 -G130 X0 Y0 Z3 A0 B0 ; Set Stepper Vref to low value -M420 P10; set back fan speed 10 off 11-20 10-100% -M140 S10 T0; set 100% heater power -M140 S99 T0; set chamber heater negative hysteresis 19 degrees -M140 S102 T0; set chamber heater positive hysteresis 2 degrees -M140 S{material_bed_temperature_layer_0} T0; set chamber temperature -M104 S100 T0; set extruder temp 100 while heating -M134 T0; wait for heated chamber temperature -M420 P13; set fan speed 10 off 11-20 10-100% -G130 X80 Y80 Z64 A127 B127 ; Set Stepper Vref to default value -; Perform probing of build plate -G162 X Y F3000; home XY axes maximum -G161 Z F450 -G161 Z F450; home Z axis minimum -G92 X0 Y0 Z0 E0 -G1 X0 Y0 Z5 F200 -G161 Z F200; home Z axis minimum again -G92 X0 Y0 Z0 E0 -M131 A; store surface calibration point 1 -G1 X0 Y0 Z5 F200 -G1 X-182 Y0 Z5 F3000; move to 2nd probing point -G161 Z F200 -M131 B; store surface calibration point 2 -G92 X-182 Y0 Z0 E0 -G1 X-182 Y0 Z5 F200 -G1 X0 Y0 Z5 F3000; move to home point -G161 Z F200; home Z axis minimum again -G92 X0 Y0 Z0 E0; set reference again -G1 X0 Y0 Z5 F200; clear Z -G1 X0 Y-228 Z5 F3000; move to 3rd calibration point -G161 Z F200 -M131 AB; store surface calibration point 3 -M132 AB; activate auto leveling -G92 X0 Y-228 Z0 E0 -G1 X0 Y-228 Z5 F200 -G162 X Y F3000 -G161 Z F200 -G92 X135 Y115 Z0 E0 -M132 Z; Recall stored home offset for Z axis -G1 X135 Y115 Z5 F450; clear nozzle from hole -G1 X0 Y115 Z5 F3000; clear nozzle from hole -; end of ZYYX pro build plate calibration -M127; turn off fan -M104 S{material_print_temperature_layer_0} T0 -M133 T0 ; stabilize extruder temperature -;SET_ZXPARAM -;SET_SUPPORT_BUMPMAP -G92 E0 ; Set E to 0 -; end of ZYYX Pro start code \ No newline at end of file diff --git a/resources/definitions/Zyyx pro start gcode.txt b/resources/definitions/Zyyx pro start gcode.txt deleted file mode 100644 index 0876750b93..0000000000 --- a/resources/definitions/Zyyx pro start gcode.txt +++ /dev/null @@ -1,52 +0,0 @@ -;start of ZYYX Pro startcode -M73 P0; enable build progress -M420 P10; set back fan speed 10 off 11-20 10-100% -M140 S10 T0; set 100% heater power -M140 S99 T0; set chamber heater negative hysteresis 19 degrees -M140 S102 T0; set chamber heater positive hysteresis 2 degrees -M140 S60 T0; set chamber temperature -M104 S{material_print_temperature_layer_0} T0; set nozzle temperature -G21; set units to mm -G90; set positioning to absolute -G130 X80 Y90 A127 B127 ; Set Stepper Vref to default value -; Start build plate homing -G162 X Y F3000; home XY axes maximum -G161 Z F1200; home Z axis minimum -G92 X0 Y0 Z0 E0 -G1 X0 Y0 Z2 F2000 -G1 X-5 Y-5 Z2 F5000 -G162 X Y F300; home XY axes maximum -G161 Z F200; home Z axis minimum -G92 X0 Y0 Z0 -M131 A; store surface calibration point 1 -; Homing point 1 complete -G1 X0 Y0 Z5 F3000; -G1 X-182 Y0 Z5 F10000; move to 2nd probing point -G161 Z F200 -M131 B; store surface calibration point 2 -G92 X-182 Y0 Z0 E0 -G1 X-182 Y0 Z5 F10000 -; Homing point 2 complete -G1 X0 Y-228 Z5 F8000; move to 3rd calibration point -G161 Z F200 -M131 AB; store surface calibration point 3 -M132 AB; activate auto leveling -; Homing point 2 complete -G1 Z5 F3000 -G1 X-5 Y-5 F5000 -G162 X Y F300 -G1 Z5 F3000 -G161 Z F200 -G92 X135 Y115 Z0 E0 -M132 Z; Recall stored home offset for Z axis -G1 Z10 F3000; clear nozzle from hole -G1 X0 Y0 Z10 F8000; move to middle of plate -; end of ZYYX pro build plate calibration -M133 T0 ; stabilize extruder temperature -M126; turn on fan to help heat chamber -M134 T0; wait for heated chamber temperature -M127; turn off fan when hot -;SET_ZXPARAM -;SET_SUPPORT_BUMPMAP -G92 E0 ; Set E to 0 -; end of ZYYX Pro start code \ No newline at end of file diff --git a/resources/definitions/zyyx_testing.txt b/resources/definitions/zyyx_testing.txt deleted file mode 100644 index 52be7545fa..0000000000 --- a/resources/definitions/zyyx_testing.txt +++ /dev/null @@ -1,51 +0,0 @@ -;RIGHT EXTRUDER -; Replicator 1 dual start.gcode -M73 P0 ; Enable build progress -G21; set units to mm -G90 ; absolute positioning -G162 Z F3000 ; Home Z maximum -G28 X Y ; Home X Y maximum -G92 X0 Y0 -M140 S[bed0_temperature] T0 ; Heat buildplate -M134 T0 ; Stabilize bed temperature -M104 S180 T0 ; Heat right extruder -M104 S70 T1 ; Heat lightly left extruder -M133 T0 ; Stabilize right extruder temperature -M133 T1 ; Stabilize left extruder temperature -M104 S0 T1 ; cool down left extruder -G0 X-45 Y-15; estrema destra in fondo punto di calibrazione ZERO prende offset primario di asse Z -G161 Z F800 -G92 Z-5 ; Set Z to 5 -G4 P20000 ; 20 seconds wait, before beginning, to stabilize ambient temps -G1 Z0 -G161 Z F50 ; Home Z maximum slowly -M132 Z ; Recall home offsets for Z -G1 Z10 -G28 X Y ; Home X Y maximum -M132 X Y A B ; Recall home offsets for everything but Z -G1 X-80 Y65 Z10 F2000 ; Prima posizione di calibrazione -G161 Z F100 -M131 A ; prima posizione memorizzata -G1 X100 Y-10 Z10 F2000 ; Seconda posizione di calibrazione -G161 Z F100 -M131 B ; seconda posizione memorizzata -G1 X-70 Y-10 Z10 F2000 ; Terza posizione di calibrazione -G161 Z F100 -M131 AB ; Terza posizione memorizzata -M132 AB ; avvio del livellamento automatico -M135 T0 ; Load right extruder offsets -G1 X-120 Y-75 Z30 F9000 ; Move to wait position off table -G130 X20 Y20 Z20 A20 B20 ; Lower stepper Vrefs while heating -M126 S[fan_speed_pwm] ; Set fan speed -M104 S[extruder0_temperature] T0 ; Heat right extruder -M133 T0 ; Stabilize right extruder temperature -G130 X127 Y127 Z40 A127 B127 ; Default stepper Vrefs -G92 A0 B0 ; Zero extruders -G1 X100 Y-75 F9000 ; Move to front right corner of bed -G1 Z0.4 F6000 ; Move down to purge -G1 X-90 Y-75 E24 F2000 ; Extrude a line of filament across the front edge of the bed -G1 X-100 Y-75 F180 ; Wait for ooze -G1 X-110 Y-75 F5000 ; Fast wipe -G1 Z0.2 F100 ; Lift -M73 P1 ;@body (notify GPX body has started) -; end of start.gcode \ No newline at end of file From 8eb4ccd9689d05d832c8237695060c13abe68105 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 17:58:48 +0200 Subject: [PATCH 45/56] update zyyx+ and pro definitions --- resources/definitions/zyyx_plus.def.json | 2 +- resources/definitions/zyyx_pro.def.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index e645caea52..1d7640f3aa 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, - "author": "ZYYX Labs AB", + "author": "Theodor Hansson", "manufacturer": "ZYYX Labs AB", "file_formats": "application/x3g", "platform": "zyyx_platform.3mf", diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 33bd8da370..739f9eea57 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -5,7 +5,7 @@ "metadata": { "visible": true, - "author": "ZYYX Labs AB", + "author": "Theodor Hansson", "manufacturer": "ZYYX Labs AB", "file_formats": "application/x3g", "platform": "zyyx_pro_platform.stl", @@ -181,7 +181,7 @@ "gantry_height": { "value": "10" }, "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 225 }, + "machine_depth": { "default_value": 228 }, "machine_disallowed_areas": { "default_value": [ From 5b8cf6db1f1e5a6dcc5a9e1ddcc6d96c2ca85b66 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 18:14:00 +0200 Subject: [PATCH 46/56] lower vref for zyyx+ --- resources/definitions/zyyx_plus.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index 1d7640f3aa..de8920684a 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -199,7 +199,7 @@ }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX+" }, - "machine_start_gcode": { "default_value": "; ZYYX+ start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nM126 S0; Turn off fan\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 Z127 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X132.5 Y120\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-44.5 Y120 F9000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X132.5 Y-110 F9000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\nG1 Z1 F1000\n\n; Lay prime strip\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 X100 Y-110 Z0.2 F1000\nG1 X40 E9 F1000\nG1 X0 E12.5 F1000\nG92 E0 ; Set E to 0\n\n; End of start gcode" }, + "machine_start_gcode": { "default_value": "; ZYYX+ start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nM126 S0; Turn off fan\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 Z100 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X132.5 Y120\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-44.5 Y120 F9000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X132.5 Y-110 F9000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\nG1 Z1 F1000\n\n; Lay prime strip\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 X100 Y-110 Z0.2 F1000\nG1 X40 E9 F1000\nG1 X0 E12.5 F1000\nG92 E0 ; Set E to 0\n\n; End of start gcode" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, From c05dd2ad97597fd0f11f5f8ea1d0192b72ee2473 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 2 Oct 2024 10:20:06 +0200 Subject: [PATCH 47/56] merge from theodorhansson/ZYYX-Cura-Printer-Profiles V3 --- resources/definitions/zyyx_plus.def.json | 14 ++++- resources/definitions/zyyx_pro.def.json | 19 +++++- resources/definitions/zyyx_pro_ii.def.json | 1 + .../extruders/zyyx_plus_extruder_0.def.json | 9 ++- .../extruders/zyyx_pro_extruder.def.json | 15 ++--- .../extruders/zyyx_pro_ii_extruder.def.json | 15 ++--- .../zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg | 7 +-- .../zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg | 7 +-- .../ABS/zyyx_plus_abs_normal.inst.cfg | 7 +-- .../FLEX/zyyx_plus_flex_fast.inst.cfg | 20 +++---- .../FLEX/zyyx_plus_flex_fine.inst.cfg | 24 ++++---- .../FLEX/zyyx_plus_flex_normal.inst.cfg | 24 ++++---- .../PLA/zyyx_plus_pla_draft.inst.cfg | 26 -------- .../zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg | 9 +-- .../zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg | 9 +-- .../PLA/zyyx_plus_pla_normal.inst.cfg | 9 +-- .../zyyx_plus/zyyx_plus_global_draft.inst.cfg | 25 -------- .../zyyx_plus/zyyx_plus_global_fast.inst.cfg | 12 ++-- .../zyyx_plus/zyyx_plus_global_fine.inst.cfg | 11 ++-- .../zyyx_plus_global_normal.inst.cfg | 11 ++-- .../flex/zyyx_pro_06_flex_fast.inst.cfg | 21 +++++++ .../flex/zyyx_pro_06_flex_fine.inst.cfg | 21 +++++++ .../flex/zyyx_pro_06_flex_normal.inst.cfg | 21 +++++++ ...t.cfg => zyyx_pro_06_global_fast.inst.cfg} | 12 ++-- .../carbon06/zyyx_pro_06_global_fine.inst.cfg | 7 ++- .../zyyx_pro_06_global_normal.inst.cfg | 8 ++- .../flex/zyyx_pro_12_flex_normal.inst.cfg | 21 +++++++ .../zyyx_pro_12_global_normal.inst.cfg | 8 ++- .../flex/zyyx_pro_02_flex_fast.inst.cfg | 21 +++++++ .../flex/zyyx_pro_02_flex_fine.inst.cfg | 21 +++++++ .../flex/zyyx_pro_02_flex_normal.inst.cfg | 21 +++++++ ...t.cfg => zyyx_pro_02_global_fast.inst.cfg} | 11 ++-- .../multi02/zyyx_pro_02_global_fine.inst.cfg | 7 ++- .../zyyx_pro_02_global_normal.inst.cfg | 7 ++- .../flex/zyyx_pro_04_flex_fast.inst.cfg | 21 +++++++ .../flex/zyyx_pro_04_flex_fine.inst.cfg | 21 +++++++ .../flex/zyyx_pro_04_flex_normal.inst.cfg | 21 +++++++ ...t.cfg => zyyx_pro_04_global_fast.inst.cfg} | 11 ++-- .../multi04/zyyx_pro_04_global_fine.inst.cfg | 7 ++- .../zyyx_pro_04_global_normal.inst.cfg | 7 ++- .../flex/zyyx_pro_08_flex_fast.inst.cfg | 21 +++++++ .../flex/zyyx_pro_08_flex_fine.inst.cfg | 21 +++++++ .../flex/zyyx_pro_08_flex_normal.inst.cfg | 21 +++++++ .../multi08/zyyx_pro_08_global_fast.inst.cfg | 25 ++++++++ .../multi08/zyyx_pro_08_global_fine.inst.cfg | 25 ++++++++ .../zyyx_pro_08_global_normal.inst.cfg | 14 +++-- .../flex/zyyx_pro_ii_04_pla_fast.inst.cfg | 22 +++++++ .../flex/zyyx_pro_ii_04_pla_fine.inst.cfg | 22 +++++++ .../flex/zyyx_pro_ii_04_pla_normal.inst.cfg | 22 +++++++ .../zyyx_pro_ii_04_pla_fast.inst.cfg} | 7 +-- .../zyyx_pro_ii_04_pla_fine.inst.cfg | 3 +- .../zyyx_pro_ii_04_pla_normal.inst.cfg | 3 +- .../flex/zyyx_pro_ii_06_pla_fast.inst.cfg | 22 +++++++ .../flex/zyyx_pro_ii_06_pla_fine.inst.cfg | 22 +++++++ .../flex/zyyx_pro_ii_06_pla_normal.inst.cfg | 22 +++++++ .../zyyx_pro_ii_06_pla_fast.inst.cfg} | 7 +-- .../zyyx_pro_ii_06_pla_fine.inst.cfg | 3 +- .../zyyx_pro_ii_06_pla_normal.inst.cfg | 3 +- .../flex/zyyx_pro_ii_12_pla_normal.inst.cfg | 22 +++++++ .../flex/zyyx_pro_ii_flex_normal.inst.cfg | 20 +++++++ .../zyyx_pro_ii_12_pla_normal.inst.cfg | 3 +- .../zyyx_pro_ii_global_normal.inst.cfg | 2 +- .../flex/zyyx_pro_ii_02_pla_normal.inst.cfg | 22 +++++++ .../zyyx_pro_ii_02_pla_normal.inst.cfg | 3 +- .../variants/zyyx/zyyx_pro_carbon0.6.inst.cfg | 12 ++-- .../variants/zyyx/zyyx_pro_carbon1.2.inst.cfg | 10 +++- .../zyyx/zyyx_pro_ii_carbon0.4.inst.cfg | 2 +- .../zyyx/zyyx_pro_ii_carbon0.6.inst.cfg | 2 +- .../zyyx/zyyx_pro_ii_carbon1.2.inst.cfg | 4 +- .../zyyx/zyyx_pro_ii_multi0.2.inst.cfg | 2 +- .../variants/zyyx/zyyx_pro_multi0.2.inst.cfg | 44 ++------------ .../variants/zyyx/zyyx_pro_multi0.4.inst.cfg | 10 ++-- .../variants/zyyx/zyyx_pro_multi0.8.inst.cfg | 60 ++----------------- 73 files changed, 747 insertions(+), 325 deletions(-) delete mode 100644 resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg delete mode 100644 resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg rename resources/quality/zyyx_pro/carbon06/{zyyx_pro_06_global_quick.inst.cfg => zyyx_pro_06_global_fast.inst.cfg} (64%) create mode 100644 resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg rename resources/quality/zyyx_pro/multi02/{zyyx_pro_02_global_quick.inst.cfg => zyyx_pro_02_global_fast.inst.cfg} (64%) create mode 100644 resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg rename resources/quality/zyyx_pro/multi04/{zyyx_pro_04_global_quick.inst.cfg => zyyx_pro_04_global_fast.inst.cfg} (63%) create mode 100644 resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg rename resources/quality/zyyx_pro_ii/{zyyx_pro_ii_04_pla_quick.inst.cfg => carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg} (94%) rename resources/quality/zyyx_pro_ii/{ => carbon04}/zyyx_pro_ii_04_pla_fine.inst.cfg (97%) rename resources/quality/zyyx_pro_ii/{ => carbon04}/zyyx_pro_ii_04_pla_normal.inst.cfg (97%) create mode 100644 resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg rename resources/quality/zyyx_pro_ii/{zyyx_pro_ii_06_pla_quick.inst.cfg => carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg} (94%) rename resources/quality/zyyx_pro_ii/{ => carbon06}/zyyx_pro_ii_06_pla_fine.inst.cfg (97%) rename resources/quality/zyyx_pro_ii/{ => carbon06}/zyyx_pro_ii_06_pla_normal.inst.cfg (97%) create mode 100644 resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg rename resources/quality/zyyx_pro_ii/{ => carbon12}/zyyx_pro_ii_12_pla_normal.inst.cfg (97%) rename resources/quality/zyyx_pro_ii/{ => carbon12}/zyyx_pro_ii_global_normal.inst.cfg (89%) create mode 100644 resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg rename resources/quality/zyyx_pro_ii/{ => multi02}/zyyx_pro_ii_02_pla_normal.inst.cfg (97%) diff --git a/resources/definitions/zyyx_plus.def.json b/resources/definitions/zyyx_plus.def.json index de8920684a..88bb335413 100644 --- a/resources/definitions/zyyx_plus.def.json +++ b/resources/definitions/zyyx_plus.def.json @@ -7,6 +7,7 @@ "visible": true, "author": "Theodor Hansson", "manufacturer": "ZYYX Labs AB", + "setting_version": 3, "file_formats": "application/x3g", "platform": "zyyx_platform.3mf", "exclude_materials": [ @@ -124,8 +125,13 @@ "tizyx_pva", "ultimaker_abscf_175", "ultimaker_absr_175", + "ultimaker_asa_175", "ultimaker_nylon12-cf_175", + "ultimaker_pla_175", + "ultimaker_pva_175", "ultimaker_rapidrinse_175", + "ultimaker_sr30_175", + "ultimaker_tough_pla_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA_Glitter", @@ -165,8 +171,12 @@ "xyzprinting_ppgf30", "xyzprinting_tough_pla", "xyzprinting_tpu", + "zyyx_abs-mm", + "zyyx_abs-perf", + "zyyx_flex95a", "zyyx_petg", "zyyx_petg-cf", + "zyyx_pla", "zyyx_pro_flex", "zyyx_pro_pla", "zyyx_procarbon", @@ -176,7 +186,7 @@ "has_machine_quality": true, "machine_extruder_trains": { "0": "zyyx_plus_extruder_0" }, "machine_x3g_variant": "z", - "preferred_material": "zyyx_pla", + "preferred_material": "generic_pla", "preferred_quality_type": "normal", "quality_definition": "zyyx_plus" }, @@ -199,7 +209,7 @@ }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX+" }, - "machine_start_gcode": { "default_value": "; ZYYX+ start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nM126 S0; Turn off fan\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 Z100 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X132.5 Y120\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-44.5 Y120 F9000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X132.5 Y-110 F9000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\nG1 Z1 F1000\n\n; Lay prime strip\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 X100 Y-110 Z0.2 F1000\nG1 X40 E9 F1000\nG1 X0 E12.5 F1000\nG92 E0 ; Set E to 0\n\n; End of start gcode" }, + "machine_start_gcode": { "default_value": "; ZYYX+ start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nM126 S0; Turn off fan\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X132.5 Y120\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-44.5 Y120 F7000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X132.5 Y-110 F7000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\nG1 Z1 F1000\n\n; Lay prime strip\nM133 T0; stabilize extruder temperature\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 X80 Y-110 Z0.2 F1000\nG1 X20 E9 F1000\nG1 X-20 E12.5 F1000\nG92 E0 ; Set E to 0\n\n; End of start gcode" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, diff --git a/resources/definitions/zyyx_pro.def.json b/resources/definitions/zyyx_pro.def.json index 739f9eea57..8b7977f6b2 100644 --- a/resources/definitions/zyyx_pro.def.json +++ b/resources/definitions/zyyx_pro.def.json @@ -7,6 +7,7 @@ "visible": true, "author": "Theodor Hansson", "manufacturer": "ZYYX Labs AB", + "setting_version": 3, "file_formats": "application/x3g", "platform": "zyyx_pro_platform.stl", "exclude_materials": [ @@ -122,7 +123,13 @@ "tizyx_pva", "ultimaker_abscf_175", "ultimaker_absr_175", + "ultimaker_asa_175", + "ultimaker_nylon12-cf_175", + "ultimaker_pla_175", + "ultimaker_pva_175", "ultimaker_rapidrinse_175", + "ultimaker_sr30_175", + "ultimaker_tough_pla_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA_Glitter", @@ -162,8 +169,14 @@ "xyzprinting_ppgf30", "xyzprinting_tough_pla", "xyzprinting_tpu", + "zyyx_abs-mm", + "zyyx_abs-perf", + "zyyx_flex95a", + "zyyx_petg", + "zyyx_pla", "zyyx_pro_flex", - "zyyx_pro_pla" + "zyyx_pro_pla", + "zyyx_pronylon" ], "has_machine_quality": true, "has_materials": true, @@ -171,7 +184,7 @@ "machine": "zyyx_pro", "machine_extruder_trains": { "0": "zyyx_pro_extruder" }, "machine_x3g_variant": "z", - "preferred_material": "zyyx_pla", + "preferred_material": "generic_pla", "preferred_variant_name": "Carbon0.6", "quality_definition": "zyyx_pro", "variants_name": "SwiftTool" @@ -225,7 +238,7 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 195 }, "machine_name": { "default_value": "ZYYX Pro" }, - "machine_start_gcode": { "default_value": "; ZYYX Pro start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM420 P20; set back fan speed 10 off 11-20 10-100%\nM140 S10 T0; set 100% heater power\nM140 S99 T0; set chamber heater negative hysteresis 19 degrees\nM140 S102 T0; set chamber heater positive hysteresis 2 degrees\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X135 Y114\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-47 F7000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X135 Y-114 F7000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\n\n; Extrude material over hole\nM133 T0 P300; stabilize extruder temperature (abort after 5 mins)\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 Z0.10 E500 F50\nG1 X115 Y-95 F1000\nG92 E0 ; Set E to 0\n; End of start gcode" }, + "machine_start_gcode": { "default_value": "; ZYYX Pro start gcode\n; Author Theodor Hansson 2024\nM73 P0; enable build progress\nM420 P20; set back fan speed 10 off 11-20 10-100%\nM140 S10 T0; set 100% heater power\nM140 S99 T0; set chamber heater negative hysteresis 19 degrees\nM140 S102 T0; set chamber heater positive hysteresis 2 degrees\nM140 S{material_bed_temperature_layer_0} T0; set chamber temperature\nM104 S{material_print_temperature_layer_0} T0; set nozzle temperature\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y90 A127 B127 ; Set Stepper Vref to default value\n\n; Home xy-axis\nG162 X Y F2500; home XY axes maximum\nG92 X0 Y0\nG1 X-5 Y-5 F2500\nG162 X Y F200; home XY axes maximum slowly\nG92 X135 Y114\n\n; Home z-axis\nG161 Z F1100; home Z axis minimum\nG92 Z0\nG1 Z2 F1100\nG161 Z F100; home Z axis minimum slowly\nG92 Z0\nM132 Z; Recall home offsets for Z\n\n; Calibrate point 1 (we're already at point 1)\nM131 A; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 2\nG1 X-47 F7000; move to 2nd probing point\nG161 Z F100\nM131 B; store surface calibration point 1\nG1 Z2 F1100; back up from buildplate\n\n; Calibrate point 3\nG1 X135 Y-114 F7000; move to 2nd probing point\nG161 Z F100\nM131 AB; store surface calibration point 3\nG1 Z2 F1100; back up from buildplate\nM132 AB; Activate auto-leveling\n\n; Extrude material over hole\nM133 T0; stabilize extruder temperature\nM126 S{cool_fan_speed_0}; Activate fan\nG4 P1000; Wait a little bit longer\nG1 Z0.10 E500 F50\nG1 X115 Y-95 F1000\nG92 E0 ; Set E to 0\n; End of start gcode" }, "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, "machine_steps_per_mm_x": { "default_value": 88.888889 }, "machine_steps_per_mm_y": { "default_value": 88.888889 }, diff --git a/resources/definitions/zyyx_pro_ii.def.json b/resources/definitions/zyyx_pro_ii.def.json index 347a2475f6..152374dd8a 100644 --- a/resources/definitions/zyyx_pro_ii.def.json +++ b/resources/definitions/zyyx_pro_ii.def.json @@ -7,6 +7,7 @@ "visible": true, "author": "ZYYX Labs AB", "manufacturer": "ZYYX Labs AB", + "setting_version": 3, "file_formats": "text/x-gcode", "platform": "zyyx_pro_platform.stl", "has_machine_quality": true, diff --git a/resources/extruders/zyyx_plus_extruder_0.def.json b/resources/extruders/zyyx_plus_extruder_0.def.json index f87248832c..4e6e6a7a67 100644 --- a/resources/extruders/zyyx_plus_extruder_0.def.json +++ b/resources/extruders/zyyx_plus_extruder_0.def.json @@ -2,15 +2,14 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "zyyx_plus", "position": "0" }, - "overrides": - { + + "overrides": { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/zyyx_pro_extruder.def.json b/resources/extruders/zyyx_pro_extruder.def.json index e885e5008c..59a6ada528 100644 --- a/resources/extruders/zyyx_pro_extruder.def.json +++ b/resources/extruders/zyyx_pro_extruder.def.json @@ -2,18 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "zyyx_pro", "position": "0" }, - "overrides": - { - "extruder_nr": - { - "default_value": 0, - "maximum_value": "1" - }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/extruders/zyyx_pro_ii_extruder.def.json b/resources/extruders/zyyx_pro_ii_extruder.def.json index 403114fa56..56110a9db9 100644 --- a/resources/extruders/zyyx_pro_ii_extruder.def.json +++ b/resources/extruders/zyyx_pro_ii_extruder.def.json @@ -2,18 +2,13 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "zyyx_pro_ii", "position": "0" }, - "overrides": - { - "extruder_nr": - { - "default_value": 0, - "maximum_value": "1" - }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg index fc69349cd2..d3e2f7f73d 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg @@ -6,21 +6,18 @@ version = 4 [metadata] material = generic_abs quality_type = fast -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] adhesion_type = brim -default_material_print_temperature = 240 +material_print_temperature = 240 infill_sparse_density = 10 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 55 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 0.8 wall_thickness = 0.8 - diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg index 24e71fcc84..76e581bf44 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg @@ -6,21 +6,18 @@ version = 4 [metadata] material = generic_abs quality_type = fine -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] adhesion_type = brim -default_material_print_temperature = 240 +material_print_temperature = 240 infill_sparse_density = 15 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 40 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 1.0 wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg index f88a8be35b..bc4830517e 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg @@ -6,21 +6,18 @@ version = 4 [metadata] material = generic_abs quality_type = normal -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] adhesion_type = brim -default_material_print_temperature = 240 +material_print_temperature = 240 infill_sparse_density = 15 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 50 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 1.0 wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg index 154c9e770c..7d15604276 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg @@ -4,24 +4,22 @@ name = Fast ZYYX Flex95A version = 4 [metadata] -material = zyyx_flex95 +material = generic_tpu_175 quality_type = fast -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] -adhesion_type = brim -default_material_print_temperature = 210 infill_sparse_density = 15 -material_flow = 105 -material_print_temperature_layer_0 = 235 -raft_airgap = 0.2 -retraction_amount = 1.0 +material_flow = 100 +material_print_temperature = 220 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_amount = 0.8 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 +speed_travel = 80 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print -top_bottom_thickness = 1.0 -wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg index 74e011da4f..9d67604381 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg @@ -4,24 +4,22 @@ name = Fine ZYYX Flex95A version = 4 [metadata] -material = zyyx_flex95 +material = generic_tpu_175 quality_type = fine -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] -adhesion_type = brim -default_material_print_temperature = 210 -infill_sparse_density = 15 -material_flow = 105 -material_print_temperature_layer_0 = 235 -raft_airgap = 0.2 -retraction_amount = 1.0 +infill_sparse_density = 20 +material_flow = 100 +material_print_temperature = 220 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_amount = 0.8 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 -speed_print = 15 +speed_print = 20 +speed_travel = 80 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print -top_bottom_thickness = 1.0 -wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg index d1c66fffb5..dd34eb9447 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg @@ -4,24 +4,22 @@ name = Normal ZYYX Flex95A version = 4 [metadata] -material = zyyx_flex95 +material = generic_tpu_175 quality_type = normal -setting_version = 20 +setting_version = 3 type = quality weight = 0 [values] -adhesion_type = brim -default_material_print_temperature = 210 -infill_sparse_density = 15 -material_flow = 105 -material_print_temperature_layer_0 = 235 -raft_airgap = 0.2 -retraction_amount = 1.0 +infill_sparse_density = 20 +material_flow = 100 +material_print_temperature = 220 +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_amount = 0.8 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop = 0.2 retraction_speed = 15 -speed_print = 20 +speed_print = 15 +speed_travel = 80 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print -top_bottom_thickness = 1.0 -wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg deleted file mode 100644 index 1bea36f585..0000000000 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_draft.inst.cfg +++ /dev/null @@ -1,26 +0,0 @@ -[general] -definition = zyyx_plus -name = Draft PLA -version = 4 - -[metadata] -material = generic_pla -quality_type = draft -setting_version = 1 -type = quality -weight = 0 - -[values] -adhesion_type = brim -default_material_print_temperature = 210 -infill_sparse_density = 10 -material_print_temperature_layer_0 = 225 -raft_airgap = 0.15 -retraction_amount = 1.2 -retraction_speed = 20 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) -top_bottom_thickness = 0.8 -wall_thickness = 0.8 - diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg index 1020bb10d0..62b5c7d14a 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg @@ -6,21 +6,18 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] adhesion_type = brim -default_material_print_temperature = 210 infill_sparse_density = 10 -material_print_temperature_layer_0 = 225 +material_print_temperature = 210 +material_print_temperature_layer_0 = 210 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 55 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 0.8 wall_thickness = 0.8 - diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg index 3e3adb4e98..a453caecc1 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg @@ -6,21 +6,18 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] adhesion_type = brim -default_material_print_temperature = 210 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +material_print_temperature = 205 +material_print_temperature_layer_0 = 210 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 40 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 1.0 wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg index 19db6d0e74..417ac70c23 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg @@ -6,21 +6,18 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 18 +setting_version = 3 type = quality weight = 0 [values] adhesion_type = brim -default_material_print_temperature = 210 infill_sparse_density = 15 -material_print_temperature_layer_0 = 225 +material_print_temperature = 205 +material_print_temperature_layer_0 = 210 raft_airgap = 0.15 retraction_amount = 1.2 retraction_speed = 20 speed_print = 50 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) top_bottom_thickness = 1.0 wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg deleted file mode 100644 index 714ef2ec0d..0000000000 --- a/resources/quality/zyyx_plus/zyyx_plus_global_draft.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -definition = zyyx_plus -name = Draft -version = 4 - -[metadata] -global_quality = True -quality_type = draft -setting_version = 1 -type = quality -weight = 0 - -[values] -adhesion_type = brim -infill_sparse_density = 10 -layer_height = 0.3 -raft_airgap = 0.15 -retraction_amount = 1.2 -retraction_speed = 20 -speed_print = 55 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) -top_bottom_thickness = 0.9 -wall_thickness = 0.8 - diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg index 94d2b6dbcf..eb27cead48 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg @@ -6,20 +6,22 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 adhesion_type = brim +infill_pattern = cubic infill_sparse_density = 10 layer_height = 0.2 -raft_airgap = 0.15 +raft_airgap = 0.25 retraction_amount = 1.2 +retraction_count_max = 20 retraction_speed = 20 speed_print = 55 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) +speed_travel = 100 top_bottom_thickness = 0.8 wall_thickness = 0.8 - diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg index ed38ad5008..560fcfd98f 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -6,21 +6,22 @@ version = 4 [metadata] global_quality = True quality_type = fine -setting_version = 1 +setting_version = 3 type = quality weight = 0 [values] +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 adhesion_type = brim infill_pattern = gyroid infill_sparse_density = 15 layer_height = 0.1 -raft_airgap = 0.15 +raft_airgap = 0.2 retraction_amount = 1.2 +retraction_count_max = 20 retraction_speed = 20 speed_print = 40 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) +speed_travel = 100 top_bottom_thickness = 1.0 wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index f97ea72d67..aa05fb3598 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -6,21 +6,22 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 19 +setting_version = 3 type = quality weight = 0 [values] +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 adhesion_type = brim infill_pattern = gyroid infill_sparse_density = 15 layer_height = 0.15 -raft_airgap = 0.15 +raft_airgap = 0.2 retraction_amount = 1.2 +retraction_count_max = 20 retraction_speed = 20 speed_print = 50 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) +speed_travel = 100 top_bottom_thickness = 1.0 wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg new file mode 100644 index 0000000000..0c38dbd09d --- /dev/null +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fast +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fast06 +weight = 0 +global_quality = True +variant = Carbon0.6 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg new file mode 100644 index 0000000000..dcfadcf92d --- /dev/null +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fine06 +weight = 0 +global_quality = True +variant = Carbon0.6 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg new file mode 100644 index 0000000000..be804279c3 --- /dev/null +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = normal06 +weight = 0 +global_quality = True +variant = Carbon0.6 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg similarity index 64% rename from resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg rename to resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg index a0b3214f19..7fc963c380 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_quick.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Quick +name = Fast definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality -quality_type = quick06 +quality_type = fast06 weight = -2 global_quality = True variant = Carbon0.6 @@ -18,4 +18,8 @@ top_bottom_thickness = =line_width*2 speed_print = 60 infill_pattern = cubic material_print_temperature = =default_material_print_temperature + 5 - +raft_airgap = 0.3 +retraction_amount = 1.2 +retraction_speed = 30 +retraction_extra_prime_amount = 0.05 +retraction_count_max = 20 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg index 8069922b93..1af40d476b 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality quality_type = fine06 weight = -2 @@ -18,3 +18,8 @@ top_bottom_thickness = =line_width*2 speed_print = 40 infill_pattern = gyroid material_print_temperature = =default_material_print_temperature + 5 +raft_airgap = 0.3 +retraction_amount = 1.2 +retraction_speed = 30 +retraction_extra_prime_amount = 0.05 +retraction_count_max = 20 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg index a500b25914..42e6ac08c8 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality quality_type = normal06 weight = -2 @@ -18,4 +18,8 @@ top_bottom_thickness = =line_width*2 speed_print = 50 infill_pattern = gyroid material_print_temperature = =default_material_print_temperature + 5 - +raft_airgap = 0.3 +retraction_amount = 1.2 +retraction_speed = 30 +retraction_extra_prime_amount = 0.05 +retraction_count_max = 20 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg new file mode 100644 index 0000000000..8e5dd8436d --- /dev/null +++ b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg @@ -0,0 +1,21 @@ +[general] +definition = zyyx_pro +name = Normal +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +quality_type = normal12 +setting_version = 3 +type = quality +variant = Carbon1.2 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg index 789ebf4376..c647fe1fad 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal12 -setting_version = 1 +setting_version = 3 type = quality variant = Carbon1.2 weight = -2 @@ -18,4 +18,8 @@ material_print_temperature = =default_material_print_temperature + 5 speed_print = 50 top_bottom_thickness = =line_width*2 wall_thickness = =line_width*2 - +raft_airgap = 0.6 +retraction_amount = 1.5 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_count_max = 20 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg new file mode 100644 index 0000000000..1e214d5978 --- /dev/null +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fast +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fast02 +weight = 0 +global_quality = True +variant = Multi0.2 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg new file mode 100644 index 0000000000..2ee2bc24e9 --- /dev/null +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fine02 +weight = 0 +global_quality = True +variant = Multi0.2 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg new file mode 100644 index 0000000000..1482f15add --- /dev/null +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = normal02 +weight = 0 +global_quality = True +variant = Multi0.2 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_quick.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg similarity index 64% rename from resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_quick.inst.cfg rename to resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg index e3a456629e..dd09499f39 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_quick.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Quick +name = Fast definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality -quality_type = quick02 +quality_type = fast02 weight = -2 global_quality = True variant = Multi0.2 @@ -17,4 +17,7 @@ wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2.5 speed_print = 50 infill_pattern = cubic -infill_sparse_density = 5 \ No newline at end of file +infill_sparse_density = 5 +raft_airgap = 0.1 +retraction_amount = 0.5 +retraction_speed = 20 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg index 5cfae7cbb0..5d6842da5a 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality quality_type = fine02 weight = -2 @@ -17,4 +17,7 @@ wall_thickness = =line_width*3 top_bottom_thickness = =line_width*2.5 speed_print = 30 infill_pattern = gyroid -infill_sparse_density = 10 \ No newline at end of file +infill_sparse_density = 10 +raft_airgap = 0.1 +retraction_amount = 0.5 +retraction_speed = 20 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg index 00019dc2dd..2748964c5f 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality quality_type = normal02 weight = -2 @@ -17,4 +17,7 @@ wall_thickness = =line_width*3 top_bottom_thickness = =line_width*2.5 speed_print = 40 infill_pattern = gyroid -infill_sparse_density = 10 \ No newline at end of file +infill_sparse_density = 10 +raft_airgap = 0.1 +retraction_amount = 0.5 +retraction_speed = 20 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg new file mode 100644 index 0000000000..7fafbb127a --- /dev/null +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fast +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fast04 +weight = 0 +global_quality = True +variant = Multi0.4 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg new file mode 100644 index 0000000000..881fcd940e --- /dev/null +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fine04 +weight = 0 +global_quality = True +variant = Multi0.4 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg new file mode 100644 index 0000000000..59e8f06d88 --- /dev/null +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = normal04 +weight = 0 +global_quality = True +variant = Multi0.4 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_quick.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg similarity index 63% rename from resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_quick.inst.cfg rename to resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg index 43bd9ba485..f775738268 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_quick.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg @@ -1,12 +1,12 @@ [general] version = 4 -name = Quick +name = Fast definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality -quality_type = quick04 +quality_type = fast04 weight = -2 global_quality = True variant = Multi0.4 @@ -16,4 +16,7 @@ layer_height = 0.2 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 60 -infill_pattern = cubic \ No newline at end of file +infill_pattern = cubic +raft_airgap = 0.2 +retraction_amount = 1 +retraction_speed = 20 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg index cd987f3afd..d9025437f6 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality quality_type = fine04 weight = -2 @@ -16,4 +16,7 @@ layer_height = 0.1 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 40 -infill_pattern = gyroid \ No newline at end of file +infill_pattern = gyroid +raft_airgap = 0.2 +retraction_amount = 1 +retraction_speed = 20 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg index 7921f12d0e..cfd2897e4b 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality quality_type = normal04 weight = -2 @@ -16,4 +16,7 @@ layer_height = 0.15 wall_thickness = =line_width*2 top_bottom_thickness = =line_width*2 speed_print = 50 -infill_pattern = gyroid \ No newline at end of file +infill_pattern = gyroid +raft_airgap = 0.2 +retraction_amount = 1 +retraction_speed = 20 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg new file mode 100644 index 0000000000..3635245d1a --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fast +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fast08 +weight = 0 +global_quality = True +variant = Multi0.8 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg new file mode 100644 index 0000000000..e3f903406b --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = fine08 +weight = 0 +global_quality = True +variant = Multi0.8 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg new file mode 100644 index 0000000000..39783832f2 --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = normal08 +weight = 0 +global_quality = True +variant = Multi0.8 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg new file mode 100644 index 0000000000..0c160a9f0a --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Fast +definition = zyyx_pro + +[metadata] +setting_version = 3 +type = quality +quality_type = fast08 +weight = -2 +global_quality = True +variant = Multi0.8 + +[values] +layer_height = 0.5 +wall_thickness = =line_width*2 +top_bottom_thickness = =layer_height*2 +speed_print = 45 +infill_pattern = cubic +raft_airgap = 0.4 +retraction_amount = 1.5 +retraction_speed = 30 +retraction_extra_prime_amount = 0.05 +retraction_count_max = 20 +infill_overlap = 50 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg new file mode 100644 index 0000000000..a9beec2933 --- /dev/null +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Fine +definition = zyyx_pro + +[metadata] +setting_version = 3 +type = quality +quality_type = fine08 +weight = -2 +global_quality = True +variant = Multi0.8 + +[values] +layer_height = 0.3 +wall_thickness = =line_width*2 +top_bottom_thickness = =layer_height*4 +speed_print = 50 +infill_pattern = cubic +raft_airgap = 0.4 +retraction_amount = 1.5 +retraction_speed = 30 +retraction_extra_prime_amount = 0.05 +retraction_count_max = 20 +infill_overlap = 30 \ No newline at end of file diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg index b37f1d553b..d2384ef013 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 1 +setting_version = 3 type = quality quality_type = normal08 weight = -2 @@ -12,8 +12,14 @@ global_quality = True variant = Multi0.8 [values] -layer_height = 0.3 +layer_height = 0.4 wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 +top_bottom_thickness = =layer_height*3 speed_print = 50 -infill_pattern = cubic \ No newline at end of file +infill_pattern = cubic +raft_airgap = 0.4 +retraction_amount = 1.5 +retraction_speed = 30 +retraction_extra_prime_amount = 0.05 +retraction_count_max = 20 +infill_overlap = 30 \ No newline at end of file diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg new file mode 100644 index 0000000000..0cddd3d311 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Fast PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = fast +setting_version = 3 +type = quality +variant = Carbon0.4 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg new file mode 100644 index 0000000000..b1af10df7c --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Fine PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = fine +setting_version = 3 +type = quality +variant = Carbon0.4 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg new file mode 100644 index 0000000000..cb135cfa84 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Normal PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Carbon0.4 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg similarity index 94% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg index 9fa105ae76..85a4b9c391 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_quick.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg @@ -1,13 +1,13 @@ [general] definition = zyyx_pro_ii -name = Quick PLA +name = Fast PLA version = 4 [metadata] global_quality = True material = generic_pla -quality_type = quick -setting_version = 17 +quality_type = fast +setting_version = 3 type = quality variant = Carbon0.4 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg similarity index 97% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg index 4d76a04f9a..ec6a840d0a 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_pla quality_type = fine -setting_version = 17 +setting_version = 3 type = quality variant = Carbon0.4 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg similarity index 97% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg index 6fbaa2636d..331b3f8066 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_04_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_pla quality_type = normal -setting_version = 17 +setting_version = 3 type = quality variant = Carbon0.4 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg new file mode 100644 index 0000000000..7e317d0473 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Fast PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = fast +setting_version = 3 +type = quality +variant = Carbon0.6 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg new file mode 100644 index 0000000000..f5830897fc --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Fine PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = fine +setting_version = 3 +type = quality +variant = Carbon0.6 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg new file mode 100644 index 0000000000..8762b221f7 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Normal PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Carbon0.6 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg similarity index 94% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg index 839aaddb89..996a4f716d 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_quick.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg @@ -1,13 +1,13 @@ [general] definition = zyyx_pro_ii -name = Quick PLA +name = Fast PLA version = 4 [metadata] global_quality = True material = generic_pla -quality_type = quick -setting_version = 17 +quality_type = fast +setting_version = 3 type = quality variant = Carbon0.6 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg similarity index 97% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg index ab28610153..a2efae59ee 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_pla quality_type = fine -setting_version = 17 +setting_version = 3 type = quality variant = Carbon0.6 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg similarity index 97% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg index 4051e4d762..dfec51d1a9 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_pla quality_type = normal -setting_version = 17 +setting_version = 3 type = quality variant = Carbon0.6 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg new file mode 100644 index 0000000000..fac9fd730d --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Normal PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Carbon1.2 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg new file mode 100644 index 0000000000..396b57860c --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Normal +definition = zyyx_pro_ii + +[metadata] +material = generic_tpu_175 +setting_version = 3 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg similarity index 97% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg index d39cbc6ba5..f07917d33d 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_pla quality_type = normal -setting_version = 17 +setting_version = 3 type = quality variant = Carbon1.2 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg similarity index 89% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_global_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg index e860e76d99..f7587a3ede 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro_ii [metadata] -setting_version = 19 +setting_version = 3 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg new file mode 100644 index 0000000000..0e613c6124 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -0,0 +1,22 @@ +[general] +definition = zyyx_pro_ii +name = Normal PLA +version = 4 + +[metadata] +material = generic_tpu_175 +global_quality = True +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Multi0.2 +weight = 0 + +[values] +material_print_temperature_layer_0 = =material_print_temperature + 5 +retraction_hop = 0.2 +retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_speed = 15 +speed_print = 20 +speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg similarity index 97% rename from resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg index 5b62834b08..c01db64e32 100644 --- a/resources/quality/zyyx_pro_ii/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_pla quality_type = normal -setting_version = 17 +setting_version = 3 type = quality variant = Multi0.2 weight = -2 @@ -40,4 +40,3 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 - diff --git a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg index dbdc06a1fd..9f945330ab 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg @@ -4,13 +4,15 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle [values] -line_width = 0.55 -machine_nozzle_size = 0.6 -machine_nozzle_cool_down_speed = 0.9 +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 +line_width = 0.6 machine_nozzle_id = Carbon0.6 -machine_nozzle_tip_outer_diameter = 1.8 \ No newline at end of file +machine_nozzle_size = 0.6 +machine_nozzle_tip_outer_diameter = 1.8 +speed_travel = 100 \ No newline at end of file diff --git a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg index 1f3a9a475f..d037093b76 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg @@ -4,11 +4,15 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle [values] -machine_nozzle_size = 1.2 +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 +line_width = 1.2 machine_nozzle_id = Carbon1.2 -machine_nozzle_tip_outer_diameter = 1.8 \ No newline at end of file +machine_nozzle_size = 1.2 +machine_nozzle_tip_outer_diameter = 1.8 +speed_travel = 100 \ No newline at end of file diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg index 27f696394b..37d0b4982a 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg index f0f2682d7f..76eee54f73 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg index 0a867f61da..5f4d0eaf0a 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle @@ -15,7 +15,7 @@ brim_width = 7 cool_fan_speed = 7 cool_fan_speed_max = 100 cool_min_speed = 5 -default_material_print_temperature = 200 +material_print_temperature = 200 infill_before_walls = False infill_line_width = =round(line_width * 1.0 / 1.2, 2) infill_overlap = 0 diff --git a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg index 3cfd160b22..824100b9f1 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle diff --git a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg index c3c481a4e0..54033d5bfd 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg @@ -4,47 +4,15 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle [values] -brim_width = 7 -infill_line_width = 0.18 -layer_height_0 = 0.17 -line_width = 0.18 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 +line_width = 0.2 machine_nozzle_id = Multi0.2 machine_nozzle_size = 0.2 -machine_nozzle_tip_outer_diameter = 1.0 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 -retraction_count_max = 25 -retraction_extrusion_window = 1 -retraction_min_travel = 0.7 -retraction_prime_speed = =retraction_speed -skin_overlap = 15 -speed_layer_0 = 20 -speed_print = 55 -speed_topbottom = 20 -speed_wall = =math.ceil(speed_print * 30 / 55) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length -top_bottom_thickness = 1.2 -wall_line_width_x = 0.23 -wall_thickness = 1.3 +machine_nozzle_tip_outer_diameter = 1.6 +speed_travel = 80 \ No newline at end of file diff --git a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg index 046064a6f0..754ddb79e7 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg @@ -4,13 +4,15 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle [values] +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 line_width = 0.4 -machine_nozzle_size = 0.4 -machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = Multi0.4 -machine_nozzle_tip_outer_diameter = 1.8 \ No newline at end of file +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.8 +speed_travel = 100 \ No newline at end of file diff --git a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg index 7b4e1e6a5f..74467189a4 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg @@ -4,63 +4,15 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 17 +setting_version = 3 type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 -brim_width = 7 -cool_fan_speed = 7 -cool_fan_speed_max = 100 -cool_min_speed = 5 -infill_before_walls = False -infill_line_width = =round(line_width * 0.6 / 0.7, 2) -infill_overlap = 0 -infill_pattern = triangles -infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 -jerk_topbottom = =math.ceil(jerk_print * 25 / 25) -jerk_wall = =math.ceil(jerk_print * 25 / 25) -jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) -layer_height = 0.2 -line_width = =machine_nozzle_size -machine_min_cool_heat_time_window = 15 -machine_nozzle_cool_down_speed = 0.85 -machine_nozzle_heat_up_speed = 1.5 +acceleration_enabled = True # No effect on print, only for better print time prediction +acceleration_print = 1000 +line_width = 0.55 machine_nozzle_id = Multi0.8 -machine_nozzle_size = 0.8 +machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.8 -material_final_print_temperature = =material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 -multiple_mesh_overlap = 0 -prime_tower_enable = False -prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize -retraction_amount = 6.5 -retraction_count_max = 25 -retraction_extrusion_window = 1 -retraction_hop = 2 -retraction_hop_only_when_collides = True -retraction_min_travel = =line_width * 2 -skin_overlap = 5 -speed_equalize_flow_enabled = True -speed_layer_0 = 20 -speed_print = 35 -speed_topbottom = =math.ceil(speed_print * 25 / 35) -speed_wall_0 = =math.ceil(speed_wall * 25 / 30) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = 20 -switch_extruder_retraction_amount = 16.5 -top_bottom_thickness = 1.4 -wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width -wall_thickness = 2 +speed_travel = 100 \ No newline at end of file From 9466072682b76203d750d9071330b8fcc985d209 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 2 Oct 2024 10:38:04 +0200 Subject: [PATCH 48/56] ZYYX pro II fix broken profiles --- ....cfg => zyyx_pro_ii_04_flex_fast.inst.cfg} | 4 +- ....cfg => zyyx_pro_ii_04_flex_fine.inst.cfg} | 4 +- .../flex/zyyx_pro_ii_04_flex_normal.inst.cfg} | 10 ++--- .../flex/zyyx_pro_ii_04_pla_normal.inst.cfg | 22 ---------- .../pla/zyyx_pro_ii_04_pla_fast.inst.cfg | 41 +++++++++++++++++++ .../pla/zyyx_pro_ii_04_pla_fine.inst.cfg | 41 +++++++++++++++++++ .../pla/zyyx_pro_ii_04_pla_normal.inst.cfg | 41 +++++++++++++++++++ ...fg => zyyx_pro_ii_04_global_fast.inst.cfg} | 3 +- ...fg => zyyx_pro_ii_04_global_fine.inst.cfg} | 3 +- ... => zyyx_pro_ii_04_global_normal.inst.cfg} | 3 +- ....cfg => zyyx_pro_ii_06_flex_fast.inst.cfg} | 4 +- ....cfg => zyyx_pro_ii_06_flex_fine.inst.cfg} | 4 +- ...fg => zyyx_pro_ii_06_flex_normal.inst.cfg} | 4 +- .../pla/zyyx_pro_ii_06_pla_fast.inst.cfg | 41 +++++++++++++++++++ .../pla/zyyx_pro_ii_06_pla_fine.inst.cfg | 41 +++++++++++++++++++ .../pla/zyyx_pro_ii_06_pla_normal.inst.cfg | 41 +++++++++++++++++++ ...fg => zyyx_pro_ii_06_global_fast.inst.cfg} | 3 +- ...fg => zyyx_pro_ii_06_global_fine.inst.cfg} | 3 +- ... => zyyx_pro_ii_06_global_normal.inst.cfg} | 3 +- ...fg => zyyx_pro_ii_12_flex_normal.inst.cfg} | 4 +- .../pla/zyyx_pro_ii_12_pla_normal.inst.cfg | 41 +++++++++++++++++++ ... => zyyx_pro_ii_12_global_normal.inst.cfg} | 3 +- .../zyyx_pro_ii_global_normal.inst.cfg | 14 ------- ...fg => zyyx_pro_ii_02_flex_normal.inst.cfg} | 4 +- .../pla/zyyx_pro_ii_02_pla_normal.inst.cfg | 41 +++++++++++++++++++ ... => zyyx_pro_ii_02_global_normal.inst.cfg} | 3 +- 26 files changed, 348 insertions(+), 78 deletions(-) rename resources/quality/zyyx_pro_ii/carbon04/flex/{zyyx_pro_ii_04_pla_fast.inst.cfg => zyyx_pro_ii_04_flex_fast.inst.cfg} (86%) rename resources/quality/zyyx_pro_ii/carbon04/flex/{zyyx_pro_ii_04_pla_fine.inst.cfg => zyyx_pro_ii_04_flex_fine.inst.cfg} (86%) rename resources/quality/zyyx_pro_ii/{carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg => carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg} (88%) delete mode 100644 resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg rename resources/quality/zyyx_pro_ii/carbon04/{zyyx_pro_ii_04_pla_fast.inst.cfg => zyyx_pro_ii_04_global_fast.inst.cfg} (96%) rename resources/quality/zyyx_pro_ii/carbon04/{zyyx_pro_ii_04_pla_fine.inst.cfg => zyyx_pro_ii_04_global_fine.inst.cfg} (96%) rename resources/quality/zyyx_pro_ii/carbon04/{zyyx_pro_ii_04_pla_normal.inst.cfg => zyyx_pro_ii_04_global_normal.inst.cfg} (96%) rename resources/quality/zyyx_pro_ii/carbon06/flex/{zyyx_pro_ii_06_pla_fast.inst.cfg => zyyx_pro_ii_06_flex_fast.inst.cfg} (86%) rename resources/quality/zyyx_pro_ii/carbon06/flex/{zyyx_pro_ii_06_pla_fine.inst.cfg => zyyx_pro_ii_06_flex_fine.inst.cfg} (86%) rename resources/quality/zyyx_pro_ii/carbon06/flex/{zyyx_pro_ii_06_pla_normal.inst.cfg => zyyx_pro_ii_06_flex_normal.inst.cfg} (85%) create mode 100644 resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg create mode 100644 resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg rename resources/quality/zyyx_pro_ii/carbon06/{zyyx_pro_ii_06_pla_fast.inst.cfg => zyyx_pro_ii_06_global_fast.inst.cfg} (96%) rename resources/quality/zyyx_pro_ii/carbon06/{zyyx_pro_ii_06_pla_fine.inst.cfg => zyyx_pro_ii_06_global_fine.inst.cfg} (96%) rename resources/quality/zyyx_pro_ii/carbon06/{zyyx_pro_ii_06_pla_normal.inst.cfg => zyyx_pro_ii_06_global_normal.inst.cfg} (96%) rename resources/quality/zyyx_pro_ii/carbon12/flex/{zyyx_pro_ii_12_pla_normal.inst.cfg => zyyx_pro_ii_12_flex_normal.inst.cfg} (85%) create mode 100644 resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg rename resources/quality/zyyx_pro_ii/carbon12/{zyyx_pro_ii_12_pla_normal.inst.cfg => zyyx_pro_ii_12_global_normal.inst.cfg} (96%) delete mode 100644 resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg rename resources/quality/zyyx_pro_ii/multi02/flex/{zyyx_pro_ii_02_pla_normal.inst.cfg => zyyx_pro_ii_02_flex_normal.inst.cfg} (85%) create mode 100644 resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg rename resources/quality/zyyx_pro_ii/multi02/{zyyx_pro_ii_02_pla_normal.inst.cfg => zyyx_pro_ii_02_global_normal.inst.cfg} (96%) diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg similarity index 86% rename from resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg index 0cddd3d311..d2d25c4be3 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg @@ -1,11 +1,9 @@ [general] definition = zyyx_pro_ii -name = Fast PLA +name = Fast version = 4 [metadata] -material = generic_tpu_175 -global_quality = True material = generic_pla quality_type = fast setting_version = 3 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg similarity index 86% rename from resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg index b1af10df7c..241518d357 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg @@ -1,11 +1,9 @@ [general] definition = zyyx_pro_ii -name = Fine PLA +name = Fine version = 4 [metadata] -material = generic_tpu_175 -global_quality = True material = generic_pla quality_type = fine setting_version = 3 diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg similarity index 88% rename from resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg index 396b57860c..33628f653e 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg @@ -1,15 +1,15 @@ [general] -version = 4 -name = Normal definition = zyyx_pro_ii +name = Normal +version = 4 [metadata] -material = generic_tpu_175 +material = generic_pla +quality_type = normal setting_version = 3 type = quality -quality_type = normal +variant = Carbon0.4 weight = 0 -global_quality = True [values] material_print_temperature_layer_0 = =material_print_temperature + 5 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg deleted file mode 100644 index cb135cfa84..0000000000 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_pla_normal.inst.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[general] -definition = zyyx_pro_ii -name = Normal PLA -version = 4 - -[metadata] -material = generic_tpu_175 -global_quality = True -material = generic_pla -quality_type = normal -setting_version = 3 -type = quality -variant = Carbon0.4 -weight = 0 - -[values] -material_print_temperature_layer_0 = =material_print_temperature + 5 -retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way -retraction_speed = 15 -speed_print = 20 -speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg new file mode 100644 index 0000000000..a400589b2e --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Fast +version = 4 + +[metadata] +material = generic_pla +quality_type = fast +setting_version = 3 +type = quality +variant = Carbon0.4 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.3 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.5 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg new file mode 100644 index 0000000000..6226c9d713 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Fine +version = 4 + +[metadata] +material = generic_pla +quality_type = fine +setting_version = 3 +type = quality +variant = Carbon0.4 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.15 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.5 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg new file mode 100644 index 0000000000..858976aa56 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Normal +version = 4 + +[metadata] +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Carbon0.4 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.2 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.5 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg index 85a4b9c391..692ca452cc 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Fast PLA +name = Fast version = 4 [metadata] global_quality = True -material = generic_pla quality_type = fast setting_version = 3 type = quality diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg index ec6a840d0a..23b136f5d6 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Fine PLA +name = Fine version = 4 [metadata] global_quality = True -material = generic_pla quality_type = fine setting_version = 3 type = quality diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg index 331b3f8066..12a68f99b2 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Normal PLA +name = Normal version = 4 [metadata] global_quality = True -material = generic_pla quality_type = normal setting_version = 3 type = quality diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg similarity index 86% rename from resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg index 7e317d0473..820a505027 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg @@ -1,11 +1,9 @@ [general] definition = zyyx_pro_ii -name = Fast PLA +name = Fast version = 4 [metadata] -material = generic_tpu_175 -global_quality = True material = generic_pla quality_type = fast setting_version = 3 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg similarity index 86% rename from resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg index f5830897fc..e3e991ef10 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg @@ -1,11 +1,9 @@ [general] definition = zyyx_pro_ii -name = Fine PLA +name = Fine version = 4 [metadata] -material = generic_tpu_175 -global_quality = True material = generic_pla quality_type = fine setting_version = 3 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg similarity index 85% rename from resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg index 8762b221f7..997c9a22e0 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg @@ -1,11 +1,9 @@ [general] definition = zyyx_pro_ii -name = Normal PLA +name = Normal version = 4 [metadata] -material = generic_tpu_175 -global_quality = True material = generic_pla quality_type = normal setting_version = 3 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg new file mode 100644 index 0000000000..3a33d6fd21 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Fast +version = 4 + +[metadata] +material = generic_pla +quality_type = fast +setting_version = 3 +type = quality +variant = Carbon0.6 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.3 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.2 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 70 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg new file mode 100644 index 0000000000..0a5e062ef3 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Fine +version = 4 + +[metadata] +material = generic_pla +quality_type = fine +setting_version = 3 +type = quality +variant = Carbon0.6 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.15 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.2 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 30 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 50 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg new file mode 100644 index 0000000000..97af9eaab2 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Normal +version = 4 + +[metadata] +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Carbon0.6 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.2 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.2 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg index 996a4f716d..1fc1ee210c 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Fast PLA +name = Fast version = 4 [metadata] global_quality = True -material = generic_pla quality_type = fast setting_version = 3 type = quality diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg index a2efae59ee..ef82fa7337 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Fine PLA +name = Fine version = 4 [metadata] global_quality = True -material = generic_pla quality_type = fine setting_version = 3 type = quality diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg index dfec51d1a9..57b4a1276a 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Normal PLA +name = Normal version = 4 [metadata] global_quality = True -material = generic_pla quality_type = normal setting_version = 3 type = quality diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg similarity index 85% rename from resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg index fac9fd730d..e02ee4df77 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg @@ -1,11 +1,9 @@ [general] definition = zyyx_pro_ii -name = Normal PLA +name = Normal version = 4 [metadata] -material = generic_tpu_175 -global_quality = True material = generic_pla quality_type = normal setting_version = 3 diff --git a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg new file mode 100644 index 0000000000..227b4205b5 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Normal +version = 4 + +[metadata] +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Carbon1.2 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.4 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.2 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg index f07917d33d..370c366246 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Normal PLA +name = Normal version = 4 [metadata] global_quality = True -material = generic_pla quality_type = normal setting_version = 3 type = quality diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg deleted file mode 100644 index f7587a3ede..0000000000 --- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_global_normal.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -version = 4 -name = Normal -definition = zyyx_pro_ii - -[metadata] -setting_version = 3 -type = quality -quality_type = normal -weight = 0 -global_quality = True - -[values] -layer_height = 0.2 diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg similarity index 85% rename from resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg index 0e613c6124..13e0ee879a 100644 --- a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg @@ -1,11 +1,9 @@ [general] definition = zyyx_pro_ii -name = Normal PLA +name = Normal version = 4 [metadata] -material = generic_tpu_175 -global_quality = True material = generic_pla quality_type = normal setting_version = 3 diff --git a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg new file mode 100644 index 0000000000..82337ec660 --- /dev/null +++ b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -0,0 +1,41 @@ +[general] +definition = zyyx_pro_ii +name = Normal +version = 4 + +[metadata] +material = generic_pla +quality_type = normal +setting_version = 3 +type = quality +variant = Multi0.2 +weight = 0 + +[values] +adhesion_type = skirt +brim_width = 7 +infill_overlap = -2 +infill_pattern = quarter_cubic +layer_height = 0.2 +material_bed_temperature = 35 +material_flow = 420.0 +material_flow_layer_0 = 150.0 +material_print_temperature_layer_0 = 235 +retraction_amount = 1.5 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +retraction_speed = 20 +skin_overlap = 15 +skirt_line_count = 2 +speed_print = 40 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width *2 diff --git a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg similarity index 96% rename from resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg rename to resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg index c01db64e32..36688b5135 100644 --- a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg @@ -1,11 +1,10 @@ [general] definition = zyyx_pro_ii -name = Normal PLA +name = Normal version = 4 [metadata] global_quality = True -material = generic_pla quality_type = normal setting_version = 3 type = quality From d93b53fdf1cc006a63efe03a9de3c5e0b25c191e Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Wed, 2 Oct 2024 08:38:59 +0000 Subject: [PATCH 49/56] Applied printer-linter format --- .../zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg | 1 + .../zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg | 1 + .../carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg | 1 + .../zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg | 1 + .../zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg | 1 + .../zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg | 1 + .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg | 1 + .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg | 1 + .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg | 1 + .../carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg | 1 + .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg | 1 + .../carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg | 1 + .../zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg | 1 + .../zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg | 1 + .../zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg | 1 + .../zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg | 1 + .../zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg | 1 + 24 files changed, 24 insertions(+) diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg index d2d25c4be3..c8c1846c6a 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg index 241518d357..c02ea3b8e6 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg index 33628f653e..169c876725 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg index a400589b2e..5845bcd9e4 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg index 6226c9d713..ceae364825 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg index 858976aa56..aa5d14ed4b 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg index 692ca452cc..4867d20ca8 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg index 23b136f5d6..7ebf5b62f7 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg index 12a68f99b2..29031fb46d 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg index 820a505027..52e4c7a3a9 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg index e3e991ef10..ab141580eb 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg index 997c9a22e0..3f9efb18ae 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg index 3a33d6fd21..198f0dbd45 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg index 0a5e062ef3..ce97d74132 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg index 97af9eaab2..2de68fa5c9 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg index 1fc1ee210c..a7390488e3 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg index ef82fa7337..6f00becf2c 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg index 57b4a1276a..70cac1e8f6 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg index e02ee4df77..85e82f1485 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg index 227b4205b5..172f11f3ef 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg index 370c366246..1509bb4e0c 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg index 13e0ee879a..ca5c4be968 100644 --- a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg @@ -18,3 +18,4 @@ retraction_hop_enabled = True # Flexible material might curl/be in the way retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg index 82337ec660..315b501bbb 100644 --- a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + diff --git a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg index 36688b5135..5e8bd0028c 100644 --- a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg @@ -39,3 +39,4 @@ support_use_towers = True support_z_distance = =layer_height * 2 top_bottom_thickness = =layer_height*3 wall_thickness = =line_width *2 + From f7ec7eec71864abc2a21064ef5d8701539fe4a7d Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 2 Oct 2024 10:49:04 +0200 Subject: [PATCH 50/56] removed comment from flex profiles --- resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg | 2 +- resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg | 2 +- .../zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg | 2 +- .../carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg | 2 -- .../zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg | 2 +- .../carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg | 2 +- .../carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg | 2 +- .../multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg | 2 +- 25 files changed, 24 insertions(+), 26 deletions(-) diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg index 7d15604276..3215a38b7e 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg @@ -17,7 +17,7 @@ material_print_temperature = 220 material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_amount = 0.8 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg index 9d67604381..5cb7fe2c6a 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg @@ -17,7 +17,7 @@ material_print_temperature = 220 material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_amount = 0.8 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg index dd34eb9447..3997713978 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg @@ -16,7 +16,7 @@ material_flow = 100 material_print_temperature = 220 material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_amount = 0.8 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_hop = 0.2 retraction_speed = 15 speed_print = 15 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg index 0c38dbd09d..2ae5f5c1ab 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg @@ -15,7 +15,7 @@ variant = Carbon0.6 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg index dcfadcf92d..df6608d72e 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg @@ -15,7 +15,7 @@ variant = Carbon0.6 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg index be804279c3..4dda412c79 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg @@ -15,7 +15,7 @@ variant = Carbon0.6 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg index 8e5dd8436d..f1ccceb99b 100644 --- a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg @@ -15,7 +15,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg index 1e214d5978..547fd3e719 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.2 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg index 2ee2bc24e9..4e3ff3bf46 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.2 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg index 1482f15add..73e61870cc 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.2 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg index 7fafbb127a..53af5f3309 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.4 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg index 881fcd940e..938c39f657 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.4 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg index 59e8f06d88..51a96ba0aa 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.4 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg index 3635245d1a..151c262d80 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.8 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg index e3f903406b..c0cc9b3c5c 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.8 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg index 39783832f2..912f34b3b8 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg @@ -15,7 +15,7 @@ variant = Multi0.8 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg index c8c1846c6a..6f4acfc1be 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg index c02ea3b8e6..5f2442f666 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg index 169c876725..518ea59dae 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg index 4867d20ca8..0c640bb92f 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg @@ -17,10 +17,8 @@ brim_width = 7 infill_overlap = -2 infill_pattern = quarter_cubic layer_height = 0.3 -material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 retraction_amount = 1.5 retraction_count_max = 25 retraction_min_travel = =line_width * 2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg index 52e4c7a3a9..a879375293 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg index ab141580eb..8ee7854878 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg index 3f9efb18ae..ada1af9b40 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg index 85e82f1485..55ad379b74 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg index ca5c4be968..1be4633751 100644 --- a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg @@ -14,7 +14,7 @@ weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_hop = 0.2 -retraction_hop_enabled = True # Flexible material might curl/be in the way +retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 From 905ec496e7c7d7b07e93d990bc01d41dd42a25f3 Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 2 Oct 2024 10:50:55 +0200 Subject: [PATCH 51/56] removed temp from global profile --- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg | 2 -- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg | 2 -- .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg | 2 -- .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg | 2 -- .../zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg | 2 -- .../zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg | 2 -- 6 files changed, 12 deletions(-) diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg index 7ebf5b62f7..49df888195 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg @@ -17,10 +17,8 @@ brim_width = 7 infill_overlap = -2 infill_pattern = quarter_cubic layer_height = 0.15 -material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 retraction_amount = 1.5 retraction_count_max = 25 retraction_min_travel = =line_width * 2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg index 29031fb46d..14614e8be4 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg @@ -17,10 +17,8 @@ brim_width = 7 infill_overlap = -2 infill_pattern = quarter_cubic layer_height = 0.2 -material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 retraction_amount = 1.5 retraction_count_max = 25 retraction_min_travel = =line_width * 2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg index a7390488e3..0928fb6683 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg @@ -17,10 +17,8 @@ brim_width = 7 infill_overlap = -2 infill_pattern = quarter_cubic layer_height = 0.3 -material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 retraction_amount = 1.2 retraction_count_max = 25 retraction_min_travel = =line_width * 2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg index 6f00becf2c..458443b87a 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg @@ -17,10 +17,8 @@ brim_width = 7 infill_overlap = -2 infill_pattern = quarter_cubic layer_height = 0.15 -material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 retraction_amount = 1.2 retraction_count_max = 25 retraction_min_travel = =line_width * 2 diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg index 1509bb4e0c..b0cb29bc3a 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg @@ -17,10 +17,8 @@ brim_width = 7 infill_overlap = -2 infill_pattern = quarter_cubic layer_height = 0.4 -material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 retraction_amount = 1.2 retraction_count_max = 25 retraction_min_travel = =line_width * 2 diff --git a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg index 5e8bd0028c..35fef68bca 100644 --- a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg @@ -17,10 +17,8 @@ brim_width = 7 infill_overlap = -2 infill_pattern = quarter_cubic layer_height = 0.2 -material_bed_temperature = 35 material_flow = 420.0 material_flow_layer_0 = 150.0 -material_print_temperature_layer_0 = 235 retraction_amount = 1.5 retraction_count_max = 25 retraction_min_travel = =line_width * 2 From 1767bfd5fb16f84022b6d9424148676c40ef02b5 Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Wed, 2 Oct 2024 08:51:44 +0000 Subject: [PATCH 52/56] Applied printer-linter format --- .../zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg | 1 + .../zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg | 1 + .../zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg | 3 ++- .../carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg | 11 ++++++----- .../carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg | 11 ++++++----- .../carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg | 11 ++++++----- .../carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg | 3 ++- .../multi02/flex/zyyx_pro_02_flex_fast.inst.cfg | 11 ++++++----- .../multi02/flex/zyyx_pro_02_flex_fine.inst.cfg | 11 ++++++----- .../multi02/flex/zyyx_pro_02_flex_normal.inst.cfg | 11 ++++++----- .../multi04/flex/zyyx_pro_04_flex_fast.inst.cfg | 11 ++++++----- .../multi04/flex/zyyx_pro_04_flex_fine.inst.cfg | 11 ++++++----- .../multi04/flex/zyyx_pro_04_flex_normal.inst.cfg | 11 ++++++----- .../multi08/flex/zyyx_pro_08_flex_fast.inst.cfg | 11 ++++++----- .../multi08/flex/zyyx_pro_08_flex_fine.inst.cfg | 11 ++++++----- .../multi08/flex/zyyx_pro_08_flex_normal.inst.cfg | 11 ++++++----- 16 files changed, 78 insertions(+), 62 deletions(-) diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg index 3215a38b7e..b4574ce0b6 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg @@ -23,3 +23,4 @@ speed_print = 20 speed_travel = 80 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print + diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg index 5cb7fe2c6a..e2b4e48b4f 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg @@ -23,3 +23,4 @@ speed_print = 20 speed_travel = 80 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print + diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg index 3997713978..6fb97e634c 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg @@ -16,10 +16,11 @@ material_flow = 100 material_print_temperature = 220 material_print_temperature_layer_0 = =material_print_temperature + 5 retraction_amount = 0.8 -retraction_hop_enabled = True retraction_hop = 0.2 +retraction_hop_enabled = True retraction_speed = 15 speed_print = 15 speed_travel = 80 speed_wall = =math.ceil(speed_print * 15 / 20) speed_wall_x = =speed_print + diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg index 2ae5f5c1ab..85dc3b8a75 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fast06 setting_version = 3 type = quality -quality_type = fast06 -weight = 0 -global_quality = True variant = Carbon0.6 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg index df6608d72e..62e71392be 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fine06 setting_version = 3 type = quality -quality_type = fine06 -weight = 0 -global_quality = True variant = Carbon0.6 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg index 4dda412c79..8e3b0e2590 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = normal06 setting_version = 3 type = quality -quality_type = normal06 -weight = 0 -global_quality = True variant = Carbon0.6 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg index f1ccceb99b..8e3cbd8330 100644 --- a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg @@ -4,8 +4,8 @@ name = Normal version = 4 [metadata] -material = generic_tpu_175 global_quality = True +material = generic_tpu_175 quality_type = normal12 setting_version = 3 type = quality @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg index 547fd3e719..887a287ceb 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fast02 setting_version = 3 type = quality -quality_type = fast02 -weight = 0 -global_quality = True variant = Multi0.2 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg index 4e3ff3bf46..78ba545e7d 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fine02 setting_version = 3 type = quality -quality_type = fine02 -weight = 0 -global_quality = True variant = Multi0.2 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg index 73e61870cc..2f638eebe8 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = normal02 setting_version = 3 type = quality -quality_type = normal02 -weight = 0 -global_quality = True variant = Multi0.2 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg index 53af5f3309..11d01014aa 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fast04 setting_version = 3 type = quality -quality_type = fast04 -weight = 0 -global_quality = True variant = Multi0.4 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg index 938c39f657..1ced16a961 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fine04 setting_version = 3 type = quality -quality_type = fine04 -weight = 0 -global_quality = True variant = Multi0.4 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg index 51a96ba0aa..4eeb84dca6 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = normal04 setting_version = 3 type = quality -quality_type = normal04 -weight = 0 -global_quality = True variant = Multi0.4 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg index 151c262d80..1c7d0a9a98 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fast08 setting_version = 3 type = quality -quality_type = fast08 -weight = 0 -global_quality = True variant = Multi0.8 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg index c0cc9b3c5c..6b1a88ab3a 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = fine08 setting_version = 3 type = quality -quality_type = fine08 -weight = 0 -global_quality = True variant = Multi0.8 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg index 912f34b3b8..fecee46d74 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg @@ -1,16 +1,16 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True material = generic_tpu_175 +quality_type = normal08 setting_version = 3 type = quality -quality_type = normal08 -weight = 0 -global_quality = True variant = Multi0.8 +weight = 0 [values] material_print_temperature_layer_0 = =material_print_temperature + 5 @@ -19,3 +19,4 @@ retraction_hop_enabled = True retraction_speed = 15 speed_print = 20 speed_travel = 80 + From e63a95b335872e965c193812a7679581252f17fe Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 2 Oct 2024 11:30:49 +0200 Subject: [PATCH 53/56] removed ZYYX Agile (and unused ZYYX+ variant file) --- resources/definitions/zyyx_agile.def.json | 45 ------------------- .../extruders/zyyx_agile_extruder_0.def.json | 16 ------- .../fast/zyyx_agile_pro_flex_fast.inst.cfg | 28 ------------ .../fast/zyyx_agile_pro_pla_fast.inst.cfg | 28 ------------ .../fine/zyyx_agile_pro_flex_fine.inst.cfg | 28 ------------ .../fine/zyyx_agile_pro_pla_fine.inst.cfg | 28 ------------ .../zyyx_agile_pro_flex_normal.inst.cfg | 28 ------------ .../normal/zyyx_agile_pro_pla_normal.inst.cfg | 28 ------------ .../zyyx_agile_global_fast.inst.cfg | 15 ------- .../zyyx_agile_global_fine.inst.cfg | 15 ------- .../zyyx_agile_global_normal.inst.cfg | 15 ------- .../variants/zyyx/zyyx_plus_0.4.inst.cfg | 14 ------ 12 files changed, 288 deletions(-) delete mode 100644 resources/definitions/zyyx_agile.def.json delete mode 100644 resources/extruders/zyyx_agile_extruder_0.def.json delete mode 100644 resources/quality/zyyx_agile/fast/zyyx_agile_pro_flex_fast.inst.cfg delete mode 100644 resources/quality/zyyx_agile/fast/zyyx_agile_pro_pla_fast.inst.cfg delete mode 100644 resources/quality/zyyx_agile/fine/zyyx_agile_pro_flex_fine.inst.cfg delete mode 100644 resources/quality/zyyx_agile/fine/zyyx_agile_pro_pla_fine.inst.cfg delete mode 100644 resources/quality/zyyx_agile/normal/zyyx_agile_pro_flex_normal.inst.cfg delete mode 100644 resources/quality/zyyx_agile/normal/zyyx_agile_pro_pla_normal.inst.cfg delete mode 100644 resources/quality/zyyx_agile/zyyx_agile_global_fast.inst.cfg delete mode 100644 resources/quality/zyyx_agile/zyyx_agile_global_fine.inst.cfg delete mode 100644 resources/quality/zyyx_agile/zyyx_agile_global_normal.inst.cfg delete mode 100644 resources/variants/zyyx/zyyx_plus_0.4.inst.cfg diff --git a/resources/definitions/zyyx_agile.def.json b/resources/definitions/zyyx_agile.def.json deleted file mode 100644 index bbbde07370..0000000000 --- a/resources/definitions/zyyx_agile.def.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": 3, - "name": "Zyyx Agile", - "inherits": "fdmprinter", - "metadata": - { - "visible": true, - "author": "Magicfirm Europe", - "manufacturer": "ZYYX Labs AB", - "file_formats": "application/x3g", - "platform": "zyyx_platform.3mf", - "has_machine_quality": true, - "machine_extruder_trains": { "0": "zyyx_agile_extruder_0" }, - "machine_x3g_variant": "z", - "preferred_material": "zyyx_pro_pla", - "preferred_quality_type": "normal", - "quality_definition": "zyyx_agile" - }, - "overrides": - { - "gantry_height": { "value": "10" }, - "infill_overlap": { "value": "12 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, - "machine_center_is_zero": { "default_value": true }, - "machine_depth": { "default_value": 225 }, - "machine_end_gcode": { "default_value": "; ZYYX 3D Printer end gcode\nM73 P100 ; end build progress\nG0 Z195 F1000 ; send Z axis to bottom of machine\nM104 S0 T0 ; cool down extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P5 (ZYYX Print Finished!)\nM72 P1 ; play Ta-Da song\n" }, - "machine_gcode_flavor": { "default_value": "Makerbot" }, - "machine_head_with_fans_polygon": - { - "default_value": [ - [-37, 50], - [25, 50], - [25, -40], - [-37, -40] - ] - }, - "machine_height": { "default_value": 195 }, - "machine_name": { "default_value": "ZYYX Agile" }, - "machine_start_gcode": { "default_value": "; ZYYX 3D Printer start gcode\nM73 P0; enable build progress\nG21; set units to mm\nG90; set positioning to absolute\nG130 X80 Y80 A127 B127 ; Set Stepper Vref to default value\nG162 X Y F3000; home XY axes maximum\nM133 T0 ; stabilize extruder temperature\nG161 Z F450\nG161 Z F450; home Z axis minimum\nG92 X0 Y0 Z0 E0\nG1 X0 Y0 Z5 F200\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0\nM131 A; store surface calibration point 1\nG1 X0 Y0 Z5 F200\nG1 X-177 Y0 Z5 F3000; move to 2nd probing point\nG161 Z F200\nM131 B; store surface calibration point 2\nG92 X-177 Y0 Z0 E0\nG1 X-177 Y0 Z5 F200\nG1 X0 Y0 Z5 F3000; move to home point\nG161 Z F200; home Z axis minimum again\nG92 X0 Y0 Z0 E0; set reference again\nG1 X0 Y0 Z5 F200; clear Z\nG1 X0 Y-225 Z5 F3000; move to 3rd calibration point\nG161 Z F200\nM131 AB; store surface calibration point 3\nM132 AB; activate auto leveling\nG92 X0 Y-225 Z0 E0\nG1 X0 Y-225 Z5 F200\nG162 X Y F3000\nG161 Z F200\nG92 X135 Y115 Z0 E0\nM132 Z; Recall stored home offset for Z axis\nG1 X135 Y115 Z5 F450; clear nozzle from hole\nG1 X0 Y115 Z5 F3000; clear nozzle from hole\nG92 E0 ; Set E to 0" }, - "machine_steps_per_mm_e": { "default_value": 96.27520187033366 }, - "machine_steps_per_mm_x": { "default_value": 88.888889 }, - "machine_steps_per_mm_y": { "default_value": 88.888889 }, - "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_width": { "default_value": 265 } - } -} \ No newline at end of file diff --git a/resources/extruders/zyyx_agile_extruder_0.def.json b/resources/extruders/zyyx_agile_extruder_0.def.json deleted file mode 100644 index a34d020faa..0000000000 --- a/resources/extruders/zyyx_agile_extruder_0.def.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": - { - "machine": "zyyx_agile", - "position": "0" - }, - "overrides": - { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} \ No newline at end of file diff --git a/resources/quality/zyyx_agile/fast/zyyx_agile_pro_flex_fast.inst.cfg b/resources/quality/zyyx_agile/fast/zyyx_agile_pro_flex_fast.inst.cfg deleted file mode 100644 index b18d8a6729..0000000000 --- a/resources/quality/zyyx_agile/fast/zyyx_agile_pro_flex_fast.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -definition = zyyx_agile -name = Fast -version = 4 - -[metadata] -material = generic_tpu -quality_type = fast -setting_version = 23 -type = quality -weight = 1 - -[values] -adhesion_type = brim -default_material_print_temperature = 220 -infill_sparse_density = 10 -layer_height = 0.3 -material_flow = 105 -material_print_temperature_layer_0 = 235 -raft_airgap = 0.2 -retraction_amount = 1.0 -retraction_speed = 15 -speed_print = 20 -speed_wall = =speed_print -speed_wall_x = =speed_print -top_bottom_thickness = 1.0 -wall_thickness = 0.8 - diff --git a/resources/quality/zyyx_agile/fast/zyyx_agile_pro_pla_fast.inst.cfg b/resources/quality/zyyx_agile/fast/zyyx_agile_pro_pla_fast.inst.cfg deleted file mode 100644 index 3b3ed24376..0000000000 --- a/resources/quality/zyyx_agile/fast/zyyx_agile_pro_pla_fast.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -definition = zyyx_agile -name = Fast -version = 4 - -[metadata] -material = generic_pla -quality_type = fast -setting_version = 23 -type = quality -weight = 1 - -[values] -adhesion_type = brim -default_material_print_temperature = 220 -infill_sparse_density = 10 -layer_height = 0.3 -material_flow = 95 -material_print_temperature_layer_0 = 225 -raft_airgap = 0.15 -retraction_amount = 1.5 -retraction_speed = 20 -speed_print = 40 -speed_wall = =speed_print -speed_wall_x = =speed_print -top_bottom_thickness = 1.0 -wall_thickness = 0.8 - diff --git a/resources/quality/zyyx_agile/fine/zyyx_agile_pro_flex_fine.inst.cfg b/resources/quality/zyyx_agile/fine/zyyx_agile_pro_flex_fine.inst.cfg deleted file mode 100644 index 920c92633d..0000000000 --- a/resources/quality/zyyx_agile/fine/zyyx_agile_pro_flex_fine.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -definition = zyyx_agile -name = Fine -version = 4 - -[metadata] -material = generic_tpu -quality_type = fine -setting_version = 23 -type = quality -weight = 1 - -[values] -adhesion_type = brim -default_material_print_temperature = 205 -infill_sparse_density = 15 -layer_height = 0.12 -material_flow = 105 -material_print_temperature_layer_0 = 235 -raft_airgap = 0.1 -retraction_amount = 0.2 -retraction_speed = 15 -speed_print = 15 -speed_wall = =speed_print -speed_wall_x = =speed_print -top_bottom_thickness = 1.0 -wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_agile/fine/zyyx_agile_pro_pla_fine.inst.cfg b/resources/quality/zyyx_agile/fine/zyyx_agile_pro_pla_fine.inst.cfg deleted file mode 100644 index 347e3ccd74..0000000000 --- a/resources/quality/zyyx_agile/fine/zyyx_agile_pro_pla_fine.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -definition = zyyx_agile -name = Fine -version = 4 - -[metadata] -material = generic_pla -quality_type = fine -setting_version = 23 -type = quality -weight = 1 - -[values] -adhesion_type = brim -default_material_print_temperature = 205 -infill_sparse_density = 15 -layer_height = 0.1 -material_flow = 95 -material_print_temperature_layer_0 = 225 -raft_airgap = 0.08 -retraction_amount = 0.4 -retraction_speed = 20 -speed_print = 35 -speed_wall = =math.ceil(speed_print * 18 / 35) -speed_wall_x = =math.ceil(speed_print * 25 / 35) -top_bottom_thickness = 1.0 -wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_agile/normal/zyyx_agile_pro_flex_normal.inst.cfg b/resources/quality/zyyx_agile/normal/zyyx_agile_pro_flex_normal.inst.cfg deleted file mode 100644 index e893ca4af1..0000000000 --- a/resources/quality/zyyx_agile/normal/zyyx_agile_pro_flex_normal.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -definition = zyyx_agile -name = Normal -version = 4 - -[metadata] -material = generic_tpu -quality_type = normal -setting_version = 23 -type = quality -weight = 0 - -[values] -adhesion_type = brim -default_material_print_temperature = 210 -infill_sparse_density = 15 -layer_height = 0.2 -material_flow = 105 -material_print_temperature_layer_0 = 235 -raft_airgap = 0.2 -retraction_amount = 1.0 -retraction_speed = 15 -speed_print = 20 -speed_wall = =math.ceil(speed_print * 15 / 20) -speed_wall_x = =speed_print -top_bottom_thickness = 1.0 -wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_agile/normal/zyyx_agile_pro_pla_normal.inst.cfg b/resources/quality/zyyx_agile/normal/zyyx_agile_pro_pla_normal.inst.cfg deleted file mode 100644 index 9af81dc520..0000000000 --- a/resources/quality/zyyx_agile/normal/zyyx_agile_pro_pla_normal.inst.cfg +++ /dev/null @@ -1,28 +0,0 @@ -[general] -definition = zyyx_agile -name = Normal -version = 4 - -[metadata] -material = generic_pla -quality_type = normal -setting_version = 23 -type = quality -weight = 0 - -[values] -adhesion_type = brim -default_material_print_temperature = 210 -infill_sparse_density = 15 -layer_height = 0.2 -material_flow = 95 -material_print_temperature_layer_0 = 225 -raft_airgap = 0.15 -retraction_amount = 1.2 -retraction_speed = 20 -speed_print = 50 -speed_wall = =math.ceil(speed_print * 22 / 50) -speed_wall_x = =math.ceil(speed_print * 33 / 50) -top_bottom_thickness = 1.0 -wall_thickness = 1.2 - diff --git a/resources/quality/zyyx_agile/zyyx_agile_global_fast.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_global_fast.inst.cfg deleted file mode 100644 index 8532b1d9cb..0000000000 --- a/resources/quality/zyyx_agile/zyyx_agile_global_fast.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -definition = zyyx_agile -name = Fast -version = 4 - -[metadata] -global_quality = True -quality_type = fast -setting_version = 23 -type = quality -weight = 1 - -[values] -layer_height = 0.3 - diff --git a/resources/quality/zyyx_agile/zyyx_agile_global_fine.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_global_fine.inst.cfg deleted file mode 100644 index 5358ee99ac..0000000000 --- a/resources/quality/zyyx_agile/zyyx_agile_global_fine.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -definition = zyyx_agile -name = Fine -version = 4 - -[metadata] -global_quality = True -quality_type = fine -setting_version = 23 -type = quality -weight = 1 - -[values] -layer_height = 0.1 - diff --git a/resources/quality/zyyx_agile/zyyx_agile_global_normal.inst.cfg b/resources/quality/zyyx_agile/zyyx_agile_global_normal.inst.cfg deleted file mode 100644 index 2356a128b0..0000000000 --- a/resources/quality/zyyx_agile/zyyx_agile_global_normal.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -definition = zyyx_agile -name = Normal -version = 4 - -[metadata] -global_quality = True -quality_type = normal -setting_version = 23 -type = quality -weight = 0 - -[values] -layer_height = 0.2 - diff --git a/resources/variants/zyyx/zyyx_plus_0.4.inst.cfg b/resources/variants/zyyx/zyyx_plus_0.4.inst.cfg deleted file mode 100644 index 8dc5119263..0000000000 --- a/resources/variants/zyyx/zyyx_plus_0.4.inst.cfg +++ /dev/null @@ -1,14 +0,0 @@ -[general] -name = 0.4 mm -version = 4 -definition = zyyx_plus - -[metadata] -setting_version = 17 -type = variant -hardware_type = nozzle - -[values] -line_width = 0.4 -machine_nozzle_size = 0.4 -machine_nozzle_tip_outer_diameter = 1.6 \ No newline at end of file From 4817d0ae9ae3278b3628c893ff93e1b9d287beee Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 2 Oct 2024 13:54:47 +0200 Subject: [PATCH 54/56] update settings version, remove line width --- resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg | 2 +- .../quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg | 2 +- .../quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg | 2 +- .../quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg | 2 +- .../quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg | 2 +- resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg | 2 +- .../quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg | 2 +- resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg | 2 +- resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg | 2 +- .../zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg | 2 +- .../zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg | 2 +- .../zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg | 2 +- .../zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg | 2 +- .../zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg | 2 +- .../zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg | 2 +- .../zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg | 2 +- .../zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg | 2 +- .../zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg | 2 +- .../zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg | 2 +- .../zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg | 2 +- .../zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg | 2 +- .../zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg | 2 +- .../zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg | 2 +- .../carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg | 2 +- .../carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg | 2 +- .../carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg | 2 +- .../carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg | 2 +- .../carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg | 2 +- .../carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg | 2 +- .../carbon04/zyyx_pro_ii_04_global_normal.inst.cfg | 2 +- .../carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg | 2 +- .../carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg | 2 +- .../carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg | 2 +- .../carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg | 2 +- .../carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg | 2 +- .../carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg | 2 +- .../carbon06/zyyx_pro_ii_06_global_normal.inst.cfg | 2 +- .../carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg | 2 +- .../carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg | 2 +- .../carbon12/zyyx_pro_ii_12_global_normal.inst.cfg | 2 +- .../multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg | 2 +- .../multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg | 2 +- .../multi02/zyyx_pro_ii_02_global_normal.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg | 3 +-- resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg | 3 +-- resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg | 3 +-- resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg | 3 +-- resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg | 5 +---- resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg | 4 +--- resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg | 3 +-- resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg | 3 +-- resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg | 3 +-- 71 files changed, 71 insertions(+), 83 deletions(-) diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg index d3e2f7f73d..a49bbda4b7 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = fast -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg index 76e581bf44..4d9a796ae1 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = fine -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg index bc4830517e..8cc1265bb1 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = normal -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg index b4574ce0b6..507e5131ca 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu_175 quality_type = fast -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg index e2b4e48b4f..9ec2994cc4 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu_175 quality_type = fine -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg index 6fb97e634c..04e1e0098c 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu_175 quality_type = normal -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg index 62b5c7d14a..2d25c199fd 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg index a453caecc1..92a58f892a 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg index 417ac70c23..6d9d0ab602 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg index eb27cead48..0bafb7284c 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg index 560fcfd98f..35a4114f5b 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index aa05fb3598..f8848c349d 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 3 +setting_version = 23 type = quality weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg index 85dc3b8a75..8d60fc97ff 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast06 -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg index 62e71392be..2e22b6d177 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine06 -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg index 8e3b0e2590..5a6e14ee86 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal06 -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg index 7fc963c380..d5babd3426 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fast06 weight = -2 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg index 1af40d476b..ba8aa010b0 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fine06 weight = -2 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg index 42e6ac08c8..366b304e37 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = normal06 weight = -2 diff --git a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg index 8e3cbd8330..d3253b540c 100644 --- a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal12 -setting_version = 3 +setting_version = 23 type = quality variant = Carbon1.2 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg index c647fe1fad..f67c8a1cca 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal12 -setting_version = 3 +setting_version = 23 type = quality variant = Carbon1.2 weight = -2 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg index 887a287ceb..0e0abad2fb 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast02 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg index 78ba545e7d..c19c51dc22 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine02 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg index 2f638eebe8..ae37a0ef8b 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal02 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg index dd09499f39..f33c9d6d00 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fast02 weight = -2 diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg index 5d6842da5a..574e0eee84 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fine02 weight = -2 diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg index 2748964c5f..ae9ec7f387 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = normal02 weight = -2 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg index 11d01014aa..9b4c9b4e44 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast04 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.4 weight = 0 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg index 1ced16a961..d97b9d46dd 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine04 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.4 weight = 0 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg index 4eeb84dca6..572b4ac8b1 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal04 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.4 weight = 0 diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg index f775738268..f730ecb886 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fast04 weight = -2 diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg index d9025437f6..aa95d74adb 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fine04 weight = -2 diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg index cfd2897e4b..2d569dcc4c 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = normal04 weight = -2 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg index 1c7d0a9a98..94fb12bcc9 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast08 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.8 weight = 0 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg index 6b1a88ab3a..94d09e0d95 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine08 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.8 weight = 0 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg index fecee46d74..6f227fa32c 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal08 -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.8 weight = 0 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg index 0c160a9f0a..b6a2465a74 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fast08 weight = -2 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg index a9beec2933..18dd0eb456 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = fine08 weight = -2 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg index d2384ef013..efb33447ec 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = quality quality_type = normal08 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg index 6f4acfc1be..4d8909764b 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg index 5f2442f666..24be298378 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg index 518ea59dae..3ec7c7ab03 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg index 5845bcd9e4..c89463ed63 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg index ceae364825..b014676eb1 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg index aa5d14ed4b..d9715d5621 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg index 0c640bb92f..4f37bfa53d 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg index 49df888195..c02eecd5b0 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg index 14614e8be4..d613780bf5 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.4 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg index a879375293..4609b564d6 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg index 8ee7854878..29bb4efacd 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg index ada1af9b40..32b8d24659 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg index 198f0dbd45..857bfd5c9d 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg index ce97d74132..d00dc208f4 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg index 2de68fa5c9..1d8c85d70e 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg index 0928fb6683..36fa1c73e7 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg index 458443b87a..7ca3968bc4 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg index 70cac1e8f6..f6b9a1fef4 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg index 55ad379b74..15a805dab7 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon1.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg index 172f11f3ef..21db9bcc38 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon1.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg index b0cb29bc3a..d9d53c3410 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Carbon1.2 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg index 1be4633751..4b4e0e8db2 100644 --- a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg index 315b501bbb..22bb19e957 100644 --- a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg index 35fef68bca..608afec4ba 100644 --- a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 3 +setting_version = 23 type = quality variant = Multi0.2 weight = -2 diff --git a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg index 9f945330ab..608d56d70d 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg @@ -4,14 +4,13 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction acceleration_print = 1000 -line_width = 0.6 machine_nozzle_id = Carbon0.6 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.8 diff --git a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg index d037093b76..1290052eaa 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg @@ -4,14 +4,13 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction acceleration_print = 1000 -line_width = 1.2 machine_nozzle_id = Carbon1.2 machine_nozzle_size = 1.2 machine_nozzle_tip_outer_diameter = 1.8 diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg index 37d0b4982a..af6bb44b8a 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg @@ -4,12 +4,11 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] -line_width = 0.4 machine_nozzle_size = 0.4 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = Carbon0.4 diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg index 76eee54f73..c69787b8a7 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg @@ -4,12 +4,11 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] -line_width = 0.55 machine_nozzle_size = 0.6 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = Carbon0.6 diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg index 5f4d0eaf0a..3fc3aca6b2 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle @@ -17,8 +17,6 @@ cool_fan_speed_max = 100 cool_min_speed = 5 material_print_temperature = 200 infill_before_walls = False -infill_line_width = =round(line_width * 1.0 / 1.2, 2) -infill_overlap = 0 infill_pattern = triangles infill_wipe_dist = 0 jerk_enabled = True @@ -27,7 +25,6 @@ jerk_topbottom = =math.ceil(jerk_print * 25 / 25) jerk_wall = =math.ceil(jerk_print * 25 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 25 / 25) layer_height = 0.2 -line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg index 824100b9f1..6e39b5f5fe 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg @@ -4,15 +4,13 @@ version = 4 definition = zyyx_pro_ii [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] brim_width = 7 -infill_line_width = 0.18 layer_height_0 = 0.17 -line_width = 0.18 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = Multi0.2 diff --git a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg index 54033d5bfd..9fe99e4e9e 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg @@ -4,14 +4,13 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction acceleration_print = 1000 -line_width = 0.2 machine_nozzle_id = Multi0.2 machine_nozzle_size = 0.2 machine_nozzle_tip_outer_diameter = 1.6 diff --git a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg index 754ddb79e7..0318460ac3 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg @@ -4,14 +4,13 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction acceleration_print = 1000 -line_width = 0.4 machine_nozzle_id = Multi0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.8 diff --git a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg index 74467189a4..3a97783faf 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg @@ -4,14 +4,13 @@ version = 4 definition = zyyx_pro [metadata] -setting_version = 3 +setting_version = 23 type = variant hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction acceleration_print = 1000 -line_width = 0.55 machine_nozzle_id = Multi0.8 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.8 From 4dd60bdf0642cd4eab2c4fba151f75de45398b5c Mon Sep 17 00:00:00 2001 From: theodorhansson Date: Wed, 2 Oct 2024 11:55:37 +0000 Subject: [PATCH 55/56] Applied printer-linter format --- .../zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg | 3 ++- .../zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg | 3 ++- .../ABS/zyyx_plus_abs_normal.inst.cfg | 3 ++- .../zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg | 1 + .../zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg | 1 + .../PLA/zyyx_plus_pla_normal.inst.cfg | 1 + .../zyyx_plus/zyyx_plus_global_fast.inst.cfg | 1 + .../zyyx_plus/zyyx_plus_global_fine.inst.cfg | 1 + .../zyyx_plus_global_normal.inst.cfg | 1 + .../carbon06/zyyx_pro_06_global_fast.inst.cfg | 23 +++++++++-------- .../carbon06/zyyx_pro_06_global_fine.inst.cfg | 23 +++++++++-------- .../zyyx_pro_06_global_normal.inst.cfg | 23 +++++++++-------- .../zyyx_pro_12_global_normal.inst.cfg | 11 ++++---- .../multi02/zyyx_pro_02_global_fast.inst.cfg | 21 ++++++++-------- .../multi02/zyyx_pro_02_global_fine.inst.cfg | 21 ++++++++-------- .../zyyx_pro_02_global_normal.inst.cfg | 21 ++++++++-------- .../multi04/zyyx_pro_04_global_fast.inst.cfg | 21 ++++++++-------- .../multi04/zyyx_pro_04_global_fine.inst.cfg | 21 ++++++++-------- .../zyyx_pro_04_global_normal.inst.cfg | 21 ++++++++-------- .../multi08/zyyx_pro_08_global_fast.inst.cfg | 25 ++++++++++--------- .../multi08/zyyx_pro_08_global_fine.inst.cfg | 25 ++++++++++--------- .../zyyx_pro_08_global_normal.inst.cfg | 25 ++++++++++--------- .../variants/zyyx/zyyx_pro_carbon0.6.inst.cfg | 7 +++--- .../variants/zyyx/zyyx_pro_carbon1.2.inst.cfg | 7 +++--- .../zyyx/zyyx_pro_ii_carbon0.4.inst.cfg | 9 ++++--- .../zyyx/zyyx_pro_ii_carbon0.6.inst.cfg | 9 ++++--- .../zyyx/zyyx_pro_ii_carbon1.2.inst.cfg | 9 ++++--- .../zyyx/zyyx_pro_ii_multi0.2.inst.cfg | 5 ++-- .../variants/zyyx/zyyx_pro_multi0.2.inst.cfg | 7 +++--- .../variants/zyyx/zyyx_pro_multi0.4.inst.cfg | 7 +++--- .../variants/zyyx/zyyx_pro_multi0.8.inst.cfg | 7 +++--- 31 files changed, 197 insertions(+), 166 deletions(-) diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg index a49bbda4b7..dcff6d8233 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg @@ -12,8 +12,8 @@ weight = 0 [values] adhesion_type = brim -material_print_temperature = 240 infill_sparse_density = 10 +material_print_temperature = 240 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 @@ -21,3 +21,4 @@ retraction_speed = 20 speed_print = 55 top_bottom_thickness = 0.8 wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg index 4d9a796ae1..17a3065f46 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg @@ -12,8 +12,8 @@ weight = 0 [values] adhesion_type = brim -material_print_temperature = 240 infill_sparse_density = 15 +material_print_temperature = 240 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 @@ -21,3 +21,4 @@ retraction_speed = 20 speed_print = 40 top_bottom_thickness = 1.0 wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg index 8cc1265bb1..7fea598f52 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg @@ -12,8 +12,8 @@ weight = 0 [values] adhesion_type = brim -material_print_temperature = 240 infill_sparse_density = 15 +material_print_temperature = 240 material_print_temperature_layer_0 = 250 raft_airgap = 0.15 retraction_amount = 1.2 @@ -21,3 +21,4 @@ retraction_speed = 20 speed_print = 50 top_bottom_thickness = 1.0 wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg index 2d25c199fd..74f4cde8e1 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg @@ -21,3 +21,4 @@ retraction_speed = 20 speed_print = 55 top_bottom_thickness = 0.8 wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg index 92a58f892a..54c87d5b33 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg @@ -21,3 +21,4 @@ retraction_speed = 20 speed_print = 40 top_bottom_thickness = 1.0 wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg index 6d9d0ab602..c16a3d7a4b 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_normal.inst.cfg @@ -21,3 +21,4 @@ retraction_speed = 20 speed_print = 50 top_bottom_thickness = 1.0 wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg index 0bafb7284c..2033e21b52 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg @@ -25,3 +25,4 @@ speed_print = 55 speed_travel = 100 top_bottom_thickness = 0.8 wall_thickness = 0.8 + diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg index 35a4114f5b..f7645eb0a9 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -25,3 +25,4 @@ speed_print = 40 speed_travel = 100 top_bottom_thickness = 1.0 wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index f8848c349d..d5325f6070 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -25,3 +25,4 @@ speed_print = 50 speed_travel = 100 top_bottom_thickness = 1.0 wall_thickness = 1.2 + diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg index d5babd3426..d11df94f84 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast06 setting_version = 23 type = quality -quality_type = fast06 -weight = -2 -global_quality = True variant = Carbon0.6 +weight = -2 [values] -layer_height = 0.3 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 60 infill_pattern = cubic +layer_height = 0.3 material_print_temperature = =default_material_print_temperature + 5 raft_airgap = 0.3 retraction_amount = 1.2 -retraction_speed = 30 -retraction_extra_prime_amount = 0.05 retraction_count_max = 20 +retraction_extra_prime_amount = 0.05 +retraction_speed = 30 +speed_print = 60 +top_bottom_thickness = =line_width*2 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg index ba8aa010b0..886304a793 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine06 setting_version = 23 type = quality -quality_type = fine06 -weight = -2 -global_quality = True variant = Carbon0.6 +weight = -2 [values] -layer_height = 0.15 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 40 infill_pattern = gyroid +layer_height = 0.15 material_print_temperature = =default_material_print_temperature + 5 raft_airgap = 0.3 retraction_amount = 1.2 -retraction_speed = 30 -retraction_extra_prime_amount = 0.05 retraction_count_max = 20 +retraction_extra_prime_amount = 0.05 +retraction_speed = 30 +speed_print = 40 +top_bottom_thickness = =line_width*2 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg index 366b304e37..74c9168414 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal06 setting_version = 23 type = quality -quality_type = normal06 -weight = -2 -global_quality = True variant = Carbon0.6 +weight = -2 [values] -layer_height = 0.2 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 50 infill_pattern = gyroid +layer_height = 0.2 material_print_temperature = =default_material_print_temperature + 5 raft_airgap = 0.3 retraction_amount = 1.2 -retraction_speed = 30 +retraction_count_max = 20 retraction_extra_prime_amount = 0.05 -retraction_count_max = 20 \ No newline at end of file +retraction_speed = 30 +speed_print = 50 +top_bottom_thickness = =line_width*2 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg index f67c8a1cca..7604e956dc 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -15,11 +15,12 @@ weight = -2 infill_pattern = cubic layer_height = 0.45 material_print_temperature = =default_material_print_temperature + 5 +raft_airgap = 0.6 +retraction_amount = 1.5 +retraction_count_max = 20 +retraction_extra_prime_amount = 0.1 +retraction_speed = 30 speed_print = 50 top_bottom_thickness = =line_width*2 wall_thickness = =line_width*2 -raft_airgap = 0.6 -retraction_amount = 1.5 -retraction_speed = 30 -retraction_extra_prime_amount = 0.1 -retraction_count_max = 20 + diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg index f33c9d6d00..465190e80a 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast02 setting_version = 23 type = quality -quality_type = fast02 -weight = -2 -global_quality = True variant = Multi0.2 +weight = -2 [values] -layer_height = 0.1 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2.5 -speed_print = 50 infill_pattern = cubic infill_sparse_density = 5 +layer_height = 0.1 raft_airgap = 0.1 retraction_amount = 0.5 -retraction_speed = 20 \ No newline at end of file +retraction_speed = 20 +speed_print = 50 +top_bottom_thickness = =line_width*2.5 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg index 574e0eee84..73a1451487 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine02 setting_version = 23 type = quality -quality_type = fine02 -weight = -2 -global_quality = True variant = Multi0.2 +weight = -2 [values] -layer_height = 0.05 -wall_thickness = =line_width*3 -top_bottom_thickness = =line_width*2.5 -speed_print = 30 infill_pattern = gyroid infill_sparse_density = 10 +layer_height = 0.05 raft_airgap = 0.1 retraction_amount = 0.5 -retraction_speed = 20 \ No newline at end of file +retraction_speed = 20 +speed_print = 30 +top_bottom_thickness = =line_width*2.5 +wall_thickness = =line_width*3 + diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg index ae9ec7f387..14f6e7a4b1 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg @@ -1,23 +1,24 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal02 setting_version = 23 type = quality -quality_type = normal02 -weight = -2 -global_quality = True variant = Multi0.2 +weight = -2 [values] -layer_height = 0.075 -wall_thickness = =line_width*3 -top_bottom_thickness = =line_width*2.5 -speed_print = 40 infill_pattern = gyroid infill_sparse_density = 10 +layer_height = 0.075 raft_airgap = 0.1 retraction_amount = 0.5 -retraction_speed = 20 \ No newline at end of file +retraction_speed = 20 +speed_print = 40 +top_bottom_thickness = =line_width*2.5 +wall_thickness = =line_width*3 + diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg index f730ecb886..b4b378d361 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast04 setting_version = 23 type = quality -quality_type = fast04 -weight = -2 -global_quality = True variant = Multi0.4 +weight = -2 [values] -layer_height = 0.2 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 60 infill_pattern = cubic +layer_height = 0.2 raft_airgap = 0.2 retraction_amount = 1 -retraction_speed = 20 \ No newline at end of file +retraction_speed = 20 +speed_print = 60 +top_bottom_thickness = =line_width*2 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg index aa95d74adb..c6bc4ee21e 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine04 setting_version = 23 type = quality -quality_type = fine04 -weight = -2 -global_quality = True variant = Multi0.4 +weight = -2 [values] -layer_height = 0.1 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 40 infill_pattern = gyroid +layer_height = 0.1 raft_airgap = 0.2 retraction_amount = 1 -retraction_speed = 20 \ No newline at end of file +retraction_speed = 20 +speed_print = 40 +top_bottom_thickness = =line_width*2 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg index 2d569dcc4c..805d997a94 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg @@ -1,22 +1,23 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal04 setting_version = 23 type = quality -quality_type = normal04 -weight = -2 -global_quality = True variant = Multi0.4 +weight = -2 [values] -layer_height = 0.15 -wall_thickness = =line_width*2 -top_bottom_thickness = =line_width*2 -speed_print = 50 infill_pattern = gyroid +layer_height = 0.15 raft_airgap = 0.2 retraction_amount = 1 -retraction_speed = 20 \ No newline at end of file +retraction_speed = 20 +speed_print = 50 +top_bottom_thickness = =line_width*2 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg index b6a2465a74..032ce478c2 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fast definition = zyyx_pro +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = fast08 setting_version = 23 type = quality -quality_type = fast08 -weight = -2 -global_quality = True variant = Multi0.8 +weight = -2 [values] -layer_height = 0.5 -wall_thickness = =line_width*2 -top_bottom_thickness = =layer_height*2 -speed_print = 45 +infill_overlap = 50 infill_pattern = cubic +layer_height = 0.5 raft_airgap = 0.4 retraction_amount = 1.5 -retraction_speed = 30 -retraction_extra_prime_amount = 0.05 retraction_count_max = 20 -infill_overlap = 50 \ No newline at end of file +retraction_extra_prime_amount = 0.05 +retraction_speed = 30 +speed_print = 45 +top_bottom_thickness = =layer_height*2 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg index 18dd0eb456..82eda2af5e 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Fine definition = zyyx_pro +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = fine08 setting_version = 23 type = quality -quality_type = fine08 -weight = -2 -global_quality = True variant = Multi0.8 +weight = -2 [values] -layer_height = 0.3 -wall_thickness = =line_width*2 -top_bottom_thickness = =layer_height*4 -speed_print = 50 +infill_overlap = 30 infill_pattern = cubic +layer_height = 0.3 raft_airgap = 0.4 retraction_amount = 1.5 -retraction_speed = 30 -retraction_extra_prime_amount = 0.05 retraction_count_max = 20 -infill_overlap = 30 \ No newline at end of file +retraction_extra_prime_amount = 0.05 +retraction_speed = 30 +speed_print = 50 +top_bottom_thickness = =layer_height*4 +wall_thickness = =line_width*2 + diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg index efb33447ec..d19fd2ab6e 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg @@ -1,25 +1,26 @@ [general] -version = 4 -name = Normal definition = zyyx_pro +name = Normal +version = 4 [metadata] +global_quality = True +quality_type = normal08 setting_version = 23 type = quality -quality_type = normal08 -weight = -2 -global_quality = True variant = Multi0.8 +weight = -2 [values] -layer_height = 0.4 -wall_thickness = =line_width*2 -top_bottom_thickness = =layer_height*3 -speed_print = 50 +infill_overlap = 30 infill_pattern = cubic +layer_height = 0.4 raft_airgap = 0.4 retraction_amount = 1.5 -retraction_speed = 30 -retraction_extra_prime_amount = 0.05 retraction_count_max = 20 -infill_overlap = 30 \ No newline at end of file +retraction_extra_prime_amount = 0.05 +retraction_speed = 30 +speed_print = 50 +top_bottom_thickness = =layer_height*3 +wall_thickness = =line_width*2 + diff --git a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg index 608d56d70d..6d47b139f6 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = zyyx_pro name = Carbon0.6 version = 4 -definition = zyyx_pro [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction @@ -14,4 +14,5 @@ acceleration_print = 1000 machine_nozzle_id = Carbon0.6 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.8 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg index 1290052eaa..ee8a089f18 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = zyyx_pro name = Carbon1.2 version = 4 -definition = zyyx_pro [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction @@ -14,4 +14,5 @@ acceleration_print = 1000 machine_nozzle_id = Carbon1.2 machine_nozzle_size = 1.2 machine_nozzle_tip_outer_diameter = 1.8 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg index af6bb44b8a..d2d0235b81 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg @@ -1,15 +1,16 @@ [general] +definition = zyyx_pro_ii name = Carbon0.4 version = 4 -definition = zyyx_pro_ii [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.4 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = Carbon0.4 -machine_nozzle_tip_outer_diameter = 1.6 \ No newline at end of file +machine_nozzle_size = 0.4 +machine_nozzle_tip_outer_diameter = 1.6 + diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg index c69787b8a7..4602af3963 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg @@ -1,15 +1,16 @@ [general] +definition = zyyx_pro_ii name = Carbon0.6 version = 4 -definition = zyyx_pro_ii [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] -machine_nozzle_size = 0.6 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = Carbon0.6 -machine_nozzle_tip_outer_diameter = 1.8 \ No newline at end of file +machine_nozzle_size = 0.6 +machine_nozzle_tip_outer_diameter = 1.8 + diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg index 3fc3aca6b2..08a1ebb3e8 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = zyyx_pro_ii name = Carbon1.2 version = 4 -definition = zyyx_pro_ii [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] acceleration_enabled = True @@ -15,7 +15,6 @@ brim_width = 7 cool_fan_speed = 7 cool_fan_speed_max = 100 cool_min_speed = 5 -material_print_temperature = 200 infill_before_walls = False infill_pattern = triangles infill_wipe_dist = 0 @@ -33,6 +32,7 @@ machine_nozzle_size = 1.2 machine_nozzle_tip_outer_diameter = 2.4 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = 200 material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False @@ -61,4 +61,5 @@ top_bottom_thickness = 1.4 wall_0_inset = 0 wall_line_width_0 = =wall_line_width wall_line_width_x = =wall_line_width -wall_thickness = 2 \ No newline at end of file +wall_thickness = 2 + diff --git a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg index 6e39b5f5fe..c3d461c4a5 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = zyyx_pro_ii name = Multi0.2 version = 4 -definition = zyyx_pro_ii [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] brim_width = 7 @@ -46,3 +46,4 @@ switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 wall_line_width_x = 0.23 wall_thickness = 1.3 + diff --git a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg index 9fe99e4e9e..b385844e27 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = zyyx_pro name = Multi0.2 version = 4 -definition = zyyx_pro [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction @@ -14,4 +14,5 @@ acceleration_print = 1000 machine_nozzle_id = Multi0.2 machine_nozzle_size = 0.2 machine_nozzle_tip_outer_diameter = 1.6 -speed_travel = 80 \ No newline at end of file +speed_travel = 80 + diff --git a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg index 0318460ac3..c2b2e89342 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = zyyx_pro name = Multi0.4 version = 4 -definition = zyyx_pro [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction @@ -14,4 +14,5 @@ acceleration_print = 1000 machine_nozzle_id = Multi0.4 machine_nozzle_size = 0.4 machine_nozzle_tip_outer_diameter = 1.8 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + diff --git a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg index 3a97783faf..cb5d522d30 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = zyyx_pro name = Multi0.8 version = 4 -definition = zyyx_pro [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] acceleration_enabled = True # No effect on print, only for better print time prediction @@ -14,4 +14,5 @@ acceleration_print = 1000 machine_nozzle_id = Multi0.8 machine_nozzle_size = 0.6 machine_nozzle_tip_outer_diameter = 1.8 -speed_travel = 100 \ No newline at end of file +speed_travel = 100 + From 1a85b7216efacf6c25ed96d085136b6e9ae9829f Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Thu, 3 Oct 2024 20:55:36 +0200 Subject: [PATCH 56/56] updated ZYYX settings version to 24 --- resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg | 2 +- resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg | 2 +- resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg | 2 +- resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg | 2 +- resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg | 2 +- resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg | 2 +- resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg | 2 +- resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg | 2 +- .../zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg | 2 +- .../quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg | 2 +- .../quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg | 2 +- .../zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg | 2 +- .../zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg | 2 +- .../zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg | 2 +- .../quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg | 2 +- .../quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg | 2 +- .../quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg | 2 +- .../quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg | 2 +- .../quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg | 2 +- .../quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg | 2 +- .../zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg | 2 +- .../quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg | 2 +- .../quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg | 2 +- .../quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg | 2 +- .../carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg | 2 +- .../zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg | 2 +- .../carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg | 2 +- .../zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg | 2 +- .../carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg | 2 +- .../zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg | 2 +- .../multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg | 2 +- .../zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg | 2 +- .../zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg | 2 +- resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg | 2 +- 70 files changed, 70 insertions(+), 70 deletions(-) diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg index dcff6d8233..2669c8c8a7 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = fast -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg index 17a3065f46..1638e9ac45 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = fine -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg index 7fea598f52..ebdf8ed8ed 100644 --- a/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg +++ b/resources/quality/zyyx_plus/ABS/zyyx_plus_abs_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_abs quality_type = normal -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg index 507e5131ca..6c3ba31527 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu_175 quality_type = fast -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg index 9ec2994cc4..d454e0ec2b 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu_175 quality_type = fine -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg index 04e1e0098c..1c875f0fd6 100644 --- a/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg +++ b/resources/quality/zyyx_plus/FLEX/zyyx_plus_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_tpu_175 quality_type = normal -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg index 74f4cde8e1..1b6d0fc320 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg index 54c87d5b33..308aa8933f 100644 --- a/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg +++ b/resources/quality/zyyx_plus/PLA/zyyx_plus_pla_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg index 2033e21b52..5684eea2c1 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg index f7645eb0a9..a375aec370 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg index d5325f6070..e62aef54ad 100644 --- a/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg +++ b/resources/quality/zyyx_plus/zyyx_plus_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 23 +setting_version = 24 type = quality weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg index 8d60fc97ff..4360f05c8e 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast06 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg index 2e22b6d177..7a17e6ba92 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine06 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg index 5a6e14ee86..83d4dab8c5 100644 --- a/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/flex/zyyx_pro_06_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal06 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg index d11df94f84..28a950b838 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast06 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg index 886304a793..ff396e110b 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine06 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg index 74c9168414..d2bfd6cc9e 100644 --- a/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon06/zyyx_pro_06_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal06 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg index d3253b540c..baf56e216e 100644 --- a/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/flex/zyyx_pro_12_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal12 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon1.2 weight = 0 diff --git a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg index 7604e956dc..287305578a 100644 --- a/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/carbon12/zyyx_pro_12_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal12 -setting_version = 23 +setting_version = 24 type = quality variant = Carbon1.2 weight = -2 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg index 0e0abad2fb..1b6e95f546 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast02 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg index c19c51dc22..1d1713a08e 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine02 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg index ae37a0ef8b..797637a25d 100644 --- a/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/flex/zyyx_pro_02_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal02 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg index 465190e80a..0d00e8a74b 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast02 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = -2 diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg index 73a1451487..71264c0fff 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine02 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = -2 diff --git a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg index 14f6e7a4b1..7deab14bb4 100644 --- a/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi02/zyyx_pro_02_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal02 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = -2 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg index 9b4c9b4e44..e49678a86c 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast04 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.4 weight = 0 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg index d97b9d46dd..09dd668f78 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine04 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.4 weight = 0 diff --git a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg index 572b4ac8b1..9aa604ca2b 100644 --- a/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/flex/zyyx_pro_04_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal04 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.4 weight = 0 diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg index b4b378d361..a73e760538 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast04 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.4 weight = -2 diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg index c6bc4ee21e..e6b7f7161f 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine04 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.4 weight = -2 diff --git a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg index 805d997a94..e50cc72523 100644 --- a/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi04/zyyx_pro_04_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal04 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.4 weight = -2 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg index 94fb12bcc9..908f069140 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fast.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fast08 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.8 weight = 0 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg index 94d09e0d95..f6456e0768 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_fine.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = fine08 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.8 weight = 0 diff --git a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg index 6f227fa32c..d5eddb7e79 100644 --- a/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/flex/zyyx_pro_08_flex_normal.inst.cfg @@ -7,7 +7,7 @@ version = 4 global_quality = True material = generic_tpu_175 quality_type = normal08 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.8 weight = 0 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg index 032ce478c2..8fe243ff59 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast08 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.8 weight = -2 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg index 82eda2af5e..b1f62d0327 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine08 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.8 weight = -2 diff --git a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg index d19fd2ab6e..14456a552f 100644 --- a/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro/multi08/zyyx_pro_08_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal08 -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.8 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg index 4d8909764b..4319f179bb 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg index 24be298378..1fe4ffd7c8 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg index 3ec7c7ab03..90c4254961 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/flex/zyyx_pro_ii_04_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg index c89463ed63..6732d610c6 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg index b014676eb1..db1659b871 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg index d9715d5621..3817e040fc 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/pla/zyyx_pro_ii_04_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg index 4f37bfa53d..847ac209e4 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg index c02eecd5b0..508e880817 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg index d613780bf5..d7b01a7ae6 100644 --- a/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon04/zyyx_pro_ii_04_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.4 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg index 4609b564d6..e01028beaa 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg index 29bb4efacd..7204aad882 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg index 32b8d24659..f5df71563f 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/flex/zyyx_pro_ii_06_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg index 857bfd5c9d..824655ffad 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg index d00dc208f4..63beda8df7 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg index 1d8c85d70e..2637e3b7fb 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/pla/zyyx_pro_ii_06_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg index 36fa1c73e7..5ffa680b49 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fast.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fast -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg index 7ca3968bc4..f1efe4cde4 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_fine.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = fine -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg index f6b9a1fef4..22c0edf596 100644 --- a/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon06/zyyx_pro_ii_06_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon0.6 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg index 15a805dab7..60dc7a557c 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/flex/zyyx_pro_ii_12_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon1.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg index 21db9bcc38..9ef2fd5f7e 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/pla/zyyx_pro_ii_12_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon1.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg index d9d53c3410..36d23c001a 100644 --- a/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/carbon12/zyyx_pro_ii_12_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Carbon1.2 weight = -2 diff --git a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg index 4b4e0e8db2..6641abe078 100644 --- a/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/flex/zyyx_pro_ii_02_flex_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg index 22bb19e957..7d22f04649 100644 --- a/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/pla/zyyx_pro_ii_02_pla_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] material = generic_pla quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = 0 diff --git a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg index 608afec4ba..84027310fa 100644 --- a/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg +++ b/resources/quality/zyyx_pro_ii/multi02/zyyx_pro_ii_02_global_normal.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = normal -setting_version = 23 +setting_version = 24 type = quality variant = Multi0.2 weight = -2 diff --git a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg index 6d47b139f6..bf952dafd0 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg index ee8a089f18..8ce78fc80d 100644 --- a/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_carbon1.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg index d2d0235b81..ac231a5cfb 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg index 4602af3963..7521ae0357 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg index 08a1ebb3e8..5fda710245 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_carbon1.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg index c3d461c4a5..edf7db4f98 100644 --- a/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_ii_multi0.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg index b385844e27..66dd6d8c8a 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg index c2b2e89342..0cc4fed125 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values] diff --git a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg index cb5d522d30..bf5fb2e667 100644 --- a/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg +++ b/resources/variants/zyyx/zyyx_pro_multi0.8.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 23 +setting_version = 24 type = variant [values]