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

Merge branch 'main' into CURA-10475_engineplugin

Browse Source
This commit is contained in:
Jelle Spijker 2023-08-01 15:58:02 +02:00
commit 730dec8d86
No known key found for this signature in database
GPG Key ID: 034D1C0527888B65
36 changed files with 1700 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -101,3 +101,4 @@ graph_info.json
Ultimaker-Cura.spec Ultimaker-Cura.spec
.run/ .run/
/printer-linter/src/printerlinter.egg-info/ /printer-linter/src/printerlinter.egg-info/
/resources/qml/Dialogs/AboutDialogVersionsList.qml

61
AboutDialogVersionsList.qml.jinja Normal file
View File

@ -0,0 +1,61 @@
import QtQuick 2.2
import QtQuick.Controls 2.9
import UM 1.6 as UM
import Cura 1.5 as Cura
ListView
{
id: projectBuildInfoList
visible: false
anchors.top: creditsNotes.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
width: parent.width
height: base.height - y - (2 * UM.Theme.getSize("default_margin").height + closeButton.height)
ScrollBar.vertical: UM.ScrollBar
{
id: projectBuildInfoListScrollBar
}
delegate: Row
{
spacing: UM.Theme.getSize("narrow_margin").width
UM.Label
{
text: (model.name)
width: (projectBuildInfoList.width* 0.4) | 0
elide: Text.ElideRight
}
UM.Label
{
text: (model.version)
width: (projectBuildInfoList.width *0.6) | 0
elide: Text.ElideRight
}
}
model: ListModel
{
id: developerInfo
}
Component.onCompleted:
{
var conan_installs = {{ conan_installs }};
var python_installs = {{ python_installs }};
developerInfo.append({ name : "<H1>Conan Installs</H1>", version : '' });
for (var n in conan_installs)
{
developerInfo.append({ name : conan_installs[n][0], version : conan_installs[n][1] });
}
developerInfo.append({ name : '', version : '' });
developerInfo.append({ name : "<H1>Python Installs</H1>", version : '' });
for (var n in python_installs)
{
developerInfo.append({ name : python_installs[n][0], version : python_installs[n][1] });
}
}
}

26
conanfile.py
View File

@ -21,7 +21,7 @@ class CuraConan(ConanFile):
description = "3D printer / slicing GUI built on top of the Uranium framework" description = "3D printer / slicing GUI built on top of the Uranium framework"
topics = ("conan", "python", "pyqt6", "qt", "qml", "3d-printing", "slicer") topics = ("conan", "python", "pyqt6", "qt", "qml", "3d-printing", "slicer")
build_policy = "missing" build_policy = "missing"
exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja" exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja", "AboutDialogVersionsList.qml.jinja"
settings = "os", "compiler", "build_type", "arch" settings = "os", "compiler", "build_type", "arch"
# FIXME: Remove specific branch once merged to main # FIXME: Remove specific branch once merged to main
@ -138,6 +138,29 @@ class CuraConan(ConanFile):
return "'x86_64'" return "'x86_64'"
return "None" return "None"
def _generate_about_versions(self, location):
with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f:
cura_version_py = Template(f.read())
conan_installs = []
python_installs = []
# list of conan installs
for _, dependency in self.dependencies.host.items():
conan_installs.append([dependency.ref.name,dependency.ref.version])
#list of python installs
import pkg_resources
for package in pkg_resources.working_set:
python_installs.append([package.key, package.version])
with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f:
f.write(cura_version_py.render(
conan_installs = conan_installs,
python_installs = python_installs
))
def _generate_cura_version(self, location): def _generate_cura_version(self, location):
with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f:
cura_version_py = Template(f.read()) cura_version_py = Template(f.read())
@ -309,6 +332,7 @@ class CuraConan(ConanFile):
vr.generate() vr.generate()
self._generate_cura_version(os.path.join(self.source_folder, "cura")) self._generate_cura_version(os.path.join(self.source_folder, "cura"))
self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs"))
if self.options.devtools: if self.options.devtools:
entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements")) entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements"))

19
cura/Machines/Models/IntentSelectionModel.py
View File

@ -71,15 +71,15 @@ class IntentSelectionModel(ListModel):
def _update(self) -> None: def _update(self) -> None:
Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__))
cura_application = cura.CuraApplication.CuraApplication.getInstance()
global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() global_stack = cura_application.getGlobalContainerStack()
if global_stack is None: if global_stack is None:
self.setItems([]) self.setItems([])
Logger.log("d", "No active GlobalStack, set quality profile model as empty.") Logger.log("d", "No active GlobalStack, set quality profile model as empty.")
return return
# Check for material compatibility # Check for material compatibility
if not cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible(): if not cura_application.getMachineManager().activeMaterialsCompatible():
Logger.log("d", "No active material compatibility, set quality profile model as empty.") Logger.log("d", "No active material compatibility, set quality profile model as empty.")
self.setItems([]) self.setItems([])
return return
@ -101,17 +101,18 @@ class IntentSelectionModel(ListModel):
else: else:
# There can be multiple intents with the same category, use one of these # There can be multiple intents with the same category, use one of these
# intent-metadata's for the icon/description defintions for the intent # intent-metadata's for the icon/description defintions for the intent
intent_metadata = cura.CuraApplication.CuraApplication \
.getInstance() \
.getContainerRegistry() \
.findContainersMetadata(type="intent", definition=global_stack.definition.getId(), intent_metadata = cura_application.getContainerRegistry().findContainersMetadata(type="intent",
intent_category=category)[0] definition=global_stack.findInstanceContainerDefinitionId(global_stack.definition),
intent_category=category)[0]
intent_name = intent_metadata.get("name", category.title()) intent_name = intent_metadata.get("name", category.title())
icon = intent_metadata.get("icon", None) icon = intent_metadata.get("icon", None)
description = intent_metadata.get("description", None) description = intent_metadata.get("description", None)
if icon is not None: if icon is not None and icon != '':
try: try:
icon = QUrl.fromLocalFile( icon = QUrl.fromLocalFile(
Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.ImageFiles, icon)) Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.ImageFiles, icon))

4
cura/Settings/CuraContainerStack.py
View File

@ -359,7 +359,7 @@ class CuraContainerStack(ContainerStack):
return self.definition return self.definition
@classmethod @classmethod
def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str: def findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str:
"""Find the ID that should be used when searching for instance containers for a specified definition. """Find the ID that should be used when searching for instance containers for a specified definition.
This handles the situation where the definition specifies we should use a different definition when This handles the situation where the definition specifies we should use a different definition when
@ -379,7 +379,7 @@ class CuraContainerStack(ContainerStack):
Logger.log("w", "Unable to find parent definition {parent} for machine {machine}", parent = quality_definition, machine = machine_definition.id) #type: ignore Logger.log("w", "Unable to find parent definition {parent} for machine {machine}", parent = quality_definition, machine = machine_definition.id) #type: ignore
return machine_definition.id #type: ignore return machine_definition.id #type: ignore
return cls._findInstanceContainerDefinitionId(definitions[0]) return cls.findInstanceContainerDefinitionId(definitions[0])
def getExtruderPositionValueWithDefault(self, key): def getExtruderPositionValueWithDefault(self, key):
"""getProperty for extruder positions, with translation from -1 to default extruder number""" """getProperty for extruder positions, with translation from -1 to default extruder number"""

45
resources/definitions/anycubic_kossel.def.json
View File

