GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 12:19:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into CURA-6867_pkg_for_macos

Browse Source
This commit is contained in:
Joey de l'Arago 2023-01-12 15:25:32 +01:00
commit 3a24ab1bee
83 changed files with 1706 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/conan-package-create.yml vendored
View File

@ -75,7 +75,8 @@ jobs:
cache-dependency-path: .github/workflows/requirements-conan-package.txt cache-dependency-path: .github/workflows/requirements-conan-package.txt
- name: Install Python requirements for runner - name: Install Python requirements for runner
run: pip install -r .github/workflows/requirements-conan-package.txt run: pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt
# Note the runner requirements are always installed from the main branch in the Ultimaker/Cura repo
- name: Use Conan download cache (Bash) - name: Use Conan download cache (Bash)
if: ${{ runner.os != 'Windows' }} if: ${{ runner.os != 'Windows' }}

3
.github/workflows/conan-recipe-export.yml vendored
View File

@ -62,8 +62,9 @@ jobs:
- name: Install Python requirements and Create default Conan profile - name: Install Python requirements and Create default Conan profile
run: | run: |
pip install -r .github/workflows/requirements-conan-package.txt pip install -r https://raw.githubusercontent.com/Ultimaker/Cura/main/.github/workflows/requirements-conan-package.txt
conan profile new default --detect conan profile new default --detect
# Note the runner requirements are always installed from the main branch in the Ultimaker/Cura repo
- name: Cache Conan local repository packages - name: Cache Conan local repository packages
uses: actions/cache@v3 uses: actions/cache@v3

2
.github/workflows/requirements-conan-package.txt vendored
View File

@ -1,2 +1,2 @@
conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3,!=1.52.0 conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3,!=1.52.0,!=1.57.0
sip sip

4
.printer-linter
View File

@ -12,4 +12,6 @@ format:
format-definition-single-value-single-line: true # Format dicts and lists with a single item on one line "dict": { "value": 10 } format-definition-single-value-single-line: true # Format dicts and lists with a single item on one line "dict": { "value": 10 }
format-profile-space-around-delimiters: true format-profile-space-around-delimiters: true
format-profile-sort-keys: true format-profile-sort-keys: true
diagnostic-mesh-file-size: 1200000 diagnostic-mesh-file-size: 1200000
diagnostic-definition-redundant-override-ignore:
- machine_.*

2
cura/ApplicationMetadata.py
View File

@ -64,7 +64,7 @@ try:
if CuraAppDisplayName == "": if CuraAppDisplayName == "":
CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME
if IsEnterpriseVersion: if IsEnterpriseVersion:
CuraAppDisplayName = CuraAppDisplayName + " Enterprise" CuraAppDisplayName = CuraAppDisplayName
except ImportError: except ImportError:
CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME CuraAppDisplayName = DEFAULT_CURA_DISPLAY_NAME

10
packaging/msi/CustomizeCuraDlg.wxs
View File

@ -6,7 +6,7 @@
<Fragment> <Fragment>
<UI> <UI>
<Dialog Id="CustomizeCuraDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes"> <Dialog Id="CustomizeCuraDlg" Width="370" Height="270" Title="!(loc.CustomizeDlg_Title)" TrackDiskSpace="yes">
<Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="115" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" /> <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="95" Property="_BrowseProperty" Sunken="yes" TabSkip="no" Text="!(loc.CustomizeDlgTree)" />
<Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)"> <Control Id="Browse" Type="PushButton" X="294" Y="210" Width="66" Height="17" Text="!(loc.CustomizeDlgBrowse)">
<Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish> <Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
<Condition Action="hide">Installed</Condition> <Condition Action="hide">Installed</Condition>
@ -16,7 +16,7 @@
<Publish Event="Reset" Value="0">1</Publish> <Publish Event="Reset" Value="0">1</Publish>
<Subscribe Event="SelectionNoItems" Attribute="Enabled" /> <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
</Control> </Control>
<Control Id="DiskCost" Type="PushButton" X="91" Y="243" Width="100" Height="17" Text="!(loc.CustomizeDlgDiskCost)"> <Control Id="DiskCost" Type="PushButton" X="91" Y="243" Width="80" Height="17" Text="!(loc.CustomizeDlgDiskCost)">
<Publish Event="SpawnDialog" Value="DiskCostDlg">1</Publish> <Publish Event="SpawnDialog" Value="DiskCostDlg">1</Publish>
<Subscribe Event="SelectionNoItems" Attribute="Enabled" /> <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
</Control> </Control>
@ -33,14 +33,14 @@
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" /> <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
<Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" /> <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgDescription)" />
<Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" /> <Control Id="Title" Type="Text" X="15" Y="6" Width="210" Height="15" Transparent="yes" NoPrefix="yes" Text="!(loc.CustomizeDlgTitle)" />
<Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="118" /> <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="150" Height="88" />
<Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="50" Text="!(loc.CustomizeDlgItemDescription)"> <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="30" Text="!(loc.CustomizeDlgItemDescription)">
<Subscribe Event="SelectionDescription" Attribute="Text" /> <Subscribe Event="SelectionDescription" Attribute="Text" />
</Control> </Control>
<Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)"> <Control Id="ItemSize" Type="Text" X="215" Y="140" Width="131" Height="50" Text="!(loc.CustomizeDlgItemSize)">
<Subscribe Event="SelectionSize" Attribute="Text" /> <Subscribe Event="SelectionSize" Attribute="Text" />
</Control> </Control>
<Control Id="UninstallPreviousCheckBox" Type="CheckBox" X="10" Y="210" Width="290" Height="17" Property="PREVIOUS_VERSIONS_INSTALLED" CheckBoxValue="0" Text="Uninstall previous Cura versions." /> <Control Id="UninstallPreviousCheckBox" Type="CheckBox" X="25" Y="190" Width="290" Height="17" Property="PREVIOUS_VERSIONS_INSTALLED" CheckBoxValue="0" Text="Uninstall previous Cura versions." />
<Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)"> <Control Id="Location" Type="Text" X="90" Y="210" Width="200" Height="20" Text="!(loc.CustomizeDlgLocation)">
<Subscribe Event="SelectionPath" Attribute="Text" /> <Subscribe Event="SelectionPath" Attribute="Text" />
<Subscribe Event="SelectionPathOn" Attribute="Visible" /> <Subscribe Event="SelectionPathOn" Attribute="Visible" />

94
packaging/msi/UltiMaker-Cura.wxs.jinja
View File

