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

Merge remote-tracking branch 'origin/PP-60_libArachne_iteration3_settings' into libArachne_rebased

Browse Source 
# Conflicts:
#	resources/definitions/fdmprinter.def.json
#	resources/definitions/ultimaker.def.json
#	resources/definitions/ultimaker2.def.json
#	resources/definitions/ultimaker3.def.json
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
This commit is contained in:
Jelle Spijker 2021-11-15 09:48:48 +01:00
commit de94fd7412
No known key found for this signature in database
GPG Key ID: 6662DC033BE6B99A
7 changed files with 32 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
resources/definitions/fdmprinter.def.json
View File

@ -1095,10 +1095,8 @@
"description": "The smallest line width, as a factor of the normal line width, below which it will choose to use fewer, but wider lines to fill the available space the wall needs to occupy. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.",
"type": "float",
"unit": "%",
"default_value": 50,
"default_value": 90,
"minimum_value": "1",
"minimum_value_warning": "min_bead_width / line_width * 100",
"maximum_value_warning": "75",
"maximum_value": "99",
"children":
{
@ -1110,8 +1108,6 @@
"default_value": 50,
"value": "wall_transition_threshold",
"minimum_value": "1",
"minimum_value_warning": "min_bead_width / line_width * 100",
"maximum_value_warning": "75",
"maximum_value": "99"
},
"wall_add_middle_threshold": {
@ -1120,10 +1116,8 @@
"type": "float",
"unit": "%",
"default_value": 50,
"value": "wall_transition_threshold",
"value": "wall_transition_threshold * 8 / 9",
"minimum_value": "1",
"minimum_value_warning": "min_bead_width / line_width * 100",
"maximum_value_warning": "75",
"maximum_value": "99"
}
}
@ -1146,8 +1140,8 @@
"label": "Wall Distribution Count",
"description": "The number of walls, counted from the center, over which the variation needs to be spread. Lower values mean that the outer walls don't change in width.",
"type": "int",
"default_value": 3,
"minimum_value": "2",
"default_value": 1,
"minimum_value": "1",
"enabled": "beading_strategy_type == 'inward_distributed'"
},
"wall_transition_angle":
@ -1243,7 +1237,7 @@
"label": "Print Thin Walls",
"description": "Print pieces of the model which are horizontally thinner than the nozzle size.",
"type": "bool",
"default_value": false,
"default_value": true,
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
@ -1252,7 +1246,7 @@
"label": "Minimum Feature Size",
"description": "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width.",
"unit": "mm",
"default_value": 0,
"value": "wall_line_width_0 / 4",
"minimum_value": "0",
"maximum_value": "wall_line_width_0",
"type": "float",
@ -1264,7 +1258,7 @@
"label": "Minimum Wall Line Width",
"description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.",
"unit": "mm",
"value": "wall_line_width_0 / 2",
"value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200",
"default_value": "0.2",
"minimum_value": "0.001",
"minimum_value_warning": "min_feature_size",
@ -3231,8 +3225,8 @@
"description": "Extrusion width based correction factor on the speed. At 0% the movement speed is kept constant at the Print Speed. At 100% the movement speed is adjusted so that the flow (in mm³/s) is kept constant, i.e. lines half the normal Line Width are printed twice as fast and lines twice as wide are printed half as fast. A value larger than 100% can help to compensate for the higher pressure required to extrude wide lines.",
"type": "float",
"unit": "%",
"default_value": 0.0,
"minimum_value": "0",
"default_value": 100.0,
"minimum_value": "0.0",
"maximum_value_warning": "200.0",
"settable_per_mesh": false,
"settable_per_extruder": true
@ -6305,7 +6299,7 @@
"default_value": 2000,
"minimum_value": "0",
"minimum_value_warning": "500",
"maximum_value_warning": "5000",
"maximum_value_warning": "50000",
"settable_per_mesh": true
}
}
@ -7485,7 +7479,8 @@
"unit": "%",
"default_value": 100,
"type": "float",
"minimum_value": "0.001",
"minimum_value": "5",
"maximum_value": "100",
"minimum_value_warning": "20",
"maximum_value_warning": "100",
"enabled": "bridge_settings_enabled",

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