@ -18,51 +18,6 @@
{ {
"machine_center_is_zero": { "default_value": true }, "machine_center_is_zero": { "default_value": true },
"machine_depth": { "default_value": 180 }, "machine_depth": { "default_value": 180 },
"machine_disallowed_areas":
{
"default_value": [
[
[-50, -85],
[-85, -85],
[-90, -90]
],
[
[-85, -85],
[-85, -50],
[-90, -90]
],
[
[50, -85],
[85, -85],
[90, -90]
],
[
[85, -85],
[85, -50],
[90, -90]
],
[
[-50, 85],
[-85, 85],
[-90, 90]
],
[
[-85, 85],
[-85, 50],
[-90, 90]
],
[
[50, 85],
[85, 85],
[90, 90]
],
[
[85, 85],
[85, 50],
[90, 90]
]
]
},
"machine_end_gcode": { "default_value": "M400 ;Free buffer\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nM107 ;fan off\nM84 ;steppers off\nG28 ;move to endstop\nM84 ;steppers off" }, "machine_end_gcode": { "default_value": "M400 ;Free buffer\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nM107 ;fan off\nM84 ;steppers off\nG28 ;move to endstop\nM84 ;steppers off" },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },

45
resources/definitions/anycubic_kossel_linear_plus.def.json
View File

@ -16,51 +16,6 @@
"overrides": "overrides":
{ {
"machine_depth": { "default_value": 240 }, "machine_depth": { "default_value": 240 },
"machine_disallowed_areas":
{
"default_value": [
[
[-50, -115],
[-115, -115],
[-90, -90]
],
[
[-115, -115],
[-115, -50],
[-90, -90]
],
[
[50, -115],
[115, -115],
[90, -90]
],
[
[115, -115],
[115, -50],
[90, -90]
],
[
[-50, 115],
[-115, 115],
[-90, 90]
],
[
[-115, 115],
[-115, 50],
[-90, 90]
],
[
[50, 115],
[115, 115],
[90, 90]
],
[
[115, 115],
[115, 50],
[90, 90]
]
]
},
"machine_name": { "default_value": "Anycubic Kossel Linear Plus" }, "machine_name": { "default_value": "Anycubic Kossel Linear Plus" },
"machine_width": { "default_value": 240 } "machine_width": { "default_value": 240 }
} }

2
resources/definitions/creality_ender3pro.def.json
View File

@ -23,7 +23,7 @@
}, },
"machine_height": { "default_value": 250 }, "machine_height": { "default_value": 250 },
"machine_name": { "default_value": "Creality Ender-3 Pro" }, "machine_name": { "default_value": "Creality Ender-3 Pro" },
"machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z5.0 F3000 ; Move Z Axis up a bit during heating to not damage bed\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" },
"machine_width": { "default_value": 220 } "machine_width": { "default_value": 220 }
} }
} }

2
resources/definitions/creality_ender3s1.def.json
View File

@ -24,7 +24,7 @@
}, },
"machine_height": { "default_value": 270 }, "machine_height": { "default_value": 270 },
"machine_name": { "default_value": "Creality Ender-3 S1" }, "machine_name": { "default_value": "Creality Ender-3 S1" },
"machine_start_gcode": { "default_value": "; Ender 3 S1 Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_start_gcode": { "default_value": "; Ender 3 S1 Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" },
"machine_width": { "default_value": 220 }, "machine_width": { "default_value": 220 },
"retraction_amount": { "value": 0.8 }, "retraction_amount": { "value": 0.8 },
"retraction_extrusion_window": { "value": 1.5 }, "retraction_extrusion_window": { "value": 1.5 },

2
resources/definitions/creality_ender3s1plus.def.json
View File

@ -24,7 +24,7 @@
}, },
"machine_height": { "default_value": 300 }, "machine_height": { "default_value": 300 },
"machine_name": { "default_value": "Creality Ender-3 S1 Plus" }, "machine_name": { "default_value": "Creality Ender-3 S1 Plus" },
"machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" },
"machine_width": { "default_value": 300 }, "machine_width": { "default_value": 300 },
"retraction_amount": { "value": 0.8 }, "retraction_amount": { "value": 0.8 },
"retraction_extrusion_window": { "value": 1.5 }, "retraction_extrusion_window": { "value": 1.5 },

2
resources/definitions/creality_ender3s1pro.def.json
View File

@ -24,7 +24,7 @@
}, },
"machine_height": { "default_value": 270 }, "machine_height": { "default_value": 270 },
"machine_name": { "default_value": "Creality Ender-3 S1 Pro" }, "machine_name": { "default_value": "Creality Ender-3 S1 Pro" },
"machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.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 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" },
"machine_width": { "default_value": 220 }, "machine_width": { "default_value": 220 },
"retraction_amount": { "value": 0.8 }, "retraction_amount": { "value": 0.8 },
"retraction_extrusion_window": { "value": 1.5 }, "retraction_extrusion_window": { "value": 1.5 },

37
resources/definitions/creality_ender5s1.def.json Normal file
View File

@ -0,0 +1,37 @@
{
"version": 2,
"name": "Creality Ender-5 S1",
"inherits": "creality_base",
"metadata":
{
"visible": true,
"quality_definition": "creality_base"
},
"overrides":
{
"build_volume_temperature": { "value": 195 },
"cool_min_layer_time": { "value": 5 },
"gantry_height": { "value": 25 },
"machine_depth": { "default_value": 225 },
"machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
"machine_head_with_fans_polygon":
{
"default_value": [
[-26, 34],
[-26, -32],
[32, -32],
[32, 34]
]
},
"machine_height": { "default_value": 305 },
"machine_name": { "default_value": "Creality Ender-5 S1" },
"machine_width": { "default_value": 225 },
"material_bed_temperature": { "value": 60 },
"retraction_amount": { "value": 2 },
"retraction_speed": { "value": 45 },
"speed_print": { "value": 80.0 },
"support_z_distance": { "value": 0.25 },
"wall_thickness": { "value": "line_width * 3" },
"z_seam_type": { "value": "'sharpest_corner'" }
}
}

200
resources/definitions/entina_tina2.def.json Normal file
View File

