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

Merge branch 'master' into CURA-8609_sync_materials_to_printer

Browse source 
Conflicts:
	cura/Machines/Models/MaterialManagementModel.py -> Both master and my branch added an __init__ function. I merged the two __init__s to do both things that need to be done.
This commit is contained in:
Ghostkeeper 2021-10-06 14:22:18 +02:00
commit b98da6b538
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
21 changed files with 4567 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

49
resources/definitions/3di_base.def.json Normal file
View file

@ -0,0 +1,49 @@
{
"version": 2,
"name": "3DI Base Printer",
"inherits": "fdmprinter",
"metadata": {
"visible": false,
"author": "Vaibhav Jain",
"manufacturer": "3Deometry Innovations",
"file_formats": "text/x-gcode",
"machine_extruder_trains":
{
"0": "3di_base_extruder_0"
}
},
"overrides": {
"machine_name":{
"default_value": "3DI Base Printer"
},
"machine_heated_bed": {
"default_value": true
},
"machine_width": {
"default_value": 220
},
"machine_height": {
"default_value": 220
},
"machine_depth": {
"default_value": 220
},
"machine_center_is_zero": {
"default_value": true
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning"
},
"machine_shape": {
"default_value": "elliptic"
}
}
}

26
resources/definitions/3di_d300.def.json Normal file
View file

@ -0,0 +1,26 @@
{
"version": 2,
"name": "3DI D300",
"inherits": "3di_base",
"metadata": {
"visible": true,
"platform": "3di_d300_platform.STL",
"platform_offset": [-200, -5, 173.205]
},
"overrides": {
"machine_name": {
"default_value": "3DI D300"
},
"machine_width": {
"default_value": 300
},
"machine_height": {
"default_value": 300
},
"machine_depth": {
"default_value": 300
}
}
}

58
resources/definitions/cremaker_common.def.json Normal file
View file

@ -0,0 +1,58 @@
{
"version": 2,
"name": "cremaker common",
"inherits": "fdmprinter",
"metadata": {
"visible": false,
"author": "Joyplace",
"manufacturer": "JOYPLACE CO., LTD.",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"has_materials": true,
"machine_extruder_trains": {
"0": "cremaker_extruder_0"
}
},
"overrides": {
"machine_heated_bed": { "default_value": true },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_size": { "default_value": 0.4 },
"layer_height": { "value": 0.2 },
"layer_height_0": { "value": 0.3 },
"optimize_wall_printing_order": { "value": true },
"xy_offset": { "value": 0.1 },
"xy_offset_layer_0": { "value": -0.1 },
"hole_xy_offset": { "value": 0.15 },
"material_print_temperature": { "value": 200 },
"speed_travel": { "value": 100 },
"speed_layer_0": { "value": 25 },
"acceleration_enabled": { "value": true },
"acceleration_print": { "value": 1250 },
"acceleration_infill": { "value": 1250 },
"acceleration_wall": { "value": 800 },
"acceleration_wall_0": { "value": 800 },
"acceleration_wall_x": { "value": 800 },
"acceleration_travel": { "value": 1250 },
"acceleration_layer_0": { "value": 1000 },
"acceleration_print_layer_0": { "value": 1000 },
"acceleration_travel_layer_0": { "value": 1000 },
"retraction_amount": { "value": 1.2 },
"retraction_speed": { "value": 40 },
"retraction_combing": { "value": "'infill'" },
"retraction_hop_enabled": { "value": true },
"retraction_hop_only_when_collides": { "value": true },
"retraction_hop": { "value": 0.3 },
"adhesion_type": { "value": "'skirt'" },
"relative_extrusion": { "value": true },
"gantry_height": { "value": 28 },
"machine_max_feedrate_z": { "value": 12 },
"machine_max_feedrate_e": { "value": 120 },
"machine_max_acceleration_z": { "value": 10 },
"machine_acceleration": { "value": 1250 },
"machine_max_jerk_xy": { "value": 10 },
"machine_max_jerk_z": { "value": 0.3 },
"machine_max_jerk_e": { "value": 5.0 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }
}
}

40
resources/definitions/cremaker_m_v1.def.json Normal file
View file

