From 069dffc18328d360c54ec16ea7a7b43bcc682e6e Mon Sep 17 00:00:00 2001 From: Theodor Hansson Date: Tue, 10 Sep 2024 16:52:09 +0200 Subject: [PATCH] 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]