@ -0,0 +1,200 @@
{
"version": 2,
"name": "ENTINA TINA2",
"inherits": "weedo_base",
"metadata":
{
"visible": true,
"author": "ENTINA",
"manufacturer": "ENTINA",
"file_formats": "text/x-gcode",
"exclude_materials": [
"3D-Fuel_PLA_PRO_Black",
"3D-Fuel_PLA_SnapSupport",
"bestfilament_abs_skyblue",
"bestfilament_petg_orange",
"bestfilament_pla_green",
"leapfrog_abs_natural",
"leapfrog_epla_natural",
"leapfrog_pva_natural",
"generic_abs_175",
"generic_asa_175",
"generic_bvoh_175",
"generic_cpe_175",
"generic_hips_175",
"generic_nylon_175",
"generic_pc_175",
"generic_petg_175",
"generic_pva_175",
"goofoo_abs",
"goofoo_asa",
"goofoo_bronze_pla",
"goofoo_emarble_pla",
"goofoo_esilk_pla",
"goofoo_hips",
"goofoo_pa_cf",
"goofoo_pa",
"goofoo_pc",
"goofoo_peek",
"goofoo_petg",
"goofoo_pla",
"goofoo_pva",
"goofoo_tpe_83a",
"goofoo_tpu_87a",
"goofoo_tpu_95a",
"goofoo_wood_pla",
"emotiontech_abs",
"emotiontech_absx",
"emotiontech_acetate",
"emotiontech_asax",
"emotiontech_bvoh",
"emotiontech_copa",
"emotiontech_hips",
"emotiontech_nylon_1030",
"emotiontech_nylon_1030cf",
"emotiontech_nylon_1070",
"emotiontech_pc",
"emotiontech_pekk",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pla_hr_870",
"emotiontech_pva-m",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"eryone_petg",
"eryone_pla_glow",
"eryone_pla_matte",
"eryone_pla_wood",
"eryone_pla",
"eryone_tpu",
"eSUN_PETG_Black",
"eSUN_PETG_Grey",
"eSUN_PETG_Purple",
"eSUN_PLA_PRO_Black",
"eSUN_PLA_PRO_Grey",
"eSUN_PLA_PRO_Purple",
"eSUN_PLA_PRO_White",
"Extrudr_GreenTECPro_Anthracite_175",
"Extrudr_GreenTECPro_Black_175",
"Extrudr_GreenTECPro_Blue_175",
"Extrudr_GreenTECPro_Nature_175",
"Extrudr_GreenTECPro_Red_175",
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fdplast_abs_tomato",
"fdplast_petg_gray",
"fdplast_pla_olive",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"layer_one_black_pla",
"layer_one_dark_gray_pla",
"layer_one_white_pla",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_abs",
"redd_asa",
"redd_hips",
"redd_nylon",
"redd_petg",
"redd_pla",
"redd_tpe",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla_bois",
"tizyx_pla",
"tizyx_pva",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"volumic_abs_ultra",
"volumic_arma_ultra",
"volumic_asa_ultra",
"volumic_br80_ultra",
"volumic_bumper_ultra",
"volumic_cu80_ultra",
"volumic_flex93_ultra",
"volumic_medical_ultra",
"volumic_nylon_ultra",
"volumic_pekk_carbone",
"volumic_petg_ultra",
"volumic_petgcarbone_ultra",
"volumic_pla_ultra",
"volumic_pp_ultra",
"volumic_strong_ultra",
"volumic_support_ultra",
"xyzprinting_abs",
"xyzprinting_antibact_pla",
"xyzprinting_carbon_fiber",
"xyzprinting_colorinkjet_pla",
"xyzprinting_flexible",
"xyzprinting_metallic_pla",
"xyzprinting_nylon",
"xyzprinting_petg",
"xyzprinting_pla",
"xyzprinting_tough_pla",
"xyzprinting_tpu",
"zyyx_pro_flex",
"zyyx_pro_pla"
],
"platform_offset": [
0,
0,
0
]
},
"overrides":
{
"infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" },
"machine_depth": { "default_value": 120 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
"machine_heated_bed": { "default_value": false },
"machine_height": { "default_value": 100 },
"machine_name": { "default_value": "ENTINA TINA2" },
"machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
"machine_width": { "default_value": 100 },
"raft_base_thickness": { "value": 0.35 },
"speed_infill": { "value": 40.0 },
"speed_print": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "value": 30.0 },
"speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 },
"speed_travel": { "value": 65.0 },
"speed_travel_layer_0": { "value": 60 },
"speed_wall": { "value": 25.0 },
"speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 }
}
}

201
resources/definitions/entina_tina2s.def.json Normal file
View File

@ -0,0 +1,201 @@
{
"version": 2,
"name": "ENTINA TINA2S",
"inherits": "weedo_base",
"metadata":
{
"visible": true,
"author": "ENTINA",
"manufacturer": "ENTINA",
"file_formats": "text/x-gcode",
"exclude_materials": [
"3D-Fuel_PLA_PRO_Black",
"3D-Fuel_PLA_SnapSupport",
"bestfilament_abs_skyblue",
"bestfilament_petg_orange",
"bestfilament_pla_green",
"leapfrog_abs_natural",
"leapfrog_epla_natural",
"leapfrog_pva_natural",
"generic_abs_175",
"generic_asa_175",
"generic_cpe_175",
"generic_nylon_175",
"generic_pc_175",
"generic_petg_175",
"generic_pva_175",
"goofoo_abs",
"goofoo_asa",
"goofoo_bronze_pla",
"goofoo_emarble_pla",
"goofoo_esilk_pla",
"goofoo_hips",
"goofoo_pa_cf",
"goofoo_pa",
"goofoo_pc",
"goofoo_peek",
"goofoo_petg",
"goofoo_pla",
"goofoo_pva",
"goofoo_tpe_83a",
"goofoo_tpu_87a",
"goofoo_tpu_95a",
"goofoo_wood_pla",
"emotiontech_abs",
"emotiontech_absx",
"emotiontech_acetate",
"emotiontech_asax",
"emotiontech_bvoh",
"emotiontech_copa",
"emotiontech_hips",
"emotiontech_nylon_1030",
"emotiontech_nylon_1030cf",
"emotiontech_nylon_1070",
"emotiontech_pc",
"emotiontech_pekk",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pla_hr_870",
"emotiontech_pva-m",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"eryone_petg",
"eryone_pla_glow",
"eryone_pla_matte",
"eryone_pla_wood",
"eryone_pla",
"eryone_tpu",
"eSUN_PETG_Black",
"eSUN_PETG_Grey",
"eSUN_PETG_Purple",
"eSUN_PLA_PRO_Black",
"eSUN_PLA_PRO_Grey",
"eSUN_PLA_PRO_Purple",
"eSUN_PLA_PRO_White",
"Extrudr_GreenTECPro_Anthracite_175",
"Extrudr_GreenTECPro_Black_175",
"Extrudr_GreenTECPro_Blue_175",
"Extrudr_GreenTECPro_Nature_175",
"Extrudr_GreenTECPro_Red_175",
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fdplast_abs_tomato",
"fdplast_petg_gray",
"fdplast_pla_olive",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"layer_one_black_pla",
"layer_one_dark_gray_pla",
"layer_one_white_pla",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_abs",
"redd_asa",
"redd_hips",
"redd_nylon",
"redd_petg",
"redd_pla",
"redd_tpe",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla_bois",
"tizyx_pla",
"tizyx_pva",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"volumic_abs_ultra",
"volumic_arma_ultra",
"volumic_asa_ultra",
"volumic_br80_ultra",
"volumic_bumper_ultra",
"volumic_cu80_ultra",
"volumic_flex93_ultra",
"volumic_medical_ultra",
"volumic_nylon_ultra",
"volumic_pekk_carbone",
"volumic_petg_ultra",
"volumic_petgcarbone_ultra",
"volumic_pla_ultra",
"volumic_pp_ultra",
"volumic_strong_ultra",
"volumic_support_ultra",
"xyzprinting_abs",
"xyzprinting_antibact_pla",
"xyzprinting_carbon_fiber",
"xyzprinting_colorinkjet_pla",
"xyzprinting_flexible",
"xyzprinting_metallic_pla",
"xyzprinting_nylon",
"xyzprinting_petg",
"xyzprinting_pla",
"xyzprinting_tough_pla",
"xyzprinting_tpu",
"zyyx_pro_flex",
"zyyx_pro_pla"
],
"platform_offset": [
0,
0,
0
]
},
"overrides":
{
"machine_depth": { "default_value": 110 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
"machine_height": { "default_value": 100 },
"machine_name": { "default_value": "ENTINA TINA2S" },
"machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
"machine_width": { "default_value": 100 },
"material_bed_temperature":
{
"maximum_value": "65",
"maximum_value_warning": "60"
},
"raft_base_thickness": { "value": 0.35 },
"speed_infill": { "value": 40.0 },
"speed_print": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "value": 30.0 },
"speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 },
"speed_travel": { "value": 65.0 },
"speed_travel_layer_0": { "value": 60 },
"speed_wall": { "value": 25.0 },
"speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 }
}
}

5
resources/definitions/kingroon_kp3s_pro.def.json
View File

@ -6,7 +6,8 @@
{ {
"visible": true, "visible": true,
"platform": "kingroon_kp3s.stl", "platform": "kingroon_kp3s.stl",
"quality_definition": "kingroon_base" "quality_definition": "kingroon_base",
"author": "willuhmjs"
}, },
"overrides": "overrides":
{ {
@ -33,4 +34,4 @@
"retraction_speed": { "value": 40 }, "retraction_speed": { "value": 40 },
"speed_z_hop": { "value": 4 } "speed_z_hop": { "value": 4 }
} }
} }

