GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 21:19:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

PP-60: Major clean up. Moved all common (libArachne + 4.12) settings to ultimaker.def.json from which all Ultimaker machines inherit their values

Browse Source
This commit is contained in:
p.kuiper 2021-11-09 12:13:02 +01:00
parent b477a9bf2a
commit de04c7d79b
6 changed files with 36 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resources/definitions/ultimaker.def.json
View File

@ -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"
}
}
}

33
resources/definitions/ultimaker2.def.json
View File

@ -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"
}
}
}

14
resources/definitions/ultimaker3.def.json
View File

@ -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" }
}
}

30
resources/definitions/ultimaker_original.def.json
View File

@ -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"
}
}
}

12
resources/definitions/ultimaker_s3.def.json
View File

@ -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" }
}

11
resources/definitions/ultimaker_s5.def.json
View File

@ -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" },