From eb3d2cf0f9e0cc789e60c6ca036c300f5369b444 Mon Sep 17 00:00:00 2001 From: Lukkoz Date: Mon, 22 Feb 2021 15:35:16 +0100 Subject: [PATCH] def.json update --- resources/definitions/skriware_2.def.json | 6 ++---- resources/quality/skriware_2/sk2_advanced.inst.cfg | 4 ++-- resources/quality/skriware_2/sk2_fast.inst.cfg | 4 ++-- resources/quality/skriware_2/sk2_precise.inst.cfg | 4 ++-- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index 1ed78b917a..f46213dde7 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -144,8 +144,7 @@ "value": "0.4" }, "infill_line_distance": { - "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))", - "default_value":5.3333 + "value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))" }, "default_material_print_temperature": { "default_value": 200 @@ -175,8 +174,7 @@ "default_value": 1 }, "support_line_distance": { - "value":"0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))", - "default_value":2 + "value":"0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))" }, "cool_lift_head": { "default_value": true diff --git a/resources/quality/skriware_2/sk2_advanced.inst.cfg b/resources/quality/skriware_2/sk2_advanced.inst.cfg index afe874a31f..7892168489 100644 --- a/resources/quality/skriware_2/sk2_advanced.inst.cfg +++ b/resources/quality/skriware_2/sk2_advanced.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 4 +version = 1 name = Advanced definition = skriware_2 @@ -32,4 +32,4 @@ raft_base_speed = 20 raft_base_thickness = 0.3 raft_surface_layers = 1 raft_surface_line_spacing = 0.6 -raft_surface_speed = 60 \ No newline at end of file +raft_surface_speed = 60 diff --git a/resources/quality/skriware_2/sk2_fast.inst.cfg b/resources/quality/skriware_2/sk2_fast.inst.cfg index 9f88bb554b..2cb1416922 100644 --- a/resources/quality/skriware_2/sk2_fast.inst.cfg +++ b/resources/quality/skriware_2/sk2_fast.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 4 +version = 1 name = Fast definition = skriware_2 @@ -60,4 +60,4 @@ raft_base_speed = 20 raft_base_thickness = 0.3 raft_surface_layers = 1 raft_surface_line_spacing = 0.6 -raft_surface_speed = 60 \ No newline at end of file +raft_surface_speed = 60 diff --git a/resources/quality/skriware_2/sk2_precise.inst.cfg b/resources/quality/skriware_2/sk2_precise.inst.cfg index 7ee076608d..640ce7bdfa 100644 --- a/resources/quality/skriware_2/sk2_precise.inst.cfg +++ b/resources/quality/skriware_2/sk2_precise.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 4 +version = 1 name = Precise definition = skriware_2 @@ -60,4 +60,4 @@ raft_base_speed = 20 raft_base_thickness = 0.3 raft_surface_layers = 1 raft_surface_line_spacing = 0.6 -raft_surface_speed = 60 \ No newline at end of file +raft_surface_speed = 60