271
resources/definitions/weedo_base.def.json
View File

@ -9,19 +9,154 @@
"manufacturer": "WEEDO", "manufacturer": "WEEDO",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"exclude_materials": [ "exclude_materials": [
"Extrudr_GreenTECPro_Anthracite", "3D-Fuel_PLA_PRO_Black",
"Extrudr_GreenTECPro_Black", "3D-Fuel_PLA_SnapSupport",
"Extrudr_GreenTECPro_Blue", "bestfilament_abs_skyblue",
"Extrudr_GreenTECPro_Nature", "bestfilament_petg_orange",
"Extrudr_GreenTECPro_Red", "bestfilament_pla_green",
"Extrudr_GreenTECPro_Silver", "leapfrog_abs_natural",
"Extrudr_GreenTECPro_White", "leapfrog_epla_natural",
"verbatim_bvoh", "leapfrog_pva_natural",
"dsm_arnitel2045", "generic_pc_175",
"dsm_novamid1070", "goofoo_abs",
"imade3d_petg", "goofoo_asa",
"imade3d_pla", "goofoo_bronze_pla",
"innofill_innoflex60" "goofoo_emarble_pla",
"goofoo_esilk_pla",
"goofoo_hips",
"goofoo_pa_cf",
"goofoo_pa",
"goofoo_pc",
"goofoo_peek",
"goofoo_petg",
"goofoo_pla",
"goofoo_pva",
"goofoo_tpe_83a",
"goofoo_tpu_87a",
"goofoo_tpu_95a",
"goofoo_wood_pla",
"emotiontech_abs",
"emotiontech_absx",
"emotiontech_acetate",
"emotiontech_asax",
"emotiontech_bvoh",
"emotiontech_copa",
"emotiontech_hips",
"emotiontech_nylon_1030",
"emotiontech_nylon_1030cf",
"emotiontech_nylon_1070",
"emotiontech_pc",
"emotiontech_pekk",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pla_hr_870",
"emotiontech_pva-m",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"eryone_petg",
"eryone_pla_glow",
"eryone_pla_matte",
"eryone_pla_wood",
"eryone_pla",
"eryone_tpu",
"eSUN_PETG_Black",
"eSUN_PETG_Grey",
"eSUN_PETG_Purple",
"eSUN_PLA_PRO_Black",
"eSUN_PLA_PRO_Grey",
"eSUN_PLA_PRO_Purple",
"eSUN_PLA_PRO_White",
"Extrudr_GreenTECPro_Anthracite_175",
"Extrudr_GreenTECPro_Black_175",
"Extrudr_GreenTECPro_Blue_175",
"Extrudr_GreenTECPro_Nature_175",
"Extrudr_GreenTECPro_Red_175",
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fdplast_abs_tomato",
"fdplast_petg_gray",
"fdplast_pla_olive",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"layer_one_black_pla",
"layer_one_dark_gray_pla",
"layer_one_white_pla",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_abs",
"redd_asa",
"redd_hips",
"redd_nylon",
"redd_petg",
"redd_pla",
"redd_tpe",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla_bois",
"tizyx_pla",
"tizyx_pva",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"volumic_abs_ultra",
"volumic_arma_ultra",
"volumic_asa_ultra",
"volumic_br80_ultra",
"volumic_bumper_ultra",
"volumic_cu80_ultra",
"volumic_flex93_ultra",
"volumic_medical_ultra",
"volumic_nylon_ultra",
"volumic_pekk_carbone",
"volumic_petg_ultra",
"volumic_petgcarbone_ultra",
"volumic_pla_ultra",
"volumic_pp_ultra",
"volumic_strong_ultra",
"volumic_support_ultra",
"xyzprinting_abs",
"xyzprinting_antibact_pla",
"xyzprinting_carbon_fiber",
"xyzprinting_colorinkjet_pla",
"xyzprinting_flexible",
"xyzprinting_metallic_pla",
"xyzprinting_nylon",
"xyzprinting_petg",
"xyzprinting_pla",
"xyzprinting_tough_pla",
"xyzprinting_tpu",
"zyyx_pro_flex",
"zyyx_pro_pla"
], ],
"has_machine_quality": false, "has_machine_quality": false,
"has_materials": true, "has_materials": true,
@ -33,63 +168,91 @@
"overrides": "overrides":
{ {
"adhesion_type": { "default_value": "raft" }, "adhesion_type": { "default_value": "raft" },
"default_material_bed_temperature": { "default_value": 35 }, "draft_shield_dist": { "default_value": 3 },
"extruder_prime_pos_x": "infill_before_walls": { "default_value": false },
{ "infill_line_width": { "value": "line_width * 1.25" },
"maximum_value": "machine_width", "infill_material_flow": { "value": "max(0, material_flow - 5)" },
"minimum_value": "0" "infill_pattern": { "value": "'zigzag'" },
}, "infill_sparse_density": { "default_value": 10.0 },
"extruder_prime_pos_y": "initial_layer_line_width_factor": { "default_value": 110.0 },
{ "layer_0_z_overlap": { "value": 0.09 },
"maximum_value": "machine_depth", "machine_acceleration": { "default_value": 3000 },
"minimum_value": "0" "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" },
}, "machine_heated_bed": { "default_value": true },
"infill_sparse_density": { "default_value": 10 }, "machine_max_acceleration_e": { "default_value": 1600 },
"machine_endstop_positive_direction_x": { "default_value": true }, "machine_max_acceleration_x": { "default_value": 3000 },
"machine_endstop_positive_direction_y": { "default_value": true }, "machine_max_acceleration_y": { "default_value": 3000 },
"machine_endstop_positive_direction_z": { "default_value": false }, "machine_max_acceleration_z": { "default_value": 120 },
"machine_feeder_wheel_diameter": { "default_value": 10.61 }, "machine_max_feedrate_e": { "default_value": 50 },
"machine_max_feedrate_e": { "default_value": 45 }, "machine_max_feedrate_x": { "default_value": 200 },
"machine_max_feedrate_x": { "default_value": 250 }, "machine_max_feedrate_y": { "default_value": 130 },
"machine_max_feedrate_y": { "default_value": 250 },
"machine_max_feedrate_z": { "default_value": 10 }, "machine_max_feedrate_z": { "default_value": 10 },
"machine_nozzle_size": { "default_value": 0.4 }, "machine_max_jerk_e": { "default_value": 5.1 },
"machine_max_jerk_xy": { "default_value": 10.0 },
"machine_max_jerk_z": { "default_value": 5 },
"machine_min_cool_heat_time_window": { "default_value": 1200.0 },
"machine_name": { "default_value": "WEEDO Base" },
"machine_nozzle_cool_down_speed": { "default_value": 0.67 },
"machine_nozzle_heat_up_speed": { "default_value": 1.8 },
"machine_nozzle_tip_outer_diameter": { "default_value": 0.8 },
"machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" },
"machine_steps_per_mm_e": { "default_value": 96 }, "machine_steps_per_mm_e": { "default_value": 96 },
"machine_steps_per_mm_x": { "default_value": 94 }, "machine_steps_per_mm_x": { "default_value": 94 },
"machine_steps_per_mm_y": { "default_value": 94 }, "machine_steps_per_mm_y": { "default_value": 94 },
"machine_steps_per_mm_z": { "default_value": 400 }, "machine_steps_per_mm_z": { "default_value": 400 },
"material_bed_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false },
"material_bed_temperature": { "maximum_value_warning": "96" },
"material_diameter": { "default_value": 1.75 }, "material_diameter": { "default_value": 1.75 },
"material_flow": { "default_value": 95 }, "material_final_print_temperature": { "value": "material_print_temperature" },
"material_print_temp_prepend": { "default_value": false }, "material_flow": { "default_value": 95.0 },
"material_flow_layer_0": { "default_value": 95.0 },
"material_initial_print_temperature": { "value": "material_print_temperature" },
"material_print_temp_wait": { "default_value": false }, "material_print_temp_wait": { "default_value": false },
"material_standby_temperature": { "minimum_value": "0" }, "material_print_temperature": { "maximum_value": "300" },
"prime_tower_min_volume": { "default_value": 10 }, "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 10, 300)" },
"prime_tower_size": { "default_value": 15 }, "material_standby_temperature": { "default_value": 175.0 },
"raft_airgap": { "default_value": 0.22 }, "prime_tower_min_volume": { "default_value": 10.0 },
"raft_base_speed": { "value": 20 }, "prime_tower_size": { "default_value": 15.0 },
"raft_interface_speed": { "value": 33 }, "raft_airgap": { "default_value": 0.19 },
"raft_margin": { "default_value": 8 }, "raft_base_fan_speed": { "value": 0.0 },
"raft_surface_fan_speed": { "value": 100 }, "raft_base_speed": { "value": 20.0 },
"raft_surface_speed": { "value": 40 }, "raft_base_thickness": { "value": 0.3 },
"retraction_amount": { "default_value": 1.5 }, "raft_interface_speed": { "value": 33.0 },
"raft_margin": { "default_value": 8.0 },
"raft_surface_speed": { "value": 40.0 },
"raft_surface_thickness": { "value": 0.25 },
"retraction_amount": { "default_value": 3 },
"retraction_combing": { "value": "off" }, "retraction_combing": { "value": "off" },
"retraction_speed": { "default_value": 28 }, "retraction_extrusion_window": { "value": 1.0 },
"retraction_hop_after_extruder_switch": { "default_value": false },
"retraction_min_travel": { "value": 0.8 },
"retraction_speed": { "default_value": 28.0 },
"skin_outline_count": { "value": "0" },
"skirt_brim_speed": { "value": 26.0 }, "skirt_brim_speed": { "value": 26.0 },
"skirt_line_count": { "default_value": 2 },
"speed_layer_0": { "value": 26.0 }, "speed_layer_0": { "value": 26.0 },
"speed_prime_tower": { "value": "speed_support" }, "speed_prime_tower": { "value": "speed_support" },
"speed_print_layer_0": { "value": 26.0 }, "speed_print": { "default_value": 70.0 },
"speed_support": { "value": "round(speed_print*0.82,1)" }, "speed_support": { "value": "round(speed_print * 0.82, 1)" },
"speed_support_interface": { "value": "round(speed_support*0.689,1)" }, "speed_support_interface": { "value": "round(speed_support * 0.689, 1)" },
"speed_topbottom": { "value": "round(speed_print * 0.65,1)" }, "speed_topbottom": { "value": "round(speed_print * 0.65, 1)" },
"speed_travel": { "value": 105.0 }, "speed_travel": { "value": 105.0 },
"speed_travel_layer_0": { "value": 80.0 }, "speed_travel_layer_0": { "value": 80.0 },
"speed_wall": { "value": "max(5,round(speed_print / 2,1))" }, "speed_wall": { "value": "max(5, round(speed_print / 2 - 5, 1))" },
"speed_wall_0": { "value": "max(5,speed_wall-5)" }, "speed_wall_0": { "value": "max(5, speed_wall - 5)" },
"speed_wall_x": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" },
"support_angle": { "default_value": 60 }, "support_angle": { "default_value": 60.0 },
"support_connect_zigzags": { "default_value": false },
"support_interface_density": { "default_value": 60.0 },
"support_interface_enable": { "default_value": true },
"support_interface_height": { "default_value": 0.8 },
"support_interface_pattern": { "default_value": "lines" }, "support_interface_pattern": { "default_value": "lines" },
"support_material_flow": { "value": "max(0, material_flow - 5)" },
"support_z_distance": { "default_value": 0.18 },
"switch_extruder_retraction_amount": { "value": 16.5 }, "switch_extruder_retraction_amount": { "value": 16.5 },
"switch_extruder_retraction_speeds": { "default_value": 28 } "switch_extruder_retraction_speeds": { "default_value": 28.0 },
"top_skin_preshrink": { "value": 0.0 },
"wall_0_wipe_dist": { "value": 0.0 },
"z_seam_corner": { "default_value": "z_seam_corner_any" }
} }
} }

