diff options
author | Remco Burema <r.burema@ultimaker.com> | 2021-10-20 09:38:01 +0300 |
---|---|---|
committer | Remco Burema <r.burema@ultimaker.com> | 2021-10-20 09:38:01 +0300 |
commit | 86046a32b301b1db917a3c1ea0630ae684e640d3 (patch) | |
tree | adbfecccc30d7fb75663820307693a344c018329 /resources/definitions/ultimaker_s5.def.json | |
parent | 2fc20fd04a8541bc30d6d88e1278ac6f444b81a2 (diff) | |
parent | 7680124f7e9d46a7e52e81cde6b47c39af563cd0 (diff) |
Merge branch 'master' into merge_main_20211019
Diffstat (limited to 'resources/definitions/ultimaker_s5.def.json')
-rw-r--r-- | resources/definitions/ultimaker_s5.def.json | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 004734467a..64d4be2a38 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -91,20 +91,27 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, - "infill_before_walls": { "value": "False" }, - "infill_line_width": { "value": "line_width" }, + "infill_before_walls": { "value": false }, + "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "jerk_layer_0": { "value": "jerk_topbottom" }, - "jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_print": { "value": "25" }, - "jerk_support": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" }, - "jerk_support_interface": { "value": "jerk_topbottom" }, - "jerk_topbottom": { "value": "max(math.ceil(jerk_print * 5 / 25), 20)" }, - "jerk_wall": { "value": "max(math.ceil(jerk_print * 10 / 25), 20)" }, - "jerk_wall_0": { "value": "max(math.ceil(jerk_wall * 5 / 10), 20)" }, + "jerk_print": { "value": "20", "minimum_value_warning": 20 }, + "jerk_infill": {"minimum_value_warning": 20 }, + "jerk_wall": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_wall_0": { "value": "jerk_wall", "minimum_value_warning": 20 }, + "jerk_roofing": {"minimum_value_warning": 20 }, + "jerk_topbottom": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_support_infill": {"minimum_value_warning": 20 }, + "jerk_support_interface": { "value": "math.ceil(jerk_print * 5 / 20)"}, + "jerk_prime_tower": { "value": "jerk_print", "minimum_value_warning": 20 }, + "jerk_travel": {"minimum_value_warning": 20 }, + "jerk_layer_0": { "value": "jerk_topbottom", "minimum_value_warning": 20}, + "jerk_print_layer_0": {"minimum_value_warning": 20 }, + "jerk_travel_layer_0": {"minimum_value_warning": 20 }, + "jerk_skirt_brim": {"minimum_value_warning": 20 }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, @@ -129,6 +136,7 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, + "retraction_combing": { "value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -136,8 +144,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "roofing_layer_count": { "value": "1" }, - "roofing_monotonic": { "value": "True" }, + "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, "speed_equalize_flow_width_factor": { "value": "0.5" }, "speed_layer_0": { "value": "20" }, @@ -168,7 +175,6 @@ "meshfix_maximum_deviation": { "value": "layer_height / 4" }, "meshfix_maximum_extrusion_area_deviation": { "value": "50000" }, "optimize_wall_printing_order": { "value": "True" }, - "retraction_combing": { "default_value": "all" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "build_volume_temperature": { "maximum_value": 50 } |