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

Merge remote-tracking branch 'origin/3.6'

Browse source
This commit is contained in:
Lipu Fei 2018-10-31 11:01:16 +01:00
commit 50d92df8a8
18 changed files with 408 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/ChangeLogPlugin/ChangeLog.txt
View file

@ -26,14 +26,17 @@ Fullscreen mode can be toggled using the View menu or with the keyboard shortcut
*Configuration error message
In previous versions, Ultimaker Cura would display an error dialog explaining when something happened to user configuration files, including the option to reset to factory defaults. This would not warn about losing the current printer and print profile settings, so this information has been added.
*Materials in the Toolbox
A new tab has been added to the Toolbox that includes downloadable material profiles, to quickly and easily prepare models for a range of third-party materials.
*Rename Toolbox to Marketplace
The entry points to the Toolbox are now renamed to Marketplace.
*Materials in the Marketplace
A new tab has been added to the Marketplace that includes downloadable material profiles, to quickly and easily prepare models for a range of third-party materials.
*New third-party definitions
New profiles added for Anycube 4MAx and Tizyx K25.
New profiles added for Anycube 4MAx and Tizyx K25. Contributed by jscurtu and ValentinPitre respectively.
*Improved definitions for Ender-3
The Ender-3 build plate size has been adjusted to the correct size of 235 x 235 mm, corrected the start-up sequence, and the printhead position has been adjusted when prints are purged or completed.
The Ender-3 build plate size has been adjusted to the correct size of 235 x 235 mm, corrected the start-up sequence, and the printhead position has been adjusted when prints are purged or completed. Contributed by stelgenhof.
*Add mesh names to slicing message
Added comment generation to indicate which mesh the GCODE after this comment is constructing. Contributed by paukstelis.

2
plugins/Toolbox/resources/qml/Toolbox.qml
View file