200
resources/definitions/weedo_tina2.def.json Normal file
View File

@ -0,0 +1,200 @@
{
"version": 2,
"name": "WEEDO TINA2",
"inherits": "weedo_base",
"metadata":
{
"visible": true,
"author": "WEEDO",
"manufacturer": "WEEDO",
"file_formats": "text/x-gcode",
"exclude_materials": [
"3D-Fuel_PLA_PRO_Black",
"3D-Fuel_PLA_SnapSupport",
"bestfilament_abs_skyblue",
"bestfilament_petg_orange",
"bestfilament_pla_green",
"leapfrog_abs_natural",
"leapfrog_epla_natural",
"leapfrog_pva_natural",
"generic_abs_175",
"generic_asa_175",
"generic_bvoh_175",
"generic_cpe_175",
"generic_hips_175",
"generic_nylon_175",
"generic_pc_175",
"generic_petg_175",
"generic_pva_175",
"goofoo_abs",
"goofoo_asa",
"goofoo_bronze_pla",
"goofoo_emarble_pla",
"goofoo_esilk_pla",
"goofoo_hips",
"goofoo_pa_cf",
"goofoo_pa",
"goofoo_pc",
"goofoo_peek",
"goofoo_petg",
"goofoo_pla",
"goofoo_pva",
"goofoo_tpe_83a",
"goofoo_tpu_87a",
"goofoo_tpu_95a",
"goofoo_wood_pla",
"emotiontech_abs",
"emotiontech_absx",
"emotiontech_acetate",
"emotiontech_asax",
"emotiontech_bvoh",
"emotiontech_copa",
"emotiontech_hips",
"emotiontech_nylon_1030",
"emotiontech_nylon_1030cf",
"emotiontech_nylon_1070",
"emotiontech_pc",
"emotiontech_pekk",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pla_hr_870",
"emotiontech_pva-m",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"eryone_petg",
"eryone_pla_glow",
"eryone_pla_matte",
"eryone_pla_wood",
"eryone_pla",
"eryone_tpu",
"eSUN_PETG_Black",
"eSUN_PETG_Grey",
"eSUN_PETG_Purple",
"eSUN_PLA_PRO_Black",
"eSUN_PLA_PRO_Grey",
"eSUN_PLA_PRO_Purple",
"eSUN_PLA_PRO_White",
"Extrudr_GreenTECPro_Anthracite_175",
"Extrudr_GreenTECPro_Black_175",
"Extrudr_GreenTECPro_Blue_175",
"Extrudr_GreenTECPro_Nature_175",
"Extrudr_GreenTECPro_Red_175",
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fdplast_abs_tomato",
"fdplast_petg_gray",
"fdplast_pla_olive",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"layer_one_black_pla",
"layer_one_dark_gray_pla",
"layer_one_white_pla",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_abs",
"redd_asa",
"redd_hips",
"redd_nylon",
"redd_petg",
"redd_pla",
"redd_tpe",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla_bois",
"tizyx_pla",
"tizyx_pva",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"volumic_abs_ultra",
"volumic_arma_ultra",
"volumic_asa_ultra",
"volumic_br80_ultra",
"volumic_bumper_ultra",
"volumic_cu80_ultra",
"volumic_flex93_ultra",
"volumic_medical_ultra",
"volumic_nylon_ultra",
"volumic_pekk_carbone",
"volumic_petg_ultra",
"volumic_petgcarbone_ultra",
"volumic_pla_ultra",
"volumic_pp_ultra",
"volumic_strong_ultra",
"volumic_support_ultra",
"xyzprinting_abs",
"xyzprinting_antibact_pla",
"xyzprinting_carbon_fiber",
"xyzprinting_colorinkjet_pla",
"xyzprinting_flexible",
"xyzprinting_metallic_pla",
"xyzprinting_nylon",
"xyzprinting_petg",
"xyzprinting_pla",
"xyzprinting_tough_pla",
"xyzprinting_tpu",
"zyyx_pro_flex",
"zyyx_pro_pla"
],
"platform_offset": [
0,
0,
0
]
},
"overrides":
{
"infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" },
"machine_depth": { "default_value": 120 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
"machine_heated_bed": { "default_value": false },
"machine_height": { "default_value": 100 },
"machine_name": { "default_value": "WEEDO TINA2" },
"machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
"machine_width": { "default_value": 100 },
"raft_base_thickness": { "value": 0.35 },
"speed_infill": { "value": 40.0 },
"speed_print": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "value": 30.0 },
"speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 },
"speed_travel": { "value": 65.0 },
"speed_travel_layer_0": { "value": 60 },
"speed_wall": { "value": 25.0 },
"speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 }
}
}