@ -8,19 +8,21 @@
Manufacturer="{{ company }}" Manufacturer="{{ company }}"
UpgradeCode="{{ upgrade_code }}" UpgradeCode="{{ upgrade_code }}"
> >
<Package InstallerVersion="500" <Package
Id="*"
InstallerVersion="500"
Compressed="yes" Compressed="yes"
InstallScope="perMachine" InstallScope="perMachine"
Manufacturer="{{ company }}" Manufacturer="{{ company }}"
Description="UltiMaker Cura the most popular 3D printing slicer" Description="UltiMaker Cura the most popular 3D printing slicer"
Keywords="UltiMaker,Cura,3D,printing,slicer" Keywords="UltiMaker,Cura,3D,printing,slicer"
Comments="Copyright (c) {{ year }} UltiMaker B.V." /> Comments="Copyright (c) {{ year }} {{ company }}" />
<InstallExecuteSequence> <InstallExecuteSequence>
<RemoveExistingProducts Before="InstallInitialize" /> <RemoveExistingProducts Before="InstallInitialize" />
</InstallExecuteSequence> </InstallExecuteSequence>
<Property Id="PREVIOUS_VERSIONS_INSTALLED" Secure="yes" Value="{{ 1 if "Enterpise" in app_name else 0 }}" /> <Property Id="PREVIOUS_VERSIONS_INSTALLED" Secure="yes" Value="{{ 1 if "Enterprise" in app_name else 0 }}" />
<Upgrade Id="{{ upgrade_code }}"> <Upgrade Id="{{ upgrade_code }}">
<UpgradeVersion <UpgradeVersion
Minimum="4.13.2" Maximum="{{ version_major }}.{{ version_minor }}.{{ version_patch }}" Minimum="4.13.2" Maximum="{{ version_major }}.{{ version_minor }}.{{ version_patch }}"
@ -28,10 +30,8 @@
IncludeMinimum="no" IncludeMaximum="no" IncludeMinimum="no" IncludeMaximum="no"
/> />
</Upgrade> </Upgrade>
<!--TODO: handle copy of configuration of previous version-->
<!--TODO: handle removal of old configuration once previous version is uninstalled-->
{% if "Enterpise" in app_name %} {% if "Enterprise" in app_name %}
<Property Id="PREVIOUS_413_INSTALLED" Secure="yes" /> <Property Id="PREVIOUS_413_INSTALLED" Secure="yes" />
<Upgrade Id="53C603BB-2B17-4206-A609-29C2E0D0B0AE"> <Upgrade Id="53C603BB-2B17-4206-A609-29C2E0D0B0AE">
<UpgradeVersion <UpgradeVersion
@ -86,43 +86,53 @@
<Property Id="ApplicationFolderName" Value="{{ app_name }} {{ version }}" /> <Property Id="ApplicationFolderName" Value="{{ app_name }} {{ version }}" />
<Property Id="WixAppFolder" Value="WixPerMachineFolder" /> <Property Id="WixAppFolder" Value="WixPerMachineFolder" />
<Component Id="CMP_UltiMaker_Cura_exe" Directory="APPLICATIONFOLDER" Guid="*"> <Component Id="CMP_UltiMaker_Cura_exe" Directory="APPLICATIONFOLDER" Guid="*">
<File Id="FILE_UltiMaker_Cura_exe" KeyPath="yes" Source="$(var.CuraDir)\{{ main_app }}"/> <File Id="FILE_UltiMaker_Cura_exe" KeyPath="yes" Source="$(var.CuraDir)\{{ main_app }}" />
<!--Computer\HKEY_LOCAL_MACHINE\SOFTWARE\Classes\Local Settings\Software\Microsoft\Windows\CurrentVersion\AppModel\PackageRepository\Extensions\windows.fileTypeAssociation\.3mf-->
<RegistryValue Root="HKLM" Key="SOFTWARE\{{ app_name }}\Capabilities\FileAssociations" Name=".3mf" Value="PRG_UltiMaker_Cura.3MF" Type="string" /> <ProgId Id="Cura" Description="{{ app_name }}" Icon="ICO_Cura" Advertise="yes">
<RegistryValue Root="HKLM" Key="SOFTWARE\{{ app_name }}\Capabilities\FileAssociations" Name=".stl" Value="PRG_UltiMaker_Cura.STL" Type="string" /> <ProgId Id="3mf" Advertise="yes">
<RegistryValue Root="HKLM" Key="SOFTWARE\{{ app_name }}\Capabilities\MIMEAssociations" Name="application/3mf" Value="PRG_UltiMaker_Cura.3MF" Type="string" /> <Extension Id="3mf" ContentType="application/3mf">
<RegistryValue Root="HKLM" Key="SOFTWARE\{{ app_name }}\Capabilities\MIMEAssociations" Name="application/stl" Value="PRG_UltiMaker_Cura.STL" Type="string" /> <Verb Id="open_3mf" Command="Open" Argument='"%1"' />
<RegistryValue Root="HKLM" Key="SOFTWARE\{{ app_name }}\Capabilities\shell\Open\command" Value='"[APPLICATIONFOLDER]\{{ main_app }}" "%1"' Type="string" /> <MIME Advertise="yes" ContentType="application/3mf" Default="yes" />
<RegistryValue Root="HKLM" Key="SOFTWARE\RegisteredApplications" Name="{{ app_name }}" Value="SOFTWARE\MyApp\Capabilities" Type="string" /> </Extension>
</ProgId>
<ProgId Id="stl" Advertise="yes">
<Extension Id="stl" ContentType="application/stl">
<Verb Id="open_stl" Command="Open" Argument='"%1"' />
<MIME Advertise="yes" ContentType="application/stl" Default="yes" />
</Extension>
</ProgId>
<ProgId Id="gcode" Advertise="yes">
<Extension Id="gcode" ContentType="text/x-gcode">
<Verb Id="open_gcode" Command="Open" Argument='"%1"' />
<MIME Advertise="yes" ContentType="text/x-gcode" Default="yes" />
</Extension>
</ProgId>
<ProgId Id="ufp" Advertise="yes">
<Extension Id="ufp" ContentType="application/x-ufp">
<Verb Id="open_ufp" Command="Open" Argument='"%1"' />
<MIME Advertise="yes" ContentType="application/x-ufp" Default="yes" />
</Extension>
</ProgId>
<ProgId Id="curapackage" Advertise="yes">
<Extension Id='curapackage' ContentType='application/curapackage'>
<Verb Id='open_curapackage' Command="Open" Argument='"%1"' />
<MIME Advertise="yes" ContentType="application/curapackage" Default="yes" />
</Extension>
</ProgId>
</ProgId>
<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\{{ main_app }}\SupportedTypes" Name=".3mf" Value="" Type="string" /> <fw:FirewallException Id="FirewallExceptLocalFrontend" Name="Cura (Frontend) Connection (LocalHost)" File="FILE_UltiMaker_Cura_exe" IgnoreFailure="yes">
<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\{{ main_app }}\SupportedTypes" Name=".stl" Value="" Type="string" /> <fw:RemoteAddress>127.0.0.1</fw:RemoteAddress>
<RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\{{ main_app }}\shell\open" Name="{{ app_name }}" Value="{{ main_app }}" Type="string" /> </fw:FirewallException>
</Component>
<Component Id="CMP_CuraEngine_exe" Directory="APPLICATIONFOLDER" Guid="*">
<File Id="FILE_CuraEngine_exe" KeyPath="yes" Source="$(var.CuraDir)\CuraEngine.exe" />
<ProgId Id="PRG_UltiMaker_Cura.STL" Description="{{ app_name }}" Icon="FILE_UltiMaker_Cura_exe"> <fw:FirewallException Id="FirewallExceptLocalEngine" Name="CuraEngine (Backend) Connection (LocalHost)" File="FILE_CuraEngine_exe" IgnoreFailure="yes">
<Extension Id="STL"> <fw:RemoteAddress>127.0.0.1</fw:RemoteAddress>
<Verb Id='edit' TargetFile="FILE_UltiMaker_Cura_exe" Argument='"%1"' /> </fw:FirewallException>
<MIME ContentType="application/stl" Default="yes" /> </Component>
</Extension>
</ProgId>
<ProgId Id="PRG_UltiMaker_Cura.3MF" Description="{{ app_name }}" Icon="FILE_UltiMaker_Cura_exe">
<Extension Id="3MF">
<Verb Id='edit' TargetFile="FILE_UltiMaker_Cura_exe" Argument='"%1"' />
<MIME ContentType="application/3mf" Default="yes" />
</Extension>
</ProgId>
<!-- Current Cura versions are not supported on XP or Server 2003. Even so, add 'ignorefailure=yes'. After all, worst that can happen is the user gets asked, like before. -->
<fw:FirewallException Id="FirewallExceptLocalFrontend" Name="Cura (Frontend) Connection (LocalHost)" File="FILE_CuraEngine_exe" Port="127.0.0.1" IgnoreFailure="yes" Scope="localSubnet" />
</Component>
<Component Id="CMP_CuraEngine_exe" Directory="APPLICATIONFOLDER" Guid="*">
<File Id="FILE_CuraEngine_exe" KeyPath="yes" Source="$(var.CuraDir)\CuraEngine.exe" />
<!-- Current Cura versions are not supported on XP or Server 2003. Even so, add 'ignorefailure=yes'. After all, worst that can happen is the user gets asked, like before. -->
<fw:FirewallException Id="FirewallExceptLocalEngine" Name="CuraEngine (Backend) Connection (LocalHost)" File="FILE_CuraEngine_exe" Port="127.0.0.1" IgnoreFailure="yes" Scope="localSubnet" />
</Component>
<!--Shortcuts--> <!--Shortcuts-->
<DirectoryRef Id="ShortCutDir"> <DirectoryRef Id="ShortCutDir">
@ -140,7 +150,7 @@
<RemoveFolder Id="RemoveMyShortcutsDir" <RemoveFolder Id="RemoveMyShortcutsDir"
On="uninstall" /> On="uninstall" />
<RegistryValue Root="HKCU" <RegistryValue Root="HKCU"
Key="Software\{{ company }}\{{ app_name }}" Key="Software\{{ company }}\{{ app_name }}\{{ version }}"
Name="installed" Name="installed"
Type="integer" Type="integer"
Value="1" Value="1"
@ -148,7 +158,7 @@
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<Feature Id="ProductFeature" Title="{{ app_name }}" Level="1"> <Feature Id="ProductFeature" Title="{{ app_name }}" Level="1" ConfigurableDirectory="APPLICATIONFOLDER">
<ComponentRef Id="CMP_UltiMaker_Cura_exe" /> <ComponentRef Id="CMP_UltiMaker_Cura_exe" />
<ComponentRef Id="CMP_CuraEngine_exe" /> <ComponentRef Id="CMP_CuraEngine_exe" />
<ComponentGroupRef Id="NewFilesGroup" /> <ComponentGroupRef Id="NewFilesGroup" />

27
packaging/msi/create_windows_msi.py
View File

