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

Merge branch 'master' into fix_use_engine_ready

Browse source
This commit is contained in:
Mark 2018-07-05 13:18:12 +02:00
commit 4157cffdbd
110 changed files with 288 additions and 311 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cura/Backups/Backup.py
View file

@ -1,12 +1,13 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import io
import os
import re
import shutil
from typing import Optional
from typing import Dict, Optional
from zipfile import ZipFile, ZIP_DEFLATED, BadZipfile
from UM import i18nCatalog
@ -28,9 +29,9 @@ class Backup:
# Re-use translation catalog.
catalog = i18nCatalog("cura")
def __init__(self, zip_file: bytes = None, meta_data: dict = None) -> None:
def __init__(self, zip_file: bytes = None, meta_data: Dict[str, str] = None) -> None:
self.zip_file = zip_file # type: Optional[bytes]
self.meta_data = meta_data # type: Optional[dict]
self.meta_data = meta_data # type: Optional[Dict[str, str]]
## Create a back-up from the current user config folder.
def makeFromCurrent(self) -> None:

11
cura/Backups/BackupsManager.py
View file

@ -1,6 +1,7 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from typing import Optional, Tuple
from typing import Dict, Optional, Tuple
from UM.Logger import Logger
from cura.Backups.Backup import Backup
@ -18,7 +19,7 @@ class BackupsManager:
## Get a back-up of the current configuration.
# \return A tuple containing a ZipFile (the actual back-up) and a dict
# containing some metadata (like version).
def createBackup(self) -> Tuple[Optional[bytes], Optional[dict]]:
def createBackup(self) -> Tuple[Optional[bytes], Optional[Dict[str, str]]]:
self._disableAutoSave()
backup = Backup()
backup.makeFromCurrent()
@ -30,7 +31,7 @@ class BackupsManager:
# \param zip_file A bytes object containing the actual back-up.
# \param meta_data A dict containing some metadata that is needed to
# restore the back-up correctly.
def restoreBackup(self, zip_file: bytes, meta_data: dict) -> None:
def restoreBackup(self, zip_file: bytes, meta_data: Dict[str, str]) -> None:
if not meta_data.get("cura_release", None):
# If there is no "cura_release" specified in the meta data, we don't execute a backup restore.
Logger.log("w", "Tried to restore a backup without specifying a Cura version number.")
@ -47,9 +48,9 @@ class BackupsManager:
## Here we try to disable the auto-save plug-in as it might interfere with
# restoring a back-up.
def _disableAutoSave(self):
def _disableAutoSave(self) -> None:
self._application.setSaveDataEnabled(False)
## Re-enable auto-save after we're done.
def _enableAutoSave(self):
def _enableAutoSave(self) -> None:
self._application.setSaveDataEnabled(True)

16
cura/BuildVolume.py
View file

@ -47,10 +47,10 @@ class BuildVolume(SceneNode):
self._disallowed_area_color = None
self._error_area_color = None
self._width = 0
self._height = 0
self._depth = 0
self._shape = ""
self._width = 0 #type: float
self._height = 0 #type: float
self._depth = 0 #type: float
self._shape = "" #type: str
self._shader = None
@ -154,19 +154,19 @@ class BuildVolume(SceneNode):
if active_extruder_changed is not None:
active_extruder_changed.connect(self._updateDisallowedAreasAndRebuild)
def setWidth(self, width):
def setWidth(self, width: float) -> None:
if width is not None:
self._width = width
def setHeight(self, height):
def setHeight(self, height: float) -> None:
if height is not None:
self._height = height
def setDepth(self, depth):
def setDepth(self, depth: float) -> None:
if depth is not None:
self._depth = depth
def setShape(self, shape: str):
def setShape(self, shape: str) -> None:
if shape:
self._shape = shape

42
cura/CuraApplication.py
View file