201
resources/definitions/weedo_tina2s.def.json Normal file
View File

@ -0,0 +1,201 @@
{
"version": 2,
"name": "WEEDO TINA2S",
"inherits": "weedo_base",
"metadata":
{
"visible": true,
"author": "WEEDO",
"manufacturer": "WEEDO",
"file_formats": "text/x-gcode",
"exclude_materials": [
"3D-Fuel_PLA_PRO_Black",
"3D-Fuel_PLA_SnapSupport",
"bestfilament_abs_skyblue",
"bestfilament_petg_orange",
"bestfilament_pla_green",
"leapfrog_abs_natural",
"leapfrog_epla_natural",
"leapfrog_pva_natural",
"generic_abs_175",
"generic_asa_175",
"generic_cpe_175",
"generic_nylon_175",
"generic_pc_175",
"generic_petg_175",
"generic_pva_175",
"goofoo_abs",
"goofoo_asa",
"goofoo_bronze_pla",
"goofoo_emarble_pla",
"goofoo_esilk_pla",
"goofoo_hips",
"goofoo_pa_cf",
"goofoo_pa",
"goofoo_pc",
"goofoo_peek",
"goofoo_petg",
"goofoo_pla",
"goofoo_pva",
"goofoo_tpe_83a",
"goofoo_tpu_87a",
"goofoo_tpu_95a",
"goofoo_wood_pla",
"emotiontech_abs",
"emotiontech_absx",
"emotiontech_acetate",
"emotiontech_asax",
"emotiontech_bvoh",
"emotiontech_copa",
"emotiontech_hips",
"emotiontech_nylon_1030",
"emotiontech_nylon_1030cf",
"emotiontech_nylon_1070",
"emotiontech_pc",
"emotiontech_pekk",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pla_hr_870",
"emotiontech_pva-m",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"eryone_petg",
"eryone_pla_glow",
"eryone_pla_matte",
"eryone_pla_wood",
"eryone_pla",
"eryone_tpu",
"eSUN_PETG_Black",
"eSUN_PETG_Grey",
"eSUN_PETG_Purple",
"eSUN_PLA_PRO_Black",
"eSUN_PLA_PRO_Grey",
"eSUN_PLA_PRO_Purple",
"eSUN_PLA_PRO_White",
"Extrudr_GreenTECPro_Anthracite_175",
"Extrudr_GreenTECPro_Black_175",
"Extrudr_GreenTECPro_Blue_175",
"Extrudr_GreenTECPro_Nature_175",
"Extrudr_GreenTECPro_Red_175",
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fdplast_abs_tomato",
"fdplast_petg_gray",
"fdplast_pla_olive",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"layer_one_black_pla",
"layer_one_dark_gray_pla",
"layer_one_white_pla",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_abs",
"redd_asa",
"redd_hips",
"redd_nylon",
"redd_petg",
"redd_pla",
"redd_tpe",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla_bois",
"tizyx_pla",
"tizyx_pva",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"volumic_abs_ultra",
"volumic_arma_ultra",
"volumic_asa_ultra",
"volumic_br80_ultra",
"volumic_bumper_ultra",
"volumic_cu80_ultra",
"volumic_flex93_ultra",
"volumic_medical_ultra",
"volumic_nylon_ultra",
"volumic_pekk_carbone",
"volumic_petg_ultra",
"volumic_petgcarbone_ultra",
"volumic_pla_ultra",
"volumic_pp_ultra",
"volumic_strong_ultra",
"volumic_support_ultra",
"xyzprinting_abs",
"xyzprinting_antibact_pla",
"xyzprinting_carbon_fiber",
"xyzprinting_colorinkjet_pla",
"xyzprinting_flexible",
"xyzprinting_metallic_pla",
"xyzprinting_nylon",
"xyzprinting_petg",
"xyzprinting_pla",
"xyzprinting_tough_pla",
"xyzprinting_tpu",
"zyyx_pro_flex",
"zyyx_pro_pla"
],
"platform_offset": [
0,
0,
0
]
},
"overrides":
{
"machine_depth": { "default_value": 110 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
"machine_height": { "default_value": 100 },
"machine_name": { "default_value": "WEEDO TINA2S" },
"machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
"machine_width": { "default_value": 100 },
"material_bed_temperature":
{
"maximum_value": "65",
"maximum_value_warning": "60"
},
"raft_base_thickness": { "value": 0.35 },
"speed_infill": { "value": 40.0 },
"speed_print": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "value": 30.0 },
"speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 },
"speed_travel": { "value": 65.0 },
"speed_travel_layer_0": { "value": 60 },
"speed_wall": { "value": 25.0 },
"speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 }
}
}

177
resources/definitions/weefun_tina2.def.json
View File