@ -82,20 +82,37 @@ def build(dist_path: Path, filename: Path):
manageoldcuradlg_loc = work_loc.joinpath("CustomizeCuraDlg.wxs") manageoldcuradlg_loc = work_loc.joinpath("CustomizeCuraDlg.wxs")
build_loc = work_loc.joinpath("build_msi") build_loc = work_loc.joinpath("build_msi")
heat_command = ["heat", "dir", f"{dist_loc.as_posix()}\\", "-dr", "APPLICATIONFOLDER", "-cg", "NewFilesGroup", "-sw5150", heat_command = ["heat",
"-gg", "-g1", "-sf", "-srd", "-var", "var.CuraDir", "-t", f"{exclude_components_loc.as_posix()}", "dir", f"{dist_loc.as_posix()}\\",
"-dr", "APPLICATIONFOLDER",
"-cg", "NewFilesGroup",
"-sw5150", # Don't pollute logs with warnings from auto generated content
"-gg",
"-g1",
"-sf",
"-srd",
"-var", "var.CuraDir",
"-t", f"{exclude_components_loc.as_posix()}",
"-out", f"{heat_loc.as_posix()}"] "-out", f"{heat_loc.as_posix()}"]
subprocess.call(heat_command) subprocess.call(heat_command)
build_command = ["candle", "-arch", "x64", f"-dCuraDir={dist_loc}\\", build_command = ["candle",
"-arch", "x64",
f"-dCuraDir={dist_loc}\\",
"-ext", "WixFirewallExtension", "-ext", "WixFirewallExtension",
"-out", f"{build_loc.as_posix()}\\", "-out", f"{build_loc.as_posix()}\\",
f"{wxs_loc.as_posix()}", f"{heat_loc.as_posix()}", f"{manageoldcuradlg_loc.as_posix()}"] f"{wxs_loc.as_posix()}",
f"{heat_loc.as_posix()}",
f"{manageoldcuradlg_loc.as_posix()}"]
subprocess.call(build_command) subprocess.call(build_command)
link_command = ["light", f"{build_loc.joinpath(wxs_loc.name).with_suffix('.wixobj')}", link_command = ["light",
f"{build_loc.joinpath(wxs_loc.name).with_suffix('.wixobj')}",
f"{build_loc.joinpath(heat_loc.name).with_suffix('.wixobj')}", f"{build_loc.joinpath(heat_loc.name).with_suffix('.wixobj')}",
f"{build_loc.joinpath(manageoldcuradlg_loc.name).with_suffix('.wixobj')}", f"{build_loc.joinpath(manageoldcuradlg_loc.name).with_suffix('.wixobj')}",
"-sw1076", # Don't pollute logs with warnings from auto generated content
"-dcl:high", # Use high compression ratio
"-sval", # Disable ICE validation otherwise the CI complains
"-ext", "WixUIExtension", "-ext", "WixUIExtension",
"-ext", "WixFirewallExtension", "-ext", "WixFirewallExtension",
"-out", f"{work_loc.joinpath(filename.name)}"] "-out", f"{work_loc.joinpath(filename.name)}"]

2
plugins/Marketplace/resources/qml/PackageCardHeader.qml
View File

@ -45,8 +45,6 @@ Item
visible: parent.packageHasIcon visible: parent.packageHasIcon
anchors.fill: parent anchors.fill: parent
source: packageData.iconUrl source: packageData.iconUrl
sourceSize.height: height
sourceSize.width: width
} }
UM.ColorImage UM.ColorImage

71
plugins/UM3NetworkPrinting/resources/qml/MonitorBuildplateConfiguration.qml
View File

@ -1,71 +0,0 @@
// Copyright (c) 2019 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2
import QtQuick.Controls 2.0
import UM 1.5 as UM
/**
* This component comprises a buildplate icon and the buildplate name. It is
* used by the MonitorPrinterConfiguration component along with two instances
* of MonitorExtruderConfiguration.
*
* NOTE: For most labels, a fixed height with vertical alignment is used to make
* layouts more deterministic (like the fixed-size textboxes used in original
* mock-ups). This is also a stand-in for CSS's 'line-height' property. Denoted
* with '// FIXED-LINE-HEIGHT:'.
*/
Item
{
// The buildplate name
property var buildplate: null
// Height is one 18px label/icon
height: 18 * screenScaleFactor // TODO: Theme!
width: childrenRect.width
Row
{
height: parent.height
spacing: UM.Theme.getSize("slider_handle").width // TODO: Theme! (Should be same as extruder spacing)
// This wrapper ensures that the buildplate icon is located centered
// below an extruder icon.
Item
{
height: parent.height
width: 32 * screenScaleFactor // Ensure the icon is centered under the extruder icon (same width)
Rectangle
{
anchors.centerIn: parent
height: parent.height
width: height
color: buildplateIcon.visible > 0 ? "transparent" : UM.Theme.getColor("monitor_skeleton_loading")
radius: Math.floor(height / 2)
}
UM.ColorImage
{
id: buildplateIcon
anchors.centerIn: parent
color: UM.Theme.getColor("monitor_icon_primary")
height: UM.Theme.getSize("medium_button_icon").width
source: UM.Theme.getIcon("Buildplate")
width: height
visible: buildplate
}
}
UM.Label
{
id: buildplateLabel
elide: Text.ElideRight
text: buildplate ? buildplate : ""
visible: text !== ""
// FIXED-LINE-HEIGHT:
height: 18 * screenScaleFactor // TODO: Theme!
}
}
}

18
plugins/UM3NetworkPrinting/resources/qml/MonitorConfigOverrideDialog.qml
View File

@ -102,9 +102,6 @@ UM.Dialog
case "print_core_change": case "print_core_change":
text = catalog.i18nc("@label", "Change print core %1 from %2 to %3.").arg(change.index + 1).arg(change.originName).arg(change.targetName) text = catalog.i18nc("@label", "Change print core %1 from %2 to %3.").arg(change.index + 1).arg(change.originName).arg(change.targetName)
break break
case "buildplate_change":
text = catalog.i18nc("@label", "Change build plate to %1 (This cannot be overridden).").arg(formatBuildPlateType(change.target_name))
break
default: default:
text = "unknown" text = "unknown"
} }
@ -143,19 +140,4 @@ UM.Dialog
} }
return true return true
} }
function formatBuildPlateType(buildPlateType)
{
var translationText = ""
switch (buildPlateType) {
case "glass":
translationText = catalog.i18nc("@label", "Glass")
break
case "aluminum":
translationText = catalog.i18nc("@label", "Aluminum")
break
default:
translationText = null
}
return translationText
}
} }

2
plugins/UM3NetworkPrinting/resources/qml/MonitorExtruderConfiguration.qml
View File

@ -10,7 +10,7 @@ import Cura 1.6 as Cura
/** /**
* This component comprises a colored extruder icon, the material name, and the * This component comprises a colored extruder icon, the material name, and the
* print core name. It is used by the MonitorPrinterConfiguration component with * print core name. It is used by the MonitorPrinterConfiguration component with
* a sibling instance as well as a MonitorBuildplateConfiguration instance. * a sibling instance.
* *
* NOTE: For most labels, a fixed height with vertical alignment is used to make * NOTE: For most labels, a fixed height with vertical alignment is used to make
* layouts more deterministic (like the fixed-size textboxes used in original * layouts more deterministic (like the fixed-size textboxes used in original

8
plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml
View File

@ -172,14 +172,6 @@ Item
{ {
id: printerConfiguration id: printerConfiguration
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
buildplate: {
switch (printJob.assignedPrinter.buildplate) {
case "glass":
return catalog.i18nc("@label", "Glass");
default:
return null
}
}
configurations: base.printJob ? base.printJob.configuration.extruderConfigurations : null configurations: base.printJob ? base.printJob.configuration.extruderConfigurations : null
height: Math.round(72 * screenScaleFactor) // TODO: Theme! height: Math.round(72 * screenScaleFactor) // TODO: Theme!
} }

9
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml
View File

@ -175,14 +175,7 @@ Item
{ {
id: printerConfiguration id: printerConfiguration
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
buildplate: {
switch (printer.buildplate) {
case "glass":
return catalog.i18nc("@label", "Glass");
default:
return null
}
}
configurations: configurations:
{ {
var configs = [] var configs = []

15
plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterConfiguration.qml
View File

@ -7,17 +7,13 @@ import UM 1.3 as UM
/** /**
* The MonitorPrinterConfiguration accepts 2 configuration objects as input and * The MonitorPrinterConfiguration accepts 2 configuration objects as input and
* applies them to a MonitorBuildplateConfiguration instance and two instances * applies them to two instances of MonitorExtruderConfiguration.
* of MonitorExtruderConfiguration. It's used in both the MonitorPrintJobCard * It's used in both the MonitorPrintJobCard component as well as the MonitorPrinterCard component.
* component as well as the MonitorPrinterCard component.
*/ */
Item Item
{ {
id: base id: base
// Extracted buildplate configuration
property alias buildplate: buildplateConfig.buildplate
// Array of extracted extruder configurations // Array of extracted extruder configurations
property var configurations: [null,null] property var configurations: [null,null]
@ -48,11 +44,4 @@ Item
} }
} }
MonitorBuildplateConfiguration
{
id: buildplateConfig
anchors.bottom: parent.bottom
buildplate: null
}
} }

11
printer-linter/src/printerlinter/linters/defintion.py
View File

@ -84,6 +84,8 @@ class Definition(Linter):
self._loadDefinitionFiles(parent_file) self._loadDefinitionFiles(parent_file)
def _isDefinedInParent(self, key, value_dict, inherits_from): def _isDefinedInParent(self, key, value_dict, inherits_from):
if self._ignore(key, "diagnostic-definition-redundant-override"):
return False, None, None, None
if "overrides" not in self._definitions[inherits_from]: if "overrides" not in self._definitions[inherits_from]:
return self._isDefinedInParent(key, value_dict, self._definitions[inherits_from]["inherits"]) return self._isDefinedInParent(key, value_dict, self._definitions[inherits_from]["inherits"])
@ -119,7 +121,6 @@ class Definition(Linter):
return False, None, None, None return False, None, None, None
def _loadBasePrinterSettings(self): def _loadBasePrinterSettings(self):
""" TODO @Jelle please explain why this """
settings = {} settings = {}
for k, v in self._definitions[self.base_def]["settings"].items(): for k, v in self._definitions[self.base_def]["settings"].items():
self._getSetting(k, v, settings) self._getSetting(k, v, settings)
@ -130,3 +131,11 @@ class Definition(Linter):
for childname, child in setting["children"].items(): for childname, child in setting["children"].items():
self._getSetting(childname, child, settings) self._getSetting(childname, child, settings)
settings |= {name: setting} settings |= {name: setting}
def _ignore(self, key: dict, type_of_check: str) -> bool:
if f"{type_of_check}-ignore" in self._settings:
filters = [re.compile(f) for f in self._settings[f"{type_of_check}-ignore"]]
for f in filters:
if f.match(key):
return True
return False

