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

Merge branch 'main' into PP-511-Method-5-9-Rebased

Browse Source
This commit is contained in:
HellAholic 2024-10-04 14:23:08 +02:00 committed by GitHub
commit aa22343660
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
21 changed files with 44451 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cura/Machines/MachineNode.py
View File

@ -48,6 +48,7 @@ class MachineNode(ContainerNode):
self.preferred_variant_name = my_metadata.get("preferred_variant_name", "")
self.preferred_material = my_metadata.get("preferred_material", "")
self.preferred_quality_type = my_metadata.get("preferred_quality_type", "")
self.supports_abstract_color = parseBool(my_metadata.get("supports_abstract_color", "false"))
self._loadAll()

4
cura/Machines/VariantNode.py
View File

@ -63,6 +63,8 @@ class VariantNode(ContainerNode):
filtered_materials = [material for material in materials if not self.machine.isExcludedMaterialBaseFile(material["id"])]
for material in filtered_materials:
if material.get("abstract_color", False) and not self.machine.supports_abstract_color:
continue # do not show abstract color profiles if the machine does not support them
base_file = material["base_file"]
if base_file not in self.materials:
self.materials[base_file] = MaterialNode(material["id"], variant = self)
@ -126,6 +128,8 @@ class VariantNode(ContainerNode):
return # We won't add any materials.
material_definition = container.getMetaDataEntry("definition")
if (not self.machine.supports_abstract_color) and container.getMetaDataEntry("abstract_color", False):
return
base_file = container.getMetaDataEntry("base_file")
if self.machine.isExcludedMaterialBaseFile(base_file):
return # Material is forbidden for this printer.

3
plugins/XmlMaterialProfile/XmlMaterialProfile.py
View File

@ -918,9 +918,6 @@ class XmlMaterialProfile(InstanceContainer):
base_metadata["properties"] = property_values
base_metadata["definition"] = "fdmprinter"
# Certain materials are loaded but should not be visible / selectable to the user.
base_metadata["visible"] = not base_metadata.get("abstract_color", False)
compatible_entries = data.iterfind("./um:settings/um:setting[@key='hardware compatible']", cls.__namespaces)
try:
common_compatibility = cls._parseCompatibleValue(next(compatible_entries).text) # type: ignore

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

@ -16,7 +16,8 @@
"preferred_quality_type": "normal",
"machine_extruder_trains": { "0": "fdmextruder" },
"supports_usb_connection": true,
"supports_network_connection": false
"supports_network_connection": false,
"supports_abstract_color": false
},
"settings":
{
@ -8923,6 +8924,111 @@
"type": "bool",
"default_value": true,
"settable_per_mesh": true
},
"scarf_joint_seam_length":
{
"label": "Scarf Seam Length",
"description": "When greater than 0, a scarf joint will be created on the Z seam to make it less visible.",
"type": "float",
"default_value": 0,
"minimum_value": "0",
"unit": "mm",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
},
"scarf_joint_seam_start_height_ratio":
{
"label": "Scarf Seam Start Height",
"description": "This is the ratio over the total layer height where the scarf joint seam will start.",
"type": "float",
"default_value": 0,
"minimum_value": 0,
"maximum_value": 100.0,
"unit": "%",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
},
"scarf_split_distance":
{
"label": "Scarf Seam Split Distance",
"description": "This is the maximum length of an extrusion path when splitting a longer path to apply the scarf seam. A smaller distance will create a more precise but also more verbose G-Code.",
"type": "float",
"default_value": 1.0,
"minimum_value": 0.1,
"maximum_value": 100.0,
"unit": "mm",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
},
"wall_0_start_speed_ratio":
{
"label": "Outer Wall Start Speed Ratio",
"description": "This is the ratio of the top speed to start with when printing an outer wall.",
"type": "float",
"default_value": 100.0,
"minimum_value": 0.0,
"maximum_value": 100.0,
"unit": "%",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
},
"wall_0_acceleration":
{
"label": "Outer Wall Acceleration",
"description": "This is the acceleration with which to reach the top speed when printing an outer wall.",
"enabled": "wall_0_start_speed_ratio < 100.0",
"type": "float",
"default_value": 20.0,
"minimum_value": 1.0,
"maximum_value": 1000.0,
"unit": "mm/s\u00b2",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
},
"wall_0_end_speed_ratio":
{
"label": "Outer Wall End Speed Ratio",
"description": "This is the ratio of the top speed to end with when printing an outer wall.",
"type": "float",
"default_value": 100.0,
"minimum_value": 0.0,
"maximum_value": 100.0,
"unit": "%",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
},
"wall_0_deceleration":
{
"label": "Outer Wall Deceleration",
"description": "This is the deceleration with which to end printing an outer wall.",
"enabled": "wall_0_end_speed_ratio < 100.0",
"type": "float",
"default_value": 20.0,
"minimum_value": 1.0,
"maximum_value": 1000.0,
"unit": "mm/s\u00b2",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
},
"wall_0_speed_split_distance":
{
"label": "Outer Wall Speed Split Distance",
"description": "This is the maximum length of an extrusion path when splitting a longer path to apply the outer wall acceleration/deceleration. A smaller distance will create a more precise but also more verbose G-Code.",
"type": "float",
"default_value": 1.0,
"minimum_value": 0.1,
"maximum_value": 100.0,
"unit": "mm",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_extruder": true,
"settable_per_mesh": true
}
}
},