@ -8,6 +8,164 @@
"author": "WEEFUN", "author": "WEEFUN",
"manufacturer": "WEEFUN", "manufacturer": "WEEFUN",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"exclude_materials": [
"3D-Fuel_PLA_PRO_Black",
"3D-Fuel_PLA_SnapSupport",
"bestfilament_abs_skyblue",
"bestfilament_petg_orange",
"bestfilament_pla_green",
"leapfrog_abs_natural",
"leapfrog_epla_natural",
"leapfrog_pva_natural",
"generic_abs_175",
"generic_asa_175",
"generic_bvoh_175",
"generic_cpe_175",
"generic_hips_175",
"generic_nylon_175",
"generic_pc_175",
"generic_petg_175",
"generic_pva_175",
"goofoo_abs",
"goofoo_asa",
"goofoo_bronze_pla",
"goofoo_emarble_pla",
"goofoo_esilk_pla",
"goofoo_hips",
"goofoo_pa_cf",
"goofoo_pa",
"goofoo_pc",
"goofoo_peek",
"goofoo_petg",
"goofoo_pla",
"goofoo_pva",
"goofoo_tpe_83a",
"goofoo_tpu_87a",
"goofoo_tpu_95a",
"goofoo_wood_pla",
"emotiontech_abs",
"emotiontech_absx",
"emotiontech_acetate",
"emotiontech_asax",
"emotiontech_bvoh",
"emotiontech_copa",
"emotiontech_hips",
"emotiontech_nylon_1030",
"emotiontech_nylon_1030cf",
"emotiontech_nylon_1070",
"emotiontech_pc",
"emotiontech_pekk",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pla_hr_870",
"emotiontech_pva-m",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"eryone_petg",
"eryone_pla_glow",
"eryone_pla_matte",
"eryone_pla_wood",
"eryone_pla",
"eryone_tpu",
"eSUN_PETG_Black",
"eSUN_PETG_Grey",
"eSUN_PETG_Purple",
"eSUN_PLA_PRO_Black",
"eSUN_PLA_PRO_Grey",
"eSUN_PLA_PRO_Purple",
"eSUN_PLA_PRO_White",
"Extrudr_GreenTECPro_Anthracite_175",
"Extrudr_GreenTECPro_Black_175",
"Extrudr_GreenTECPro_Blue_175",
"Extrudr_GreenTECPro_Nature_175",
"Extrudr_GreenTECPro_Red_175",
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fdplast_abs_tomato",
"fdplast_petg_gray",
"fdplast_pla_olive",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"layer_one_black_pla",
"layer_one_dark_gray_pla",
"layer_one_white_pla",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_abs",
"redd_asa",
"redd_hips",
"redd_nylon",
"redd_petg",
"redd_pla",
"redd_tpe",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla_bois",
"tizyx_pla",
"tizyx_pva",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"volumic_abs_ultra",
"volumic_arma_ultra",
"volumic_asa_ultra",
"volumic_br80_ultra",
"volumic_bumper_ultra",
"volumic_cu80_ultra",
"volumic_flex93_ultra",
"volumic_medical_ultra",
"volumic_nylon_ultra",
"volumic_pekk_carbone",
"volumic_petg_ultra",
"volumic_petgcarbone_ultra",
"volumic_pla_ultra",
"volumic_pp_ultra",
"volumic_strong_ultra",
"volumic_support_ultra",
"xyzprinting_abs",
"xyzprinting_antibact_pla",
"xyzprinting_carbon_fiber",
"xyzprinting_colorinkjet_pla",
"xyzprinting_flexible",
"xyzprinting_metallic_pla",
"xyzprinting_nylon",
"xyzprinting_petg",
"xyzprinting_pla",
"xyzprinting_tough_pla",
"xyzprinting_tpu",
"zyyx_pro_flex",
"zyyx_pro_pla"
],
"platform_offset": [ "platform_offset": [
0, 0,
0, 0,
@ -16,28 +174,27 @@
}, },
"overrides": "overrides":
{ {
"machine_center_is_zero": { "default_value": false }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" },
"machine_depth": { "default_value": 120 }, "machine_depth": { "default_value": 120 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": false }, "machine_heated_bed": { "default_value": false },
"machine_height": { "default_value": 100 }, "machine_height": { "default_value": 100 },
"machine_name": { "default_value": "WEEFUN TINA2" }, "machine_name": { "default_value": "WEEFUN TINA2" },
"machine_start_gcode": { "default_value": ";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" }, "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
"machine_width": { "default_value": 100 }, "machine_width": { "default_value": 100 },
"retraction_amount": { "default_value": 3 }, "raft_base_thickness": { "value": 0.35 },
"retraction_count_max": { "default_value": 10 },
"retraction_speed": { "default_value": 35 },
"speed_infill": { "value": 40.0 }, "speed_infill": { "value": 40.0 },
"speed_print": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 }, "speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 }, "speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "dvalue": 30.0 }, "speed_support_bottom": { "value": 30.0 },
"speed_support_infill": { "value": 45.0 }, "speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 }, "speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 }, "speed_topbottom": { "value": 30.0 },
"speed_travel": { "value": 65.0 },
"speed_travel_layer_0": { "value": 60 }, "speed_travel_layer_0": { "value": 60 },
"speed_wall": { "value": 25.0 },
"speed_wall_0": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 }, "speed_wall_x": { "value": 25.0 }
"support_xy_distance": { "default_value": 1.0 }
} }
} }

178
resources/definitions/weefun_tina2s.def.json
View File

@ -8,6 +8,162 @@
"author": "WEEFUN", "author": "WEEFUN",
"manufacturer": "WEEFUN", "manufacturer": "WEEFUN",
"file_formats": "text/x-gcode", "file_formats": "text/x-gcode",
"exclude_materials": [
"3D-Fuel_PLA_PRO_Black",
"3D-Fuel_PLA_SnapSupport",
"bestfilament_abs_skyblue",
"bestfilament_petg_orange",
"bestfilament_pla_green",
"leapfrog_abs_natural",
"leapfrog_epla_natural",
"leapfrog_pva_natural",
"generic_abs_175",
"generic_asa_175",
"generic_cpe_175",
"generic_nylon_175",
"generic_pc_175",
"generic_petg_175",
"generic_pva_175",
"goofoo_abs",
"goofoo_asa",
"goofoo_bronze_pla",
"goofoo_emarble_pla",
"goofoo_esilk_pla",
"goofoo_hips",
"goofoo_pa_cf",
"goofoo_pa",
"goofoo_pc",
"goofoo_peek",
"goofoo_petg",
"goofoo_pla",
"goofoo_pva",
"goofoo_tpe_83a",
"goofoo_tpu_87a",
"goofoo_tpu_95a",
"goofoo_wood_pla",
"emotiontech_abs",
"emotiontech_absx",
"emotiontech_acetate",
"emotiontech_asax",
"emotiontech_bvoh",
"emotiontech_copa",
"emotiontech_hips",
"emotiontech_nylon_1030",
"emotiontech_nylon_1030cf",
"emotiontech_nylon_1070",
"emotiontech_pc",
"emotiontech_pekk",
"emotiontech_petg",
"emotiontech_pla",
"emotiontech_pla_hr_870",
"emotiontech_pva-m",
"emotiontech_pva-s",
"emotiontech_tpu98a",
"eryone_petg",
"eryone_pla_glow",
"eryone_pla_matte",
"eryone_pla_wood",
"eryone_pla",
"eryone_tpu",
"eSUN_PETG_Black",
"eSUN_PETG_Grey",
"eSUN_PETG_Purple",
"eSUN_PLA_PRO_Black",
"eSUN_PLA_PRO_Grey",
"eSUN_PLA_PRO_Purple",
"eSUN_PLA_PRO_White",
"Extrudr_GreenTECPro_Anthracite_175",
"Extrudr_GreenTECPro_Black_175",
"Extrudr_GreenTECPro_Blue_175",
"Extrudr_GreenTECPro_Nature_175",
"Extrudr_GreenTECPro_Red_175",
"Extrudr_GreenTECPro_Silver_175",
"Extrudr_GreenTECPro_White_175",
"verbatim_bvoh_175",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"chromatik_pla",
"dsm_arnitel2045_175",
"dsm_novamid1070_175",
"fabtotum_abs",
"fabtotum_nylon",
"fabtotum_pla",
"fabtotum_tpu",
"fdplast_abs_tomato",
"fdplast_petg_gray",
"fdplast_pla_olive",
"fiberlogy_hd_pla",
"filo3d_pla",
"filo3d_pla_green",
"filo3d_pla_red",
"imade3d_petg_green",
"imade3d_petg_pink",
"imade3d_pla_green",
"imade3d_pla_pink",
"imade3d_petg_175",
"imade3d_pla_175",
"innofill_innoflex60_175",
"layer_one_black_pla",
"layer_one_dark_gray_pla",
"layer_one_white_pla",
"octofiber_pla",
"polyflex_pla",
"polymax_pla",
"polyplus_pla",
"polywood_pla",
"redd_abs",
"redd_asa",
"redd_hips",
"redd_nylon",
"redd_petg",
"redd_pla",
"redd_tpe",
"tizyx_abs",
"tizyx_flex",
"tizyx_petg",
"tizyx_pla_bois",
"tizyx_pla",
"tizyx_pva",
"Vertex_Delta_ABS",
"Vertex_Delta_PET",
"Vertex_Delta_PLA_Glitter",
"Vertex_Delta_PLA_Mat",
"Vertex_Delta_PLA_Satin",
"Vertex_Delta_PLA_Wood",
"Vertex_Delta_PLA",
"Vertex_Delta_TPU",
"volumic_abs_ultra",
"volumic_arma_ultra",
"volumic_asa_ultra",
"volumic_br80_ultra",
"volumic_bumper_ultra",
"volumic_cu80_ultra",
"volumic_flex93_ultra",
"volumic_medical_ultra",
"volumic_nylon_ultra",
"volumic_pekk_carbone",
"volumic_petg_ultra",
"volumic_petgcarbone_ultra",
"volumic_pla_ultra",
"volumic_pp_ultra",
"volumic_strong_ultra",
"volumic_support_ultra",
"xyzprinting_abs",
"xyzprinting_antibact_pla",
"xyzprinting_carbon_fiber",
"xyzprinting_colorinkjet_pla",
"xyzprinting_flexible",
"xyzprinting_metallic_pla",
"xyzprinting_nylon",
"xyzprinting_petg",
"xyzprinting_pla",
"xyzprinting_tough_pla",
"xyzprinting_tpu",
"zyyx_pro_flex",
"zyyx_pro_pla"
],
"platform_offset": [ "platform_offset": [
0, 0,
0, 0,
@ -16,25 +172,29 @@
}, },
"overrides": "overrides":
{ {
"gantry_height": { "value": 20 }, "machine_depth": { "default_value": 110 },
"machine_center_is_zero": { "default_value": false }, "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" },
"machine_depth": { "default_value": 120 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete" },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 100 }, "machine_height": { "default_value": 100 },
"machine_name": { "default_value": "WEEFUN TINA2S" }, "machine_name": { "default_value": "WEEFUN TINA2S" },
"machine_start_gcode": { "default_value": ";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..." }, "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" },
"machine_width": { "default_value": 100 }, "machine_width": { "default_value": 100 },
"retraction_amount": { "default_value": 3 }, "material_bed_temperature":
{
"maximum_value": "65",
"maximum_value_warning": "60"
},
"raft_base_thickness": { "value": 0.35 },
"speed_infill": { "value": 40.0 }, "speed_infill": { "value": 40.0 },
"speed_print": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 }, "speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 }, "speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "dvalue": 30.0 }, "speed_support_bottom": { "value": 30.0 },
"speed_support_infill": { "value": 45.0 }, "speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 }, "speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 }, "speed_topbottom": { "value": 30.0 },
"speed_travel": { "value": 65.0 },
"speed_travel_layer_0": { "value": 60 }, "speed_travel_layer_0": { "value": 60 },
"speed_wall": { "value": 25.0 },
"speed_wall_0": { "value": 20.0 }, "speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 } "speed_wall_x": { "value": 25.0 }
} }