@ -10,7 +10,7 @@ Window
{
id: base
property var selection: null
title: catalog.i18nc("@title", "Toolbox")
title: catalog.i18nc("@title", "Marketplace")
modality: Qt.ApplicationModal
flags: Qt.Dialog | Qt.CustomizeWindowHint | Qt.WindowTitleHint | Qt.WindowCloseButtonHint

2
plugins/Toolbox/resources/qml/ToolboxDownloadsShowcaseTile.qml
View file

@ -1,5 +1,5 @@
// Copyright (c) 2018 Ultimaker B.V.
// Toolbox is released under the terms of the LGPLv3 or higher.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4

2
plugins/Toolbox/src/PackagesModel.py
View file

@ -52,7 +52,7 @@ class PackagesModel(ListModel):
items = []
if self._metadata is None:
Logger.logException("w", "Failed to load packages for Toolbox")
Logger.logException("w", "Failed to load packages for Marketplace")
self.setItems(items)
return

24
plugins/Toolbox/src/Toolbox.py
View file

@ -245,7 +245,7 @@ class Toolbox(QObject, Extension):
self._dialog = self._createDialog("Toolbox.qml")
if not self._dialog:
Logger.log("e", "Unexpected error trying to create the 'Toolbox' dialog.")
Logger.log("e", "Unexpected error trying to create the 'Marketplace' dialog.")
return
self._dialog.show()
@ -254,7 +254,7 @@ class Toolbox(QObject, Extension):
self.enabledChanged.emit()
def _createDialog(self, qml_name: str) -> Optional[QObject]:
Logger.log("d", "Toolbox: Creating dialog [%s].", qml_name)
Logger.log("d", "Marketplace: Creating dialog [%s].", qml_name)
plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId())
if not plugin_path:
return None
@ -262,7 +262,7 @@ class Toolbox(QObject, Extension):
dialog = self._application.createQmlComponent(path, {"toolbox": self})
if not dialog:
raise Exception("Failed to create toolbox dialog")
raise Exception("Failed to create Marketplace dialog")
return dialog
def _convertPluginMetadata(self, plugin: Dict[str, Any]) -> Dict[str, Any]:
@ -578,7 +578,7 @@ class Toolbox(QObject, Extension):
# Make API Calls
# --------------------------------------------------------------------------
def _makeRequestByType(self, type: str) -> None:
Logger.log("i", "Toolbox: Requesting %s metadata from server.", type)
Logger.log("i", "Marketplace: Requesting %s metadata from server.", type)
request = QNetworkRequest(self._request_urls[type])
request.setRawHeader(*self._request_header)
if self._network_manager:
@ -586,7 +586,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str)
def startDownload(self, url: str) -> None:
Logger.log("i", "Toolbox: Attempting to download & install package from %s.", url)
Logger.log("i", "Marketplace: Attempting to download & install package from %s.", url)
url = QUrl(url)
self._download_request = QNetworkRequest(url)
if hasattr(QNetworkRequest, "FollowRedirectsAttribute"):
@ -603,7 +603,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot()
def cancelDownload(self) -> None:
Logger.log("i", "Toolbox: User cancelled the download of a package.")
Logger.log("i", "Marketplace: User cancelled the download of a package.")
self.resetDownload()
def resetDownload(self) -> None:
@ -690,7 +690,7 @@ class Toolbox(QObject, Extension):
return
except json.decoder.JSONDecodeError:
Logger.log("w", "Toolbox: Received invalid JSON for %s.", type)
Logger.log("w", "Marketplace: Received invalid JSON for %s.", type)
break
else:
self.setViewPage("errored")
@ -717,10 +717,10 @@ class Toolbox(QObject, Extension):
self._onDownloadComplete(file_path)
def _onDownloadComplete(self, file_path: str) -> None:
Logger.log("i", "Toolbox: Download complete.")
Logger.log("i", "Marketplace: Download complete.")
package_info = self._package_manager.getPackageInfo(file_path)
if not package_info:
Logger.log("w", "Toolbox: Package file [%s] was not a valid CuraPackage.", file_path)
Logger.log("w", "Marketplace: Package file [%s] was not a valid CuraPackage.", file_path)
return
license_content = self._package_manager.getPackageLicense(file_path)
@ -819,7 +819,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str, str, str)
def filterModelByProp(self, model_type: str, filter_type: str, parameter: str) -> None:
if not self._models[model_type]:
Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type)
Logger.log("w", "Marketplace: Couldn't filter %s model because it doesn't exist.", model_type)
return
self._models[model_type].setFilter({filter_type: parameter})
self.filterChanged.emit()
@ -827,7 +827,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str, "QVariantMap")
def setFilters(self, model_type: str, filter_dict: dict) -> None:
if not self._models[model_type]:
Logger.log("w", "Toolbox: Couldn't filter %s model because it doesn't exist.", model_type)
Logger.log("w", "Marketplace: Couldn't filter %s model because it doesn't exist.", model_type)
return
self._models[model_type].setFilter(filter_dict)
self.filterChanged.emit()
@ -835,7 +835,7 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str)
def removeFilters(self, model_type: str) -> None:
if not self._models[model_type]:
Logger.log("w", "Toolbox: Couldn't remove filters on %s model because it doesn't exist.", model_type)
Logger.log("w", "Marketplace: Couldn't remove filters on %s model because it doesn't exist.", model_type)
return
self._models[model_type].setFilter({})
self.filterChanged.emit()

5
plugins/UM3NetworkPrinting/resources/qml/PrintJobContextMenu.qml
View file