29
resources/definitions/anycubic_kobra_go.def.json Normal file
View File

@ -0,0 +1,29 @@
{
"version": 2,
"name": "Anycubic Kobra Go",
"inherits": "fdmprinter",
"metadata":
{
"visible": true,
"author": "Kolja Lampe",
"manufacturer": "Anycubic",
"file_formats": "text/x-gcode",
"firmware_file": "MarlinChiron.hex",
"has_machine_quality": true,
"has_materials": true,
"machine_extruder_trains": { "0": "anycubic_kobra_go_extruder_0" },
"preferred_material": "generic_pla",
"preferred_quality_type": "pla",
"quality_definition": "anycubic_kobra_go"
},
"overrides":
{
"machine_depth": { "default_value": 222 },
"machine_end_gcode": { "default_value": "M400 ; Wait for current moves to finish\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F2400 E-1 ; Retract filament 3mm at 40mm/s to prevent stringing\nG0 F5000 Z20 ; Move Z Axis up 20mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG0 X0 Y220 F5000 ; Move Heat Bed to the front for easy print removal\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; Disable stepper motors\n; End of custom end GCode" },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 250 },
"machine_name": { "default_value": "Anycubic Kobra Go" },
"machine_start_gcode": { "default_value": "M140 S[first_layer_bed_temperature]; Heat bed\nM104 S[first_layer_temperature\n ]; Heat extruder\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nM420 S1 ; Enable Bed Levelling Mesh\nM190 S[first_layer_bed_temperature\n ]; Wait for bed to get up to temperature\nM109 S[first_layer_temperature\n ]; Wait for extruder to get up to temperature\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X2 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X2 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X2.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X2.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 F2400 E-1\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" },
"machine_width": { "default_value": 222 }
}
}

141
resources/definitions/elegoo_base.def.json Normal file
View File

@ -0,0 +1,141 @@
{
"version": 2,
"name": "ELEGOO Base Printer",
"inherits": "fdmprinter",
"metadata":
{
"author": "NARUTO",
"manufacturer": "ELEGOO",
"file_formats": "text/x-gcode",
"platform": "elegoo_platform.3mf",
"exclude_materials": [
"generic_nylon_175",
"generic_nylon",
"generic_hips_175",
"generic_hips",
"generic_gffcpe",
"generic_bvoh_175",
"generic_ccfpe",
"generic_cffcpe",
"generic_cpe_plus",
"generic_cpe_175",
"generic_cpe",
"generic_tpu",
"generic_pp",
"generic_pc",
"generic_pc_175",
"generic_pvc",
"generic_pva",
"generic_pva_175",
"generic_pvc_175",
"generic_pp"
],
"has_machine_quality": true,
"machine_extruder_trains": { "0": "elegoo_extruder_0" },
"platform_offset": [
-2.2,
14.5,
-31
],
"preferred_material": "generic_pla_175",
"preferred_quality_type": "fine"
},
"overrides":
{
"acceleration_enabled": { "value": true },
"acceleration_layer_0": { "value": 500 },
"acceleration_print": { "value": 1000 },
"acceleration_travel": { "value": "acceleration_print" },
"brim_gap": { "default_value": 0.1 },
"brim_width": { "default_value": 5 },
"cool_fan_full_at_height": { "value": "layer_height_0 if resolveOrValue('adhesion_type') == 'raft' else resolveOrValue('layer_height_0')+0.4" },
"cool_fan_speed": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" },
"cool_fan_speed_0":
{
"enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled",
"value": "cool_fan_speed if resolveOrValue('adhesion_type') == 'raft' else 0"
},
"cool_fan_speed_max": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" },
"cool_fan_speed_min": { "enabled": "resolveOrValue('cool_fan_enabled') == 'true' or cool_fan_enabled" },
"fill_outline_gaps": { "default_value": false },
"gantry_height": { "value": "machine_height-20" },
"gradual_support_infill_step_height": { "value": "5" },
"infill_overlap": { "value": "10 if infill_sparse_density < 20.01 else 5 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else 0" },
"infill_overlap_mm": { "value": "0.5 * (infill_line_width + (wall_line_width_x if wall_line_count > 1 else wall_line_width_0)) * infill_overlap / 100" },
"infill_pattern": { "value": "'lines' if (infill_sparse_density > 35 or speed_print >= 80) else 'grid' " },
"infill_sparse_density": { "default_value": 15 },
"initial_layer_line_width_factor": { "value": "100.0 if resolveOrValue('adhesion_type') == 'raft' else 130 if line_width < 0.5 else 110" },
"line_width": { "value": "machine_nozzle_size + 0.02" },
"machine_acceleration": { "value": 1000 },
"machine_heated_bed": { "default_value": true },
"machine_max_acceleration_e": { "value": 5000 },
"machine_max_acceleration_x": { "value": 1000 },
"machine_max_acceleration_y": { "value": 1000 },
"machine_max_jerk_xy": { "value": 8.0 },
"material_diameter": { "value": 1.75 },
"material_final_print_temperature": { "value": "material_print_temperature" },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_print_temperature_layer_0": { "value": "210 if material_print_temperature < 210 else material_print_temperature" },
"min_infill_area": { "value": "5" },
"minimum_interface_area": { "default_value": 10 },
"minimum_support_area": { "default_value": 3 },
"optimize_wall_printing_order": { "default_value": true },
"prime_tower_brim_enable": { "default_value": true },
"prime_tower_min_volume": { "value": "(layer_height) * (prime_tower_size / 2)**2 * 3 * 0.5 " },
"prime_tower_size": { "default_value": 30 },
"prime_tower_wipe_enabled": { "default_value": false },
"raft_base_speed": { "value": "0.4 * raft_speed" },
"raft_base_thickness": { "value": "resolveOrValue('machine_nozzle_size') * 0.75" },
"raft_interface_speed": { "value": "0.6 * raft_speed" },
"raft_interface_thickness": { "value": "resolveOrValue('machine_nozzle_size') * 0.75" },
"raft_margin": { "default_value": 5 },
"raft_speed": { "value": "30" },
"raft_surface_fan_speed": { "value": "cool_fan_speed" },
"raft_surface_line_width": { "value": "machine_nozzle_size * 1.25" },
"raft_surface_thickness": { "value": "resolveOrValue('machine_nozzle_size')*0.375" },
"retraction_amount": { "default_value": 5 },
"retraction_combing": { "value": "'no_outer_surfaces' if (any(extruderValues('skin_monotonic')) or any(extruderValues('ironing_enabled')) or (any(extruderValues('roofing_monotonic')) and any(extruderValues('roofing_layer_count')))) else 'no_outer_surfaces'" },
"retraction_combing_max_distance": { "value": "(infill_line_distance)*1.5 + 5 " },
"retraction_hop": { "value": "layer_height if layer_height > 0.199 else 0.2" },
"skirt_brim_speed": { "value": "speed_print_layer_0" },
"speed_infill": { "value": "math.ceil(speed_wall + 35)" },
"speed_layer_0":
{
"maximum_value_warning": "60",
"value": "speed_print * 20 / 60 if material_bed_temperature > 70 else speed_print * 30 / 60"
},
"speed_prime_tower": { "value": "speed_print if speed_print < 70.1 else 90 if speed_print > 100 else speed_print * 0.5+35" },
"speed_slowdown_layers": { "value": "0 if resolveOrValue('adhesion_type') == 'raft' else speed_print / 30" },
"speed_support": { "value": "speed_print if speed_wall > 0 and speed_wall < 40.01 else speed_wall + 40 " },
"speed_topbottom": { "value": "speed_wall + 15" },
"speed_travel": { "value": "90 if speed_print < 60.1 else speed_print * 1.5 if speed_print > 90 else speed_print+30" },
"speed_travel_layer_0": { "value": "70 if speed_layer_0 < 20 else 90 if speed_layer_0 > 40 else speed_layer_0+50" },
"speed_wall_x": { "value": "speed_wall + 15" },
"support_angle": { "value": "45 if speed_print > 99.9 else 50" },
"support_bottom_offset": { "value": "-0.4" },
"support_brim_enable": { "value": "support_structure == 'normal' or support_structure == 'tree'" },
"support_brim_width":
{
"default_value": 3,
"value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 "
},
"support_infill_angles": { "default_value": "[65]" },
"support_interface_density": { "default_value": 33.333 },
"support_interface_pattern": { "default_value": "lines" },
"support_material_flow": { "value": "material_flow * 0.95" },
"support_offset": { "default_value": 0.3 },
"support_roof_pattern": { "value": "'grid'" },
"support_top_distance": { "value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'layer_height') + (0 if support_structure == 'tree' else 0)" },
"support_tower_maximum_supported_diameter": { "value": "1" },
"support_use_towers": { "default_value": false },
"support_xy_distance": { "value": "machine_nozzle_size * 1.7" },
"support_xy_distance_overhang": { "value": "machine_nozzle_size * 1.2 if support_interface_enable else machine_nozzle_size * 0.8" },
"support_z_distance": { "value": "layer_height * 1.2 if (support_interface_enable and support_bottom_enable and layer_height < 0.16) or support_bottom_enable else layer_height" },
"switch_extruder_retraction_amount": { "value": "15 if extruders_enabled_count > 1 else machine_heat_zone_length" },
"wall_thickness": { "value": "wall_line_width_0 if magic_spiralize else line_width * 2" },
"z_seam_corner": { "default_value": "z_seam_corner_weighted" },
"z_seam_position": { "default_value": "left" },
"z_seam_type": { "default_value": "back" },
"zig_zaggify_infill": { "value": "infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_sparse_density < 30 " }
}
}