1
resources/definitions/ultimaker_factor4.def.json
View File

@ -39,6 +39,7 @@
"preferred_quality_type": "draft",
"preferred_variant_name": "AA 0.4",
"supported_actions": [ "DiscoverUM3Action" ],
"supports_abstract_color": true,
"supports_material_export": true,
"supports_network_connection": true,
"supports_usb_connection": false,

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

@ -48,6 +48,7 @@
"preferred_variant_buildplate_name": "Glass",
"preferred_variant_name": "AA 0.4",
"supported_actions": [ "DiscoverUM3Action" ],
"supports_abstract_color": true,
"supports_material_export": true,
"supports_network_connection": true,
"supports_usb_connection": false,

1
resources/definitions/ultimaker_s7.def.json
View File

@ -36,6 +36,7 @@
"preferred_variant_name": "AA 0.4",
"quality_definition": "ultimaker_s5",
"supported_actions": [ "DiscoverUM3Action" ],
"supports_abstract_color": true,
"supports_material_export": true,
"supports_network_connection": true,
"supports_usb_connection": false,

186
resources/definitions/ultimaker_sketch.def.json Normal file
View File

@ -0,0 +1,186 @@
{
"version": 2,
"name": "MakerBot Sketch",
"inherits": "ultimaker",
"metadata":
{
"visible": true,
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot-sketch",
"platform": "ultimaker_sketch_platform.obj",
"exclude_materials": [
"dsm_",
"Essentium_",
"imade3d_",
"chromatik_",
"3D-Fuel_",
"bestfilament_",
"emotiontech_",
"eryone_",
"eSUN_",
"Extrudr_",
"fabtotum_",
"fdplast_",
"filo3d_",
"ultimaker_rapidrinse_175",
"goofoo_",
"ideagen3D_",
"imade3d_",
"innofill_",
"layer_one_",
"leapfrog_",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_",
"tizyx_",
"verbatim_",
"Vertex_",
"volumic_",
"xyzprinting_",
"zyyx_pro_",
"octofiber_",
"fiberlogy_",
"generic_",
"ultimaker_asa",
"ultimaker_abs",
"ultimaker_nylon",
"ultimaker_rapidrinse",
"ultimaker_sr30",
"ultimaker_petg",
"ultimaker_pva",
"ultimaker_metallic_pla"
],
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains": { "0": "ultimaker_sketch_extruder" },
"preferred_quality_type": "draft",
"preferred_variant_name": "0.4mm",
"reference_machine_id": "sketch",
"supports_network_connection": true,
"supports_usb_connection": false,
"variants_name": "Extruder",
"weight": -1
},
"overrides":
{
"acceleration_enabled":
{
"enabled": false,
"value": false
},
"adhesion_type": { "value": "'skirt'" },
"brim_width": { "value": "3" },
"cool_during_extruder_switch":
{
"enabled": false,
"value": false
},
"cool_fan_full_at_height": { "value": "layer_height + layer_height_0" },
"cool_fan_speed": { "value": 100 },
"cool_fan_speed_0": { "value": 0 },
"cool_min_layer_time": { "value": 8 },
"extruder_prime_pos_abs": { "default_value": true },
"fill_outline_gaps": { "value": false },
"gantry_height": { "value": "60" },
"infill_angles": { "value": "[45,45,45,45,45,135,135,135,135,135]" },
"infill_before_walls": { "value": false },
"infill_overlap": { "value": 0 },
"infill_pattern": { "value": "'zigzag'" },
"infill_sparse_density": { "value": 20 },
"infill_wipe_dist": { "value": 0 },
"initial_layer_line_width_factor": { "value": 125 },
"inset_direction": { "value": "'inside_out'" },
"jerk_enabled":
{
"enabled": false,
"value": false
},
"layer_height_0": { "value": "layer_height * 1.25" },
"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'))" },
"machine_center_is_zero": { "default_value": true },
"machine_depth": { "default_value": 150 },
"machine_end_gcode": { "default_value": "M107; Disable Fan; \n; End of print; \n; End GCode\nM104 S0 T0; Set Toolhead Temp to 0\nM140 S0 T0; Set Platform Temp to 0\nG162 Z F1800; Move to max axes position\nG28 X Y; Home\nM652; Turn off back fan\nM132 X Y Z A B; Set Home Position\nG91; Use Relative Positioning\nM18; Disable Axes\n\n" },
"machine_extruder_count": { "default_value": 1 },
"machine_gcode_flavor": { "default_value": "Griffin" },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 150 },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 },
"machine_min_cool_heat_time_window": { "value": "15" },
"machine_name": { "default_value": "MakerBot Sketch" },
"machine_nozzle_cool_down_speed": { "default_value": 0.8 },
"machine_nozzle_heat_up_speed": { "default_value": 1.4 },
"machine_start_gcode": { "default_value": "M140 S50 T0; Set Platform Temp\nM104 S220 T0; Set Extruder Temp\nG90; Use Absolute Positioning\nG28; Home\nM132 X Y Z A B; Set Current Position to Home\nG161 X Y F3300; Move to min axes positions\nM7 T0; Wait For Platform to Heat\nM6 T0; Wait For Extruders to Heat\nM651; Turn on back fan\nM907 X100 Y100 Z40 A80 B20; Set Stepper Currents\nM106; Enable Cooling Fan\n; Purge Line\nG92 E0; Reset Extruder Axis Position\nG1 X-26.18 Y-75.90 Z0.200 F420\nG1 X26.18 Y-75.90 E10\nG92 E0; Reset Extruder Axis Position\n; Start GCode\n" },
"machine_width": { "default_value": 150 },
"material_diameter": { "default_value": 1.75 },
"material_flow": { "default_value": 100 },
"min_bead_width":
{
"minimum_value": "line_width * 0.5",
"minimum_value_warning": "line_width * 0.75",
"value": "line_width"
},
"min_wall_line_width":
{
"minimum_value": "line_width * 0.5",
"minimum_value_warning": "line_width * 0.75",
"value": "line_width"
},
"multiple_mesh_overlap": { "value": "0" },
"optimize_wall_printing_order": { "value": "True" },
"prime_blob_enable":
{
"default_value": true,
"enabled": true,
"value": "resolveOrValue('print_sequence') != 'one_at_a_time'"
},
"raft_margin": { "value": "5" },
"retract_at_layer_change": { "value": true },
"retraction_amount":
{
"maximum_value": 6,
"maximum_value_warning": 5.75,
"value": 5.5
},
"retraction_combing": { "value": "'no_outer_surfaces'" },
"retraction_min_travel": { "value": "2 * line_width" },
"retraction_prime_speed": { "value": "15" },
"retraction_speed": { "value": "25" },
"roofing_material_flow": { "value": 100 },
"skin_material_flow": { "value": 95 },
"skin_material_flow_layer_0": { "value": 100 },
"skirt_brim_line_width": { "value": 1 },
"skirt_brim_speed": { "value": 15 },
"skirt_height": { "value": 3 },
"speed_print": { "value": 50 },
"speed_roofing": { "value": "0.8 * speed_print" },
"speed_support": { "value": "0.7 * speed_print" },
"speed_support_interface": { "value": "speed_topbottom" },
"speed_topbottom": { "value": "speed_roofing" },
"speed_travel": { "value": 80 },
"speed_wall": { "value": "0.5 * speed_print" },
"speed_wall_0": { "value": "1 * speed_wall" },
"speed_wall_x": { "value": "1 * speed_wall" },
"speed_z_hop": { "value": 10 },
"support_angle": { "value": "45" },
"support_structure": { "value": "'tree'" },
"top_bottom_thickness": { "value": "4 * layer_height" },
"travel_avoid_distance": { "value": "machine_nozzle_tip_outer_diameter / 2 * 1.5" },
"travel_avoid_supports": { "value": true },
"wall_0_inset": { "value": "0" },
"wall_0_material_flow_layer_0": { "value": "1 * material_flow" },
"wall_thickness": { "value": "2 * machine_nozzle_size" },
"wall_x_material_flow": { "value": "0.95 * material_flow" },
"wall_x_material_flow_layer_0": { "value": "1 * material_flow" },
"xy_offset": { "value": 0 },
"xy_offset_layer_0": { "value": 0 },
"z_seam_corner": { "value": "'z_seam_corner_any'" },
"zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
}
}