@ -41,8 +41,23 @@
"value": false,
"enabled": false
},
"skin_angles": {
"value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]"
"line_width": {
"value": "machine_nozzle_size"
},
"infill_before_walls": {
"value": "False"
},
"retraction_combing": {
"value": "'no_outer_surfaces'"
},
"skin_monotonic" : {
"value": true
},
"speed_equalize_flow_width_factor": {
"value": "1.1"
},
"meshfix_maximum_extrusion_area_deviation": {
"value": "50000"
}
}
}

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

@ -86,33 +86,6 @@
},
"machine_acceleration": {
"default_value": 3000
},
"infill_before_walls": {
"value": "False"
},
"speed_equalize_flow_width_factor": {
"value": "50.0"
},
"retraction_combing": {
"value": "'no_outer_surfaces'"
},
"skin_monotonic" : {
"value": true
},
"top_bottom_pattern" : {
"value": "'zigzag'"
},
"fill_outline_gaps": {
"value": "True"
},
"min_feature_size": {
"value": "wall_line_width_0 / 4"
},
"min_bead_width": {
"value": "wall_line_width_0 / 2"
},
"meshfix_maximum_extrusion_area_deviation": {
"value": "50000"
}
}
}

12
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 / 2" },
"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": "50.0" },
"skin_monotonic" : { "value": true },
"speed_layer_0": { "value": "20" },
"speed_prime_tower": { "value": "speed_topbottom" },
"speed_print": { "value": "35" },
@ -174,7 +163,6 @@
"support_z_distance": { "value": "0" },
"switch_extruder_prime_speed": { "value": "15" },
"switch_extruder_retraction_amount": { "value": "8" },
"top_bottom_pattern": { "value": "'zigzag'" },
"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" },

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

@ -59,6 +59,9 @@
},
"machine_end_gcode": {
"value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'"
},
"infill_before_walls": {
"value": "False"
}
}
}

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

@ -89,7 +89,6 @@
"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" },
@ -112,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" },
@ -131,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" },
@ -139,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": "50.0" },
"speed_layer_0": { "value": "20" },
"speed_prime_tower": { "value": "speed_topbottom" },
"speed_print": { "value": "35" },
@ -159,7 +154,6 @@
"support_z_distance": { "value": "0" },
"switch_extruder_prime_speed": { "value": "15" },
"switch_extruder_retraction_amount": { "value": "8" },
"top_bottom_pattern": { "value": "'zigzag'" },
"top_bottom_thickness": { "value": "1" },
"travel_avoid_supports": { "value": "True" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
@ -167,7 +161,6 @@
"wall_thickness": { "value": "1" },
"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" }
}

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

@ -91,7 +91,6 @@
"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" },
@ -114,15 +113,11 @@
"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" },
"multiple_mesh_overlap": { "value": "0" },
"prime_tower_enable": { "value": "True" },
"fill_outline_gaps": { "value": "True" },
"min_feature_size": { "value": "wall_line_width_0 / 4" },
"min_bead_width": { "value": "wall_line_width_0 / 2" },
"raft_airgap": { "value": "0" },
"raft_base_speed": { "value": "20" },
"raft_base_thickness": { "value": "0.3" },
@ -143,9 +138,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": "50.0" },
"speed_layer_0": { "value": "20" },
"speed_prime_tower": { "value": "speed_topbottom" },
"speed_print": { "value": "35" },
@ -163,7 +156,6 @@
"support_z_distance": { "value": "0" },
"switch_extruder_prime_speed": { "value": "15" },
"switch_extruder_retraction_amount": { "value": "8" },
"top_bottom_pattern": { "value": "'zigzag'" },
"top_bottom_thickness": { "value": "1" },
"travel_avoid_supports": { "value": "True" },
"travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" },
@ -171,7 +163,6 @@
"wall_thickness": { "value": "1" },
"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" },