@ -0,0 +1,40 @@
{
"version": 2,
"name": "Cremaker M V1",
"inherits": "cremaker_common",
"metadata": {
"visible": true,
"platform": "cremaker_platform_200.obj"
},
"overrides": {
"machine_name": { "default_value": "Cremaker M V1" },
"machine_width": { "default_value": 200 },
"machine_depth": { "default_value": 200 },
"machine_height": { "default_value": 260 },
"initial_layer_line_width_factor": { "default_value": 110.0 },
"machine_head_with_fans_polygon": {
"default_value": [
[ -35, 48 ],
[ 54, 48 ],
[ 54, -67 ],
[ -35, -67 ]
]
},
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": {
"default_value": "G28\nG1 Z5.0 F6000\nG1 X2 Y5 F3000\nG1 Z0.3\nG92 E0\nG1 Y100 E10 F600\nG92 E0"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y180\nM84"
},
"jerk_enabled": { "value": true },
"jerk_print": { "value": 8 },
"jerk_infill": { "value": 8 },
"jerk_wall": { "value": 8 },
"jerk_wall_0": { "value": 8 },
"jerk_wall_x": { "value": 8 },
"jerk_travel": { "value": 10 },
"jerk_layer_0": { "value": 8 }
}
}

38
resources/definitions/cremaker_m_v2.def.json Normal file
View file

@ -0,0 +1,38 @@
{
"version": 2,
"name": "Cremaker M V2",
"inherits": "cremaker_common",
"metadata": {
"visible": true,
"platform": "cremaker_platform_220.obj"
},
"overrides": {
"machine_name": { "default_value": "Cremaker M V2" },
"machine_width": { "default_value": 220 },
"machine_depth": { "default_value": 220 },
"machine_height": { "default_value": 260 },
"initial_layer_line_width_factor": { "default_value": 100.0 },
"machine_head_with_fans_polygon": {
"default_value": [
[ -35, 48 ],
[ 54, 48 ],
[ 54, -67 ],
[ -35, -67 ]
]
},
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": {
"default_value": "G28\nG29\nG1 Z5.0 F6000\nG1 X2 Y5 Z0.3 F3000\nG92 E0\nG1 Y100 E10 F1500\nG0 X2.3 F3000\nG1 Y20 E8.5 F1500\nG92 E0\nG1 F2400 E-2"
},
"machine_end_gcode": {
"default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y200\nM84"
},
"cool_fan_speed": { "value": 50 },
"coasting_enable": { "value": true },
"coasting_volume": { "value": 0.05 },
"coasting_min_volume": { "value": 1.0 },
"jerk_enabled": { "value": false }
}
}

32
resources/definitions/cremaker_s_v1.def.json Normal file
View file

@ -0,0 +1,32 @@
{
"version": 2,
"name": "Cremaker S V1",
"inherits": "cremaker_common",
"metadata": {
"visible": true,
"platform": "cremaker_platform_200.obj"
},
"overrides": {
"machine_name": { "default_value": "Cremaker S V1" },
"machine_width": { "default_value": 200 },
"machine_depth": { "default_value": 200 },
"machine_height": { "default_value": 160 },
"initial_layer_line_width_factor": { "default_value": 110.0 },
"machine_head_with_fans_polygon": {
"default_value": [
[ -39, 45 ],
[ 23, 45 ],
[ 23, -33 ],
[ -39, -33 ]
]
},
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": {
"default_value": "G28\nG1 Z5.0 F6000\nG1 X2 Y5 F3000\nG1 Z0.3\nG92 E0\nG1 Y100 E10 F600\nG92 E0"
},
"machine_end_gcode": {
"default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off heatbed\nG92 E1\nG1 E-1 F300\nG28 X0 Y180\nM84"
}
}
}

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