2
resources/qml/Cura.qml
View File

@ -628,7 +628,7 @@ UM.MainWindow
//: File open dialog title //: File open dialog title
title: catalog.i18nc("@title:window","Open file(s)") title: catalog.i18nc("@title:window","Open file(s)")
modality: Qt.WindowModal modality: Qt.WindowModal
fileMode: FileDialog.FileMode.ExistingFile fileMode: FileDialog.FileMode.OpenFiles
nameFilters: UM.MeshFileHandler.supportedReadFileTypes; nameFilters: UM.MeshFileHandler.supportedReadFileTypes;
currentFolder: CuraApplication.getDefaultPath("dialog_load_path") currentFolder: CuraApplication.getDefaultPath("dialog_load_path")
onAccepted: onAccepted:

29
resources/qml/Dialogs/AboutDialog.qml
View File

@ -1,10 +1,10 @@
// Copyright (c) 2022 UltiMaker // Copyright (c) 2022 UltiMaker
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.4
import QtQuick.Controls 2.9 import QtQuick.Controls 2.9
import UM 1.5 as UM import UM 1.6 as UM
import Cura 1.5 as Cura import Cura 1.5 as Cura
UM.Dialog UM.Dialog
@ -21,6 +21,14 @@ UM.Dialog
backgroundColor: UM.Theme.getColor("main_background") backgroundColor: UM.Theme.getColor("main_background")
property real dialogX: base.x
property real dialogY: base.y
property int shakeDetected: shakeDetector.shakeIsdetected
property UM.ShakeDetector shakeDetector: UM.ShakeDetector
{
position: Qt.point(base.x, base.y)
}
Rectangle Rectangle
{ {
id: header id: header
@ -181,6 +189,23 @@ UM.Dialog
} }
} }
AboutDialogVersionsList{
id: projectBuildInfoList
}
onShakeDetectedChanged:
{
projectsList.visible = !projectsList.visible;
projectBuildInfoList.visible = !projectBuildInfoList.visible;
}
onVisibleChanged:
{
projectsList.visible = true;
projectBuildInfoList.visible = false;
}
rightButtons: Cura.TertiaryButton rightButtons: Cura.TertiaryButton
{ {
//: Close about dialog button //: Close about dialog button

5
resources/qml/MachineSettings/NumericTextFieldWithUnit.qml
View File

@ -76,6 +76,11 @@ UM.TooltipArea
anchors.left: fieldLabel.right anchors.left: fieldLabel.right
anchors.leftMargin: spacing anchors.leftMargin: spacing
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
// The control is set up for left to right. So we force it to that. If we don't, it will take the OS reading
// direction, which might not be left to right. This will lead to the text overlapping with the unit
horizontalAlignment: TextInput.AlignLeft
selectionColor: UM.Theme.getColor("text_selection") selectionColor: UM.Theme.getColor("text_selection")
selectedTextColor: UM.Theme.getColor("setting_control_text") selectedTextColor: UM.Theme.getColor("setting_control_text")
padding: 0 padding: 0

13
resources/variants/creality/creality_ender5s1_0.2.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = creality_ender5s1
name = 0.2mm Nozzle
version = 4
[metadata]
hardware_type = nozzle
setting_version = 22
type = variant
[values]
machine_nozzle_size = 0.2

13
resources/variants/creality/creality_ender5s1_0.3.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = creality_ender5s1
name = 0.3mm Nozzle
version = 4
[metadata]
hardware_type = nozzle
setting_version = 22
type = variant
[values]
machine_nozzle_size = 0.3

13
resources/variants/creality/creality_ender5s1_0.4.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = creality_ender5s1
name = 0.4mm Nozzle
version = 4
[metadata]
hardware_type = nozzle
setting_version = 22
type = variant
[values]
machine_nozzle_size = 0.4

13
resources/variants/creality/creality_ender5s1_0.5.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = creality_ender5s1
name = 0.5mm Nozzle
version = 4
[metadata]
hardware_type = nozzle
setting_version = 22
type = variant
[values]
machine_nozzle_size = 0.5

13
resources/variants/creality/creality_ender5s1_0.6.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = creality_ender5s1
name = 0.6mm Nozzle
version = 4
[metadata]
hardware_type = nozzle
setting_version = 22
type = variant
[values]
machine_nozzle_size = 0.6

13
resources/variants/creality/creality_ender5s1_0.8.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = creality_ender5s1
name = 0.8mm Nozzle
version = 4
[metadata]
hardware_type = nozzle
setting_version = 22
type = variant
[values]
machine_nozzle_size = 0.8

13
resources/variants/creality/creality_ender5s1_1.0.inst.cfg Normal file
View File

@ -0,0 +1,13 @@
[general]
definition = creality_ender5s1
name = 1.0mm Nozzle
version = 4
[metadata]
hardware_type = nozzle
setting_version = 22
type = variant
[values]
machine_nozzle_size = 1.0

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

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

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

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

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

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

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

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

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

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

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

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