@ -84,7 +84,6 @@ from cura.Settings.SettingInheritanceManager import SettingInheritanceManager
from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager
from cura.Machines.VariantManager import VariantManager
from plugins.SliceInfoPlugin.SliceInfo import SliceInfo
from .SingleInstance import SingleInstance
from .AutoSave import AutoSave
@ -110,6 +109,10 @@ from cura.ObjectsModel import ObjectsModel
from UM.FlameProfiler import pyqtSlot
if TYPE_CHECKING:
from plugins.SliceInfoPlugin.SliceInfo import SliceInfo
numpy.seterr(all = "ignore")
try:
@ -407,43 +410,6 @@ class CuraApplication(QtApplication):
}
)
"""
self._currently_loading_files = []
self._non_sliceable_extensions = []
self._machine_action_manager = MachineActionManager.MachineActionManager()
self._machine_manager = None # This is initialized on demand.
self._extruder_manager = None
self._material_manager = None
self._quality_manager = None
self._object_manager = None
self._build_plate_model = None
self._multi_build_plate_model = None
self._setting_visibility_presets_model = None
self._setting_inheritance_manager = None
self._simple_mode_settings_manager = None
self._cura_scene_controller = None
self._machine_error_checker = None
self._auto_save = None
self._save_data_enabled = True
self._additional_components = {} # Components to add to certain areas in the interface
super().__init__(name = "cura",
version = CuraVersion,
buildtype = CuraBuildType,
is_debug_mode = CuraDebugMode,
tray_icon_name = "cura-icon-32.png",
**kwargs)
# FOR TESTING ONLY
if kwargs["parsed_command_line"].get("trigger_early_crash", False):
assert not "This crash is triggered by the trigger_early_crash command line argument."
self._variant_manager = None
self.default_theme = "cura-light"
"""
# Runs preparations that needs to be done before the starting process.
def startSplashWindowPhase(self):
super().startSplashWindowPhase()

39
plugins/CuraEngineBackend/CuraEngineBackend.py
View file

@ -3,6 +3,8 @@
from collections import defaultdict
import os
from typing import Union
from PyQt5.QtCore import QObject, QTimer, pyqtSlot
import sys
from time import time
@ -60,17 +62,16 @@ class CuraEngineBackend(QObject, Backend):
if hasattr(sys, "frozen"):
default_engine_location = os.path.join(os.path.dirname(os.path.abspath(sys.executable)), executable_name)
if Platform.isLinux() and not default_engine_location:
if not os.getenv("PATH"):
env_path = os.getenv("PATH")
if not env_path:
raise OSError("There is something wrong with your Linux installation.")
for pathdir in os.getenv("PATH").split(os.pathsep):
for pathdir in env_path.split(os.pathsep):
execpath = os.path.join(pathdir, executable_name)
if os.path.exists(execpath):
default_engine_location = execpath
break
self._application = CuraApplication.getInstance() #type: CuraApplication
self._multi_build_plate_model = None #type: MultiBuildPlateModel
self._machine_error_checker = None #type: MachineErrorChecker
if not default_engine_location:
raise EnvironmentError("Could not find CuraEngine")
@ -120,11 +121,11 @@ class CuraEngineBackend(QObject, Backend):
self._engine_is_fresh = True #type: bool # Is the newly started engine used before or not?
self._backend_log_max_lines = 20000 #type: int # Maximum number of lines to buffer
self._error_message = None #type: Message # Pop-up message that shows errors.
self._error_message = None #type: Optional[Message] # Pop-up message that shows errors.
self._last_num_objects = defaultdict(int) #type: Dict[int, int] # Count number of objects to see if there is something changed
self._postponed_scene_change_sources = [] #type: List[SceneNode] # scene change is postponed (by a tool)
self._slice_start_time = None #type: Optional[float]
self._slice_start_time = time() #type: float
self._is_disabled = False #type: bool
self._application.getPreferences().addPreference("general/auto_slice", False)
@ -142,8 +143,7 @@ class CuraEngineBackend(QObject, Backend):
self._application.initializationFinished.connect(self.initialize)
def initialize(self) -> None:
self._multi_build_plate_model = self._application.getMultiBuildPlateModel()
self._multi_build_plate_model = self._application.getMultiBuildPlateModel() #type: MultiBuildPlateModel
self._application.getController().activeViewChanged.connect(self._onActiveViewChanged)
self._multi_build_plate_model.activeBuildPlateChanged.connect(self._onActiveViewChanged)
@ -160,7 +160,7 @@ class CuraEngineBackend(QObject, Backend):
self._application.getController().toolOperationStarted.connect(self._onToolOperationStarted)
self._application.getController().toolOperationStopped.connect(self._onToolOperationStopped)
self._machine_error_checker = self._application.getMachineErrorChecker()
self._machine_error_checker = self._application.getMachineErrorChecker() #type: MachineErrorChecker
self._machine_error_checker.errorCheckFinished.connect(self._onStackErrorCheckFinished)
## Terminate the engine process.
@ -310,6 +310,11 @@ class CuraEngineBackend(QObject, Backend):
if self._start_slice_job is job:
self._start_slice_job = None
if not self._global_container_stack:
self.backendStateChange.emit(BackendState.Error)
self.backendError.emit(job)
return
if job.isCancelled() or job.getError() or job.getResult() == StartJobResult.Error:
self.backendStateChange.emit(BackendState.Error)
self.backendError.emit(job)
@ -447,6 +452,7 @@ class CuraEngineBackend(QObject, Backend):
# Only count sliceable objects
if node.callDecoration("isSliceable"):
build_plate_number = node.callDecoration("getBuildPlateNumber")
if build_plate_number is not None:
num_objects[build_plate_number] += 1
return num_objects
@ -464,7 +470,7 @@ class CuraEngineBackend(QObject, Backend):
if source.callDecoration("isBlockSlicing") and source.callDecoration("getLayerData"):
self._stored_optimized_layer_data = {}
build_plate_changed = set()
build_plate_changed = set() # type: Set[int]
source_build_plate_number = source.callDecoration("getBuildPlateNumber")
if source == self._scene.getRoot():
# we got the root node
@ -476,14 +482,15 @@ class CuraEngineBackend(QObject, Backend):
else:
# we got a single scenenode
if not source.callDecoration("isGroup"):
if source.getMeshData() is None:
mesh_data = source.getMeshData()
if mesh_data is None:
return
if source.getMeshData().getVertices() is None:
elif mesh_data.getVertices() is None:
return
if source_build_plate_number is not None:
build_plate_changed.add(source_build_plate_number)
build_plate_changed.discard(None)
build_plate_changed.discard(-1) # object not on build plate
if not build_plate_changed:
return
@ -577,6 +584,7 @@ class CuraEngineBackend(QObject, Backend):
#
# \param message The protobuf message containing sliced layer data.
def _onOptimizedLayerMessage(self, message: Arcus.PythonMessage) -> None:
if self._start_slice_job_build_plate is not None:
if self._start_slice_job_build_plate not in self._stored_optimized_layer_data:
self._stored_optimized_layer_data[self._start_slice_job_build_plate] = []
self._stored_optimized_layer_data[self._start_slice_job_build_plate].append(message)
@ -658,7 +666,10 @@ class CuraEngineBackend(QObject, Backend):
## Creates a new socket connection.
def _createSocket(self, protocol_file: str = None) -> None:
if not protocol_file:
protocol_file = os.path.abspath(os.path.join(PluginRegistry.getInstance().getPluginPath(self.getPluginId()), "Cura.proto"))
plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId())
if not plugin_path:
return
protocol_file = os.path.abspath(os.path.join(plugin_path, "Cura.proto"))
super()._createSocket(protocol_file)
self._engine_is_fresh = True

