From e63a95b335872e965c193812a7679581252f17fe Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Wed, 2 Oct 2024 11:30:49 +0200 Subject: [PATCH] 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