30
resources/definitions/elegoo_neptune_1.def.json Normal file
View File

@ -0,0 +1,30 @@
{
"version": 2,
"name": "ELEGOO NEPTUNE",
"inherits": "elegoo_base",
"metadata":
{
"visible": true,
"author": "NARUTO",
"quality_definition": "elegoo_base"
},
"overrides":
{
"machine_depth": { "default_value": 210 },
"machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
"machine_head_with_fans_polygon":
{
"value": [
[-50, 20],
[50, 20],
[50, -25],
[-50, -25]
]
},
"machine_height": { "default_value": 200 },
"machine_name": { "default_value": "ELEGOO NEPTUNE" },
"machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE\nG90\nG28 ;home\nG1 Z0.6 F100 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" },
"machine_width": { "default_value": 210 },
"material_bed_temperature": { "value": "default_material_bed_temperature + 5" }
}
}

30
resources/definitions/elegoo_neptune_2s.def.json Normal file
View File

@ -0,0 +1,30 @@
{
"version": 2,
"name": "ELEGOO NEPTUNE 2S",
"inherits": "elegoo_base",
"metadata":
{
"visible": true,
"author": "NARUTO",
"quality_definition": "elegoo_base"
},
"overrides":
{
"machine_depth": { "default_value": 235 },
"machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
"machine_head_with_fans_polygon":
{
"value": [
[-55, 20],
[55, 20],
[55, -25],
[-55, -25]
]
},
"machine_height": { "default_value": 260 },
"machine_name": { "default_value": "ELEGOO NEPTUNE 2S" },
"machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 2S\nG90\nG28 ;home\nG1 Z0.6 F100 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" },
"machine_width": { "default_value": 235 },
"material_bed_temperature": { "value": "default_material_bed_temperature + 10" }
}
}

30
resources/definitions/elegoo_neptune_3.def.json Normal file
View File

@ -0,0 +1,30 @@
{
"version": 2,
"name": "ELEGOO NEPTUNE 3",
"inherits": "elegoo_base",
"metadata":
{
"visible": true,
"author": "NARUTO",
"quality_definition": "elegoo_base"
},
"overrides":
{
"machine_depth": { "default_value": 235 },
"machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
"machine_head_with_fans_polygon":
{
"value": [
[-55, 20],
[55, 20],
[55, -25],
[-55, -25]
]
},
"machine_height": { "default_value": 280 },
"machine_name": { "default_value": "ELEGOO NEPTUNE 3" },
"machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3\n;M413 S0;S0=Disable power-loss recovery:S1=Enable power-loss recovery\nM220 S100 ;Set the feed speed to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.6 F100\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" },
"machine_width": { "default_value": 235 },
"material_bed_temperature": { "value": "default_material_bed_temperature + 10" }
}
}

26
resources/definitions/elegoo_neptune_3max.def.json Normal file
View File

@ -0,0 +1,26 @@
{
"version": 2,
"name": "ELEGOO NEPTUNE 3 Max",
"inherits": "elegoo_neptune_3pro",
"metadata":
{
"platform": "elegoo_platform_max.3mf",
"platform_offset": [
-2.1,
-0.2,
0
]
},
"overrides":
{
"acceleration_wall": { "value": 700 },
"machine_acceleration": { "value": 700 },
"machine_depth": { "default_value": 426 },
"machine_height": { "default_value": 510 },
"machine_max_acceleration_x": { "value": 700 },
"machine_max_acceleration_y": { "value": 500 },
"machine_name": { "default_value": "ELEGOO NEPTUNE 3 Max" },
"machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3 Max\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" },
"machine_width": { "default_value": 426 }
}
}

26
resources/definitions/elegoo_neptune_3plus.def.json Normal file
View File

@ -0,0 +1,26 @@
{
"version": 2,
"name": "ELEGOO NEPTUNE 3 Plus",
"inherits": "elegoo_neptune_3pro",
"metadata":
{
"platform": "elegoo_platform_max.3mf",
"platform_offset": [
-2.1,
-0.2,
0
]
},
"overrides":
{
"acceleration_wall": { "value": 700 },
"machine_acceleration": { "value": 700 },
"machine_depth": { "default_value": 330 },
"machine_height": { "default_value": 410 },
"machine_max_acceleration_x": { "value": 700 },
"machine_max_acceleration_y": { "value": 700 },
"machine_name": { "default_value": "ELEGOO NEPTUNE 3 Plus" },
"machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3 Plus\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" },
"machine_width": { "default_value": 330 }
}
}

38
resources/definitions/elegoo_neptune_3pro.def.json Normal file
View File

@ -0,0 +1,38 @@
{
"version": 2,
"name": "ELEGOO NEPTUNE 3 Pro",
"inherits": "elegoo_base",
"metadata":
{
"visible": true,
"author": "NARUTO",
"quality_definition": "elegoo_base"
},
"overrides":
{
"infill_overlap": { "value": "0 if infill_sparse_density < 40.01 and infill_pattern != 'concentric' else -5" },
"machine_depth": { "default_value": 235 },
"machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-8 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
"machine_head_with_fans_polygon":
{
"value": [
[-55, 30],
[55, 30],
[55, -35],
[-55, -35]
]
},
"machine_height": { "default_value": 280 },
"machine_name": { "default_value": "ELEGOO NEPTUNE 3 Pro" },
"machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE 3 Pro\nM220 S100 ;Set the feed speed to 100%\nM221 S100 ;Set the flow rate to 100%\nG90\nG28 ;home\n;M420 S1 Z10;Uncomment to enable progressive compensation height of 10mm\nG92 E0 ;Reset Extruder\nG1 Z0.45 F300\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E15 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600 E30 ;Draw the second line\nG92 E0 ;Reset Extruder" },
"machine_width": { "default_value": 235 },
"material_bed_temperature": { "value": "default_material_bed_temperature + 10" },
"retraction_amount": { "value": 1 },
"retraction_count_max": { "value": 80 },
"retraction_prime_speed": { "resolve": 25 },
"retraction_retract_speed": { "resolve": 25 },
"retraction_speed": { "resolve": 25 },
"speed_travel": { "value": "150 if speed_print < 100 else speed_print * 1.5" },
"speed_travel_layer_0": { "value": "100" }
}
}

30
resources/definitions/elegoo_neptune_x.def.json Normal file
View File

@ -0,0 +1,30 @@
{
"version": 2,
"name": "ELEGOO NEPTUNE X",
"inherits": "elegoo_base",
"metadata":
{
"visible": true,
"author": "NARUTO",
"quality_definition": "elegoo_base"
},
"overrides":
{
"machine_depth": { "default_value": 235 },
"machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-10 X5 Y5 Z3 F3000 ;Retract\nG90 ;Absolute positionning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z" },
"machine_head_with_fans_polygon":
{
"value": [
[-55, 20],
[55, 20],
[55, -25],
[-55, -25]
]
},
"machine_height": { "default_value": 310 },
"machine_name": { "default_value": "ELEGOO NEPTUNE X" },
"machine_start_gcode": { "default_value": ";ELEGOO NEPTUNE X\nG90\nG28 ;home\nG1 Z0.6 F3000 ;Move Z Axis up\nG92 E0 ;Reset Extruder\nG1 X1.5 Y20 F5000.0 ;Move to start position\nG1 Y120.0 F600.0 E20 ;Draw the first line\nG1 X0.5 F1000.0 ;Move to side a little\nG1 Y20 F600.0 E40 ;Draw the second line\nG92 E0 ;Reset Extruder" },
"machine_width": { "default_value": 235 },
"material_bed_temperature": { "value": "default_material_bed_temperature + 5" }
}
}

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

