diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index a0d3a8d44a..c772ef6984 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -36,10 +36,10 @@ class CuraPackageManager(PackageManager): machine_with_qualities = [] for container_id in ids: for global_stack in global_stacks: - for extruder_nr, extruder_stack in global_stack.extruders.items(): + for extruder_nr, extruder_stack in enumerate(global_stack.extruderList): if container_id in (extruder_stack.material.getId(), extruder_stack.material.getMetaData().get("base_file")): - machine_with_materials.append((global_stack, extruder_nr, container_id)) + machine_with_materials.append((global_stack, str(extruder_nr), container_id)) if container_id == extruder_stack.quality.getId(): - machine_with_qualities.append((global_stack, extruder_nr, container_id)) + machine_with_qualities.append((global_stack, str(extruder_nr), container_id)) return machine_with_materials, machine_with_qualities diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py index 5e672faa12..b4b677d8cc 100644 --- a/cura/Machines/Models/BaseMaterialsModel.py +++ b/cura/Machines/Models/BaseMaterialsModel.py @@ -150,9 +150,10 @@ class BaseMaterialsModel(ListModel): global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() if not global_stack.hasMaterials: return # There are no materials for this machine, so nothing to do. - extruder_stack = global_stack.extruders.get(str(self._extruder_position)) - if not extruder_stack: + extruder_list = global_stack.extruderList + if self._extruder_position > len(extruder_list): return + extruder_stack = extruder_list[self._extruder_position] nozzle_name = extruder_stack.variant.getName() machine_node = ContainerTree.getInstance().machines[global_stack.definition.getId()] if nozzle_name not in machine_node.variants: diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py index 8a956263e7..c15dddce4c 100644 --- a/cura/Machines/Models/QualitySettingsModel.py +++ b/cura/Machines/Models/QualitySettingsModel.py @@ -152,7 +152,7 @@ class QualitySettingsModel(ListModel): if self._selected_position == self.GLOBAL_STACK_POSITION: user_value = global_container_stack.userChanges.getProperty(definition.key, "value") else: - extruder_stack = global_container_stack.extruders[str(self._selected_position)] + extruder_stack = global_container_stack.extruderList[self._selected_position] user_value = extruder_stack.userChanges.getProperty(definition.key, "value") if profile_value is None and user_value is None: diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py index 0ef09a1fac..00d2719793 100644 --- a/cura/Settings/CuraContainerRegistry.py +++ b/cura/Settings/CuraContainerRegistry.py @@ -180,9 +180,7 @@ class CuraContainerRegistry(ContainerRegistry): return {"status": "error", "message": catalog.i18nc("@info:status Don't translate the XML tags !", "Can't import profile from {0} before a printer is added.", file_name)} container_tree = ContainerTree.getInstance() - machine_extruders = [] - for position in sorted(global_stack.extruders): - machine_extruders.append(global_stack.extruders[position]) + machine_extruders = global_stack.extruderList plugin_registry = PluginRegistry.getInstance() extension = file_name.split(".")[-1] @@ -263,7 +261,7 @@ class CuraContainerRegistry(ContainerRegistry): if len(profile_or_list) == 1: global_profile = profile_or_list[0] extruder_profiles = [] - for idx, extruder in enumerate(global_stack.extruders.values()): + for idx, extruder in enumerate(global_stack.extruderList): profile_id = ContainerRegistry.getInstance().uniqueName(global_stack.getId() + "_extruder_" + str(idx + 1)) profile = InstanceContainer(profile_id) profile.setName(quality_name) diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 257af78ecc..96307d3250 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -62,7 +62,7 @@ class CuraStackBuilder: except IndexError: return None - for new_extruder in new_global_stack.extruders.values(): # Only register the extruders if we're sure that all of them are correct. + for new_extruder in new_global_stack.extruderList: # Only register the extruders if we're sure that all of them are correct. registry.addContainer(new_extruder) # Register the global stack after the extruder stacks are created. This prevents the registry from adding another diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 4610e6a454..ef68e8c56e 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -143,25 +143,6 @@ class ExtruderManager(QObject): return self._extruder_trains[global_container_stack.getId()][str(index)] return None - def registerExtruder(self, extruder_train: "ExtruderStack", machine_id: str) -> None: - changed = False - - if machine_id not in self._extruder_trains: - self._extruder_trains[machine_id] = {} - changed = True - - # do not register if an extruder has already been registered at the position on this machine - if any(item.getId() == extruder_train.getId() for item in self._extruder_trains[machine_id].values()): - Logger.log("w", "Extruder [%s] has already been registered on machine [%s], not doing anything", - extruder_train.getId(), machine_id) - return - - if extruder_train: - self._extruder_trains[machine_id][extruder_train.getMetaDataEntry("position")] = extruder_train - changed = True - if changed: - self.extrudersChanged.emit(machine_id) - ## Gets a property of a setting for all extruders. # # \param setting_key \type{str} The setting to get the property of. diff --git a/cura/Settings/ExtruderStack.py b/cura/Settings/ExtruderStack.py index 5d4b3e38b1..13dfd18bcc 100644 --- a/cura/Settings/ExtruderStack.py +++ b/cura/Settings/ExtruderStack.py @@ -44,9 +44,6 @@ class ExtruderStack(CuraContainerStack): stack.addExtruder(self) self.setMetaDataEntry("machine", stack.id) - # For backward compatibility: Register the extruder with the Extruder Manager - ExtruderManager.getInstance().registerExtruder(self, stack.id) - @override(ContainerStack) def getNextStack(self) -> Optional["GlobalStack"]: return super().getNextStack() diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 2866e3a494..8f1a8bb7f8 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -915,7 +915,7 @@ class MachineManager(QObject): @pyqtSlot(int, bool) def setExtruderEnabled(self, position: int, enabled: bool) -> None: - if self._global_container_stack is None or str(position) not in self._global_container_stack.extruders: + if self._global_container_stack is None or position >= len(self._global_container_stack.extruderList): Logger.log("w", "Could not find extruder on position %s.", position) return extruder = self._global_container_stack.extruderList[position] @@ -1073,14 +1073,14 @@ class MachineManager(QObject): self._global_container_stack.quality = quality_container self._global_container_stack.qualityChanges = quality_changes_container - for position, extruder in self._global_container_stack.extruders.items(): + for position, extruder in enumerate(self._global_container_stack.extruderList): quality_node = None if quality_group is not None: - quality_node = quality_group.nodes_for_extruders.get(int(position)) + quality_node = quality_group.nodes_for_extruders.get(position) quality_changes_container = empty_quality_changes_container quality_container = empty_quality_container - quality_changes_metadata = quality_changes_group.metadata_per_extruder.get(int(position)) + quality_changes_metadata = quality_changes_group.metadata_per_extruder.get(position) if quality_changes_metadata: containers = container_registry.findContainers(id = quality_changes_metadata["id"]) if containers: @@ -1099,7 +1099,7 @@ class MachineManager(QObject): def _setVariantNode(self, position: str, variant_node: "VariantNode") -> None: if self._global_container_stack is None: return - self._global_container_stack.extruders[position].variant = variant_node.container + self._global_container_stack.extruderList[int(position)].variant = variant_node.container self.activeVariantChanged.emit() def _setGlobalVariant(self, container_node: "ContainerNode") -> None: @@ -1114,7 +1114,7 @@ class MachineManager(QObject): return if material_node and material_node.container: material_container = material_node.container - self._global_container_stack.extruders[position].material = material_container + self._global_container_stack.extruderList[int(position)].material = material_container root_material_id = material_container.getMetaDataEntry("base_file", None) else: self._global_container_stack.extruderList[int(position)].material = empty_material_container @@ -1214,7 +1214,7 @@ class MachineManager(QObject): if self._global_container_stack is None: return if position is None: - position_list = list(self._global_container_stack.extruders.keys()) + position_list = [str(position) for position in range(len(self._global_container_stack.extruderList))] else: position_list = [position] @@ -1286,17 +1286,15 @@ class MachineManager(QObject): # Keep a temporary copy of the global and per-extruder user changes and transfer them to the user changes # of the new machine after the new_machine becomes active. global_user_changes = self._global_container_stack.userChanges - per_extruder_user_changes = {} - for extruder_name, extruder_stack in self._global_container_stack.extruders.items(): - per_extruder_user_changes[extruder_name] = extruder_stack.userChanges + per_extruder_user_changes = [extruder_stack.userChanges for extruder_stack in self._global_container_stack.extruderList] self.setActiveMachine(new_machine.getId()) # Apply the global and per-extruder userChanges to the new_machine (which is of different type than the # previous one). self._global_container_stack.setUserChanges(global_user_changes) - for extruder_name in self._global_container_stack.extruders.keys(): - self._global_container_stack.extruders[extruder_name].setUserChanges(per_extruder_user_changes[extruder_name]) + for i, user_changes in enumerate(per_extruder_user_changes): + self._global_container_stack.extruderList[i].setUserChanges(per_extruder_user_changes[i]) @pyqtSlot(QObject) def applyRemoteConfiguration(self, configuration: PrinterConfigurationModel) -> None: @@ -1354,7 +1352,7 @@ class MachineManager(QObject): material_container_node = variant_node.materials.get(base_file, material_container_node) self._setMaterial(position, material_container_node) - self._global_container_stack.extruders[position].setEnabled(True) + self._global_container_stack.extruderList[int(position)].setEnabled(True) self.updateMaterialWithVariant(position) self.updateDefaultExtruder() @@ -1405,7 +1403,7 @@ class MachineManager(QObject): @pyqtSlot(str, "QVariant") def setMaterial(self, position: str, container_node, global_stack: Optional["GlobalStack"] = None) -> None: if global_stack is not None and global_stack != self._global_container_stack: - global_stack.extruders[position].material = container_node.container + global_stack.extruderList[int(position)].material = container_node.container return position = str(position) self.blurSettings.emit() @@ -1590,7 +1588,7 @@ class MachineManager(QObject): return with postponeSignals(*self._getContainerChangedSignals(), compress = CompressTechnique.CompressPerParameterValue): self._setQualityGroup(self.activeQualityGroup()) - for stack in [self._global_container_stack] + list(self._global_container_stack.extruders.values()): + for stack in [self._global_container_stack] + self._global_container_stack.extruderList: stack.userChanges.clear() @pyqtProperty(QObject, fset = setQualityChangesGroup, notify = activeQualityChangesGroupChanged) diff --git a/cura_app.py b/cura_app.py index 6c9839e79c..a78e7cabd1 100755 --- a/cura_app.py +++ b/cura_app.py @@ -63,14 +63,17 @@ if with_sentry_sdk: # Errors to be ignored by Sentry ignore_errors = [KeyboardInterrupt, MemoryError] - sentry_sdk.init("https://5034bf0054fb4b889f82896326e79b13@sentry.io/1821564", - before_send = CrashHandler.sentryBeforeSend, - environment = sentry_env, - release = "cura%s" % ApplicationMetadata.CuraVersion, - default_integrations = False, - max_breadcrumbs = 300, - server_name = "cura", - ignore_errors = ignore_errors) + try: + sentry_sdk.init("https://5034bf0054fb4b889f82896326e79b13@sentry.io/1821564", + before_send = CrashHandler.sentryBeforeSend, + environment = sentry_env, + release = "cura%s" % ApplicationMetadata.CuraVersion, + default_integrations = False, + max_breadcrumbs = 300, + server_name = "cura", + ignore_errors = ignore_errors) + except Exception: + with_sentry_sdk = False if not known_args["debug"]: def get_cura_dir_path(): diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 74589b8335..6ab72b029c 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -623,8 +623,8 @@ class ThreeMFWorkspaceReader(WorkspaceReader): machine_name = self._container_registry.uniqueName(self._machine_info.name) global_stack = CuraStackBuilder.createMachine(machine_name, self._machine_info.definition_id) - if global_stack: #Only switch if creating the machine was successful. - extruder_stack_dict = global_stack.extruders + if global_stack: # Only switch if creating the machine was successful. + extruder_stack_dict = {str(position): extruder for position, extruder in enumerate(global_stack.extruderList)} self._container_registry.addContainer(global_stack) else: diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py index 62b0bd16e7..51eea7beea 100644 --- a/plugins/CuraEngineBackend/StartSliceJob.py +++ b/plugins/CuraEngineBackend/StartSliceJob.py @@ -251,7 +251,7 @@ class StartSliceJob(Job): global_stack = CuraApplication.getInstance().getGlobalContainerStack() if not global_stack: return - extruders_enabled = {position: stack.isEnabled for position, stack in global_stack.extruders.items()} + extruders_enabled = [stack.isEnabled for stack in global_stack.extruderList] filtered_object_groups = [] has_model_with_disabled_extruders = False associated_disabled_extruders = set() @@ -261,7 +261,7 @@ class StartSliceJob(Job): for node in group: # Only check if the printing extruder is enabled for printing meshes is_non_printing_mesh = node.callDecoration("evaluateIsNonPrintingMesh") - extruder_position = node.callDecoration("getActiveExtruderPosition") + extruder_position = int(node.callDecoration("getActiveExtruderPosition")) if not is_non_printing_mesh and not extruders_enabled[extruder_position]: skip_group = True has_model_with_disabled_extruders = True @@ -271,8 +271,8 @@ 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])} - self.setMessage(", ".join(associated_disabled_extruders)) + associated_disabled_extruders = {p + 1 for p in associated_disabled_extruders} + self.setMessage(", ".join(map(str, sorted(associated_disabled_extruders)))) return # There are cases when there is nothing to slice. This can happen due to one at a time slicing not being diff --git a/plugins/PerObjectSettingsTool/SettingPickDialog.qml b/plugins/PerObjectSettingsTool/SettingPickDialog.qml index 4e9295c05a..28ddb7e642 100644 --- a/plugins/PerObjectSettingsTool/SettingPickDialog.qml +++ b/plugins/PerObjectSettingsTool/SettingPickDialog.qml @@ -60,16 +60,12 @@ UM.Dialog CheckBox { id: toggleShowAll - anchors { top: parent.top right: parent.right } - text: catalog.i18nc("@label:checkbox", "Show all") - checked: listview.model.showAll - onClicked: listview.model.showAll = checked } ScrollView @@ -85,7 +81,7 @@ UM.Dialog } ListView { - id:listview + id: listview model: UM.SettingDefinitionsModel { id: definitionsModel @@ -98,6 +94,7 @@ UM.Dialog excluded_settings = excluded_settings.concat(settingPickDialog.additional_excluded_settings) return excluded_settings } + showAll: toggleShowAll.checked || filterInput.text !== "" } delegate:Loader { diff --git a/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py b/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py index c447f9f25d..1aa5e1b2da 100644 --- a/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py +++ b/plugins/VersionUpgrade/VersionUpgrade460to462/VersionUpgrade460to462.py @@ -2,11 +2,44 @@ # Cura is released under the terms of the LGPLv3 or higher. import configparser +import copy # To split up files. from typing import Tuple, List import io from UM.VersionUpgrade import VersionUpgrade + +renamed_nozzles = { + "deltacomb_025_e3d": "deltacomb_dc20_fbe025", + "deltacomb_040_e3d": "deltacomb_dc20_fbe040", + "deltacomb_080_e3d": "deltacomb_dc20_vfbe080" +} +default_qualities_per_nozzle_and_material = { + # Can't define defaults for user-defined materials, since we only have the material ID. Those will get reset to empty quality :( + "deltacomb_dc20_fbe025": { + "generic_pla_175": "deltacomb_FBE0.25_PLA_C", + "generic_abs_175": "deltacomb_FBE0.25_ABS_C" + }, + "deltacomb_dc20_fbe040": { + "generic_pla_175": "deltacomb_FBE0.40_PLA_C", + "generic_abs_175": "deltacomb_FBE0.40_ABS_C", + "generic_petg_175": "deltacomb_FBE0.40_PETG_C", + "generic_tpu_175": "deltacomb_FBE0.40_TPU_C" + }, + "deltacomb_dc20_vfbe080": { + "generic_pla_175": "deltacomb_VFBE0.80_PLA_D", + "generic_abs_175": "deltacomb_VFBE0.80_ABS_D" + } +} + + class VersionUpgrade460to462(VersionUpgrade): + def getCfgVersion(self, serialised: str) -> int: + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialised) + format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. + setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) + return format_version * 1000000 + setting_version + def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: """ Upgrades preferences to have the new version number. @@ -25,6 +58,66 @@ class VersionUpgrade460to462(VersionUpgrade): parser.write(result) return [filename], [result.getvalue()] + def upgradeExtruderInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """ + Upgrades per-extruder instance containers to the new version number. + + This applies all of the changes that are applied in other instance + containers as well. + + In the case of Deltacomb printers, it splits the 2 extruders into 4 and + changes the definition. + :param serialized: The original contents of the instance container. + :param filename: The original file name of the instance container. + :return: A list of new file names, and a list of the new contents for + those files. + """ + parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ()) + parser.read_string(serialized) + results = [(parser, filename)] + + if "general" in parser and "definition" in parser["general"]: + if parser["general"]["definition"] == "deltacomb_extruder_0": + parser["general"]["definition"] = "deltacomb_base_extruder_0" + elif parser["general"]["definition"] == "deltacomb_extruder_1": # Split up the second Deltacomb extruder into 3, creating an extra two extruders. + parser_e2 = configparser.ConfigParser(interpolation = None) + parser_e3 = configparser.ConfigParser(interpolation = None) + parser_e2.read_dict(parser) + parser_e3.read_dict(parser) + + parser["general"]["definition"] = "deltacomb_base_extruder_1" + parser_e2["general"]["definition"] = "deltacomb_base_extruder_2" + parser_e3["general"]["definition"] = "deltacomb_base_extruder_3" + results.append((parser_e2, filename + "_e2_upgrade")) # Hopefully not already taken. + results.append((parser_e3, filename + "_e3_upgrade")) + elif parser["general"]["definition"] == "deltacomb": # On the global stack, the per-extruder user container OR the per-extruder quality changes container. + parser["general"]["definition"] = "deltacomb_dc20" + + if "metadata" in parser and ("extruder" in parser["metadata"] or "position" in parser["metadata"]): # Per-extruder user container or quality changes container. + parser_e2 = configparser.ConfigParser(interpolation = None) + parser_e3 = configparser.ConfigParser(interpolation = None) + parser_e2.read_dict(parser) + parser_e3.read_dict(parser) + if "extruder" in parser["metadata"]: + parser_e2["metadata"]["extruder"] += "_e2_upgrade" + parser_e3["metadata"]["extruder"] += "_e3_upgrade" + results.append((parser_e2, filename + "_e2_upgrade")) + results.append((parser_e3, filename + "_e3_upgrade")) + + # Now go upgrade with the generic instance container method. + final_serialized = [] # type: List[str] + final_filenames = [] # type: List[str] + for result_parser, result_filename in results: + result_ss = io.StringIO() + result_parser.write(result_ss) + result_serialized = result_ss.getvalue() + # The upgrade function itself might also return multiple files, so we need to append all of those into the final list. + this_filenames_upgraded, this_serialized_upgraded = self.upgradeInstanceContainer(result_serialized, result_filename) + final_serialized += this_serialized_upgraded + final_filenames += this_filenames_upgraded + + return final_filenames, final_serialized + def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: """ Upgrades instance containers to have the new version number. @@ -62,6 +155,9 @@ class VersionUpgrade460to462(VersionUpgrade): def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: """ Upgrades stacks to have the new version number. + + This upgrades Deltacomb printers to their new profile structure, and + gives them 4 extruders. :param serialized: The original contents of the stack. :param filename: The original file name of the stack. :return: A list of new file names, and a list of the new contents for @@ -69,12 +165,56 @@ class VersionUpgrade460to462(VersionUpgrade): """ parser = configparser.ConfigParser(interpolation = None) parser.read_string(serialized) + results = [(parser, filename)] # Update version number. if "metadata" not in parser: parser["metadata"] = {} parser["metadata"]["setting_version"] = "14" - result = io.StringIO() - parser.write(result) - return [filename], [result.getvalue()] + if "containers" in parser and "7" in parser["containers"]: + if parser["containers"]["7"] == "deltacomb_extruder_0" or parser["containers"]["7"] == "deltacomb_extruder_1": # Extruder stack. + if "5" in parser["containers"]: + parser["containers"]["5"] = renamed_nozzles.get(parser["containers"]["5"], parser["containers"]["5"]) + if "3" in parser["containers"] and "4" in parser["containers"] and parser["containers"]["3"] == "empty_quality": + parser["containers"]["3"] = default_qualities_per_nozzle_and_material[parser["containers"]["5"]].get(parser["containers"]["4"], "empty_quality") + if parser["containers"]["7"] == "deltacomb_extruder_0": + parser["containers"]["7"] = "deltacomb_base_extruder_0" + else: + parser["containers"]["7"] = "deltacomb_base_extruder_1" + # Copy this extruder to extruder 3 and 4. + extruder3 = configparser.ConfigParser(interpolation=None) + extruder4 = configparser.ConfigParser(interpolation=None) + extruder3.read_dict(parser) + extruder4.read_dict(parser) + + extruder3["general"]["id"] += "_e2_upgrade" + extruder3["metadata"]["position"] = "2" + extruder3["containers"]["0"] += "_e2_upgrade" + if extruder3["containers"]["1"] != "empty_quality_changes": + extruder3["containers"]["1"] += "_e2_upgrade" + extruder3["containers"]["6"] += "_e2_upgrade" + extruder3["containers"]["7"] = "deltacomb_base_extruder_2" + results.append((extruder3, filename + "_e2_upgrade")) + + extruder4["general"]["id"] += "_e3_upgrade" + extruder4["metadata"]["position"] = "3" + extruder4["containers"]["0"] += "_e3_upgrade" + if extruder4["containers"]["1"] != "empty_quality_changes": + extruder4["containers"]["1"] += "_e3_upgrade" + extruder4["containers"]["6"] += "_e3_upgrade" + extruder4["containers"]["7"] = "deltacomb_base_extruder_3" + results.append((extruder4, filename + "_e3_upgrade")) + elif parser["containers"]["7"] == "deltacomb": # Global stack. + parser["containers"]["7"] = "deltacomb_dc20" + parser["containers"]["3"] = "deltacomb_global_C" + + result_serialized = [] + result_filenames = [] + for result_parser, result_filename in results: + result_ss = io.StringIO() + result_parser.write(result_ss) + result_serialized.append(result_ss.getvalue()) + result_filenames.append(result_filename) + + return result_filenames, result_serialized diff --git a/plugins/VersionUpgrade/VersionUpgrade460to462/__init__.py b/plugins/VersionUpgrade/VersionUpgrade460to462/__init__.py index 33732dc9e2..5f096545b2 100644 --- a/plugins/VersionUpgrade/VersionUpgrade460to462/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade460to462/__init__.py @@ -17,10 +17,10 @@ def getMetaData() -> Dict[str, Any]: ("preferences", 6000013): ("preferences", 6000014, upgrade.upgradePreferences), ("machine_stack", 4000013): ("machine_stack", 4000014, upgrade.upgradeStack), ("extruder_train", 4000013): ("extruder_train", 4000014, upgrade.upgradeStack), - ("definition_changes", 4000013): ("definition_changes", 4000014, upgrade.upgradeInstanceContainer), - ("quality_changes", 4000013): ("quality_changes", 4000014, upgrade.upgradeInstanceContainer), - ("quality", 4000013): ("quality", 4000014, upgrade.upgradeInstanceContainer), - ("user", 4000013): ("user", 4000014, upgrade.upgradeInstanceContainer), + ("definition_changes", 4000013): ("definition_changes", 4000014, upgrade.upgradeExtruderInstanceContainer), + ("quality_changes", 4000013): ("quality_changes", 4000014, upgrade.upgradeExtruderInstanceContainer), + ("quality", 4000013): ("quality", 4000014, upgrade.upgradeExtruderInstanceContainer), + ("user", 4000013): ("user", 4000014, upgrade.upgradeExtruderInstanceContainer), }, "sources": { "preferences": { diff --git a/resources/definitions/deltacomb.def.json b/resources/definitions/deltacomb.def.json deleted file mode 100644 index 7fa2b5a7c7..0000000000 --- a/resources/definitions/deltacomb.def.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "version": 2, - "name": "Deltacomb 3D", - "inherits": "fdmprinter", - - "metadata": { - "author": "Gabriele Rossetti", - "visible": true, - "manufacturer": "Deltacomb 3D", - "file_formats": "text/x-gcode", - "icon": "icon_ultimaker2", - "platform": "deltacomb.3mf", - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "variants_name": "Head", - "preferred_variant_name": "E3D 0.40mm", - "preferred_material": "generic_pla", - "preferred_quality_type": "normal", - "machine_extruder_trains": { "0": "deltacomb_extruder_0", "1": "deltacomb_extruder_1" } - }, - - "overrides": { - "machine_extruder_count": { "default_value": 1 }, - "machine_heated_bed": { "default_value": true }, - "machine_width": { "default_value": 190 }, - "machine_height": { "default_value": 250 }, - "machine_depth": { "default_value": 190 }, - "machine_center_is_zero": { "default_value": true }, - "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, - "machine_start_gcode": { "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..."}, - "machine_end_gcode": { "default_value": "M104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\nG90 ;absolute positioning" }, - "machine_shape": { "default_value": "elliptic" }, - "retraction_hop_enabled": { "default_value": true }, - "retraction_hop": { "default_value": 1 }, - "retraction_amount" : { "default_value": 3.5 }, - "retraction_speed" : { "default_value": 30 }, - "retraction_combing" : { "default_value": "noskin" }, - "travel_avoid_distance": { "value": "1" }, - "speed_print" : { "default_value": 80 }, - "speed_infill": { "value": "round(speed_print * 1.05, 0)" }, - "speed_topbottom": { "value": "round(speed_print * 0.95, 0)" }, - "speed_wall": { "value": "speed_print" }, - "speed_wall_0": { "value": "30" }, - "speed_wall_x": { "value": "speed_wall" }, - "speed_layer_0": { "value": "min(round(speed_print * 0.75, 0), 45.0)" }, - "speed_travel": { "value": 150 }, - "speed_travel_layer_0": { "value": "round(speed_travel * 0.7, 0)" }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "skirt_line_count": { "default_value": 3 }, - "skirt_brim_minimal_length": { "default_value": 150 }, - "infill_sparse_density": { "default_value": 30 }, - "infill_pattern": { "value": "'cubic'" }, - "infill_before_walls" : { "default_value": false }, - "top_bottom_thickness": { "default_value": 0.8 }, - "support_z_distance": { "value": "layer_height * 2" }, - "support_bottom_distance": { "value": "layer_height" }, - "support_use_towers" : { "default_value": false }, - "jerk_enabled": { "value": "True" }, - "jerk_infill" : { "value": "5" }, - "jerk_support" : { "value": "5" }, - "acceleration_enabled": { "value": "1" }, - "acceleration_travel" : { "value": 5000 }, - "machine_max_feedrate_z" : { "default_value": 300 } - } -} diff --git a/resources/definitions/deltacomb_base.def.json b/resources/definitions/deltacomb_base.def.json new file mode 100755 index 0000000000..e1f66ee8df --- /dev/null +++ b/resources/definitions/deltacomb_base.def.json @@ -0,0 +1,92 @@ +{ + "version": 2, + "name": "Deltacomb Base Printer", + "inherits": "fdmprinter", + + "metadata": { + "author": "Gabriele Rossetti", + "visible": false, + "manufacturer": "Deltacomb 3D Printers", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "variants_name": "Head", + + "preferred_quality_type": "d", + "preferred_material": "generic_pla", + + "machine_extruder_trains": { + "0": "deltacomb_base_extruder_0", + "1": "deltacomb_base_extruder_1", + "2": "deltacomb_base_extruder_2", + "3": "deltacomb_base_extruder_3" + } + }, + + "overrides": { + "machine_extruder_count": { "default_value": 1, "maximum_value": "4" }, + "machine_heated_bed": { "default_value": true }, + "machine_center_is_zero": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { "default_value": ";---------------------------------------\n;Deltacomb start script\n;---------------------------------------\nG21 ;metric values\nG90 ;absolute positioning\nM107 ;start with the fan off\nG28 ;Home all axes (max endstops)\nG92 E0 ;zero the extruded length\nG1 Z15.0 F9000 ;move to the platform down 15mm\nG1 F9000\n\n;Put printing message on LCD screen\nM117 Printing...\n;---------------------------------------"}, + "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 F15000 X8.0 E-4.5 ;Wipe filament+material retraction\nG1 F15000 E4.0 Z1 ;Retraction compensation\nG28 ;Home all axes (max endstops)\nM84 ;steppers off\n" }, + "machine_shape": { "default_value": "elliptic" }, + + "machine_max_feedrate_z" : { "default_value": 300 }, + + "speed_print" : { "default_value": 80 }, + "speed_topbottom": { "value": "speed_print * 0.90" }, + "speed_wall_0": { "value": "35 if speed_print > 35 else speed_print" }, + "speed_layer_0": { "value": "speed_print * 0.55" }, + + "speed_travel": { "value": "170" }, + "speed_travel_layer_0": { "value": "speed_travel * 0.70" }, + "speed_z_hop": { "value": "speed_travel" }, + + "acceleration_enabled": { "value": "True" }, + "acceleration_travel" : { "value": "9000" }, + "acceleration_print": { "value": "4000" }, + "acceleration_wall": { "value": "acceleration_print * 0.5" }, + "acceleration_wall_0": { "value": "acceleration_wall * 0.5" }, + "acceleration_topbottom": { "value": "acceleration_wall_0" }, + "acceleration_layer_0": { "value": "acceleration_wall_0" }, + "acceleration_prime_tower": { "value": "acceleration_wall" }, + "acceleration_support": { "value": "acceleration_wall" }, + "acceleration_support_interface": { "value": "acceleration_wall_0" }, + + "jerk_enabled": { "value": "True" }, + "jerk_print": { "value": "25" }, + "jerk_infill": { "value": "10" }, + "jerk_travel": { "value": "10" }, + + "retraction_hop_enabled": { "default_value": true }, + "retraction_hop": { "default_value": 0.5 }, + "retraction_amount" : { "default_value": 3.5 }, + "retraction_speed" : { "default_value": 70 }, + "retraction_combing" : { "default_value": "noskin" }, + "travel_avoid_distance": { "value": "1" }, + + "top_bottom_thickness": { "default_value": 0.8 }, + "roofing_layer_count": { "value": "1" }, + "roofing_line_width": { "value": "line_width * 0.75" }, + + "infill_sparse_density": { "default_value": 30 }, + "infill_pattern": { "value": "'cubic'" }, + "infill_before_walls": { "default_value": false }, + + "support_z_distance": { "value": "layer_height * 2" }, + "support_bottom_distance": { "value": "layer_height" }, + "support_use_towers" : { "default_value": false }, + "support_bottom_enable" : { "value": "0" }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + "skirt_line_count": { "default_value": 3 }, + "skirt_brim_minimal_length": { "default_value": 150 }, + "brim_width": { "value": "3" }, + + "prime_tower_size": { "value": "math.sqrt(extruders_enabled_count * prime_tower_min_volume / layer_height / math.pi) * 2"}, + "prime_tower_position_x": { "value": "prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0)" }, + "prime_tower_position_y": { "value": "machine_depth / 2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" } + } +} diff --git a/resources/definitions/deltacomb_dc20.def.json b/resources/definitions/deltacomb_dc20.def.json new file mode 100755 index 0000000000..5bb3e220d2 --- /dev/null +++ b/resources/definitions/deltacomb_dc20.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Deltacomb DC-20", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc20.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "FBE 0.40mm" + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-20" }, + "machine_width": { "default_value": 190 }, + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 250 }, + "machine_extruder_count": { "default_value": 1, "maximum_value": "4" } + } +} diff --git a/resources/definitions/deltacomb_dc20dual.def.json b/resources/definitions/deltacomb_dc20dual.def.json new file mode 100755 index 0000000000..a78415331c --- /dev/null +++ b/resources/definitions/deltacomb_dc20dual.def.json @@ -0,0 +1,24 @@ +{ + "version": 2, + "name": "Deltacomb DC-20 DUAL", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc20.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "DBE 0.40mm", + "machine_extruder_trains": { + "0": "deltacomb_dc20dual_extruder_0", + "1": "deltacomb_dc20dual_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-20 DUAL" }, + "machine_extruder_count": { "default_value": 2, "maximum_value": "2" }, + "machine_width": { "default_value": 190 }, + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 250 } + } +} diff --git a/resources/definitions/deltacomb_dc20flux.def.json b/resources/definitions/deltacomb_dc20flux.def.json new file mode 100644 index 0000000000..fdd4f77942 --- /dev/null +++ b/resources/definitions/deltacomb_dc20flux.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Deltacomb DC-20 FLUX", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc20.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "FBE 0.40mm", + "machine_extruder_trains": { + "0": "deltacomb_dc20flux_extruder_0", + "1": "deltacomb_dc20flux_extruder_1", + "2": "deltacomb_dc20flux_extruder_2", + "3": "deltacomb_dc20flux_extruder_3" + } + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-20 FLUX" }, + "machine_width": { "default_value": 190 }, + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 250 }, + "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, + "switch_extruder_retraction_amount": { "value": "0" }, + "prime_tower_min_volume": { "value": "45" }, + "prime_tower_enable": { "value": "1" } + } +} diff --git a/resources/definitions/deltacomb_dc21.def.json b/resources/definitions/deltacomb_dc21.def.json new file mode 100755 index 0000000000..32efb2170a --- /dev/null +++ b/resources/definitions/deltacomb_dc21.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Deltacomb DC-21", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc20.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "FBE 0.40mm" + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-21" }, + "machine_width": { "default_value": 190 }, + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 400 }, + "machine_extruder_count": { "default_value": 1, "maximum_value": "4" } + } +} diff --git a/resources/definitions/deltacomb_dc21dual.def.json b/resources/definitions/deltacomb_dc21dual.def.json new file mode 100755 index 0000000000..d173888f7a --- /dev/null +++ b/resources/definitions/deltacomb_dc21dual.def.json @@ -0,0 +1,24 @@ +{ + "version": 2, + "name": "Deltacomb DC-21 DUAL", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc20.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "DBE 0.40mm", + "machine_extruder_trains": { + "0": "deltacomb_dc20dual_extruder_0", + "1": "deltacomb_dc20dual_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-20 DUAL" }, + "machine_extruder_count": { "default_value": 2, "maximum_value": "2" }, + "machine_width": { "default_value": 190 }, + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 400 } + } +} diff --git a/resources/definitions/deltacomb_dc21flux.def.json b/resources/definitions/deltacomb_dc21flux.def.json new file mode 100644 index 0000000000..c6d20cb301 --- /dev/null +++ b/resources/definitions/deltacomb_dc21flux.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Deltacomb DC-21 FLUX", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc20.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "FBE 0.40mm", + "machine_extruder_trains": { + "0": "deltacomb_dc20flux_extruder_0", + "1": "deltacomb_dc20flux_extruder_1", + "2": "deltacomb_dc20flux_extruder_2", + "3": "deltacomb_dc20flux_extruder_3" + } + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-20 FLUX" }, + "machine_width": { "default_value": 190 }, + "machine_depth": { "default_value": 190 }, + "machine_height": { "default_value": 400 }, + "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, + "switch_extruder_retraction_amount": { "value": "0" }, + "prime_tower_min_volume": { "value": "45" }, + "prime_tower_enable": { "value": "1" } + } +} diff --git a/resources/definitions/deltacomb_dc30.def.json b/resources/definitions/deltacomb_dc30.def.json new file mode 100755 index 0000000000..485fb5cc45 --- /dev/null +++ b/resources/definitions/deltacomb_dc30.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Deltacomb DC-30", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc30.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "FBE 0.40mm" + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-30" }, + "machine_width": { "default_value": 290 }, + "machine_depth": { "default_value": 290 }, + "machine_height": { "default_value": 300 }, + "machine_extruder_count": { "default_value": 1, "maximum_value": "4" } + } +} diff --git a/resources/definitions/deltacomb_dc30dual.def.json b/resources/definitions/deltacomb_dc30dual.def.json new file mode 100755 index 0000000000..4ac2c185b7 --- /dev/null +++ b/resources/definitions/deltacomb_dc30dual.def.json @@ -0,0 +1,24 @@ +{ + "version": 2, + "name": "Deltacomb DC-30 DUAL", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc30.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "DBE 0.40mm", + "machine_extruder_trains": { + "0": "deltacomb_dc30dual_extruder_0", + "1": "deltacomb_dc30dual_extruder_1" + } + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-30 DUAL" }, + "machine_width": { "default_value": 290 }, + "machine_depth": { "default_value": 290 }, + "machine_height": { "default_value": 300 }, + "machine_extruder_count": { "default_value": 2, "maximum_value": "2" } + } +} diff --git a/resources/definitions/deltacomb_dc30flux.def.json b/resources/definitions/deltacomb_dc30flux.def.json new file mode 100644 index 0000000000..3b2148d9b8 --- /dev/null +++ b/resources/definitions/deltacomb_dc30flux.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Deltacomb DC-30 FLUX", + "inherits": "deltacomb_base", + + "metadata": { + "visible": true, + "platform": "deltacomb_dc30.stl", + "quality_definition": "deltacomb_base", + "preferred_variant_name": "FBE 0.40mm", + "machine_extruder_trains": { + "0": "deltacomb_dc30flux_extruder_0", + "1": "deltacomb_dc30flux_extruder_1", + "2": "deltacomb_dc30flux_extruder_2", + "3": "deltacomb_dc30flux_extruder_3" + } + }, + + "overrides": { + "machine_name": { "default_value": "Deltacomb DC-30 FLUX" }, + "machine_width": { "default_value": 290 }, + "machine_depth": { "default_value": 290 }, + "machine_height": { "default_value": 300 }, + "machine_extruder_count": { "default_value": 2, "maximum_value": "4" }, + "switch_extruder_retraction_amount": { "value": "0" }, + "prime_tower_min_volume": { "value": "45" }, + "prime_tower_enable": { "value": "1" } + } +} diff --git a/resources/extruders/deltacomb_base_extruder_0.def.json b/resources/extruders/deltacomb_base_extruder_0.def.json new file mode 100755 index 0000000000..d3ad8aa06c --- /dev/null +++ b/resources/extruders/deltacomb_base_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "3" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 1\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 1\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_base_extruder_1.def.json b/resources/extruders/deltacomb_base_extruder_1.def.json new file mode 100755 index 0000000000..2f2de6c747 --- /dev/null +++ b/resources/extruders/deltacomb_base_extruder_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_base", + "position": "1" + }, + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "3" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 2\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 2\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_base_extruder_2.def.json b/resources/extruders/deltacomb_base_extruder_2.def.json new file mode 100755 index 0000000000..f4a898f0c7 --- /dev/null +++ b/resources/extruders/deltacomb_base_extruder_2.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_base", + "position": "2" + }, + + "overrides": { + "extruder_nr": { "default_value": 2, "maximum_value": "3" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 3\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 3\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_base_extruder_3.def.json b/resources/extruders/deltacomb_base_extruder_3.def.json new file mode 100755 index 0000000000..2d01c8e5aa --- /dev/null +++ b/resources/extruders/deltacomb_base_extruder_3.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 4", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_base", + "position": "3" + }, + + "overrides": { + "extruder_nr": { "default_value": 3, "maximum_value": "3" }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";Deltacomb Extruder 4\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";Deltacomb Extruder 4\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_dc20dual_extruder_0.def.json b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json new file mode 100755 index 0000000000..510f8a3562 --- /dev/null +++ b/resources/extruders/deltacomb_dc20dual_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc20dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 1\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_dc20dual_extruder_1.def.json b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json new file mode 100755 index 0000000000..1421a7d3db --- /dev/null +++ b/resources/extruders/deltacomb_dc20dual_extruder_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc20dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 19 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";DC20 Dual Extruder 2\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_dc20flux_extruder_0.def.json b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json new file mode 100755 index 0000000000..96617a9465 --- /dev/null +++ b/resources/extruders/deltacomb_dc20flux_extruder_0.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc20flux", + "position": "0" + }, + + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 1 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 1 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} + } +} diff --git a/resources/extruders/deltacomb_dc20flux_extruder_1.def.json b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json new file mode 100755 index 0000000000..309f857fe0 --- /dev/null +++ b/resources/extruders/deltacomb_dc20flux_extruder_1.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc20flux", + "position": "1" + }, + + + "overrides": { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 2 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 2 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "prime_tower_flow": { "value": "200" } + } +} diff --git a/resources/extruders/deltacomb_dc20flux_extruder_2.def.json b/resources/extruders/deltacomb_dc20flux_extruder_2.def.json new file mode 100755 index 0000000000..1283e3dbf5 --- /dev/null +++ b/resources/extruders/deltacomb_dc20flux_extruder_2.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc20flux", + "position": "2" + }, + + + "overrides": { + "extruder_nr": { "default_value": 2 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 3 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 3 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "prime_tower_flow": { "value": "200" } + } +} diff --git a/resources/extruders/deltacomb_dc20flux_extruder_3.def.json b/resources/extruders/deltacomb_dc20flux_extruder_3.def.json new file mode 100755 index 0000000000..1965f615f6 --- /dev/null +++ b/resources/extruders/deltacomb_dc20flux_extruder_3.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Extruder 4", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc20flux", + "position": "3" + }, + + + "overrides": { + "extruder_nr": { "default_value": 3 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 4 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC20 Flux Extruder 4 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "prime_tower_flow": { "value": "200" } + } +} diff --git a/resources/extruders/deltacomb_dc30dual_extruder_0.def.json b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json new file mode 100755 index 0000000000..d404e488bc --- /dev/null +++ b/resources/extruders/deltacomb_dc30dual_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc30dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 1\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_dc30dual_extruder_1.def.json b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json new file mode 100755 index 0000000000..c1ce8dec33 --- /dev/null +++ b/resources/extruders/deltacomb_dc30dual_extruder_1.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc30dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 19 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"}, + "machine_extruder_end_code": { "default_value": ";DC30 Dual Extruder 2\n;Put your custom code here"} + } +} diff --git a/resources/extruders/deltacomb_dc30flux_extruder_0.def.json b/resources/extruders/deltacomb_dc30flux_extruder_0.def.json new file mode 100755 index 0000000000..1f401c3657 --- /dev/null +++ b/resources/extruders/deltacomb_dc30flux_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc30flux", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 1 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 1 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"} + } +} diff --git a/resources/extruders/deltacomb_dc30flux_extruder_1.def.json b/resources/extruders/deltacomb_dc30flux_extruder_1.def.json new file mode 100755 index 0000000000..909d87feeb --- /dev/null +++ b/resources/extruders/deltacomb_dc30flux_extruder_1.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc30flux", + "position": "1" + }, + + "overrides": { + "extruder_nr": { "default_value": 1 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 2 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 2 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "prime_tower_flow": { "value": "200" } + } +} diff --git a/resources/extruders/deltacomb_dc30flux_extruder_2.def.json b/resources/extruders/deltacomb_dc30flux_extruder_2.def.json new file mode 100755 index 0000000000..f1df8ab154 --- /dev/null +++ b/resources/extruders/deltacomb_dc30flux_extruder_2.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 3", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc30flux", + "position": "2" + }, + + "overrides": { + "extruder_nr": { "default_value": 2 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 3 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 3 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "prime_tower_flow": { "value": "200" } + } +} diff --git a/resources/extruders/deltacomb_dc30flux_extruder_3.def.json b/resources/extruders/deltacomb_dc30flux_extruder_3.def.json new file mode 100755 index 0000000000..dbc23f96b6 --- /dev/null +++ b/resources/extruders/deltacomb_dc30flux_extruder_3.def.json @@ -0,0 +1,20 @@ +{ + "version": 2, + "name": "Extruder 4", + "inherits": "fdmextruder", + "metadata": { + "machine": "deltacomb_dc30flux", + "position": "3" + }, + + "overrides": { + "extruder_nr": { "default_value": 3 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "machine_extruder_start_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 4 Start\n;---------------------------------------\nG92 E0 ;zero the extruded length\nG91 ;use relative coordinates\nG1 E68 F10000 ; fast insert\nG92 E0 ;zero the extruded length\nG90 ;absolute positioning\n;---------------------------------------\n;---------------------------------------"}, + "machine_extruder_end_code": { "default_value": ";---------------------------------------\n;DC30 Flux Extruder 4 End\n;---------------------------------------\nG91 ;use relative coordinates\nG0 E-15 F10000\nG1 Z2 ;lift head\nG4 P3000\nG0 E14.7 F10000\nG1 E-69.7 F10000\nG90 ;absolute positioning\nG92 E0 ;zero the extruded length\n;---------------------------------------\n;---------------------------------------"}, + "prime_tower_flow": { "value": "200" } + } +} diff --git a/resources/extruders/deltacomb_extruder_0.def.json b/resources/extruders/deltacomb_extruder_0.def.json deleted file mode 100755 index 875655d5c7..0000000000 --- a/resources/extruders/deltacomb_extruder_0.def.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } - } -} diff --git a/resources/extruders/deltacomb_extruder_1.def.json b/resources/extruders/deltacomb_extruder_1.def.json deleted file mode 100755 index b1f30f4624..0000000000 --- a/resources/extruders/deltacomb_extruder_1.def.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "version": 2, - "name": "Extruder 2", - "inherits": "fdmextruder", - "metadata": { - "machine": "deltacomb", - "position": "1" - }, - - "overrides": { - "extruder_nr": { "default_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0.0 }, - "machine_nozzle_offset_y": { "default_value": 0.0 } - } -} diff --git a/resources/meshes/deltacomb_dc20.stl b/resources/meshes/deltacomb_dc20.stl new file mode 100644 index 0000000000..41e2f6f217 Binary files /dev/null and b/resources/meshes/deltacomb_dc20.stl differ diff --git a/resources/meshes/deltacomb_dc30.stl b/resources/meshes/deltacomb_dc30.stl new file mode 100644 index 0000000000..8c11351f14 Binary files /dev/null and b/resources/meshes/deltacomb_dc30.stl differ diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg new file mode 100755 index 0000000000..7e7784862d --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_abs +variant = DBE 0.25mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 0.5 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 80 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg new file mode 100755 index 0000000000..c40b0a56f0 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_abs +variant = DBE 0.25mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 0.5 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg new file mode 100755 index 0000000000..46782077b2 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_abs +variant = DBE 0.25mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 0.5 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 32 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg new file mode 100755 index 0000000000..83b5f25ac7 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_abs +variant = DBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg new file mode 100755 index 0000000000..8e86950b69 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_abs +variant = DBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg new file mode 100755 index 0000000000..4c2c074801 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_abs +variant = DBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg new file mode 100755 index 0000000000..868bdc62b2 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_abs +variant = FBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg new file mode 100755 index 0000000000..1c5a51f3df --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_abs +variant = DBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg new file mode 100755 index 0000000000..af0d6b9fd6 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_abs +variant = DBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg new file mode 100755 index 0000000000..2a7a9d9440 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_abs +variant = FBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg new file mode 100755 index 0000000000..7b4daab934 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_abs +variant = DBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 65 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg new file mode 100755 index 0000000000..8aabe4e9a7 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_abs +variant = DBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg new file mode 100755 index 0000000000..9921efc3be --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_abs +variant = FBE 0.25mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 0.5 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 80 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg new file mode 100755 index 0000000000..52ca0e2bdf --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_abs +variant = FBE 0.25mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 0.5 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg new file mode 100755 index 0000000000..a391eab3e3 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_abs +variant = FBE 0.25mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 0.5 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 32 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg new file mode 100755 index 0000000000..83063da2ad --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_abs +variant = FBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg new file mode 100755 index 0000000000..685b6b7ad4 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_abs +variant = FBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg new file mode 100755 index 0000000000..75f6b59a1a --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_abs +variant = FBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg new file mode 100755 index 0000000000..868bdc62b2 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_abs +variant = FBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg new file mode 100755 index 0000000000..5e14b9fc70 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_abs +variant = FBE 0.40mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg new file mode 100755 index 0000000000..7158f1c834 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_abs +variant = FBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg new file mode 100755 index 0000000000..2a7a9d9440 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_abs +variant = FBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg new file mode 100755 index 0000000000..13d189f26a --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_abs +variant = FBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 65 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg new file mode 100755 index 0000000000..adc1a19946 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_abs +variant = FBE 0.60mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg new file mode 100755 index 0000000000..c5bbb85a96 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_abs +variant = V-FBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 150 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg new file mode 100755 index 0000000000..58b898ae50 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_abs +variant = V-DBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 110 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg new file mode 100755 index 0000000000..8615a982ea --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_abs +variant = V-DBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 75 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg new file mode 100755 index 0000000000..24995e8b16 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_abs +variant = V-DBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg new file mode 100755 index 0000000000..c5bbb85a96 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_abs +variant = V-FBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 150 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg new file mode 100755 index 0000000000..263a713f1a --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_abs +variant = V-FBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 110 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg new file mode 100755 index 0000000000..485e321878 --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_abs +variant = V-FBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 75 \ No newline at end of file diff --git a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg new file mode 100755 index 0000000000..847f427abb --- /dev/null +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = g +material = generic_abs +variant = V-FBE 0.80mm + +[values] +adhesion_type = raft +cool_fan_full_at_height = 1 +cool_fan_speed = 50 +cool_fan_speed_max = 50 +cool_fan_speed_min = 0 +material_bed_temperature = 100 +material_bed_temperature_layer_0 = 80 +material_print_temperature = 240 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg new file mode 100644 index 0000000000..0d3691c4cb --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_A.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_petg +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg new file mode 100644 index 0000000000..610497f293 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_B.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_petg +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg new file mode 100644 index 0000000000..51764e2983 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_C.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_petg +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg new file mode 100644 index 0000000000..03b8ebaf5d --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_D.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_petg +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg new file mode 100644 index 0000000000..79bd7b236e --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.40_PETG_E.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_petg +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg new file mode 100644 index 0000000000..ff20f9db25 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_C.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_petg +variant = DBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg new file mode 100644 index 0000000000..dc98660be8 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_D.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_petg +variant = DBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg new file mode 100644 index 0000000000..8195c6d351 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_E.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_petg +variant = DBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 40 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.7 +speed_roofing = =speed_print * 0.7 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg new file mode 100644 index 0000000000..5f10c6b418 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_DBE0.60_PETG_F.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_petg +variant = DBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 26 +speed_infill = =speed_print +speed_wall_0 = =speed_print +speed_roofing = =speed_print +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg new file mode 100644 index 0000000000..102b405206 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_A.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_petg +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg new file mode 100644 index 0000000000..2b8a10a9a5 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_B.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_petg +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg new file mode 100644 index 0000000000..e8df16f090 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_C.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_petg +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg new file mode 100644 index 0000000000..d229efb930 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_D.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_petg +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg new file mode 100644 index 0000000000..57b46af2ed --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.40_PETG_E.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_petg +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg new file mode 100644 index 0000000000..69a8112a54 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_C.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_petg +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg new file mode 100644 index 0000000000..1ecdf9a046 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_D.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_petg +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 50 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.5 +speed_roofing = =speed_print * 0.5 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg new file mode 100644 index 0000000000..502507a4c4 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_E.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_petg +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 40 +speed_infill = =speed_print +speed_wall_0 = =speed_print * 0.7 +speed_roofing = =speed_print * 0.7 +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg new file mode 100644 index 0000000000..62d91eeec8 --- /dev/null +++ b/resources/quality/deltacomb/PETG/deltacomb_FBE0.60_PETG_F.inst.cfg @@ -0,0 +1,30 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_petg +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = 1 +cool_fan_speed = 60 +cool_fan_speed_max = 100 +cool_fan_speed_min = 60 +speed_print = 26 +speed_infill = =speed_print +speed_wall_0 = =speed_print +speed_roofing = =speed_print +default_material_print_temperature = 235 +material_bed_temperature = 60 +material_bed_temperature_layer_0 = 45 +initial_layer_line_width_factor = 120 +retraction_speed = 40 +coasting_enable = True +coasting_volume = 0.256 +retraction_combing_max_distance = 5 diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg new file mode 100755 index 0000000000..4c6c7eb463 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_pla +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg old mode 100644 new mode 100755 similarity index 52% rename from resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg rename to resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg index af0a7a8779..9bd6be46d5 --- a/resources/quality/deltacomb/deltacomb_pla_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg @@ -1,22 +1,19 @@ [general] version = 4 -name = Fast -definition = deltacomb +name = B +definition = deltacomb_base [metadata] setting_version = 15 type = quality -quality_type = draft -weight = -2 +quality_type = b material = generic_pla +variant = DBE 0.40mm [values] adhesion_type = skirt -cool_fan_enabled = True cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg old mode 100644 new mode 100755 similarity index 52% rename from resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg rename to resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg index f037e9b82c..ac937328d1 --- a/resources/quality/deltacomb/deltacomb_pla_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg @@ -1,22 +1,19 @@ [general] version = 4 -name = Fine -definition = deltacomb +name = C +definition = deltacomb_base [metadata] setting_version = 15 type = quality -quality_type = normal -weight = 0 +quality_type = c material = generic_pla +variant = DBE 0.40mm [values] adhesion_type = skirt -cool_fan_enabled = True cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 +speed_print = 32 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg new file mode 100755 index 0000000000..4c6c7eb463 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_pla +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg new file mode 100755 index 0000000000..2b8f3e73ba --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_pla +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg new file mode 100755 index 0000000000..7700215b14 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_pla +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg new file mode 100755 index 0000000000..73de629d54 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_pla +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg new file mode 100755 index 0000000000..d07ec4719a --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_pla +variant = DBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg new file mode 100755 index 0000000000..b48ba7bc1d --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_pla +variant = DBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg new file mode 100755 index 0000000000..7c41ebe440 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_pla +variant = DBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg old mode 100644 new mode 100755 similarity index 52% rename from resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg rename to resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg index 91d6d9583e..21969bb21f --- a/resources/quality/deltacomb/deltacomb_pla_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg @@ -1,22 +1,19 @@ [general] version = 4 -name = Normal -definition = deltacomb +name = E +definition = deltacomb_base [metadata] setting_version = 15 type = quality -quality_type = fast -weight = -1 +quality_type = e material = generic_pla +variant = DBE 0.60mm [values] adhesion_type = skirt -cool_fan_enabled = True cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 +speed_print = 65 \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg old mode 100644 new mode 100755 similarity index 52% rename from resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg rename to resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg index 5ed3c393fa..788742ffda --- a/resources/quality/deltacomb/deltacomb_pla_High_Quality.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg @@ -1,22 +1,19 @@ [general] version = 4 -name = Extra Fine -definition = deltacomb +name = F +definition = deltacomb_base [metadata] setting_version = 15 type = quality -quality_type = high -weight = 0 +quality_type = f material = generic_pla +variant = DBE 0.60mm [values] adhesion_type = skirt -cool_fan_enabled = True cool_fan_full_at_height = =layer_height * 4 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 100 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg new file mode 100755 index 0000000000..eed43cde94 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg new file mode 100755 index 0000000000..b887de192f --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg new file mode 100755 index 0000000000..b124f4b2e6 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 32 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg new file mode 100755 index 0000000000..eed43cde94 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = A +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg new file mode 100755 index 0000000000..e7b9cbb2fd --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = B +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg new file mode 100755 index 0000000000..a5f6090d19 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg new file mode 100755 index 0000000000..736c078c1b --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg new file mode 100755 index 0000000000..9311f36c53 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_pla +variant = FBE 0.40mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg new file mode 100755 index 0000000000..a5ed9bb6ad --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = C +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +material = generic_pla +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg new file mode 100755 index 0000000000..6c2ab49968 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_pla +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg new file mode 100755 index 0000000000..e4eaefbc69 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_pla +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 65 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg new file mode 100755 index 0000000000..38027b0075 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_pla +variant = FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 45 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg new file mode 100755 index 0000000000..e16ba1d877 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_pla +variant = V-DBE 0.80mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 150 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg new file mode 100755 index 0000000000..a347e605cb --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_pla +variant = V-DBE 0.80mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 110 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg new file mode 100755 index 0000000000..0ff1b784ae --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_pla +variant = V-DBE 0.80mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 75 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg new file mode 100755 index 0000000000..a3dc27b16c --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = G +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = g +material = generic_pla +variant = V-DBE 0.80mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg new file mode 100755 index 0000000000..a103bb25e1 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = D +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +material = generic_pla +variant = V-FBE 0.80mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 150 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg new file mode 100755 index 0000000000..2f806692b6 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = E +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +material = generic_pla +variant = V-FBE 0.60mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 110 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg new file mode 100755 index 0000000000..c7a10c7f23 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = F +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +material = generic_pla +variant = V-FBE 0.80mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 75 \ No newline at end of file diff --git a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg new file mode 100755 index 0000000000..e7bc4398a6 --- /dev/null +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = G +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = g +material = generic_pla +variant = V-FBE 0.80mm + +[values] +adhesion_type = skirt +cool_fan_full_at_height = =layer_height * 4 +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_fan_speed_min = 100 +speed_print = 55 \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg old mode 100644 new mode 100755 similarity index 62% rename from resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg rename to resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg index 73e3580cd3..25f7877f6d --- a/resources/quality/deltacomb/deltacomb_tpu_Draft_Quality.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg @@ -1,27 +1,26 @@ [general] version = 4 -name = Fast -definition = deltacomb +name = B +definition = deltacomb_base [metadata] setting_version = 15 type = quality -quality_type = draft -weight = -2 +quality_type = b material = generic_tpu +variant = FBE 0.40mm [values] adhesion_type = skirt -cool_fan_enabled = True cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 speed_print = 25 speed_travel = 300 acceleration_travel = 10000 retraction_amount = 5 retraction_hop_enabled = False +ironing_flow = 5 +jerk_ironing = 5 +speed_ironing = =speed_print \ No newline at end of file diff --git a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg old mode 100644 new mode 100755 similarity index 62% rename from resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg rename to resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg index 10dc3ba618..303093413a --- a/resources/quality/deltacomb/deltacomb_tpu_Normal_Quality.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg @@ -1,27 +1,26 @@ [general] version = 4 -name = Fine -definition = deltacomb +name = C +definition = deltacomb_base [metadata] setting_version = 15 type = quality -quality_type = normal -weight = 0 +quality_type = c material = generic_tpu +variant = FBE 0.40mm [values] adhesion_type = skirt -cool_fan_enabled = True cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 speed_print = 25 speed_travel = 300 acceleration_travel = 10000 retraction_amount = 5 retraction_hop_enabled = False +ironing_flow = 5 +jerk_ironing = 5 +speed_ironing = =speed_print diff --git a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg old mode 100644 new mode 100755 similarity index 62% rename from resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg rename to resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg index ba1cef2fed..d51e640be5 --- a/resources/quality/deltacomb/deltacomb_tpu_Fast_Quality.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg @@ -1,27 +1,26 @@ [general] version = 4 -name = Normal -definition = deltacomb +name = D +definition = deltacomb_base [metadata] setting_version = 15 type = quality -quality_type = fast -weight = -1 +quality_type = d material = generic_tpu +variant = FBE 0.40mm [values] adhesion_type = skirt -cool_fan_enabled = True cool_fan_full_at_height = =layer_height * 6 cool_fan_speed = 100 cool_fan_speed_max = 100 cool_fan_speed_min = 70 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 speed_print = 25 speed_travel = 300 acceleration_travel = 10000 retraction_amount = 5 retraction_hop_enabled = False +ironing_flow = 5 +jerk_ironing = 5 +speed_ironing = =speed_print diff --git a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg deleted file mode 100644 index ac1bb5fc4d..0000000000 --- a/resources/quality/deltacomb/deltacomb_abs_Draft_Quality.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Fast (beta) -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = draft -weight = -2 -material = generic_abs - -[values] -adhesion_type = raft -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 6 -cool_fan_speed = 50 -cool_fan_speed_max = 50 -cool_fan_speed_min = 50 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_bed_temperature = 80 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 - diff --git a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg deleted file mode 100644 index 206ed42cf1..0000000000 --- a/resources/quality/deltacomb/deltacomb_abs_Fast_Quality.inst.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 4 -name = Normal (beta) -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = fast -weight = -1 -material = generic_abs - -[values] -adhesion_type = raft -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 6 -cool_fan_speed = 50 -cool_fan_speed_max = 50 -cool_fan_speed_min = 50 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_bed_temperature = 80 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg deleted file mode 100644 index 60d3e7a513..0000000000 --- a/resources/quality/deltacomb/deltacomb_abs_High_Quality.inst.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 4 -name = Extra Fine (beta) -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = high -weight = 0 -material = generic_abs - -[values] -adhesion_type = raft -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 6 -cool_fan_speed = 50 -cool_fan_speed_max = 50 -cool_fan_speed_min = 50 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_bed_temperature = 80 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg deleted file mode 100644 index 657b0f3615..0000000000 --- a/resources/quality/deltacomb/deltacomb_abs_Normal_Quality.inst.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 4 -name = Fine (beta) -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = normal -weight = 0 -material = generic_abs - -[values] -adhesion_type = raft -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 6 -cool_fan_speed = 50 -cool_fan_speed_max = 50 -cool_fan_speed_min = 50 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_bed_temperature = 80 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg deleted file mode 100644 index 3666d89a57..0000000000 --- a/resources/quality/deltacomb/deltacomb_abs_Verydraft_Quality.inst.cfg +++ /dev/null @@ -1,23 +0,0 @@ -[general] -version = 4 -name = Extra Fast (beta) -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = verydraft -weight = -3 -material = generic_abs - -[values] -adhesion_type = raft -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 6 -cool_fan_speed = 50 -cool_fan_speed_max = 50 -cool_fan_speed_min = 50 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_bed_temperature = 80 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_global_A.inst.cfg b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg new file mode 100755 index 0000000000..7541ba7ec5 --- /dev/null +++ b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Extra Fine +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = a +weight = 1 +global_quality = True + +[values] +layer_height = 0.05 +layer_height_0 = 0.1 +cool_fan_enabled = True +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 10 +cool_min_speed = 5 +material_flow_layer_0 = =material_flow * 1.2 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +support_angle = 80 diff --git a/resources/quality/deltacomb/deltacomb_global_B.inst.cfg b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg new file mode 100755 index 0000000000..f37234d357 --- /dev/null +++ b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Fine +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = b +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +layer_height_0 = 0.1 +cool_fan_enabled = True +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 10 +cool_min_speed = 5 +material_flow_layer_0 = =material_flow * 1.2 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +support_angle = 65 diff --git a/resources/quality/deltacomb/deltacomb_global_C.inst.cfg b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg new file mode 100755 index 0000000000..691c845c1a --- /dev/null +++ b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg @@ -0,0 +1,21 @@ +[general] +version = 4 +name = Normal +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = c +weight = -1 +global_quality = True + +[values] +layer_height = 0.15 +cool_fan_enabled = True +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 10 +cool_min_speed = 5 +material_flow_layer_0 = =material_flow * 1.2 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 +support_angle = 55 diff --git a/resources/quality/deltacomb/deltacomb_global_D.inst.cfg b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg new file mode 100755 index 0000000000..e70970ab4f --- /dev/null +++ b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Fast +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = d +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 +cool_fan_enabled = True +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 10 +cool_min_speed = 5 +material_flow_layer_0 = =material_flow * 1.2 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg deleted file mode 100644 index 34518dac22..0000000000 --- a/resources/quality/deltacomb/deltacomb_global_Draft_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Fast -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = draft -weight = -2 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = =layer_height diff --git a/resources/quality/deltacomb/deltacomb_global_E.inst.cfg b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg new file mode 100755 index 0000000000..b38a9435fb --- /dev/null +++ b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Extra Fast +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = e +weight = -3 +global_quality = True + +[values] +layer_height = 0.3 +cool_fan_enabled = True +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 10 +cool_min_speed = 5 +material_flow_layer_0 = =material_flow * 1.2 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_global_F.inst.cfg b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg new file mode 100755 index 0000000000..e113397039 --- /dev/null +++ b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Coarse +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = f +weight = -4 +global_quality = True + +[values] +layer_height = 0.45 +cool_fan_enabled = True +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 10 +cool_min_speed = 5 +material_flow_layer_0 = =material_flow * 1.2 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg deleted file mode 100644 index 8455475cc8..0000000000 --- a/resources/quality/deltacomb/deltacomb_global_Fast_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Normal -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = fast -weight = -1 -global_quality = True - -[values] -layer_height = 0.15 -layer_height_0 = =layer_height diff --git a/resources/quality/deltacomb/deltacomb_global_G.inst.cfg b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg new file mode 100755 index 0000000000..776c7874dc --- /dev/null +++ b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg @@ -0,0 +1,20 @@ +[general] +version = 4 +name = Extra Coarse +definition = deltacomb_base + +[metadata] +setting_version = 15 +type = quality +quality_type = g +weight = -5 +global_quality = True + +[values] +layer_height = 0.6 +cool_fan_enabled = True +cool_min_layer_time = 10 +cool_min_layer_time_fan_speed_max = 10 +cool_min_speed = 5 +material_flow_layer_0 = =material_flow * 1.2 +material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg deleted file mode 100644 index 2d0af456f5..0000000000 --- a/resources/quality/deltacomb/deltacomb_global_High_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = high -weight = 0 -global_quality = True - -[values] -layer_height = 0.05 -layer_height_0 = =layer_height * 2 diff --git a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg deleted file mode 100644 index 8fd1a31493..0000000000 --- a/resources/quality/deltacomb/deltacomb_global_Normal_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Fine -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = normal -weight = 0 -global_quality = True - -[values] -layer_height = 0.1 -layer_height_0 = =layer_height * 2 diff --git a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg deleted file mode 100644 index 8f4c549ba6..0000000000 --- a/resources/quality/deltacomb/deltacomb_global_Verydraft_Quality.inst.cfg +++ /dev/null @@ -1,15 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = verydraft -weight = -3 -global_quality = True - -[values] -layer_height = 0.3 -layer_height_0 = =layer_height diff --git a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg deleted file mode 100644 index 53f7a18438..0000000000 --- a/resources/quality/deltacomb/deltacomb_petg_Draft_Quality.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -version = 4 -name = Fast -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = draft -weight = -2 -material = generic_petg - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 4 -cool_fan_speed = 60 -cool_fan_speed_max = 100 -cool_fan_speed_min = 60 -cool_min_layer_time = 5 -cool_min_speed = 20 -speed_print = 50 -default_material_print_temperature = 235 -material_standby_temperature = 215 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg deleted file mode 100644 index e0d7f2dc97..0000000000 --- a/resources/quality/deltacomb/deltacomb_petg_Fast_Quality.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -version = 4 -name = Normal -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = fast -weight = -1 -material = generic_petg - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 4 -cool_fan_speed = 60 -cool_fan_speed_max = 100 -cool_fan_speed_min = 60 -cool_min_layer_time = 5 -cool_min_speed = 20 -speed_print = 50 -default_material_print_temperature = 235 -material_standby_temperature = 215 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg deleted file mode 100644 index 541192dd97..0000000000 --- a/resources/quality/deltacomb/deltacomb_petg_High_Quality.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = high -weight = 0 -material = generic_petg - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 4 -cool_fan_speed = 60 -cool_fan_speed_max = 100 -cool_fan_speed_min = 60 -cool_min_layer_time = 5 -cool_min_speed = 20 -speed_print = 50 -default_material_print_temperature = 235 -material_standby_temperature = 215 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg deleted file mode 100644 index a35b9eb1c8..0000000000 --- a/resources/quality/deltacomb/deltacomb_petg_Normal_Quality.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -version = 4 -name = Fine -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = normal -weight = 0 -material = generic_petg - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 4 -cool_fan_speed = 60 -cool_fan_speed_max = 100 -cool_fan_speed_min = 60 -cool_min_layer_time = 5 -cool_min_speed = 20 -speed_print = 50 -default_material_print_temperature = 235 -material_standby_temperature = 215 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg deleted file mode 100644 index d8fa4ce542..0000000000 --- a/resources/quality/deltacomb/deltacomb_petg_Verydraft_Quality.inst.cfg +++ /dev/null @@ -1,25 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = verydraft -weight = -3 -material = generic_petg - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 4 -cool_fan_speed = 60 -cool_fan_speed_max = 100 -cool_fan_speed_min = 60 -cool_min_layer_time = 5 -cool_min_speed = 20 -speed_print = 50 -default_material_print_temperature = 235 -material_standby_temperature = 215 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg deleted file mode 100644 index aa1e306aa9..0000000000 --- a/resources/quality/deltacomb/deltacomb_pla_Verydraft_Quality.inst.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = verydraft -weight = -3 -material = generic_pla - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 4 -cool_fan_speed = 100 -cool_fan_speed_max = 100 -cool_fan_speed_min = 100 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg deleted file mode 100644 index 03b69b2132..0000000000 --- a/resources/quality/deltacomb/deltacomb_tpu_High_Quality.inst.cfg +++ /dev/null @@ -1,27 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = high -weight = 0 -material = generic_tpu - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 6 -cool_fan_speed = 100 -cool_fan_speed_max = 100 -cool_fan_speed_min = 70 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False diff --git a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg b/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg deleted file mode 100644 index c3f35821f7..0000000000 --- a/resources/quality/deltacomb/deltacomb_tpu_Verydraft_Quality.inst.cfg +++ /dev/null @@ -1,27 +0,0 @@ -[general] -version = 4 -name = Extra Fast -definition = deltacomb - -[metadata] -setting_version = 15 -type = quality -quality_type = verydraft -weight = -3 -material = generic_tpu - -[values] -adhesion_type = skirt -cool_fan_enabled = True -cool_fan_full_at_height = =layer_height * 6 -cool_fan_speed = 100 -cool_fan_speed_max = 100 -cool_fan_speed_min = 70 -cool_min_layer_time = 5 -cool_min_speed = 20 -material_print_temperature_layer_0 = =default_material_print_temperature + 5 -speed_print = 25 -speed_travel = 300 -acceleration_travel = 10000 -retraction_amount = 5 -retraction_hop_enabled = False diff --git a/resources/variants/deltacomb_080_e3d.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg similarity index 63% rename from resources/variants/deltacomb_080_e3d.inst.cfg rename to resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg index 4321c15cea..62f49821d6 100644 --- a/resources/variants/deltacomb_080_e3d.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe025.inst.cfg @@ -1,7 +1,7 @@ [general] -name = E3D 0.80mm +name = FBE 0.25mm version = 4 -definition = deltacomb +definition = deltacomb_dc20 [metadata] author = Deltacomb 3D @@ -10,4 +10,4 @@ type = variant hardware_type = nozzle [values] -machine_nozzle_size = 0.8 +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb_025_e3d.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg similarity index 63% rename from resources/variants/deltacomb_025_e3d.inst.cfg rename to resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg index 7c494a08ee..878e663f90 100644 --- a/resources/variants/deltacomb_025_e3d.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe040.inst.cfg @@ -1,7 +1,7 @@ [general] -name = E3D 0.25mm +name = FBE 0.40mm version = 4 -definition = deltacomb +definition = deltacomb_dc20 [metadata] author = Deltacomb 3D @@ -10,4 +10,4 @@ type = variant hardware_type = nozzle [values] -machine_nozzle_size = 0.25 +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb_040_e3d.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg similarity index 63% rename from resources/variants/deltacomb_040_e3d.inst.cfg rename to resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg index b4b8397ccb..c8321d3b4f 100644 --- a/resources/variants/deltacomb_040_e3d.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_fbe060.inst.cfg @@ -1,7 +1,7 @@ [general] -name = E3D 0.40mm +name = FBE 0.60mm version = 4 -definition = deltacomb +definition = deltacomb_dc20 [metadata] author = Deltacomb 3D @@ -10,4 +10,4 @@ type = variant hardware_type = nozzle [values] -machine_nozzle_size = 0.4 +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg new file mode 100755 index 0000000000..7660498767 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V-FBE 0.80mm +version = 4 +definition = deltacomb_dc20 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.80 diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg new file mode 100755 index 0000000000..ad0e008338 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.25mm +version = 4 +definition = deltacomb_dc20dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg new file mode 100755 index 0000000000..b2208ee556 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.40mm +version = 4 +definition = deltacomb_dc20dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg new file mode 100755 index 0000000000..177b782a16 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.60mm +version = 4 +definition = deltacomb_dc20dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg new file mode 100755 index 0000000000..8233eecf59 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V-DBE 0.80mm +version = 4 +definition = deltacomb_dc20dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.80 diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg new file mode 100755 index 0000000000..81d5cfc900 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.25mm +version = 4 +definition = deltacomb_dc20flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg new file mode 100755 index 0000000000..c0fe84306a --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.40mm +version = 4 +definition = deltacomb_dc20flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg new file mode 100755 index 0000000000..4305d12e72 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.60mm +version = 4 +definition = deltacomb_dc20flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg new file mode 100755 index 0000000000..964b7ec6ed --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.25mm +version = 4 +definition = deltacomb_dc21 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg new file mode 100755 index 0000000000..827098ee13 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.40mm +version = 4 +definition = deltacomb_dc21 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg new file mode 100755 index 0000000000..ff60930326 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.60mm +version = 4 +definition = deltacomb_dc21 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg new file mode 100755 index 0000000000..f8c357ef7d --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V-FBE 0.80mm +version = 4 +definition = deltacomb_dc21 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.80 diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg new file mode 100755 index 0000000000..18807199b4 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.25mm +version = 4 +definition = deltacomb_dc21dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg new file mode 100755 index 0000000000..0a2d933c48 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.40mm +version = 4 +definition = deltacomb_dc21dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg new file mode 100755 index 0000000000..4785d44050 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.60mm +version = 4 +definition = deltacomb_dc21dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg new file mode 100755 index 0000000000..b4f93890ea --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V-DBE 0.80mm +version = 4 +definition = deltacomb_dc21dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.80 diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg new file mode 100755 index 0000000000..25baf1efbf --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.25mm +version = 4 +definition = deltacomb_dc21flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg new file mode 100755 index 0000000000..c3b57a530d --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.40mm +version = 4 +definition = deltacomb_dc21flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg new file mode 100755 index 0000000000..a431785bd6 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.60mm +version = 4 +definition = deltacomb_dc21flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg new file mode 100755 index 0000000000..34456acefc --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.25mm +version = 4 +definition = deltacomb_dc30 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg new file mode 100755 index 0000000000..7229469d9d --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.40mm +version = 4 +definition = deltacomb_dc30 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg new file mode 100755 index 0000000000..bbee12aedd --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.60mm +version = 4 +definition = deltacomb_dc30 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg new file mode 100755 index 0000000000..40332863b6 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V-FBE 0.80mm +version = 4 +definition = deltacomb_dc30 + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.80 diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg new file mode 100755 index 0000000000..3c3c6f0fd0 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.25mm +version = 4 +definition = deltacomb_dc30dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg new file mode 100755 index 0000000000..7485ac2462 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.40mm +version = 4 +definition = deltacomb_dc30dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg new file mode 100755 index 0000000000..9254085faa --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = DBE 0.60mm +version = 4 +definition = deltacomb_dc30dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg new file mode 100755 index 0000000000..670dfb4d70 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = V-DBE 0.80mm +version = 4 +definition = deltacomb_dc30dual + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.80 diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg new file mode 100755 index 0000000000..b4a62d6ca9 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.25mm +version = 4 +definition = deltacomb_dc30flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.25 \ No newline at end of file diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg new file mode 100755 index 0000000000..e30eb5c109 --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.40mm +version = 4 +definition = deltacomb_dc30flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.40 diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg new file mode 100755 index 0000000000..426f0323fa --- /dev/null +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = FBE 0.60mm +version = 4 +definition = deltacomb_dc30flux + +[metadata] +setting_version = 15 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.60 diff --git a/tests/TestExtruderManager.py b/tests/TestExtruderManager.py index f732278e83..6eca0a34ad 100644 --- a/tests/TestExtruderManager.py +++ b/tests/TestExtruderManager.py @@ -15,17 +15,3 @@ def test_getAllExtruderSettings(extruder_manager): extruder_2.getProperty = MagicMock(return_value="zomg") extruder_manager.getActiveExtruderStacks = MagicMock(return_value = [extruder_1, extruder_2]) assert extruder_manager.getAllExtruderSettings("whatever", "value") == ["beep", "zomg"] - - -def test_registerExtruder(extruder_manager): - extruder = createMockedExtruder("beep") - extruder.getMetaDataEntry = MagicMock(return_value = "0") # because the extruder position gets called - - extruder_manager.extrudersChanged = MagicMock() - extruder_manager.registerExtruder(extruder, "zomg") - - assert extruder_manager.extrudersChanged.emit.call_count == 1 - - # Doing it again should not trigger anything - extruder_manager.registerExtruder(extruder, "zomg") - assert extruder_manager.extrudersChanged.emit.call_count == 1