3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into feature_firmware_updater

Browse source
This commit is contained in:
fieldOfView 2018-10-02 15:10:44 +02:00
commit 91ee691c80
16 changed files with 426 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

40
resources/definitions/fdmprinter.def.json
View file

@ -846,6 +846,7 @@
"default_value": 0.4,
"type": "float",
"value": "line_width",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1192,6 +1193,7 @@
"zigzag": "Zig Zag"
},
"default_value": "lines",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1207,6 +1209,7 @@
"zigzag": "Zig Zag"
},
"default_value": "lines",
"enabled": "top_layers > 0 or bottom_layers > 0",
"value": "top_bottom_pattern",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
@ -1217,7 +1220,7 @@
"description": "Connect top/bottom skin paths where they run next to each other. For the concentric pattern enabling this setting greatly reduces the travel time, but because the connections can happend midway over infill this feature can reduce the top surface quality.",
"type": "bool",
"default_value": false,
"enabled": "top_bottom_pattern == 'concentric'",
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern == 'concentric'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -1227,7 +1230,7 @@
"description": "A list of integer line directions to use when the top/bottom layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).",
"type": "[int]",
"default_value": "[ ]",
"enabled": "top_bottom_pattern != 'concentric'",
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1454,6 +1457,7 @@
"description": "When the model has small vertical gaps, about 5% extra computation time can be spent on generating top and bottom skin in these narrow spaces. In such case, disable the setting.",
"type": "bool",
"default_value": false,
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1465,6 +1469,7 @@
"minimum_value": "0",
"maximum_value_warning": "10",
"type": "int",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1639,7 +1644,7 @@
"infill_pattern":
{
"label": "Infill Pattern",
"description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.",
"description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction.",
"type": "enum",
"options":
{
@ -1654,7 +1659,8 @@
"concentric": "Concentric",
"zigzag": "Zig Zag",
"cross": "Cross",
"cross_3d": "Cross 3D"
"cross_3d": "Cross 3D",
"gyroid": "Gyroid"
},
"default_value": "grid",
"enabled": "infill_sparse_density > 0",
@ -1669,7 +1675,7 @@
"type": "bool",
"default_value": false,
"value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
"enabled": "infill_pattern == 'lines' or infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d'",
"enabled": "infill_pattern == 'lines' or infill_pattern == 'grid' or infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'gyroid'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -1679,8 +1685,8 @@
"description": "Connect infill paths where they run next to each other. For infill patterns which consist of several closed polygons, enabling this setting greatly reduces the travel time.",
"type": "bool",
"default_value": true,
"value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0",
"enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0",
"value": "(infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_multiplier % 2 == 0) and infill_wall_line_count > 0",
"enabled": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'concentric' or infill_multiplier % 2 == 0 or infill_wall_line_count > 1",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -1793,7 +1799,7 @@
"minimum_value_warning": "-50",
"maximum_value_warning": "100",
"value": "5 if top_bottom_pattern != 'concentric' else 0",
"enabled": "top_bottom_pattern != 'concentric'",
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true,
"children":
@ -1808,7 +1814,7 @@
"minimum_value_warning": "-0.5 * machine_nozzle_size",
"maximum_value_warning": "machine_nozzle_size",
"value": "0.5 * (skin_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0)) * skin_overlap / 100 if top_bottom_pattern != 'concentric' else 0",
"enabled": "top_bottom_pattern != 'concentric'",
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
"settable_per_mesh": true
}
}
@ -1921,6 +1927,7 @@
"default_value": 0,
"value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
"minimum_value": "0",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true,
"children":
@ -1934,6 +1941,7 @@
"default_value": 0,
"value": "skin_preshrink",
"minimum_value": "0",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1946,6 +1954,7 @@
"default_value": 0,
"value": "skin_preshrink",
"minimum_value": "0",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
}
@ -1961,6 +1970,7 @@
"value": "wall_line_width_0 + (wall_line_count - 1) * wall_line_width_x",
"minimum_value": "-skin_preshrink",
"limit_to_extruder": "top_bottom_extruder_nr",
"enabled": "top_layers > 0 or bottom_layers > 0",
"settable_per_mesh": true,
"children":
{
@ -1973,6 +1983,7 @@
"default_value": 2.8,
"value": "expand_skins_expand_distance",
"minimum_value": "-top_skin_preshrink",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -1985,6 +1996,7 @@
"default_value": 2.8,
"value": "expand_skins_expand_distance",
"minimum_value": "-bottom_skin_preshrink",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
}
@ -2000,7 +2012,7 @@
"minimum_value_warning": "2",
"maximum_value": "90",
"default_value": 90,
"enabled": "top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0",
"enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true,
"children":
@ -2014,7 +2026,7 @@
"default_value": 2.24,
"value": "top_layers * layer_height / math.tan(math.radians(max_skin_angle_for_expansion))",
"minimum_value": "0",
"enabled": "top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0",
"enabled": "(top_layers > 0 or bottom_layers > 0) and (top_skin_expand_distance > 0 or bottom_skin_expand_distance > 0)",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
}
@ -2564,6 +2576,7 @@
"default_value": 30,
"value": "speed_print / 2",
"limit_to_extruder": "top_bottom_extruder_nr",
"enabled": "top_layers > 0 or bottom_layers > 0",
"settable_per_mesh": true
},
"speed_support":
@ -2888,6 +2901,7 @@
"default_value": 3000,
"value": "acceleration_topbottom",
"enabled": "resolveOrValue('acceleration_enabled') and roofing_layer_count > 0 and top_layers > 0",
"enabled": "top_layers > 0 or bottom_layers > 0",
"limit_to_extruder": "roofing_extruder_nr",
"settable_per_mesh": true
},
@ -3188,7 +3202,7 @@
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_print",
"enabled": "resolveOrValue('jerk_enabled')",
"enabled": "(top_layers > 0 or bottom_layers > 0) and resolveOrValue('jerk_enabled')",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},
@ -5863,7 +5877,7 @@
"description": "Alternate the direction in which the top/bottom layers are printed. Normally they are printed diagonally only. This setting adds the X-only and Y-only directions.",
"type": "bool",
"default_value": false,
"enabled": "top_bottom_pattern != 'concentric'",
"enabled": "(top_layers > 0 or bottom_layers > 0) and top_bottom_pattern != 'concentric'",
"limit_to_extruder": "top_bottom_extruder_nr",
"settable_per_mesh": true
},

4
resources/definitions/ultimaker_s5.def.json
View file

@ -63,7 +63,7 @@
"machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "default_value": 345 },
"prime_tower_position_y": { "default_value": 222.5 },
"prime_blob_enable": { "enabled": true },
"prime_blob_enable": { "enabled": false },
"speed_travel":
{
@ -127,6 +127,7 @@
"retraction_min_travel": { "value": "5" },
"retraction_prime_speed": { "value": "15" },
"skin_overlap": { "value": "10" },
"speed_equalize_flow_enabled": { "value": "True" },
"speed_layer_0": { "value": "20" },
"speed_prime_tower": { "value": "speed_topbottom" },
"speed_print": { "value": "35" },
@ -145,6 +146,7 @@
"switch_extruder_prime_speed": { "value": "15" },
"switch_extruder_retraction_amount": { "value": "8" },
"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" },
"wall_0_inset": { "value": "0" },
"wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" },