@ -5608,9 +5608,9 @@
{ {
"label": "Build Plate Adhesion Extruder", "label": "Build Plate Adhesion Extruder",
"description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the skirt/brim/raft. This is used in multi-extrusion.",
"type": "extruder", "type": "optional_extruder",
"default_value": "0", "default_value": "-1",
"value": "int(defaultExtruderPosition())", "value": "int(defaultExtruderPosition()) if resolveOrValue('adhesion_type') == 'raft' else -1",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))", "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') != 'none' or resolveOrValue('prime_tower_brim_enable'))",
"resolve": "max(extruderValues('adhesion_extruder_nr'))", "resolve": "max(extruderValues('adhesion_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5623,8 +5623,9 @@
"description": "The extruder train to use for printing the skirt or brim. This is used in multi-extrusion.", "description": "The extruder train to use for printing the skirt or brim. This is used in multi-extrusion.",
"type": "optional_extruder", "type": "optional_extruder",
"default_value": "-1", "default_value": "-1",
"enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') == 'skirt' or resolveOrValue('adhesion_type') == 'brim' or resolveOrValue('prime_tower_brim_enable'))", "value": "adhesion_extruder_nr",
"resolve": "'-1' if '-1' in extruderValues('skirt_brim_extruder_nr') else adhesion_extruder_nr", "enabled": "extruders_enabled_count > 1 and (resolveOrValue('adhesion_type') in ['skirt', 'brim'] or resolveOrValue('prime_tower_brim_enable'))",
"resolve": "max(extruderValues('skirt_brim_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
}, },
@ -5634,7 +5635,7 @@
"description": "The extruder train to use for printing the first layer of the raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the first layer of the raft. This is used in multi-extrusion.",
"type": "extruder", "type": "extruder",
"default_value": "0", "default_value": "0",
"value": "adhesion_extruder_nr", "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'", "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
"resolve": "max(extruderValues('raft_base_extruder_nr'))", "resolve": "max(extruderValues('raft_base_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5646,7 +5647,7 @@
"description": "The extruder train to use for printing the middle layer of the raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the middle layer of the raft. This is used in multi-extrusion.",
"type": "extruder", "type": "extruder",
"default_value": "0", "default_value": "0",
"value": "adhesion_extruder_nr", "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'", "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
"resolve": "max(extruderValues('raft_interface_extruder_nr'))", "resolve": "max(extruderValues('raft_interface_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5658,7 +5659,7 @@
"description": "The extruder train to use for printing the top layer(s) of the raft. This is used in multi-extrusion.", "description": "The extruder train to use for printing the top layer(s) of the raft. This is used in multi-extrusion.",
"type": "extruder", "type": "extruder",
"default_value": "0", "default_value": "0",
"value": "adhesion_extruder_nr", "value": "0 if adhesion_extruder_nr == -1 else adhesion_extruder_nr",
"enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'", "enabled": "extruders_enabled_count > 1 and resolveOrValue('adhesion_type') == 'raft'",
"resolve": "max(extruderValues('raft_surface_extruder_nr'))", "resolve": "max(extruderValues('raft_surface_extruder_nr'))",
"settable_per_mesh": false, "settable_per_mesh": false,

45
resources/definitions/flsun_v400.def.json Normal file
View File

@ -0,0 +1,45 @@
{
"version": 2,
"name": "Flsun V400",
"inherits": "fdmprinter",
"metadata":
{
"visible": true,
"author": "FLSUN, Guislain Cyril",
"manufacturer": "Flsun",
"file_formats": "text/x-gcode",
"platform": "flsun_v400.stl",
"has_machine_quality": true,
"has_materials": true,
"machine_extruder_trains": { "0": "flsun_v400_extruder_0" },
"platform_offset": [
0,
-40.6455,
-43.5
]
},
"overrides":
{
"gantry_height": { "value": "0" },
"infill_sparse_density": { "default_value": 15 },
"machine_center_is_zero": { "default_value": true },
"machine_depth": { "default_value": 300 },
"machine_end_gcode": { "default_value": "M107 T0\nM104 S0\nM104 S0 T1\nM140 S0\nG92 E0\nG91\nG1 E-1 F300\nG1 Z+0.5 F6000\nG28 \nG90 ;absolute positioning\n" },
"machine_head_with_fans_polygon":
{
"default_value": [
[0, 0],
[0, 0],
[0, 0],
[0, 0]
]
},
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 410 },
"machine_shape": { "default_value": "elliptic" },
"machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107 T0\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature} T0\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature} T0\nG28\nG1 F3000 Z1\nG1 X-150 Y0 Z0.4\nG92 E0\nG3 X0 Y-130 I150 Z0.3 E30 F2000\nG92 E0\n" },
"machine_width": { "default_value": 300 },
"material_diameter": { "default_value": 1.75 },
"z_seam_type": { "value": "'back'" }
}
}

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

@ -126,6 +126,7 @@
"wall_x_material_flow_layer_0": { "value": "0.95 * material_flow_layer_0" }, "wall_x_material_flow_layer_0": { "value": "0.95 * material_flow_layer_0" },
"xy_offset": { "value": "-layer_height * 0.1" }, "xy_offset": { "value": "-layer_height * 0.1" },
"xy_offset_layer_0": { "value": "-wall_line_width_0 / 5 + xy_offset" }, "xy_offset_layer_0": { "value": "-wall_line_width_0 / 5 + xy_offset" },
"z_seam_corner": { "value": "'z_seam_corner_none'" },
"zig_zaggify_support": { "value": true } "zig_zaggify_support": { "value": true }
} }
} }

16
resources/definitions/voron_trident_250.def.json Normal file
View File

@ -0,0 +1,16 @@
{
"version": 2,
"name": "Voron Trident 250",
"inherits": "voron_trident_base",
"metadata":
{
"visible": true,
"author": "RagingRoosevelt, hartk",
"platform": "voron_trident_250mm_bed_model.stl",
"quality_definition": "voron2_base"
},
"overrides":
{
"machine_name": { "default_value": "VORON Trident 250" }
}
}

18
resources/definitions/voron_trident_300.def.json Normal file
View File

@ -0,0 +1,18 @@
{
"version": 2,
"name": "Voron Trident 300",
"inherits": "voron_trident_base",
"metadata":
{
"visible": true,
"author": "RagingRoosevelt, hartk",
"platform": "voron_trident_300mm_bed_model.stl",
"quality_definition": "voron2_base"
},
"overrides":
{
"machine_depth": { "default_value": 300 },
"machine_name": { "default_value": "VORON Trident 300" },
"machine_width": { "default_value": 300 }
}
}

18
resources/definitions/voron_trident_350.def.json Normal file
View File

@ -0,0 +1,18 @@
{
"version": 2,
"name": "Voron Trident 350",
"inherits": "voron_trident_base",
"metadata":
{
"visible": true,
"author": "RagingRoosevelt, hartk",
"platform": "voron_trident_350mm_bed_model.stl",
"quality_definition": "voron2_base"
},
"overrides":
{
"machine_depth": { "default_value": 350 },
"machine_name": { "default_value": "VORON Trident 350" },
"machine_width": { "default_value": 350 }
}
}

19
resources/definitions/voron_trident_base.def.json Normal file
View File

@ -0,0 +1,19 @@
{
"version": 2,
"name": "Voron Trident Base",
"inherits": "voron2_base",
"metadata":
{
"visible": false,
"author": "RagingRoosevelt, hartk",
"platform": "voron_trident_250mm_bed_model.stl",
"quality_definition": "voron2_base"
},
"overrides":
{
"machine_depth": { "default_value": 250 },
"machine_height": { "default_value": 250 },
"machine_name": { "default_value": "VORON Trident" },
"machine_width": { "default_value": 250 }
}
}

15
resources/extruders/anycubic_kobra_go_extruder_0.def.json Normal file
View File

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

15
resources/extruders/elegoo_extruder_0.def.json Normal file
View File

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

15
resources/extruders/flsun_v400_extruder_0.def.json Normal file
View File

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

BIN
resources/meshes/elegoo_platform.3mf Normal file
View File

Binary file not shown.

BIN
resources/meshes/elegoo_platform_max.3mf Normal file
View File

Binary file not shown.

BIN
resources/meshes/flsun_v400.stl Normal file
View File

Binary file not shown.

BIN
resources/meshes/voron_trident_250mm_bed_model.stl Normal file
View File

Binary file not shown.

BIN
resources/meshes/voron_trident_300mm_bed_model.stl Normal file
View File

Binary file not shown.

BIN
resources/meshes/voron_trident_350mm_bed_model.stl Normal file
View File

Binary file not shown.

33
resources/quality/anycubic_kobra_go/anycubic_kobra_go_abs.inst.cfg Normal file
View File

@ -0,0 +1,33 @@
[general]
definition = anycubic_kobra_go
name = Normal
version = 4
[metadata]
global_quality = True
material = generic_abs
quality_type = abs
setting_version = 20
type = quality
weight = 0
[values]
acceleration_print = 1000.0
acceleration_travel = 3000.0
bottom_layers = 6
brim_width = 4.0
infill_pattern = lines
infill_sparse_density = 25
inset_direction = ='outside_in' if (True) else 'inside_out'
layer_height = 0.2
material_final_print_temperature = 230
material_initial_print_temperature = 230
material_print_temperature = 235.0
material_print_temperature_layer_0 = 235.0
optimize_wall_printing_order = True
speed_print = 50.0
top_layers = 6
z_seam_corner = z_seam_corner_inner
z_seam_type = sharpest_corner
z_seam_x = 111

30
resources/quality/anycubic_kobra_go/anycubic_kobra_go_pla.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = anycubic_kobra_go
name = Normal
version = 4
[metadata]
global_quality = True
material = generic_pla
quality_type = pla
setting_version = 20
type = quality
weight = -2
[values]
bottom_layers = 6
brim_width = 7.0
infill_pattern = lines
infill_sparse_density = 15
inset_direction = ='outside_in' if (True) else 'inside_out'
layer_height = 0.2
material_final_print_temperature = 185
material_initial_print_temperature = 185
material_print_temperature = 190
optimize_wall_printing_order = True
speed_print = 50.0
top_layers = 6
z_seam_corner = z_seam_corner_any
z_seam_type = sharpest_corner
z_seam_x = 111

