From 12c53ce4e441b48d967e42c358d488ecaf379783 Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Wed, 12 Apr 2023 16:26:46 +0200 Subject: [PATCH] Use resolveOrValue --- resources/definitions/elegoo_base.def.json | 2 +- .../pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg | 2 +- .../pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/elegoo_base.def.json b/resources/definitions/elegoo_base.def.json index f1ad995e60..e13bd5be32 100644 --- a/resources/definitions/elegoo_base.def.json +++ b/resources/definitions/elegoo_base.def.json @@ -138,6 +138,6 @@ "z_seam_corner": { "default_value": "z_seam_corner_weighted" }, "z_seam_position": { "default_value": "left" }, "z_seam_type": { "default_value": "back" }, - "zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_sparse_density < 30 " } + "zig_zaggify_infill": { "value": "resolveOrValue('infill_pattern') == 'cross' or resolveOrValue('infill_pattern') == 'cross_3d' or resolveOrValue('infill_sparse_density') < 30 " } } } diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg index 3e70c6034d..c5ed8f40f8 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.05.inst.cfg @@ -12,7 +12,7 @@ variant = 0.20mm_Elegoo_Nozzle [values] brim_width = 8 -infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_overlap = =0 if resolveOrValue('infill_sparse_density') > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 diff --git a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg index 73ab456379..f98dd73c40 100644 --- a/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg +++ b/resources/quality/elegoo/base/pla/nozzle_0.20/elegoo_pla_nozzle_0.20_layer_0.10.inst.cfg @@ -12,7 +12,7 @@ variant = 0.20mm_Elegoo_Nozzle [values] brim_width = 8 -infill_overlap = =0 if infill_sparse_density > 80 else 10 +infill_overlap = =0 if resolveOrValue('infill_sparse_density') > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4