@ -1881,7 +1881,7 @@
"default_value": 2,
"minimum_value": "0",
"minimum_value_warning": "infill_line_width",
"value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else 1))))",
"value": "0 if infill_sparse_density == 0 else (infill_line_width * 100) / infill_sparse_density * (2 if infill_pattern == 'grid' else (3 if infill_pattern == 'triangles' or infill_pattern == 'trihexagon' or infill_pattern == 'cubic' or infill_pattern == 'cubicsubdiv' else (2 if infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' else (1 if infill_pattern == 'cross' or infill_pattern == 'cross_3d' else (1.6 if infill_pattern == 'lightning' else 1)))))",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
}
@ -1906,7 +1906,8 @@
"zigzag": "Zig Zag",
"cross": "Cross",
"cross_3d": "Cross 3D",
"gyroid": "Gyroid"
"gyroid": "Gyroid",
"lightning": "Lightning"
},
"default_value": "grid",
"enabled": "infill_line_distance > 0",
@ -1932,7 +1933,7 @@
"type": "bool",
"default_value": true,
"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",
"enabled": "infill_pattern != 'lightning' and 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
},
@ -1942,7 +1943,7 @@
"description": "A list of integer line directions to use. 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 for the lines and zig zag patterns and 45 degrees for all other patterns).",
"type": "[int]",
"default_value": "[ ]",
"enabled": "infill_pattern != 'concentric' and infill_sparse_density > 0",
"enabled": "infill_pattern != 'lightning' and infill_pattern != 'concentric' and infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -1953,7 +1954,7 @@
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"enabled": "infill_pattern != 'lightning' and infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -1964,7 +1965,7 @@
"unit": "mm",
"type": "float",
"default_value": 0,
"enabled": "infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"enabled": "infill_pattern != 'lightning' and infill_pattern == 'grid' or infill_pattern == 'lines' or infill_pattern == 'triangles' or infill_pattern == 'cubic' or infill_pattern == 'tetrahedral' or infill_pattern == 'quarter_cubic' or infill_pattern == 'zigzag'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -1975,7 +1976,7 @@
"type": "bool",
"default_value": false,
"warning_value": "True if infill_pattern not in ('grid', 'triangles', 'trihexagon', 'cubic', 'cubicsubdiv', 'tetrahedral', 'quarter_cubic') else None",
"enabled": "not ((infill_pattern == 'cross' and connect_infill_polygons) or infill_pattern == 'concentric')",
"enabled": "not (infill_pattern == 'lightning' or (infill_pattern == 'cross' and connect_infill_polygons) or infill_pattern == 'concentric')",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -2084,7 +2085,7 @@
"minimum_value": "0",
"maximum_value_warning": "1 if (infill_pattern == 'cross' or infill_pattern == 'cross_3d' or support_pattern == 'concentric') else 5",
"maximum_value": "999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2))",
"enabled": "infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv'",
"enabled": "infill_pattern != 'lightning' and infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -2097,7 +2098,7 @@
"default_value": 1.5,
"minimum_value": "0.0001",
"minimum_value_warning": "3 * resolveOrValue('layer_height')",
"enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
"enabled": "infill_pattern != 'lightning' and infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -2127,7 +2128,7 @@
"description": "Print infill structures only where tops of the model should be supported. Enabling this reduces print time and material usage, but leads to ununiform object strength.",
"type": "bool",
"default_value": false,
"enabled": "infill_sparse_density > 0",
"enabled": "infill_pattern != 'lightning' and infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -2141,7 +2142,7 @@
"minimum_value_warning": "2",
"maximum_value": "90",
"default_value": 40,
"enabled": "infill_sparse_density > 0 and infill_support_enabled",
"enabled": "infill_pattern != 'lightning' and infill_sparse_density > 0 and infill_support_enabled",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
@ -2175,6 +2176,72 @@
"settable_per_mesh": true
}
}
},
"lightning_infill_support_angle":
{
"label": "Lightning Infill Support Angle",
"description": "Determines when a lightning infill layer has to support anything above it. Measured in the angle given the thickness of a layer.",
"unit": "°",
"type": "float",
"minimum_value": "0",
"maximum_value": "90",
"maximum_value_warning": "75",
"default_value": 40,
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_pattern == 'lightning'",
"settable_per_mesh": false,
"settable_per_extruder": true,
"children":
{
"lightning_infill_overhang_angle":
{
"label": "Lightning Infill Overhang Angle",
"description": "Determines when a lightning infill layer has to support the model above it. Measured in the angle given the thickness.",
"unit": "°",
"type": "float",
"minimum_value": "0",
"maximum_value": "90",
"maximum_value_warning": "75",
"default_value": 40,
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_pattern == 'lightning'",
"settable_per_mesh": false,
"settable_per_extruder": true,
"value": "lightning_infill_support_angle"
},
"lightning_infill_prune_angle":
{
"label": "Lightning Infill Prune Angle",
"description": "The difference a lightning infill layer can have with the one immediately above w.r.t the pruning of the outer extremities of trees. Measured in the angle given the thickness.",
"unit": "°",
"type": "float",
"minimum_value": "0",
"maximum_value": "90",
"maximum_value_warning": "75",
"default_value": 40,
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_pattern == 'lightning'",
"settable_per_mesh": false,
"settable_per_extruder": true,
"value": "lightning_infill_support_angle"
},
"lightning_infill_straightening_angle":
{
"label": "Lightning Infill Straightening Angle",
"description": "The difference a lightning infill layer can have with the one immediately above w.r.t the smoothing of trees. Measured in the angle given the thickness.",
"unit": "°",
"type": "float",
"minimum_value": "0",
"maximum_value": "90",
"maximum_value_warning": "75",
"default_value": 40,
"limit_to_extruder": "infill_extruder_nr",
"enabled": "infill_pattern == 'lightning'",
"settable_per_mesh": false,
"settable_per_extruder": true,
"value": "lightning_infill_support_angle"
}
}
}
}
},