35
resources/quality/anycubic_kobra_go/anycubic_kobra_go_tpu.inst.cfg Normal file
View File

@ -0,0 +1,35 @@
[general]
definition = anycubic_kobra_go
name = Normal
version = 4
[metadata]
global_quality = True
material = generic_tpu
quality_type = tpu
setting_version = 20
type = quality
weight = 1
[values]
acceleration_print = 1000.0
acceleration_travel = 3000.0
bottom_layers = 6
brim_width = 7.0
infill_pattern = lines
infill_sparse_density = 15
inset_direction = ='outside_in' if (False) else 'inside_out'
layer_height = 0.2
material_final_print_temperature = 190
material_initial_print_temperature = 190
material_print_temperature = 190
material_print_temperature_layer_0 = 190
optimize_wall_printing_order = True
retraction_amount = 8
retraction_speed = 40
speed_print = 50.0
top_layers = 6
z_seam_corner = z_seam_corner_inner
z_seam_type = sharpest_corner
z_seam_x = 111

30
resources/quality/elegoo/base/abs040/abs_040012.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = abs_040012
version = 4
[metadata]
material = generic_abs_175
quality_type = high
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 10
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.72
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/abs040/abs_040016.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = abs_040016
version = 4
[metadata]
material = generic_abs_175
quality_type = normal
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 10
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.64
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/abs040/abs_040020.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = abs_040020
version = 4
[metadata]
material = generic_abs_175
quality_type = fine
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 10
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.8
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/abs040/abs_040024.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = abs_040024
version = 4
[metadata]
material = generic_abs_175
quality_type = medium
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 10
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.75
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/abs040/abs_040028.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = abs_040028
version = 4
[metadata]
material = generic_abs_175
quality_type = draft
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.2
raft_margin = 10
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.84
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/asa040/asa_040012.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = asa_040012
version = 4
[metadata]
material = generic_asa_175
quality_type = high
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 15
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.72
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/asa040/asa_040016.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = asa_040016
version = 4
[metadata]
material = generic_asa_175
quality_type = normal
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 15
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.64
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/asa040/asa_040020.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = asa_040020
version = 4
[metadata]
material = generic_asa_175
quality_type = fine
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 15
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.8
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/asa040/asa_040024.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = asa_040024
version = 4
[metadata]
material = generic_asa_175
quality_type = medium
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.15
raft_margin = 15
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.75
wall_thickness = =line_width*2

30
resources/quality/elegoo/base/asa040/asa_040028.inst.cfg Normal file
View File

@ -0,0 +1,30 @@
[general]
definition = elegoo_base
name = asa_040028
version = 4
[metadata]
material = generic_asa_175
quality_type = draft
setting_version = 20
type = quality
[values]
brim_gap = 0
brim_width = 10
cool_fan_enabled = False
cool_fan_speed = 0
cool_fan_speed_0 = 0
default_material_bed_temperature = 80
default_material_print_temperature = 240
layer_0_z_overlap = =raft_airgap*0.8
material_shrinkage_percentage_xy = 100.3
raft_airgap = =0.2
raft_margin = 15
retraction_speed = 25
support_top_distance = =extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (0 if support_structure == 'tree' else 0)
support_xy_distance_overhang = =machine_nozzle_size*0.8
support_z_distance = =layer_height/2
top_bottom_thickness = 0.84
wall_thickness = =line_width*2

20
resources/quality/elegoo/base/elegoo_global_012_high.inst.cfg Normal file
View File

@ -0,0 +1,20 @@
[general]
definition = elegoo_base
name = High Quality
version = 4
[metadata]
global_quality = True
quality_type = high
setting_version = 20
type = quality
weight = -1
[values]
layer_height = 0.12
layer_height_0 = 0.2
material_print_temperature = =default_material_print_temperature
prime_tower_size = 40
speed_print = 70
top_bottom_thickness = 0.7

20
resources/quality/elegoo/base/elegoo_global_016_normal.inst.cfg Normal file
View File

@ -0,0 +1,20 @@
[general]
definition = elegoo_base
name = Normal Quality
version = 4
[metadata]
global_quality = True
quality_type = normal
setting_version = 20
type = quality
weight = -2
[values]
layer_height = 0.16
layer_height_0 = 0.25
material_print_temperature = =default_material_print_temperature
prime_tower_size = 35
speed_print = 60
top_bottom_thickness = 0.8

19
resources/quality/elegoo/base/elegoo_global_020_fine.inst.cfg Normal file
View File

@ -0,0 +1,19 @@
[general]
definition = elegoo_base
name = Fine Quality
version = 4
[metadata]
global_quality = True
quality_type = fine
setting_version = 20
type = quality
weight = -3
[values]
layer_height = 0.20
layer_height_0 = 0.25
material_print_temperature = =default_material_print_temperature
prime_tower_size = 31
top_bottom_thickness = 0.8

19
resources/quality/elegoo/base/elegoo_global_024_medium.inst.cfg Normal file
View File

@ -0,0 +1,19 @@
[general]
definition = elegoo_base
name = Medium Quality
version = 4
[metadata]
global_quality = True
quality_type = medium
setting_version = 20
type = quality
weight = -4
[values]
layer_height = 0.24
layer_height_0 = 0.25
material_print_temperature = =default_material_print_temperature
prime_tower_size = 28
top_bottom_thickness = 1.0

19
resources/quality/elegoo/base/elegoo_global_028_draft.inst.cfg Normal file
View File

@ -0,0 +1,19 @@
[general]
definition = elegoo_base
name = Draft Quality
version = 4
[metadata]
global_quality = True
quality_type = draft
setting_version = 20
type = quality
weight = -5
[values]
layer_height = 0.28
layer_height_0 = 0.30
material_print_temperature = =default_material_print_temperature + 5
prime_tower_size = 27
top_bottom_thickness = 1.0

25
resources/quality/elegoo/base/petg040/petg_040012.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = petg_040012
version = 4
[metadata]
material = generic_petg_175
quality_type = high
setting_version = 20
type = quality
[values]
brim_width = 6
cool_fan_speed_min = =cool_fan_speed*0.5
cool_min_layer_time = 10
cool_min_layer_time_fan_speed_max = 30
default_material_bed_temperature = 70
default_material_print_temperature = 235
layer_0_z_overlap = =raft_airgap*0.6
material_shrinkage_percentage_xy = 100.2
raft_airgap = =0.35
raft_margin = 10
retraction_speed = 25
speed_support = =speed_wall_x

25
resources/quality/elegoo/base/petg040/petg_040016.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = petg_040016
version = 4
[metadata]
material = generic_petg_175
quality_type = normal
setting_version = 20
type = quality
[values]
brim_width = 6
cool_fan_speed_min = =cool_fan_speed*0.5
cool_min_layer_time = 10
cool_min_layer_time_fan_speed_max = 30
default_material_bed_temperature = 70
default_material_print_temperature = 235
layer_0_z_overlap = =raft_airgap*0.6
material_shrinkage_percentage_xy = 100.2
raft_airgap = =0.35
raft_margin = 10
retraction_speed = 25
speed_support = =speed_wall_x

25
resources/quality/elegoo/base/petg040/petg_040020.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = petg_040020
version = 4
[metadata]
material = generic_petg_175
quality_type = fine
setting_version = 20
type = quality
[values]
brim_width = 6
cool_fan_speed_min = =cool_fan_speed*0.5
cool_min_layer_time = 10
cool_min_layer_time_fan_speed_max = 30
default_material_bed_temperature = 70
default_material_print_temperature = 235
layer_0_z_overlap = =raft_airgap*0.6
material_shrinkage_percentage_xy = 100.2
raft_airgap = =0.35
raft_margin = 10
retraction_speed = 25
speed_support = =speed_wall_x

25
resources/quality/elegoo/base/petg040/petg_040024.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = petg_040024
version = 4
[metadata]
material = generic_petg_175
quality_type = medium
setting_version = 20
type = quality
[values]
brim_width = 6
cool_fan_speed_min = =cool_fan_speed*0.5
cool_min_layer_time = 10
cool_min_layer_time_fan_speed_max = 30
default_material_bed_temperature = 70
default_material_print_temperature = 235
layer_0_z_overlap = =raft_airgap*0.6
material_shrinkage_percentage_xy = 100.2
raft_airgap = =0.35
raft_margin = 10
retraction_speed = 25
speed_support = =speed_wall_x

25
resources/quality/elegoo/base/petg040/petg_040028.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = petg_040028
version = 4
[metadata]
material = generic_petg_175
quality_type = draft
setting_version = 20
type = quality
[values]
brim_width = 6
cool_fan_speed_min = =cool_fan_speed*0.5
cool_min_layer_time = 10
cool_min_layer_time_fan_speed_max = 30
default_material_bed_temperature = 70
default_material_print_temperature = 235
layer_0_z_overlap = =raft_airgap*0.6
material_shrinkage_percentage_xy = 100.2
raft_airgap = =0.38
raft_margin = 10
retraction_speed = 25
speed_support = =speed_wall_x