30
plugins/CuraEngineBackend/StartSliceJob.py
View file

@ -114,13 +114,14 @@ class StartSliceJob(Job):
self.setResult(StartJobResult.Error)
return
stack = CuraApplication.getInstance().getGlobalContainerStack()
if not stack:
global_stack = CuraApplication.getInstance().getGlobalContainerStack()
machine_manager = CuraApplication.getInstance().getMachineManager()
if not global_stack:
self.setResult(StartJobResult.Error)
return
# Don't slice if there is a setting with an error value.
if CuraApplication.getInstance().getMachineManager().stacksHaveErrors:
if machine_manager.stacksHaveErrors:
self.setResult(StartJobResult.SettingError)
return
@ -129,12 +130,12 @@ class StartSliceJob(Job):
return
# Don't slice if the buildplate or the nozzle type is incompatible with the materials
if not CuraApplication.getInstance().getMachineManager().variantBuildplateCompatible and \
not CuraApplication.getInstance().getMachineManager().variantBuildplateUsable:
if not machine_manager.variantBuildplateCompatible and \
not machine_manager.variantBuildplateUsable:
self.setResult(StartJobResult.MaterialIncompatible)
return
for position, extruder_stack in stack.extruders.items():
for position, extruder_stack in global_stack.extruders.items():
material = extruder_stack.findContainer({"type": "material"})
if not extruder_stack.isEnabled:
continue
@ -162,7 +163,7 @@ class StartSliceJob(Job):
# Get the objects in their groups to print.
object_groups = []
if stack.getProperty("print_sequence", "value") == "one_at_a_time":
if global_stack.getProperty("print_sequence", "value") == "one_at_a_time":
for node in OneAtATimeIterator(self._scene.getRoot()): #type: ignore #Ignore type error because iter() should get called automatically by Python syntax.
temp_list = []
@ -216,12 +217,11 @@ class StartSliceJob(Job):
if temp_list:
object_groups.append(temp_list)
extruders_enabled = {position: stack.isEnabled for position, stack in CuraApplication.getInstance().getGlobalContainerStack().extruders.items()}
extruders_enabled = {position: stack.isEnabled for position, stack in global_stack.extruders.items()}
filtered_object_groups = []
has_model_with_disabled_extruders = False
associated_disabled_extruders = set()
associated_disabled_extruders = set() # type: Set[str]
for group in object_groups:
stack = CuraApplication.getInstance().getGlobalContainerStack()
skip_group = False
for node in group:
extruder_position = node.callDecoration("getActiveExtruderPosition")
@ -234,7 +234,7 @@ class StartSliceJob(Job):
if has_model_with_disabled_extruders:
self.setResult(StartJobResult.ObjectsWithDisabledExtruder)
associated_disabled_extruders = [str(c) for c in sorted([int(p) + 1 for p in associated_disabled_extruders])]
associated_disabled_extruders = set([str(c) for c in sorted([int(p) + 1 for p in associated_disabled_extruders])])
self.setMessage(", ".join(associated_disabled_extruders))
return
@ -245,11 +245,11 @@ class StartSliceJob(Job):
self.setResult(StartJobResult.NothingToSlice)
return
self._buildGlobalSettingsMessage(stack)
self._buildGlobalInheritsStackMessage(stack)
self._buildGlobalSettingsMessage(global_stack)
self._buildGlobalInheritsStackMessage(global_stack)
# Build messages for extruder stacks
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(stack.getId()):
for extruder_stack in ExtruderManager.getInstance().getMachineExtruders(global_stack.getId()):
self._buildExtruderMessage(extruder_stack)
for group in filtered_object_groups:
@ -326,6 +326,8 @@ class StartSliceJob(Job):
def _expandGcodeTokens(self, value: str, default_extruder_nr: int = -1) -> str:
if not self._all_extruders_settings:
global_stack = CuraApplication.getInstance().getGlobalContainerStack()
if not global_stack:
return str(value)
# NB: keys must be strings for the string formatter
self._all_extruders_settings = {

11
plugins/Toolbox/resources/qml/ToolboxAuthorPage.qml
View file

@ -9,17 +9,8 @@ import UM 1.1 as UM
Item
{
id: page
property var details: base.selection || dummy_details
property var details: base.selection || {}
anchors.fill: parent
property var dummy_details: new Object({
name: "",
description: "",
email: "",
website: "",
icon_url: ""
})
ToolboxBackColumn
{
id: sidebar

16
plugins/Toolbox/resources/qml/ToolboxDetailPage.qml
View file

@ -9,21 +9,9 @@ import UM 1.1 as UM
Item
{
id: page
property var details: base.selection || dummy_details
property var details: base.selection
anchors.fill: parent
width: parent.width
property var dummy_details: new Object({
name: '',
version: '',
last_updated: '',
author_email: '',
author_name: '',
website: '',
icon_url: '',
download_count: ''
})
ToolboxBackColumn
{
id: sidebar
@ -86,6 +74,7 @@ Item
}
spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
width: childrenRect.width
height: childrenRect.height
Label
{
text: catalog.i18nc("@label", "Version") + ":"
@ -122,6 +111,7 @@ Item
topMargin: UM.Theme.getSize("default_margin").height
}
spacing: Math.floor(UM.Theme.getSize("narrow_margin").height)
height: childrenRect.height
Label
{
text: details.version || catalog.i18nc("@label", "Unknown")

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

@ -25,7 +25,7 @@ Column
{
id: grid
property var model: toolbox.viewCategory == "material" ? toolbox.authorsModel : toolbox.packagesModel
width: parent.width
width: parent.width - 2 * parent.padding
columns: 2
columnSpacing: UM.Theme.getSize("default_margin").height
rowSpacing: UM.Theme.getSize("default_margin").width

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

@ -15,6 +15,7 @@ Item
Label
{
text: catalog.i18nc("@info", "You will need to restart Cura before changes in packages have effect.")
color: UM.Theme.getColor("text")
height: Math.floor(UM.Theme.getSize("toolbox_footer_button").height)
verticalAlignment: Text.AlignVCenter
anchors
@ -25,6 +26,7 @@ Item
right: restartButton.right
rightMargin: UM.Theme.getSize("default_margin").width
}
}
Button
{

1
resources/definitions/101Hero.def.json
View file

@ -24,7 +24,6 @@
"machine_depth": { "default_value": 149.86 },
"machine_height": { "default_value": 99.822 },
"machine_center_is_zero": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[ 0, 0 ],

1
resources/definitions/3dator.def.json
View file

@ -18,7 +18,6 @@
"overrides": {
"machine_name": { "default_value": "3Dator" },
"machine_nozzle_size": { "default_value": 0.5 },
"speed_travel": { "default_value": 120 },
"prime_tower_size": { "default_value": 8.660254037844387 },
"infill_sparse_density": { "default_value": 20 },

3
resources/definitions/alya3dp.def.json
View file

@ -26,9 +26,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[75, 18],

4
resources/definitions/anycubic_i3_mega.def.json
View file

@ -45,10 +45,6 @@
{
"default_value": false
},
"machine_nozzle_size":
{
"default_value": 0.4
},
"gantry_height":
{
"default_value": 0

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

@ -21,7 +21,6 @@
"prime_tower_size": { "default_value": 7.745966692414834 },
"machine_name": { "default_value": "BFB_Test" },
"machine_heated_bed": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.5 },
"speed_layer_0": { "default_value": 25 },
"machine_width": { "default_value": 275 },
"machine_gcode_flavor": { "default_value": "BFB" },

3
resources/definitions/creality_cr10.def.json
View file

@ -31,9 +31,6 @@
[30, 34]
]
},
"machine_nozzle_size": {
"default_value": 0.4
},
"layer_height_0": {
"default_value": 0.2
},

3
resources/definitions/dagoma_discoeasy200.def.json
View file

@ -27,9 +27,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon": {
"default_value": [
[17, 70],

3
resources/definitions/dagoma_neva.def.json
View file

@ -28,9 +28,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon": {
"default_value": [
[17, 40],

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

@ -22,7 +22,6 @@
"speed_wall_0": { "default_value": 30 },
"speed_topbottom": { "default_value": 30 },
"layer_height": { "default_value": 0.2 },
"machine_nozzle_size": { "default_value": 0.5 },
"speed_print": { "default_value": 30 },
"speed_infill": { "default_value": 30 },
"machine_extruder_count": { "default_value": 1 },

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

@ -23,7 +23,6 @@
"machine_height": { "default_value": 250 },
"machine_depth": { "default_value": 190 },
"machine_center_is_zero": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."},
"machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" },

3
resources/definitions/easyarts_ares.def.json
View file

@ -52,9 +52,6 @@
"bottom_thickness": {
"default_value": 1
},
"machine_nozzle_size": {
"default_value": 0.4
},
"speed_print": {
"default_value": 75
},

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

@ -35,7 +35,6 @@
"machine_depth": { "default_value": 234 },
"machine_center_is_zero": { "default_value": false },
"machine_heated_bed": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": { "default_value": [[-75, 35], [-75, -18], [18, 35], [18, -18]] },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
"machine_max_feedrate_x": { "default_value": 250 },

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

@ -44,7 +44,6 @@
"retraction_amount": { "default_value": 1 },
"retraction_speed": { "default_value": 50},
"material_flow": { "default_value": 87 },
"machine_nozzle_size": { "default_value": 0.35 },
"adhesion_type": { "default_value": "skirt" },
"skirt_brim_minimal_length": { "default_value": 130},

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

@ -27,7 +27,6 @@
"machine_depth": { "default_value": 406 },
"machine_height": { "default_value": 533 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.5 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.3 },
"retraction_amount": { "default_value": 1 },

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

@ -28,7 +28,6 @@
"machine_depth": { "default_value": 406 },
"machine_height": { "default_value": 533 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.5 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.3 },
"retraction_amount": { "default_value": 1 },

3
resources/definitions/grr_neo.def.json
View file

@ -29,9 +29,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.5
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

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

@ -26,7 +26,6 @@
"machine_width": { "default_value": 170 },
"machine_height": { "default_value": 145 },
"machine_depth": { "default_value": 160 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },

3
resources/definitions/innovo_inventor.def.json
View file

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-43.7, -19.2],

3
resources/definitions/kemiq_q2_beta.def.json
View file

@ -34,9 +34,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},

3
resources/definitions/kemiq_q2_gama.def.json
View file

@ -35,9 +35,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 2
},

3
resources/definitions/kossel_mini.def.json
View file

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

3
resources/definitions/kossel_pro.def.json
View file

@ -31,9 +31,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

3
resources/definitions/makeR_pegasus.def.json
View file

@ -33,9 +33,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

3
resources/definitions/makeR_prusa_tairona_i3.def.json
View file

@ -33,9 +33,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

3
resources/definitions/makeit_pro_l.def.json
View file

@ -30,9 +30,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

3
resources/definitions/makeit_pro_m.def.json
View file

@ -30,9 +30,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

3
resources/definitions/maker_starter.def.json
View file

@ -33,9 +33,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"gantry_height": {
"default_value": 55
},

3
resources/definitions/malyan_m180.def.json
View file

@ -29,9 +29,6 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon": {
"default_value": [
[ -75, 35 ],

4
resources/definitions/malyan_m200.def.json
View file

@ -60,10 +60,6 @@
"machine_height": { "default_value": 120 },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": {
"default_value": 0.4,
"minimum_value": 0.15
},
"machine_max_feedrate_x": { "default_value": 150 },
"machine_max_feedrate_y": { "default_value": 150 },
"machine_max_feedrate_z": { "default_value": 1.5 },

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

@ -20,7 +20,6 @@
"machine_height": { "default_value": 300 },
"machine_heated_bed": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[ -3, 3 ],

3
resources/definitions/mendel90.def.json
View file

@ -70,9 +70,6 @@
"gantry_height": {
"default_value": 55
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

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

@ -24,7 +24,6 @@
"infill_sparse_density": { "default_value": 15 },
"speed_travel": { "default_value": 150 },
"layer_height": { "default_value": 0.3 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_print_temperature": { "default_value": 240 },
"machine_extruder_count": { "default_value": 5 },
"machine_heated_bed": { "default_value": true },

3
resources/definitions/peopoly_moai.def.json
View file

@ -28,9 +28,6 @@
"machine_depth": {
"default_value": 130
},
"machine_nozzle_size": {
"default_value": 0.067
},
"machine_head_with_fans_polygon":
{
"default_value": [

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

@ -21,7 +21,6 @@
"machine_depth": { "default_value": 100 },
"machine_height": { "default_value": 130 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"layer_height": { "default_value": 0.2 },
"layer_height_0": { "default_value": 0.3 },
"retraction_amount": { "default_value": 0.7 },

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

@ -22,7 +22,6 @@
"machine_height": { "default_value": 150 },
"machine_depth": { "default_value": 140 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[-49, 20],

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

@ -22,7 +22,6 @@
"machine_height": { "default_value": 235 },
"machine_depth": { "default_value": 150 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[ 55, -20 ],

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

@ -19,7 +19,6 @@
"machine_width": { "default_value": 100 },
"machine_depth": { "default_value": 100 },
"machine_height": { "default_value": 115 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_with_fans_polygon": {
"default_value": [
[-40, 1000],

3
resources/definitions/prusa_i3.def.json
View file

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

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

@ -24,7 +24,6 @@
"machine_depth": { "default_value": 210 },
"machine_center_is_zero": { "default_value": false },
"material_bed_temperature": { "default_value": 55 },
"machine_nozzle_size": { "default_value": 0.4 },
"layer_height": { "default_value": 0.1 },
"layer_height_0": { "default_value": 0.15 },
"retraction_amount": { "default_value": 0.8 },

3
resources/definitions/prusa_i3_xl.def.json
View file

@ -32,9 +32,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_polygon": {
"default_value": [
[-75, -18],

3
resources/definitions/raise3D_N2_dual.def.json
View file

@ -33,9 +33,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

3
resources/definitions/raise3D_N2_plus_dual.def.json
View file

@ -33,9 +33,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

3
resources/definitions/raise3D_N2_plus_single.def.json
View file

@ -32,9 +32,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

3
resources/definitions/raise3D_N2_single.def.json
View file

@ -32,9 +32,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_nozzle_heat_up_speed": {
"default_value": 6
},

3
resources/definitions/rigid3d_mucit.def.json
View file

@ -69,9 +69,6 @@
"machine_depth": {
"default_value": 150
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap"
},

3
resources/definitions/rigid3d_zero2.def.json
View file

@ -80,9 +80,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"gantry_height": {
"default_value": 25
},

3
resources/definitions/rigidbot_big.def.json
View file

@ -28,9 +28,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"gantry_height": {
"default_value": 0
},

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

@ -26,7 +26,6 @@
"machine_height": { "default_value": 530 },
"machine_max_feedrate_z": { "default_value": 400 },
"machine_name": { "default_value": "Artemis" },
"machine_nozzle_size": { "default_value": 0.5 },
"machine_shape": { "default_value": "elliptic" },
"machine_width": { "default_value": 290 },
"relative_extrusion": { "default_value": false },

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

@ -26,7 +26,6 @@
"machine_height": { "default_value": 395 },
"machine_max_feedrate_z": { "default_value": 300 },
"machine_name": { "default_value": "Rostock Max V3.2" },
"machine_nozzle_size": { "default_value": 0.5 },
"machine_shape": { "default_value": "elliptic" },
"machine_width": { "default_value": 265 },
"relative_extrusion": { "default_value": false },

4
resources/definitions/tevo_blackwidow.def.json
View file

@ -43,10 +43,6 @@
{
"default_value": false
},
"machine_nozzle_size":
{
"default_value": 0.4
},
"gantry_height":
{
"default_value": 0

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

@ -24,7 +24,6 @@
"machine_height": { "default_value": 200 },
"machine_depth": { "default_value": 200 },
"machine_center_is_zero": { "default_value": false },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_head_polygon":
{
"default_value":

11
resources/definitions/tevo_tornado.def.json
View file

@ -8,7 +8,10 @@
"manufacturer": "Tevo",
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2.png",
"has_materials": true
"has_materials": true,
"machine_extruder_trains": {
"0": "tevo_tornado_extruder_0"
}
},
"overrides": {
"machine_name": {
@ -34,12 +37,6 @@
[30, 34]
]
},
"material_diameter": {
"default_value": 1.75
},
"machine_nozzle_size": {
"default_value": 0.4
},
"top_bottom_thickness": {
"default_value": 1.2
},

1
resources/definitions/ubuild-3d_mr_bot_280.def.json
View file

@ -27,7 +27,6 @@
"machine_depth": { "default_value": 275 },
"machine_center_is_zero": { "default_value": false },
"material_bed_temperature": { "default_value": 70 },
"machine_nozzle_size": { "default_value": 0.4 },
"layer_height_0": { "default_value": 0.1 },
"retraction_amount": { "default_value": 2 },
"retraction_speed": { "default_value": 50 },

4
resources/definitions/ultimaker2.def.json
View file

@ -54,10 +54,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4,
"minimum_value": "0.001"
},
"gantry_height": {
"default_value": 48
},

3
resources/definitions/ultimaker_original.def.json
View file

@ -35,9 +35,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

3
resources/definitions/ultimaker_original_dual.def.json
View file

@ -37,9 +37,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_head_with_fans_polygon":
{
"default_value": [

7
resources/definitions/uni_print_3d.def.json
View file

@ -11,7 +11,10 @@
"manufacturer": "TheCoolTool",
"file_formats": "text/x-ngc;text/x-gcode",
"platform": "uni_print_3d_platform.stl",
"platform_offset": [0, 0, 0]
"platform_offset": [0, 0, 0],
"machine_extruder_trains": {
"0": "uni_print_3d_extruder_0"
}
},
"overrides": {
@ -21,8 +24,6 @@
"machine_height": { "default_value": 230 },
"machine_depth": { "default_value": 220 },
"machine_center_is_zero": { "default_value": true },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_nozzle_heat_up_speed": { "default_value": 2.0 },
"machine_nozzle_cool_down_speed": { "default_value": 2.0 },
"machine_head_shape_min_x": { "default_value": 75 },

3
resources/definitions/uniqbot_one.def.json
View file

@ -30,9 +30,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.5
},
"gantry_height": {
"default_value": 55
},

3
resources/definitions/vertex_delta_k8800.def.json
View file

@ -30,9 +30,6 @@
"machine_shape": {
"default_value": "elliptic"
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_head_shape_min_x": {
"default_value": 0
},

3
resources/definitions/vertex_k8400.def.json
View file

@ -42,9 +42,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_head_polygon": {
"default_value": [
[-60, -18],

3
resources/definitions/vertex_k8400_dual.def.json
View file

@ -43,9 +43,6 @@
"machine_use_extruder_offset_to_offset_coords": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.35
},
"machine_head_polygon": {
"default_value": [
[-60, -18],

9
resources/definitions/wanhao_d4s.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_225_145_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_d4s_extruder_0"
},
"platform_offset": [
0,
-28,
@ -33,9 +36,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
@ -44,9 +44,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 1.75
}
}
}

9
resources/definitions/wanhao_d6.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_200_200_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_d6_extruder_0"
},
"platform_offset": [
0,
-28,
@ -33,9 +36,6 @@
"machine_depth": {
"default_value": 200
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_heated_bed": {
"default_value": true
},
@ -50,9 +50,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 1.75
}
}
}

9
resources/definitions/wanhao_d6_plus.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_200_200_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_d6_plus_extruder_0"
},
"platform_offset": [
0,
-28,
@ -30,9 +33,6 @@
"machine_depth": {
"default_value": 200
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_heated_bed": {
"default_value": true
},
@ -44,9 +44,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 1.75
}
}
}

9
resources/definitions/wanhao_duplicator5S.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_300_200_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_duplicator5S_extruder_0"
},
"platform_offset": [
0,
-28,
@ -36,9 +39,6 @@
"machine_heated_bed": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
@ -47,9 +47,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 3
}
}
}

9
resources/definitions/wanhao_duplicator5Smini.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_300_200_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_duplicator5Smini_extruder_0"
},
"platform_offset": [
0,
-28,
@ -33,9 +36,6 @@
"machine_heated_bed": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
@ -44,9 +44,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 3
}
}
}

