From dafd3fdec91df419c0c9a336cada520870111c14 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 3 Apr 2025 13:42:34 +0200 Subject: [PATCH 1/3] [jerk settings] Update jerk parameters with a minimum value of 1 for all Ultimaker machines. PP-608 --- resources/definitions/ultimaker.def.json | 112 ++++++++++++++++++++--- 1 file changed, 100 insertions(+), 12 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 2e9f4abda1..5a66076307 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -48,23 +48,111 @@ "infill_material_flow": { "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" }, "infill_overlap": { "value": "0 if infill_sparse_density > 80 else 10" }, "inset_direction": { "value": "'outside_in'" }, - "jerk_infill": { "minimum_value_warning": 20 }, - "jerk_prime_tower": { "minimum_value_warning": 20 }, + "jerk_flooring": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_infill": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_layer_0": { "minimum_value": 1 }, + "jerk_prime_tower": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, "jerk_print": { + "minimum_value": 1, "minimum_value_warning": 20, "value": "20" }, - "jerk_print_layer_0": { "value": "max(20, jerk_wall_0)" }, - "jerk_roofing": { "minimum_value_warning": 20 }, - "jerk_support": { "minimum_value_warning": 20 }, - "jerk_support_infill": { "minimum_value_warning": 20 }, - "jerk_support_interface": { "minimum_value_warning": 20 }, - "jerk_topbottom": { "minimum_value_warning": 20 }, - "jerk_travel": { "value": "jerk_print" }, + "jerk_print_layer_0": + { + "minimum_value": 1, + "value": "max(20, jerk_wall_0)" + }, + "jerk_roofing": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_skirt_brim": { "minimum_value": 1 }, + "jerk_support": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_bottom": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_infill": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_interface": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_support_roof": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_topbottom": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_travel": + { + "minimum_value": 1, + "value": "jerk_print" + }, "jerk_travel_enabled": { "value": false }, - "jerk_wall": { "minimum_value_warning": 20 }, - "jerk_wall_0": { "minimum_value_warning": 20 }, + "jerk_travel_layer_0": { "minimum_value": 1 }, + "jerk_wall": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_0": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_0_flooring": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_0_roofing": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_x": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_x_flooring": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, + "jerk_wall_x_roofing": + { + "minimum_value": 1, + "minimum_value_warning": 20 + }, "layer_height": { "value": 0.15 }, "layer_height_0": { "value": "max(0.2, layer_height)" }, "line_width": { "value": "machine_nozzle_size" }, @@ -84,7 +172,7 @@ "material_standby_temperature": { "minimum_value": "0", - "value": "resolveOrValue('material_print_temperature') - 100" + "value": "material_print_temperature - 100" }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, From 549e7c92e907aab6aadc58fc8bac9318cb01332d Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 3 Apr 2025 14:28:10 +0200 Subject: [PATCH 2/3] Update ultimaker.def.json Corrected unintended overridden change --- resources/definitions/ultimaker.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 5a66076307..ad5e32df0f 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -172,7 +172,7 @@ "material_standby_temperature": { "minimum_value": "0", - "value": "material_print_temperature - 100" + "value": "resolveOrValue('material_print_temperature') - 100" }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, @@ -229,4 +229,4 @@ "z_seam_relative": { "value": "True" }, "zig_zaggify_support": { "value": true } } -} \ No newline at end of file +} From 0b8f6fb09cfedb9e3b8d07758b394b71bfc0a3c1 Mon Sep 17 00:00:00 2001 From: pkuiper-ultimaker <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 3 Apr 2025 12:29:33 +0000 Subject: [PATCH 3/3] Apply printer-linter format --- resources/definitions/ultimaker.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index ad5e32df0f..d8fdd7eede 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -229,4 +229,4 @@ "z_seam_relative": { "value": "True" }, "zig_zaggify_support": { "value": true } } -} +} \ No newline at end of file