18
resources/quality/elegoo/base/pla040/pla_040012.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
definition = elegoo_base
name = pla_040012
version = 4
[metadata]
material = generic_pla_175
quality_type = high
setting_version = 20
type = quality
[values]
brim_width = 3.5
default_material_bed_temperature = 50
layer_0_z_overlap = =raft_airgap*0.7
raft_airgap = =0.3
retraction_speed = 45

18
resources/quality/elegoo/base/pla040/pla_040016.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
definition = elegoo_base
name = pla_040016
version = 4
[metadata]
material = generic_pla_175
quality_type = normal
setting_version = 20
type = quality
[values]
brim_width = 3.5
default_material_bed_temperature = 50
layer_0_z_overlap = =raft_airgap*0.7
raft_airgap = =0.3
retraction_speed = 45

18
resources/quality/elegoo/base/pla040/pla_040020.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
definition = elegoo_base
name = pla_040020
version = 4
[metadata]
material = generic_pla_175
quality_type = fine
setting_version = 20
type = quality
[values]
brim_width = 3.5
default_material_bed_temperature = 50
layer_0_z_overlap = =raft_airgap*0.7
raft_airgap = =0.3
retraction_speed = 45

18
resources/quality/elegoo/base/pla040/pla_040024.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
definition = elegoo_base
name = pla_040024
version = 4
[metadata]
material = generic_pla_175
quality_type = medium
setting_version = 20
type = quality
[values]
brim_width = 3.5
default_material_bed_temperature = 50
layer_0_z_overlap = =raft_airgap*0.6
raft_airgap = =0.3
retraction_speed = 45

18
resources/quality/elegoo/base/pla040/pla_040028.inst.cfg Normal file
View File

@ -0,0 +1,18 @@
[general]
definition = elegoo_base
name = pla_040028
version = 4
[metadata]
material = generic_pla_175
quality_type = draft
setting_version = 20
type = quality
[values]
brim_width = 3.5
default_material_bed_temperature = 50
layer_0_z_overlap = =raft_airgap*0.6
raft_airgap = =0.35
retraction_speed = 45

25
resources/quality/elegoo/base/tpu040/tpu_040012.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = tpu_040012
version = 4
[metadata]
material = generic_tpu_175
quality_type = high
setting_version = 20
type = quality
[values]
brim_width = 5
cool_min_layer_time = 10
default_material_bed_temperature = 45
default_material_print_temperature = 230
retraction_speed = 25
speed_print = 50
speed_print_layer_0 = 15
speed_support = =speed_wall_x
speed_support_interface = =speed_wall_x
speed_topbottom = =speed_wall
speed_wall_x = =speed_wall
support_angle = 35

25
resources/quality/elegoo/base/tpu040/tpu_040016.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = tpu_040016
version = 4
[metadata]
material = generic_tpu_175
quality_type = normal
setting_version = 20
type = quality
[values]
brim_width = 5
cool_min_layer_time = 10
default_material_bed_temperature = 45
default_material_print_temperature = 230
retraction_speed = 25
speed_print = 50
speed_print_layer_0 = 15
speed_support = =speed_wall_x
speed_support_interface = =speed_wall_x
speed_topbottom = =speed_wall
speed_wall_x = =speed_wall
support_angle = 35

25
resources/quality/elegoo/base/tpu040/tpu_040020.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = tpu_040020
version = 4
[metadata]
material = generic_tpu_175
quality_type = fine
setting_version = 20
type = quality
[values]
brim_width = 5
cool_min_layer_time = 10
default_material_bed_temperature = 45
default_material_print_temperature = 230
retraction_speed = 25
speed_print = 50
speed_print_layer_0 = 15
speed_support = =speed_wall_x
speed_support_interface = =speed_wall_x
speed_topbottom = =speed_wall
speed_wall_x = =speed_wall
support_angle = 35

25
resources/quality/elegoo/base/tpu040/tpu_040024.inst.cfg Normal file
View File

@ -0,0 +1,25 @@
[general]
definition = elegoo_base
name = tpu_040024
version = 4
[metadata]
material = generic_tpu_175
quality_type = medium
setting_version = 20
type = quality
[values]
brim_width = 5
cool_min_layer_time = 10
default_material_bed_temperature = 45
default_material_print_temperature = 230
retraction_speed = 25
speed_print = 50
speed_print_layer_0 = 15
speed_support = =speed_wall_x
speed_support_interface = =speed_wall_x
speed_topbottom = =speed_wall
speed_wall_x = =speed_wall
support_angle = 35

126
resources/quality/flsun_v400/flsun_v400_normal.inst.cfg Normal file
View File

@ -0,0 +1,126 @@
[general]
definition = flsun_v400
name = Normal
version = 4
[metadata]
global_quality = True
quality_type = normal
setting_version = 20
type = quality
weight = -2
[values]
acceleration_enabled = True
acceleration_print = 8000.0
acceleration_topbottom = 6000.0
acceleration_travel = 8000.0
acceleration_wall = 5000.0
adhesion_type = brim
bridge_enable_more_layers = False
bridge_settings_enabled = True
bridge_skin_material_flow = 60
bridge_skin_speed = 60
bridge_skin_support_threshold = 50
bridge_wall_material_flow = 100.0
bridge_wall_speed = 60
brim_width = 6.6
cool_fan_full_at_height = 0.6
cool_fan_speed = 100
cool_lift_head = False
cool_min_layer_time = 5
expand_skins_expand_distance = 0.8
fill_outline_gaps = False
infill_before_walls = False
infill_enable_travel_optimization = False
infill_pattern = grid
infill_sparse_density = 10.0
infill_support_angle = 50
inset_direction = inside_out
ironing_enabled = False
ironing_only_highest_layer = True
jerk_enabled = True
jerk_infill = 100.0
jerk_layer_0 = 10.0
jerk_print = 10.0
jerk_roofing = 10.0
jerk_support_interface = 10.0
jerk_topbottom = 10.0
jerk_travel = 100.0
jerk_wall = 10.0
jerk_wall_0 = 5.0
layer_height = 0.2
layer_height_0 = 0.3
line_width = 0.44
material_bed_temperature = 60
material_bed_temperature_layer_0 = 60
material_final_print_temperature = 210
material_flow_dependent_temperature = False
material_initial_print_temperature = 210
material_print_temperature = 210
material_print_temperature_layer_0 = 210
max_skin_angle_for_expansion = 90
minimum_interface_area = 2.0
minimum_support_area = 2.0
optimize_wall_printing_order = True
raft_speed = 75.0
retract_at_layer_change = False
retraction_amount = 0.6
retraction_combing = noskin
retraction_combing_max_distance = 10
retraction_hop = 0.3
retraction_hop_enabled = True
retraction_hop_only_when_collides = False
retraction_speed = 40
roofing_layer_count = 1
skin_monotonic = True
skin_no_small_gaps_heuristic = False
skin_overlap = 10
skin_preshrink = 0.8
skirt_line_count = 2
small_feature_speed_factor = 60.0
small_hole_max_size = 5.0
speed_infill = 350.0
speed_layer_0 = 25
speed_print = 400.0
speed_roofing = 120.0
speed_support = 350
speed_support_interface = 100
speed_topbottom = 120.0
speed_travel = 400.0
speed_travel_layer_0 = 50.0
speed_wall = 120.0
speed_wall_x = 280.0
speed_z_hop = 50.0
support_angle = 65
support_brim_enable = True
support_brim_width = 8.8
support_enable = False
support_infill_rate = 10
support_interface_density = 70
support_interface_enable = True
support_interface_height = 0.6
support_interface_pattern = lines
support_interface_skip_height = 0.2
support_pattern = zigzag
support_roof_density = 70
support_type = everywhere
support_use_towers = False
support_wall_count = 1
support_xy_distance = 0.5
support_xy_overrides_z = xy_overrides_z
support_z_distance = 0.2
top_bottom_thickness = 0.6
top_layers = =0 if infill_sparse_density == 100 else math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))
top_thickness = 1
travel_avoid_other_parts = True
travel_avoid_supports = True
travel_retract_before_outer_wall = False
wall_overhang_angle = 35.0
wall_overhang_speed_factor = 60.0
wall_thickness = =line_width*2
z_seam_corner = z_seam_corner_inner
z_seam_position = backright
z_seam_type = sharpest_corner
zig_zaggify_infill = True

13
resources/variants/voron/voron_trident_250_0.40.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_250
name = V6 0.40mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.4

13
resources/variants/voron/voron_trident_250_0.60.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_250
name = V6 0.60mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.6

13
resources/variants/voron/voron_trident_250_0.80.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_250
name = V6 0.80mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.8

13
resources/variants/voron/voron_trident_300_0.40.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_300
name = V6 0.40mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.4

13
resources/variants/voron/voron_trident_300_0.60.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_300
name = V6 0.60mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.6

13
resources/variants/voron/voron_trident_300_0.80.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_300
name = V6 0.80mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.8

13
resources/variants/voron/voron_trident_350_0.40.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_350
name = V6 0.40mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.4

13
resources/variants/voron/voron_trident_350_0.60.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_350
name = V6 0.60mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.6

13
resources/variants/voron/voron_trident_350_0.80.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = voron_trident_350
name = V6 0.80mm
version = 4
[metadata]
hardware_type = nozzle
setting_version = 20
type = variant
[values]
machine_nozzle_size = 0.8