@ -33,6 +33,7 @@ Item {
hoverEnabled: true;
onClicked: parent.switchPopupState();
text: "\u22EE"; //Unicode; Three stacked points.
visible: printJob.state == "queued" || running ? true : false;
width: 35 * screenScaleFactor; // TODO: Theme!
}
@ -101,7 +102,7 @@ Item {
PrintJobContextMenuItem {
enabled: {
if (printJob && !running) {
if (printJob && printJob.state == "queued") {
if (OutputDevice && OutputDevice.queuedPrintJobs[0]) {
return OutputDevice.queuedPrintJobs[0].key != printJob.key;
}
@ -116,7 +117,7 @@ Item {
}
PrintJobContextMenuItem {
enabled: printJob && !running;
enabled: printJob && printJob.state == "queued";
onClicked: {
deleteConfirmationDialog.visible = true;
popup.close();

23
plugins/UM3NetworkPrinting/resources/qml/PrinterCard.qml
View file

@ -48,11 +48,12 @@ Item {
Column {
height: childrenRect.height;
width: parent.width;
spacing: UM.Theme.getSize("default_margin").height;
// Main card
Item {
id: mainCard;
height: 60 * screenScaleFactor + 2 * UM.Theme.getSize("default_margin").width;
height: 60 * screenScaleFactor + UM.Theme.getSize("default_margin").width;
width: parent.width;
// Machine icon
@ -223,6 +224,16 @@ Item {
}
}
HorizontalLine {
anchors {
left: parent.left;
leftMargin: UM.Theme.getSize("default_margin").width;
right: parent.right;
rightMargin: UM.Theme.getSize("default_margin").width;
}
visible: root.printer;
}
// Detailed card
PrinterCardDetails {
collapsed: root.collapsed;
@ -230,6 +241,16 @@ Item {
visible: root.printer;
}
CameraButton {
id: showCameraButton;
anchors {
left: parent.left;
leftMargin: UM.Theme.getSize("default_margin").width;
}
iconSource: "../svg/camera-icon.svg";
visible: root.printer && root.printJob;
}
// Progress bar
PrinterCardProgressBar {
visible: printer && printer.activePrintJob != null;

15
plugins/UM3NetworkPrinting/resources/qml/PrinterCardDetails.qml
View file

@ -32,8 +32,6 @@ Item {
spacing: UM.Theme.getSize("default_margin").height;
width: parent.width;
HorizontalLine {}
PrinterInfoBlock {
printer: root.printer;
printJob: root.printer ? root.printer.activePrintJob : null;
@ -61,7 +59,6 @@ Item {
visible: printJob;
}
}
PrintJobPreview {
anchors.horizontalCenter: parent.horizontalCenter;
@ -69,16 +66,4 @@ Item {
visible: root.printJob;
}
}
CameraButton {
id: showCameraButton;
anchors {
bottom: contentColumn.bottom;
bottomMargin: Math.round(1.5 * UM.Theme.getSize("default_margin").height);
left: contentColumn.left;
leftMargin: Math.round(0.5 * UM.Theme.getSize("default_margin").width);
}
iconSource: "../svg/camera-icon.svg";
visible: root.printJob;
}
}

136
resources/bundled_packages/cura.json
View file

@ -753,8 +753,8 @@
"package_type": "material",
"display_name": "Generic ABS",
"description": "The generic ABS profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -771,8 +771,44 @@
"package_type": "material",
"display_name": "Generic BAM",
"description": "The generic BAM profile which other profiles can be based upon.",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
"display_name": "Generic",
"email": "materials@ultimaker.com",
"website": "https://github.com/Ultimaker/fdm_materials",
"description": "Professional 3D printing made accessible."
}
}
},
"GenericCFFCPE": {
"package_info": {
"package_id": "GenericCFFCPE",
"package_type": "material",
"display_name": "Generic CFF CPE",
"description": "The generic CFF CPE profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
"display_name": "Generic",
"email": "materials@ultimaker.com",
"website": "https://github.com/Ultimaker/fdm_materials",
"description": "Professional 3D printing made accessible."
}
}
},
"GenericCFFPA": {
"package_info": {
"package_id": "GenericCFFPA",
"package_type": "material",
"display_name": "Generic CFF PA",
"description": "The generic CFF PA profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -789,8 +825,8 @@
"package_type": "material",
"display_name": "Generic CPE",
"description": "The generic CPE profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -807,8 +843,44 @@
"package_type": "material",
"display_name": "Generic CPE+",
"description": "The generic CPE+ profile which other profiles can be based upon.",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
"display_name": "Generic",
"email": "materials@ultimaker.com",
"website": "https://github.com/Ultimaker/fdm_materials",
"description": "Professional 3D printing made accessible."
}
}
},
"GenericGFFCPE": {
"package_info": {
"package_id": "GenericGFFCPE",
"package_type": "material",
"display_name": "Generic GFF CPE",
"description": "The generic GFF CPE profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
"display_name": "Generic",
"email": "materials@ultimaker.com",
"website": "https://github.com/Ultimaker/fdm_materials",
"description": "Professional 3D printing made accessible."
}
}
},
"GenericGFFPA": {
"package_info": {
"package_id": "GenericGFFPA",
"package_type": "material",
"display_name": "Generic GFF PA",
"description": "The generic GFF PA profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -826,7 +898,7 @@
"display_name": "Generic HIPS",
"description": "The generic HIPS profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -843,8 +915,8 @@
"package_type": "material",
"display_name": "Generic Nylon",
"description": "The generic Nylon profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -861,8 +933,8 @@
"package_type": "material",
"display_name": "Generic PC",
"description": "The generic PC profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -880,7 +952,7 @@
"display_name": "Generic PETG",
"description": "The generic PETG profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -897,8 +969,8 @@
"package_type": "material",
"display_name": "Generic PLA",
"description": "The generic PLA profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -915,8 +987,8 @@
"package_type": "material",
"display_name": "Generic PP",
"description": "The generic PP profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -933,8 +1005,8 @@
"package_type": "material",
"display_name": "Generic PVA",
"description": "The generic PVA profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -951,8 +1023,8 @@
"package_type": "material",
"display_name": "Generic Tough PLA",
"description": "The generic Tough PLA profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.0.1",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -969,8 +1041,8 @@
"package_type": "material",
"display_name": "Generic TPU",
"description": "The generic TPU profile which other profiles can be based upon.",
"package_version": "1.0.0",
"sdk_version": 6,
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://github.com/Ultimaker/fdm_materials",
"author": {
"author_id": "Generic",
@ -1225,7 +1297,7 @@
"package_type": "material",
"display_name": "Ultimaker ABS",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1244,7 +1316,7 @@
"package_type": "material",
"display_name": "Ultimaker Breakaway",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/breakaway",
"author": {
@ -1263,7 +1335,7 @@
"package_type": "material",
"display_name": "Ultimaker CPE",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1282,7 +1354,7 @@
"package_type": "material",
"display_name": "Ultimaker CPE+",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/cpe",
"author": {
@ -1301,7 +1373,7 @@
"package_type": "material",
"display_name": "Ultimaker Nylon",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1320,7 +1392,7 @@
"package_type": "material",
"display_name": "Ultimaker PC",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/pc",
"author": {
@ -1339,7 +1411,7 @@
"package_type": "material",
"display_name": "Ultimaker PLA",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1358,7 +1430,7 @@
"package_type": "material",
"display_name": "Ultimaker PP",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/pp",
"author": {
@ -1377,7 +1449,7 @@
"package_type": "material",
"display_name": "Ultimaker PVA",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/abs",
"author": {
@ -1396,7 +1468,7 @@
"package_type": "material",
"display_name": "Ultimaker TPU 95A",
"description": "Example package for material and quality profiles for Ultimaker materials.",
"package_version": "1.0.0",
"package_version": "1.1.0",
"sdk_version": 5,
"website": "https://ultimaker.com/products/materials/tpu-95a",
"author": {

2
resources/qml/Actions.qml
View file

@ -423,7 +423,7 @@ Item
Action
{
id: browsePackagesAction
text: catalog.i18nc("@action:menu", "Browse packages...")
text: catalog.i18nc("@action:menu", "Open Marketplace...")
iconName: "plugins_browse"
}

2
resources/qml/Cura.qml
View file

@ -283,7 +283,7 @@ UM.MainWindow
Menu
{
id: plugin_menu
title: catalog.i18nc("@title:menu menubar:toplevel", "&Toolbox")
title: catalog.i18nc("@title:menu menubar:toplevel", "&Marketplace")
MenuItem { action: Cura.Actions.browsePackages }
}

31
resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,31 @@
[general]
version = 4
name = Fast
definition = ultimaker_s5
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = -3
material = generic_cffcpe
variant = CC Red 0.6
[values]
adhesion_type = skirt
cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
wall_line_width_x = =line_width

31
resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,31 @@
[general]
version = 4
name = Fast
definition = ultimaker_s5
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = -3
material = generic_cffpa
variant = CC Red 0.6
[values]
adhesion_type = skirt
cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
wall_line_width_x = =line_width

31
resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,31 @@
[general]
version = 4
name = Fast
definition = ultimaker_s5
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = -3
material = generic_gffcpe
variant = CC Red 0.6
[values]
adhesion_type = brim
cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
wall_line_width_x = =line_width

31
resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,31 @@
[general]
version = 4
name = Fast
definition = ultimaker_s5
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = -3
material = generic_gffpa
variant = CC Red 0.6
[values]
adhesion_type = brim
cool_fan_enabled = True
cool_min_layer_time = 7
cool_min_layer_time_fan_speed_max = 15
cool_min_speed = 6
infill_line_width = =line_width
initial_layer_line_width_factor = 130.0
line_width = =machine_nozzle_size * (0.58/0.6)
material_bed_temperature_layer_0 = =material_bed_temperature + 5
material_print_temperature = =default_material_print_temperature
material_print_temperature_layer_0 = =material_print_temperature
material_standby_temperature = 100
skin_overlap = 20
support_bottom_distance = =support_z_distance / 2
support_top_distance = =support_z_distance
support_z_distance = =layer_height * 2
wall_line_width_x = =line_width

42
resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg Normal file
View file

@ -0,0 +1,42 @@
[general]
version = 4
name = Fast
definition = ultimaker_s5
[metadata]
setting_version = 5
type = quality
quality_type = draft
weight = -3
material = generic_pla
variant = CC Red 0.6
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
infill_line_width = =round(line_width * 0.65 / 0.75, 2)
infill_pattern = triangles
line_width = =machine_nozzle_size * 0.9375
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_x = =speed_wall
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
support_line_width = =line_width * 0.75
support_pattern = triangles
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
wall_line_width = =round(line_width * 0.75 / 0.75, 2)
wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x

42
resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg Normal file
View file

@ -0,0 +1,42 @@
[general]
version = 4
name = Normal
definition = ultimaker_s5
[metadata]
setting_version = 5
type = quality
quality_type = fast
weight = -2
material = generic_pla
variant = CC Red 0.6
[values]
cool_fan_full_at_height = =layer_height_0 + 2 * layer_height
cool_fan_speed_max = =100
cool_min_speed = 2
gradual_infill_step_height = =3 * layer_height
infill_line_width = =round(line_width * 0.65 / 0.75, 2)
infill_pattern = triangles
line_width = =machine_nozzle_size * 0.9375
machine_nozzle_cool_down_speed = 0.75
machine_nozzle_heat_up_speed = 1.6
material_final_print_temperature = =max(-273.15, material_print_temperature - 15)
material_initial_print_temperature = =max(-273.15, material_print_temperature - 10)
material_print_temperature = =default_material_print_temperature + 10
material_standby_temperature = 100
prime_tower_enable = True
retract_at_layer_change = False
speed_print = 45
speed_topbottom = =math.ceil(speed_print * 35 / 45)
speed_wall = =math.ceil(speed_print * 40 / 45)
speed_wall_x = =speed_wall
speed_wall_0 = =math.ceil(speed_wall * 35 / 40)
support_angle = 70
support_line_width = =line_width * 0.75
support_pattern = triangles
support_xy_distance = =wall_line_width_0 * 1.5
top_bottom_thickness = =layer_height * 4
wall_line_width = =round(line_width * 0.75 / 0.75, 2)
wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2)
wall_thickness = =wall_line_width_0 + wall_line_width_x

47
resources/variants/ultimaker_s5_cc06.inst.cfg Normal file
View file

@ -0,0 +1,47 @@
[general]
name = CC Red 0.6
version = 4
definition = ultimaker_s5
[metadata]
setting_version = 5
type = variant
hardware_type = nozzle
[values]
brim_width = 7
machine_nozzle_cool_down_speed = 0.9
machine_nozzle_id = CC Red 0.6
machine_nozzle_size = 0.6
material_print_temperature = =default_material_print_temperature + 10
raft_acceleration = =acceleration_print
raft_airgap = 0.3
raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2
raft_interface_line_spacing = =raft_interface_line_width + 0.2
raft_interface_line_width = =line_width * 2
raft_interface_thickness = =layer_height * 1.5
raft_jerk = =jerk_print
raft_margin = 15
raft_surface_layers = 2
retraction_count_max = 25
retraction_min_travel = =line_width * 2
retraction_prime_speed = =retraction_speed
speed_infill = =speed_print
speed_layer_0 = 20
speed_print = 45
speed_support = =speed_topbottom
speed_topbottom = =math.ceil(speed_print * 25 / 45)
speed_travel_layer_0 = 50
speed_wall = =math.ceil(speed_print * 30 / 45)
speed_wall_0 = =math.ceil(speed_wall * 25 / 30)
speed_wall_x = =speed_wall
support_angle = 60
support_bottom_distance = =support_z_distance / 2
support_pattern = zigzag
support_top_distance = =support_z_distance
support_use_towers = True
support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = =layer_height * 6
wall_thickness = =line_width * 3