40
resources/definitions/ultimaker_sketch_large.def.json Normal file
View File

@ -0,0 +1,40 @@
{
"version": 2,
"name": "MakerBot Sketch Large",
"inherits": "ultimaker_sketch",
"metadata":
{
"visible": true,
"author": "Ultimaker",
"manufacturer": "Ultimaker B.V.",
"file_formats": "application/x-makerbot-sketch",
"platform": "ultimaker_sketch_large_platform.obj",
"has_machine_quality": true,
"has_materials": true,
"has_variants": true,
"machine_extruder_trains": { "0": "ultimaker_sketch_large_extruder" },
"preferred_material": "ultimaker_pla_175",
"preferred_quality_type": "draft",
"preferred_variant_name": "0.4mm",
"reference_machine_id": "sketch_large",
"supports_network_connection": true,
"supports_usb_connection": false,
"variants_name": "Extruder",
"weight": -1
},
"overrides":
{
"machine_depth": { "default_value": 200 },
"machine_height": { "default_value": 250 },
"machine_name": { "default_value": "MakerBot Sketch Large" },
"machine_width": { "default_value": 220 },
"retraction_amount":
{
"maximum_value": 6.5,
"maximum_value_warning": 6.25,
"value": 6
},
"retraction_prime_speed": { "value": "retraction_speed * 0.8" },
"speed_travel": { "value": 150 }
}
}