9
resources/definitions/wanhao_i3.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_200_200_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_i3_extruder_0"
},
"platform_offset": [
0,
-28,
@ -33,9 +36,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
@ -44,9 +44,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 1.75
}
}
}

9
resources/definitions/wanhao_i3mini.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_110_110_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_i3mini_extruder_0"
},
"platform_offset": [
0,
-15,
@ -33,9 +36,6 @@
"machine_heated_bed": {
"default_value": false
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
@ -44,9 +44,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 1.75
}
}
}

9
resources/definitions/wanhao_i3plus.def.json
View file

@ -11,6 +11,9 @@
"has_materials": true,
"platform": "wanhao_200_200_platform.obj",
"platform_texture": "Wanhaobackplate.png",
"machine_extruder_trains": {
"0": "wanhao_i3plus_extruder_0"
},
"platform_offset": [
0,
-28,
@ -33,9 +36,6 @@
"machine_heated_bed": {
"default_value": true
},
"machine_nozzle_size": {
"default_value": 0.4
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},
@ -44,9 +44,6 @@
},
"machine_end_gcode": {
"default_value": "M104 S0 ;extruder heater off \n G91 ;relative positioning\n G1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\n G1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\n G28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\n M84 ;steppers off\n G90 ;absolute positioning"
},
"material_diameter": {
"default_value": 1.75
}
}
}

