From de04c7d79b38736abf99a6faa4a567229c439808 Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Tue, 9 Nov 2021 12:13:02 +0100 Subject: [PATCH] PP-60: Major clean up. Moved all common (libArachne + 4.12) settings to ultimaker.def.json from which all Ultimaker machines inherit their values --- resources/definitions/ultimaker.def.json | 36 +++++++++++++++++++ resources/definitions/ultimaker2.def.json | 33 ----------------- resources/definitions/ultimaker3.def.json | 14 -------- .../definitions/ultimaker_original.def.json | 30 ---------------- resources/definitions/ultimaker_s3.def.json | 12 ------- resources/definitions/ultimaker_s5.def.json | 11 ------ 6 files changed, 36 insertions(+), 100 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 47a60fe51c..04e8834f19 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -40,6 +40,42 @@ { "value": false, "enabled": false + }, + "line_width": { + "value": "machine_nozzle_size" + }, + "infill_before_walls": { + "value": "False" + }, + "retraction_combing": { + "value": "'no_outer_surfaces'" + }, + "skin_monotonic" : { + "value": true + }, + "fill_outline_gaps": { + "value": "True" + }, + "min_feature_size": { + "value": "wall_line_width_0 / 4" + }, + "min_bead_width": { + "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" + }, + "speed_equalize_flow_width_factor": { + "value": "1.1" + }, + "wall_transition_threshold": { + "value": "90" + }, + "wall_add_middle_threshold": { + "value": "wall_transition_threshold * 8/9" + }, + "wall_distribution_count": { + "value": "1" + }, + "meshfix_maximum_extrusion_area_deviation": { + "value": "50000" } } } diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index ca580122a0..c028363239 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -86,39 +86,6 @@ }, "machine_acceleration": { "default_value": 3000 - }, - "infill_before_walls": { - "value": "False" - }, - "speed_equalize_flow_width_factor": { - "value": "1.1" - }, - "wall_distribution_count": { - "value": "1" - }, - "wall_transition_threshold": { - "value": 90 - }, - "wall_add_middle_threshold": { - "value": "wall_transition_threshold * 8/9" - }, - "retraction_combing": { - "value": "'no_outer_surfaces'" - }, - "skin_monotonic" : { - "value": true - }, - "fill_outline_gaps": { - "value": "True" - }, - "min_feature_size": { - "value": "wall_line_width_0 / 4" - }, - "min_bead_width": { - "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" - }, - "meshfix_maximum_extrusion_area_deviation": { - "value": "50000" } } } diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index d388b970cc..4743d1b77e 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -96,10 +96,6 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, - "fill_outline_gaps": { "value": "True" }, - "min_feature_size": { "value": "wall_line_width_0 / 4" }, - "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" }, - "infill_before_walls": { "value": false }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, @@ -123,14 +119,12 @@ "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'))" }, - "line_width": { "value": "machine_nozzle_size" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "material_bed_temperature": { "maximum_value": "115" }, "material_bed_temperature_layer_0": { "maximum_value": "115" }, "material_standby_temperature": { "value": "100" }, - "meshfix_maximum_extrusion_area_deviation": { "value": "50000" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "default_value": true }, @@ -143,7 +137,6 @@ "raft_margin": { "value": "10" }, "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" }, @@ -151,11 +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_overlap": { "value": "10" }, - "speed_equalize_flow_width_factor": { "value": "1.1" }, - "skin_monotonic" : { "value": true }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -177,10 +166,7 @@ "top_bottom_thickness": { "value": "1" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "wall_distribution_count": { "value": "1" }, "wall_thickness": { "value": "1" }, - "wall_transition_threshold": {"value": "90"}, - "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"}, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } } diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 21e83981da..15b381f4da 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -62,36 +62,6 @@ }, "infill_before_walls": { "value": "False" - }, - "speed_equalize_flow_width_factor": { - "value": "1.1" - }, - "wall_distribution_count": { - "value": "1" - }, - "wall_transition_threshold": { - "value": 90 - }, - "wall_add_middle_threshold": { - "value": "wall_transition_threshold * 8/9" - }, - "retraction_combing": { - "value": "'no_outer_surfaces'" - }, - "skin_monotonic" : { - "value": true - }, - "fill_outline_gaps": { - "value": "True" - }, - "min_feature_size": { - "value": "wall_line_width_0 / 4" - }, - "min_bead_width": { - "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" - }, - "meshfix_maximum_extrusion_area_deviation": { - "value": "50000" } } } diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 86d1976987..17531c66a4 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -89,13 +89,9 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, - "infill_before_walls": { "value": false }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, - "fill_outline_gaps": { "value": "True" }, - "min_feature_size": { "value": "wall_line_width_0 / 4" }, - "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" }, "jerk_enabled": { "value": "True" }, "jerk_print": { "value": "20", "minimum_value_warning": 20 }, "jerk_infill": {"minimum_value_warning": 20 }, @@ -115,7 +111,6 @@ "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'))" }, - "line_width": { "value": "machine_nozzle_size" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, @@ -134,7 +129,6 @@ "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" }, @@ -142,9 +136,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, - "speed_equalize_flow_width_factor": { "value": "1.1" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -166,13 +158,9 @@ "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"}, - "wall_distribution_count": { "value": "1" }, "wall_thickness": { "value": "1" }, - "wall_transition_threshold": {"value": "90"}, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, - "meshfix_maximum_extrusion_area_deviation": { "value": "50000" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 4886518896..5ad560a0c7 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -91,13 +91,9 @@ "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, - "infill_before_walls": { "value": false }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'triangles'" }, "infill_wipe_dist": { "value": "0" }, - "fill_outline_gaps": { "value": "True" }, - "min_feature_size": { "value": "wall_line_width_0 / 4" }, - "min_bead_width": { "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200" }, "jerk_enabled": { "value": "True" }, "jerk_print": { "value": "20", "minimum_value_warning": 20 }, "jerk_infill": {"minimum_value_warning": 20 }, @@ -117,7 +113,6 @@ "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'))" }, - "line_width": { "value": "machine_nozzle_size" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, @@ -146,9 +141,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, - "speed_equalize_flow_width_factor": { "value": "1.1" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -170,13 +163,9 @@ "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "wall_add_middle_threshold": {"value": "wall_transition_threshold * 8/9"}, - "wall_distribution_count": { "value": "1" }, "wall_thickness": { "value": "1" }, - "wall_transition_threshold": {"value": "90"}, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, - "meshfix_maximum_extrusion_area_deviation": { "value": "50000" }, "optimize_wall_printing_order": { "value": "True" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" },