22
resources/extruders/ultimaker_sketch_extruder.def.json Normal file
View File

@ -0,0 +1,22 @@
{
"version": 2,
"name": "Extruder",
"inherits": "fdmextruder",
"metadata":
{
"machine": "ultimaker_sketch",
"position": "0"
},
"overrides":
{
"extruder_nr":
{
"default_value": 0,
"maximum_value": "1"
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

22
resources/extruders/ultimaker_sketch_large_extruder.def.json Normal file
View File

@ -0,0 +1,22 @@
{
"version": 2,
"name": "Extruder",
"inherits": "fdmextruder",
"metadata":
{
"machine": "ultimaker_sketch_large",
"position": "0"
},
"overrides":
{
"extruder_nr":
{
"default_value": 0,
"maximum_value": "1"
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

17214
resources/meshes/ultimaker_sketch_large_platform.obj Normal file
View File

File diff suppressed because it is too large Load Diff

26728
resources/meshes/ultimaker_sketch_platform.obj Normal file
View File

File diff suppressed because it is too large Load Diff

16
resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-pla-175_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,16 @@
[general]
definition = ultimaker_sketch
name = Fast
version = 4
[metadata]
material = ultimaker_pla_175
quality_type = draft
setting_version = 24
type = quality
variant = 0.4mm
weight = -2
[values]
support_z_distance = =layer_height

16
resources/quality/ultimaker_sketch/um_sketch_0.4mm_um-tough-pla-175_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,16 @@
[general]
definition = ultimaker_sketch
name = Fast
version = 4
[metadata]
material = ultimaker_tough_pla_175
quality_type = draft
setting_version = 24
type = quality
variant = 0.4mm
weight = -2
[values]
support_z_distance = =layer_height

15
resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
definition = ultimaker_sketch
name = Fast
version = 4
[metadata]
global_quality = True
quality_type = draft
setting_version = 24
type = quality
weight = -2
[values]
layer_height = 0.2

16
resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-pla-175_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,16 @@
[general]
definition = ultimaker_sketch_large
name = Fast
version = 4
[metadata]
material = ultimaker_pla_175
quality_type = draft
setting_version = 24
type = quality
variant = 0.4mm
weight = -2
[values]
support_z_distance = =layer_height * 0.75

16
resources/quality/ultimaker_sketch_large/um_sketch_large_0.4mm_um-tough-pla-175_0.2mm.inst.cfg Normal file
View File

@ -0,0 +1,16 @@
[general]
definition = ultimaker_sketch_large
name = Fast
version = 4
[metadata]
material = ultimaker_tough_pla_175
quality_type = draft
setting_version = 24
type = quality
variant = 0.4mm
weight = -2
[values]
support_z_distance = =layer_height * 0.75

15
resources/quality/ultimaker_sketch_large/um_sketch_large_global_Draft_Quality.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
definition = ultimaker_sketch_large
name = Fast
version = 4
[metadata]
global_quality = True
quality_type = draft
setting_version = 24
type = quality
weight = -2
[values]
layer_height = 0.2

15
resources/variants/ultimaker_sketch_0.4mm.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
definition = ultimaker_sketch
name = 0.4mm
version = 4
[metadata]
hardware_type = nozzle
reference_extruder_id = sketch_extruder
setting_version = 24
type = variant
[values]
machine_nozzle_id = 0.4mm
machine_nozzle_size = 0.4

15
resources/variants/ultimaker_sketch_large_0.4mm.inst.cfg Normal file
View File

@ -0,0 +1,15 @@
[general]
definition = ultimaker_sketch_large
name = 0.4mm
version = 4
[metadata]
hardware_type = nozzle
reference_extruder_id = sketch_l_extruder
setting_version = 24
type = variant
[values]
machine_nozzle_id = 0.4mm
machine_nozzle_size = 0.4