1
resources/extruders/felixtec4_dual_extruder_0.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/felixtec4_dual_extruder_1.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 13 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/makeit_dual_1st.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/makeit_dual_2nd.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/makeit_l_dual_1st.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/makeit_l_dual_2nd.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/ord_extruder_0.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

1
resources/extruders/ord_extruder_1.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 62.95 },
"machine_nozzle_offset_y": { "default_value": 2.05 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

1
resources/extruders/ord_extruder_2.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 27.7 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

1
resources/extruders/ord_extruder_3.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 63.18 },
"machine_nozzle_offset_y": { "default_value": 28.65 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

1
resources/extruders/ord_extruder_4.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 31.6 },
"machine_nozzle_offset_y": { "default_value": 28.2 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 }
}
}

1
resources/extruders/raise3D_N2_dual_extruder_0.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/raise3D_N2_dual_extruder_1.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 24.8 },
"machine_nozzle_offset_y": { "default_value": 0.6 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/raise3D_N2_plus_dual_extruder_0.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0 },
"machine_nozzle_offset_y": { "default_value": 0 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/raise3D_N2_plus_dual_extruder_1.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 24.8 },
"machine_nozzle_offset_y": { "default_value": 0.6 },
"machine_nozzle_size": { "default_value": 0.4 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

1
resources/extruders/raise3D_N2_plus_single_extruder_0.def.json
View file

@ -1,5 +1,4 @@
{
"id": "raise3D_N2_plus_single_extruder_0",
"version": 2,
"name": "Extruder 1",
"inherits": "fdmextruder",

16
resources/extruders/tevo_tornado_extruder_0.def.json Normal file
View file

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

1
resources/extruders/ultimaker_original_dual_1st.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },

1
resources/extruders/ultimaker_original_dual_2nd.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 0.0 },
"machine_nozzle_offset_y": { "default_value": 21.6 },
"machine_nozzle_size": { "default_value": 0.4 },
"machine_extruder_start_pos_abs": { "default_value": true },
"machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },

16
resources/extruders/uni_print_3d_extruder_0.def.json Normal file
View file

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

1
resources/extruders/vertex_k8400_dual_1st.def.json
View file

@ -15,6 +15,7 @@
},
"machine_nozzle_offset_x": { "default_value": 23.7 },
"machine_nozzle_offset_y": { "default_value": 0.0 },
"machine_nozzle_size": { "default_value": 0.35 },
"material_diameter": { "default_value": 1.75 },
"machine_extruder_start_pos_abs": { "default_value": true },

Some files were not shown because too many files have changed in this diff Show more