15
resources/extruders/3di_base_extruder_0.def.json Normal file
View file

@ -0,0 +1,15 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "3di_base",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

15
resources/extruders/cremaker_extruder_0.def.json Normal file
View file

@ -0,0 +1,15 @@
{
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",
"metadata": {
"machine": "cremaker_common",
"position": "0"
},
"overrides": {
"extruder_nr": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 }
}
}

BIN
resources/meshes/3di_d300_platform.STL Normal file
View file

Binary file not shown.

1870
resources/meshes/cremaker_platform_200.obj Normal file
View file

File diff suppressed because it is too large Load diff

1870
resources/meshes/cremaker_platform_220.obj Normal file
View file

File diff suppressed because it is too large Load diff

75
resources/qml/WelcomePages/CloudContent.qml
View file

@ -190,55 +190,48 @@ Item
}
}
}
// Sign in Button
Cura.PrimaryButton
{
id: signInButton
anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@button", "Sign in")
onClicked: Cura.API.account.login()
// Content Item is used in order to align the text inside the button. Without it, when resizing the
// button, the text will be aligned on the left
contentItem: Text {
text: signInButton.text
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("primary_text")
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
}
// Create an account button
Cura.TertiaryButton
{
id: createAccountButton
anchors.horizontalCenter: parent.horizontalCenter
text: catalog.i18nc("@text", "Create a free Ultimaker Account")
onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=onboarding-signup")
}
}
}
// The "Skip" button exists on the bottom right
Label
// Skip button
Cura.TertiaryButton
{
id: skipButton
anchors.left: parent.left
anchors.bottom: parent.bottom
text: catalog.i18nc("@button", "Skip")
onClicked: base.showNextPage()
}
// Create an account button
Cura.SecondaryButton
{
id: createAccountButton
anchors.right: signInButton.left
anchors.rightMargin: UM.Theme.getSize("default_margin").width
anchors.bottom: parent.bottom
text: catalog.i18nc("@text", "Create a free Ultimaker Account")
onClicked: Qt.openUrlExternally("https://ultimaker.com/app/ultimaker-cura-account-sign-up?utm_source=cura&utm_medium=software&utm_campaign=onboarding-signup")
}
// Sign in Button
Cura.PrimaryButton
{
id: signInButton
anchors.right: parent.right
anchors.bottom: parent.bottom
anchors.leftMargin: UM.Theme.getSize("default_margin").width
text: catalog.i18nc("@button", "Skip")
color: UM.Theme.getColor("secondary_button_text")
font: UM.Theme.getFont("medium")
renderType: Text.NativeRendering
MouseArea
{
anchors.fill: parent
hoverEnabled: true
onClicked: base.showNextPage()
onEntered: parent.font.underline = true
onExited: parent.font.underline = false
text: catalog.i18nc("@button", "Sign in")
onClicked: Cura.API.account.login()
// Content Item is used in order to align the text inside the button. Without it, when resizing the
// button, the text will be aligned on the left
contentItem: Text {
text: signInButton.text
font: UM.Theme.getFont("medium")
color: UM.Theme.getColor("primary_text")
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
}
}
}

2
resources/themes/cura-light/theme.json
View file

@ -627,7 +627,7 @@
"message_close": [1, 1],
"message_radius": [0.25, 0.25],
"message_action_button": [0, 2.5],
"message_image": [15.0, 5.0],
"message_image": [15.0, 10.0],
"message_type_icon": [2, 2],
"infill_button_margin": [0.5, 0.5],