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

Merge branch 'main' into add-creality-ender-3-V3-SE

Browse source
This commit is contained in:
Saumya Jain 2023-10-11 14:00:33 +02:00 • committed by GitHub
commit e7fc100f62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
151 changed files with 4115 additions and 379 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2861,6 +2861,34 @@
"maximum_value_warning": "150",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"wall_0_material_flow_roofing":
{
"label": "Top Surface Outer Wall Flow",
"description": "Flow compensation on the top surface outermost wall line.",
"unit": "%",
"type": "float",
"default_value": 100,
"value": "wall_0_material_flow",
"minimum_value": "0.0001",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"wall_x_material_flow_roofing":
{
"label": "Top Surface Inner Wall(s) Flow",
"description": "Flow compensation on top surface wall lines for all wall lines except the outermost one.",
"unit": "%",
"type": "float",
"default_value": 100,
"value": "wall_x_material_flow",
"minimum_value": "0.0001",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
@ -3166,6 +3194,34 @@
"value": "speed_wall * 2",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"speed_wall_0_roofing":
{
"label": "Top Surface Outer Wall Speed",
"description": "The speed at which the top surface outermost walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "150",
"default_value": 30,
"value": "speed_wall_0",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"speed_wall_x_roofing":
{
"label": "Top Surface Inner Wall Speed",
"description": "The speed at which the top surface inner walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0.1",
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
"maximum_value_warning": "150",
"default_value": 60,
"value": "speed_wall_x",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
@ -3509,6 +3565,36 @@
"enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"acceleration_wall_0_roofing":
{
"label": "Top Surface Outer Wall Acceleration",
"description": "The acceleration with which the top surface outermost walls are printed.",
"unit": "mm/s\u00b2",
"type": "float",
"minimum_value": "0.1",
"minimum_value_warning": "100",
"maximum_value_warning": "10000",
"default_value": 3000,
"value": "acceleration_wall_0",
"enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"acceleration_wall_x_roofing":
{
"label": "Top Surface Inner Wall Acceleration",
"description": "The acceleration with which the top surface inner walls are printed.",
"unit": "mm/s\u00b2",
"type": "float",
"minimum_value": "0.1",
"minimum_value_warning": "100",
"maximum_value_warning": "10000",
"default_value": 3000,
"value": "acceleration_wall_x",
"enabled": "resolveOrValue('acceleration_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
@ -3808,6 +3894,34 @@
"enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
},
"jerk_wall_0_roofing":
{
"label": "Top Surface Outer Wall Jerk",
"description": "The maximum instantaneous velocity change with which the top surface outermost walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_wall_0",
"enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_0_extruder_nr",
"settable_per_mesh": true
},
"jerk_wall_x_roofing":
{
"label": "Top Surface Inner Wall Jerk",
"description": "The maximum instantaneous velocity change with which the top surface inner walls are printed.",
"unit": "mm/s",
"type": "float",
"minimum_value": "0",
"maximum_value_warning": "50",
"default_value": 20,
"value": "jerk_wall_x",
"enabled": "resolveOrValue('jerk_enabled')",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true
}
}
},
@ -4534,7 +4648,7 @@
"type": "extruder",
"default_value": "0",
"value": "support_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_interface_enable",
"resolve": "max(extruderValues('support_interface_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false,
@ -4547,7 +4661,7 @@
"type": "extruder",
"default_value": "0",
"value": "support_interface_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_roof_enable",
"resolve": "max(extruderValues('support_roof_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false
@ -4559,7 +4673,7 @@
"type": "extruder",
"default_value": "0",
"value": "support_interface_extruder_nr",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1",
"enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1 and support_bottom_enable",
"resolve": "max(extruderValues('support_bottom_extruder_nr'))",
"settable_per_mesh": false,
"settable_per_extruder": false

1
resources/definitions/ultimaker_s3.def.json
View file

@ -41,6 +41,7 @@
0
],
"platform_texture": "UltimakerS3backplate.png",
"preferred_material": "ultimaker_pla_blue",
"preferred_quality_type": "draft",
"preferred_variant_name": "AA 0.4",
"supported_actions": [ "DiscoverUM3Action" ],

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

@ -38,6 +38,7 @@
-10
],
"platform_texture": "UltimakerS5backplate.png",
"preferred_material": "ultimaker_pla_blue",
"preferred_quality_type": "draft",
"preferred_variant_buildplate_name": "Glass",
"preferred_variant_name": "AA 0.4",

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

@ -32,6 +32,7 @@
0
],
"platform_texture": "UltimakerS7backplate.png",
"preferred_material": "ultimaker_pla_blue",
"preferred_variant_name": "AA 0.4",
"quality_definition": "ultimaker_s5",
"supported_actions": [ "DiscoverUM3Action" ],