diff options
660 files changed, 3313 insertions, 1824 deletions
diff --git a/.gitignore b/.gitignore index c76f622a43..7fed42af69 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ plugins/CuraFlatPack plugins/CuraRemoteSupport plugins/ModelCutter plugins/PrintProfileCreator +plugins/MultiPrintPlugin #Build stuff CMakeCache.txt diff --git a/cura/ApplicationMetadata.py b/cura/ApplicationMetadata.py index feaf47acac..f367f61cc7 100644 --- a/cura/ApplicationMetadata.py +++ b/cura/ApplicationMetadata.py @@ -46,6 +46,10 @@ except ImportError: # Various convenience flags indicating what kind of Cura build it is. __ENTERPRISE_VERSION_TYPE = "enterprise" IsEnterpriseVersion = CuraBuildType.lower() == __ENTERPRISE_VERSION_TYPE +IsAlternateVersion = CuraBuildType.lower() not in [DEFAULT_CURA_BUILD_TYPE, __ENTERPRISE_VERSION_TYPE] +# NOTE: IsAlternateVersion is to make it possibile to have 'non-numbered' versions, at least as presented to the user. +# (Internally, it'll still have some sort of version-number, but the user is never meant to see it in the GUI). +# Warning: This will also change (some of) the icons/splash-screen to the 'work in progress' alternatives! try: from cura.CuraVersion import CuraAppDisplayName # type: ignore diff --git a/cura/BuildVolume.py b/cura/BuildVolume.py index 8374bddf74..fc5691f034 100755 --- a/cura/BuildVolume.py +++ b/cura/BuildVolume.py @@ -66,6 +66,7 @@ class BuildVolume(SceneNode): self._height = 0 # type: float self._depth = 0 # type: float self._shape = "" # type: str + self._scale_vector = Vector(1.0, 1.0, 1.0) self._shader = None @@ -513,6 +514,13 @@ class BuildVolume(SceneNode): self._disallowed_area_size = max(size, self._disallowed_area_size) return mb.build() + def _updateScaleFactor(self) -> None: + if not self._global_container_stack: + return + scale_xy = 100.0 / max(100.0, self._global_container_stack.getProperty("material_shrinkage_percentage_xy", "value")) + scale_z = 100.0 / max(100.0, self._global_container_stack.getProperty("material_shrinkage_percentage_z" , "value")) + self._scale_vector = Vector(scale_xy, scale_xy, scale_z) + def rebuild(self) -> None: """Recalculates the build volume & disallowed areas.""" @@ -554,9 +562,12 @@ class BuildVolume(SceneNode): self._error_mesh = self._buildErrorMesh(min_w, max_w, min_h, max_h, min_d, max_d, disallowed_area_height) + self._updateScaleFactor() + self._volume_aabb = AxisAlignedBox( - minimum = Vector(min_w, min_h - 1.0, min_d), - maximum = Vector(max_w, max_h - self._raft_thickness - self._extra_z_clearance, max_d)) + minimum = Vector(min_w, min_h - 1.0, min_d).scale(self._scale_vector), + maximum = Vector(max_w, max_h - self._raft_thickness - self._extra_z_clearance, max_d).scale(self._scale_vector) + ) bed_adhesion_size = self.getEdgeDisallowedSize() @@ -564,15 +575,15 @@ class BuildVolume(SceneNode): # This is probably wrong in all other cases. TODO! # The +1 and -1 is added as there is always a bit of extra room required to work properly. scale_to_max_bounds = AxisAlignedBox( - minimum = Vector(min_w + bed_adhesion_size + 1, min_h, min_d + self._disallowed_area_size - bed_adhesion_size + 1), - maximum = Vector(max_w - bed_adhesion_size - 1, max_h - self._raft_thickness - self._extra_z_clearance, max_d - self._disallowed_area_size + bed_adhesion_size - 1) + minimum = Vector(min_w + bed_adhesion_size + 1, min_h, min_d + self._disallowed_area_size - bed_adhesion_size + 1).scale(self._scale_vector), + maximum = Vector(max_w - bed_adhesion_size - 1, max_h - self._raft_thickness - self._extra_z_clearance, max_d - self._disallowed_area_size + bed_adhesion_size - 1).scale(self._scale_vector) ) self._application.getController().getScene()._maximum_bounds = scale_to_max_bounds # type: ignore self.updateNodeBoundaryCheck() - def getBoundingBox(self): + def getBoundingBox(self) -> Optional[AxisAlignedBox]: return self._volume_aabb def getRaftThickness(self) -> float: @@ -633,18 +644,18 @@ class BuildVolume(SceneNode): for extruder in extruders: extruder.propertyChanged.connect(self._onSettingPropertyChanged) - self._width = self._global_container_stack.getProperty("machine_width", "value") + self._width = self._global_container_stack.getProperty("machine_width", "value") * self._scale_vector.x machine_height = self._global_container_stack.getProperty("machine_height", "value") if self._global_container_stack.getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1: - self._height = min(self._global_container_stack.getProperty("gantry_height", "value"), machine_height) - if self._height < machine_height: + self._height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height) + if self._height < (machine_height * self._scale_vector.z): self._build_volume_message.show() else: self._build_volume_message.hide() else: self._height = self._global_container_stack.getProperty("machine_height", "value") self._build_volume_message.hide() - self._depth = self._global_container_stack.getProperty("machine_depth", "value") + self._depth = self._global_container_stack.getProperty("machine_depth", "value") * self._scale_vector.y self._shape = self._global_container_stack.getProperty("machine_shape", "value") self._updateDisallowedAreas() @@ -678,18 +689,18 @@ class BuildVolume(SceneNode): if setting_key == "print_sequence": machine_height = self._global_container_stack.getProperty("machine_height", "value") if self._application.getGlobalContainerStack().getProperty("print_sequence", "value") == "one_at_a_time" and len(self._scene_objects) > 1: - self._height = min(self._global_container_stack.getProperty("gantry_height", "value"), machine_height) - if self._height < machine_height: + self._height = min(self._global_container_stack.getProperty("gantry_height", "value") * self._scale_vector.z, machine_height) + if self._height < (machine_height * self._scale_vector.z): self._build_volume_message.show() else: self._build_volume_message.hide() else: - self._height = self._global_container_stack.getProperty("machine_height", "value") + self._height = self._global_container_stack.getProperty("machine_height", "value") * self._scale_vector.z self._build_volume_message.hide() update_disallowed_areas = True # sometimes the machine size or shape settings are adjusted on the active machine, we should reflect this - if setting_key in self._machine_settings: + if setting_key in self._machine_settings or setting_key in self._material_size_settings: self._updateMachineSizeProperties() update_extra_z_clearance = True update_disallowed_areas = True @@ -738,9 +749,10 @@ class BuildVolume(SceneNode): def _updateMachineSizeProperties(self) -> None: if not self._global_container_stack: return - self._height = self._global_container_stack.getProperty("machine_height", "value") - self._width = self._global_container_stack.getProperty("machine_width", "value") - self._depth = self._global_container_stack.getProperty("machine_depth", "value") + self._updateScaleFactor() + self._height = self._global_container_stack.getProperty("machine_height", "value") * self._scale_vector.z + self._width = self._global_container_stack.getProperty("machine_width", "value") * self._scale_vector.x + self._depth = self._global_container_stack.getProperty("machine_depth", "value") * self._scale_vector.y self._shape = self._global_container_stack.getProperty("machine_shape", "value") def _updateDisallowedAreasAndRebuild(self): @@ -757,6 +769,14 @@ class BuildVolume(SceneNode): self._extra_z_clearance = self._calculateExtraZClearance(ExtruderManager.getInstance().getUsedExtruderStacks()) self.rebuild() + def _scaleAreas(self, result_areas: List[Polygon]) -> None: + if self._global_container_stack is None: + return + for i, polygon in enumerate(result_areas): + result_areas[i] = polygon.scale( + 100.0 / max(100.0, self._global_container_stack.getProperty("material_shrinkage_percentage_xy", "value")) + ) + def _updateDisallowedAreas(self) -> None: if not self._global_container_stack: return @@ -812,9 +832,11 @@ class BuildVolume(SceneNode): self._disallowed_areas = [] for extruder_id in result_areas: + self._scaleAreas(result_areas[extruder_id]) self._disallowed_areas.extend(result_areas[extruder_id]) self._disallowed_areas_no_brim = [] for extruder_id in result_areas_no_brim: + self._scaleAreas(result_areas_no_brim[extruder_id]) self._disallowed_areas_no_brim.extend(result_areas_no_brim[extruder_id]) def _computeDisallowedAreasPrinted(self, used_extruders): @@ -1200,4 +1222,5 @@ class BuildVolume(SceneNode): _distance_settings = ["infill_wipe_dist", "travel_avoid_distance", "support_offset", "support_enable", "travel_avoid_other_parts", "travel_avoid_supports", "wall_line_count", "wall_line_width_0", "wall_line_width_x"] _extruder_settings = ["support_enable", "support_bottom_enable", "support_roof_enable", "support_infill_extruder_nr", "support_extruder_nr_layer_0", "support_bottom_extruder_nr", "support_roof_extruder_nr", "brim_line_count", "adhesion_extruder_nr", "adhesion_type"] #Settings that can affect which extruders are used. _limit_to_extruder_settings = ["wall_extruder_nr", "wall_0_extruder_nr", "wall_x_extruder_nr", "top_bottom_extruder_nr", "infill_extruder_nr", "support_infill_extruder_nr", "support_extruder_nr_layer_0", "support_bottom_extruder_nr", "support_roof_extruder_nr", "adhesion_extruder_nr"] - _disallowed_area_settings = _skirt_settings + _prime_settings + _tower_settings + _ooze_shield_settings + _distance_settings + _extruder_settings + _material_size_settings = ["material_shrinkage_percentage", "material_shrinkage_percentage_xy", "material_shrinkage_percentage_z"] + _disallowed_area_settings = _skirt_settings + _prime_settings + _tower_settings + _ooze_shield_settings + _distance_settings + _extruder_settings + _material_size_settings diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index bf60da374b..ca708709aa 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -152,11 +152,11 @@ class CuraApplication(QtApplication): def __init__(self, *args, **kwargs): super().__init__(name = ApplicationMetadata.CuraAppName, app_display_name = ApplicationMetadata.CuraAppDisplayName, - version = ApplicationMetadata.CuraVersion, + version = ApplicationMetadata.CuraVersion if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType, api_version = ApplicationMetadata.CuraSDKVersion, build_type = ApplicationMetadata.CuraBuildType, is_debug_mode = ApplicationMetadata.CuraDebugMode, - tray_icon_name = "cura-icon-32.png", + tray_icon_name = "cura-icon-32.png" if not ApplicationMetadata.IsAlternateVersion else "cura-icon-32_wip.png", **kwargs) self.default_theme = "cura-light" @@ -484,7 +484,7 @@ class CuraApplication(QtApplication): if not self.getIsHeadLess(): try: - self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png"))) + self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png" if not ApplicationMetadata.IsAlternateVersion else "cura-icon_wip.png"))) except FileNotFoundError: Logger.log("w", "Unable to find the window icon.") diff --git a/cura/OAuth2/KeyringAttribute.py b/cura/OAuth2/KeyringAttribute.py index 35ffdcbd24..58b45a67ef 100644 --- a/cura/OAuth2/KeyringAttribute.py +++ b/cura/OAuth2/KeyringAttribute.py @@ -5,7 +5,7 @@ from typing import Type, TYPE_CHECKING, Optional, List from io import BlockingIOError import keyring from keyring.backend import KeyringBackend -from keyring.errors import NoKeyringError, PasswordSetError, KeyringLocked +from keyring.errors import NoKeyringError, PasswordSetError, KeyringLocked, KeyringError from UM.Logger import Logger @@ -53,6 +53,10 @@ class KeyringAttribute: self._store_secure = False Logger.log("w", "The password retrieved from the keyring cannot be used because it contains characters that cannot be decoded.") return getattr(instance, self._name) + except KeyringError: + self._store_secure = False + Logger.logException("w", "Unknown keyring error.") + return getattr(instance, self._name) else: return getattr(instance, self._name) diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py index 81d3f733b4..701d3d987b 100755 --- a/cura/Settings/ExtruderManager.py +++ b/cura/Settings/ExtruderManager.py @@ -422,7 +422,10 @@ class ExtruderManager(QObject): Logger.log("w", "Could not find the variant %s", active_variant_name) return True active_variant_node = machine_node.variants[active_variant_name] - active_material_node = active_variant_node.materials[extruder_stack.material.getMetaDataEntry("base_file")] + try: + active_material_node = active_variant_node.materials[extruder_stack.material.getMetaDataEntry("base_file")] + except KeyError: # The material in this stack is not a supported material (e.g. wrong filament diameter, as loaded from a project file). + return False active_material_node_qualities = active_material_node.qualities if not active_material_node_qualities: diff --git a/cura/UI/CuraSplashScreen.py b/cura/UI/CuraSplashScreen.py index d9caa207f4..4fa798247d 100644 --- a/cura/UI/CuraSplashScreen.py +++ b/cura/UI/CuraSplashScreen.py @@ -17,7 +17,9 @@ class CuraSplashScreen(QSplashScreen): self._scale = 0.7 self._version_y_offset = 0 # when extra visual elements are in the background image, move version text down - if ApplicationMetadata.IsEnterpriseVersion: + if ApplicationMetadata.IsAlternateVersion: + splash_image = QPixmap(Resources.getPath(Resources.Images, "cura_wip.png")) + elif ApplicationMetadata.IsEnterpriseVersion: splash_image = QPixmap(Resources.getPath(Resources.Images, "cura_enterprise.png")) self._version_y_offset = 26 else: @@ -70,7 +72,7 @@ class CuraSplashScreen(QSplashScreen): font = QFont() # Using system-default font here font.setPixelSize(18) painter.setFont(font) - painter.drawText(60, 70 + self._version_y_offset, round(330 * self._scale), round(230 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[0]) + painter.drawText(60, 70 + self._version_y_offset, round(330 * self._scale), round(230 * self._scale), Qt.AlignLeft | Qt.AlignTop, version[0] if not ApplicationMetadata.IsAlternateVersion else ApplicationMetadata.CuraBuildType) if len(version) > 1: font.setPixelSize(16) painter.setFont(font) diff --git a/cura/UI/TextManager.py b/cura/UI/TextManager.py index e45689936b..77dadae809 100644 --- a/cura/UI/TextManager.py +++ b/cura/UI/TextManager.py @@ -46,7 +46,9 @@ class TextManager(QObject): line = line.replace("[", "")
line = line.replace("]", "")
open_version = Version(line)
- if open_version > Version([14, 99, 99]): # Bit of a hack: We released the 15.x.x versions before 2.x
+ if open_version < Version([0, 0, 1]): # Something went wrong with parsing, assume non-numerical alternate version that should be on top.
+ open_version = Version([99, 99, 99])
+ if Version([14, 99, 99]) < open_version < Version([16, 0, 0]): # Bit of a hack: We released the 15.x.x versions before 2.x
open_version = Version([0, open_version.getMinor(), open_version.getRevision(), open_version.getPostfixVersion()])
open_header = ""
change_logs_dict[open_version] = collections.OrderedDict()
@@ -66,7 +68,9 @@ class TextManager(QObject): text_version = version
if version < Version([1, 0, 0]): # Bit of a hack: We released the 15.x.x versions before 2.x
text_version = Version([15, version.getMinor(), version.getRevision(), version.getPostfixVersion()])
- content += "<h1>" + str(text_version) + "</h1><br>"
+ if version > Version([99, 0, 0]): # Leave it out altogether if it was originally a non-numbered version.
+ text_version = ""
+ content += ("<h1>" + str(text_version) + "</h1><br>") if text_version else ""
content += ""
for change in change_logs_dict[version]:
if str(change) != "":
diff --git a/cura_app.py b/cura_app.py index 57692ec0ae..b9a42f0aba 100755 --- a/cura_app.py +++ b/cura_app.py @@ -48,6 +48,8 @@ if with_sentry_sdk: sentry_env = "development" # Master is always a development version. elif "beta" in ApplicationMetadata.CuraVersion or "BETA" in ApplicationMetadata.CuraVersion: sentry_env = "beta" + elif "alpha" in ApplicationMetadata.CuraVersion or "ALPHA" in ApplicationMetadata.CuraVersion: + sentry_env = "alpha" try: if ApplicationMetadata.CuraVersion.split(".")[2] == "99": sentry_env = "nightly" diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 0578fd51c3..5f57e49cc6 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -379,7 +379,9 @@ class ThreeMFWorkspaceReader(WorkspaceReader): # - the global stack DOESN'T exist but some/all of the extruder stacks exist # To simplify this, only check if the global stack exists or not global_stack_id = self._stripFileToId(global_stack_file) + serialized = archive.open(global_stack_file).read().decode("utf-8") + serialized = GlobalStack._updateSerialized(serialized, global_stack_file) machine_name = self._getMachineNameFromSerializedStack(serialized) self._machine_info.metadata_dict = self._getMetaDataDictFromSerializedStack(serialized) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 7b1601aaf0..b31b8efa7c 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -479,7 +479,15 @@ class PauseAtHeight(Script): else: Logger.log("w", "No previous feedrate found in gcode, feedrate for next layer(s) might be incorrect") - prepend_gcode += self.putValue(M = 82) + "\n" + extrusion_mode_string = "absolute" + extrusion_mode_numeric = 82 + + relative_extrusion = Application.getInstance().getGlobalContainerStack().getProperty("relative_extrusion", "value") + if relative_extrusion: + extrusion_mode_string = "relative" + extrusion_mode_numeric = 83 + + prepend_gcode += self.putValue(M = extrusion_mode_numeric) + " ; switch back to " + extrusion_mode_string + " E values\n" # reset extrude value to pre pause value prepend_gcode += self.putValue(G = 92, E = current_e) + "\n" diff --git a/plugins/SimulationView/SimulationPass.py b/plugins/SimulationView/SimulationPass.py index 2754fb5d94..1294b37db4 100644 --- a/plugins/SimulationView/SimulationPass.py +++ b/plugins/SimulationView/SimulationPass.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from UM.Math.Color import Color diff --git a/plugins/SimulationView/plugin.json b/plugins/SimulationView/plugin.json index 5ea5e20596..39c528f89d 100644 --- a/plugins/SimulationView/plugin.json +++ b/plugins/SimulationView/plugin.json @@ -2,7 +2,7 @@ "name": "Simulation View", "author": "Ultimaker B.V.", "version": "1.0.1", - "description": "Provides the Simulation view.", + "description": "Provides the preview of sliced layerdata.", "api": 7, "i18n-catalog": "cura" } diff --git a/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py new file mode 100644 index 0000000000..a3fccb68ea --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade49to50/VersionUpgrade49to50.py @@ -0,0 +1,118 @@ +# Copyright (c) 2021 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +import configparser +from typing import Tuple, List +import io +from UM.VersionUpgrade import VersionUpgrade + +_removed_settings = { + "travel_compensate_overlapping_walls_enabled", + "travel_compensate_overlapping_walls_0_enabled", + "travel_compensate_overlapping_walls_x_enabled", + "fill_perimeter_gaps", + "wall_min_flow", + "wall_min_flow_retract", + "speed_equalize_flow_enabled", + "speed_equalize_flow_min" +} + + +class VersionUpgrade49to50(VersionUpgrade): + def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """ + Upgrades preferences to remove from the visibility list the settings that were removed in this version. + It also changes the preferences to have the new version number. + + This removes any settings that were removed in the new Cura version. + :param serialized: The original contents of the preferences file. + :param filename: The file name of the preferences file. + :return: A list of new file names, and a list of the new contents for + those files. + """ + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + parser["metadata"]["setting_version"] = "18" + + # Remove deleted settings from the visible settings list. + if "general" in parser and "visible_settings" in parser["general"]: + visible_settings = set(parser["general"]["visible_settings"].split(";")) + for removed in _removed_settings: + if removed in visible_settings: + visible_settings.remove(removed) + + # Replace Outer Before Inner Walls with equivalent. + if "outer_inset_first" in visible_settings: + visible_settings.remove("outer_inset_first") + visible_settings.add("inset_direction") + + parser["general"]["visible_settings"] = ";".join(visible_settings) + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """ + Upgrades instance containers to remove the settings that were removed in this version. + It also changes the instance containers to have the new version number. + + This removes any settings that were removed in the new Cura version and updates settings that need to be updated + with a new value. + + :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) + + # Update version number. + parser["metadata"]["setting_version"] = "18" + + if "values" in parser: + # Remove deleted settings from the instance containers. + for removed in _removed_settings: + if removed in parser["values"]: + del parser["values"][removed] + + # Replace Outer Before Inner Walls with equivalent setting. + if "outer_inset_first" in parser["values"]: + old_value = parser["values"]["outer_inset_first"] + if old_value.startswith("="): # Was already a formula. + old_value = old_value[1:] + parser["values"]["inset_direction"] = f"='outside_in' if ({old_value}) else 'inside_out'" # Makes it work both with plain setting values and formulas. + + # Disable Fuzzy Skin as it doesn't work with with the libArachne walls + if "magic_fuzzy_skin_enabled" in parser["values"]: + parser["values"]["magic_fuzzy_skin_enabled"] = "False" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] + + def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: + """ + Upgrades stacks to have the new version number. + + :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 + those files. + """ + parser = configparser.ConfigParser(interpolation = None) + parser.read_string(serialized) + + # Update version number. + if "metadata" not in parser: + parser["metadata"] = {} + + parser["general"]["version"] = "5" + parser["metadata"]["setting_version"] = "18" + + result = io.StringIO() + parser.write(result) + return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py b/plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py new file mode 100644 index 0000000000..3bf4bea4e1 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade49to50/__init__.py @@ -0,0 +1,61 @@ +# Copyright (c) 2020 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Any, Dict, TYPE_CHECKING + +from . import VersionUpgrade49to50 + +if TYPE_CHECKING: + from UM.Application import Application + +upgrade = VersionUpgrade49to50.VersionUpgrade49to50() + +def getMetaData() -> Dict[str, Any]: + return { # Since there is no VersionUpgrade from 48 to 49 yet, upgrade the 48 profiles to 50. + "version_upgrade": { + # From To Upgrade function + ("preferences", 6000016): ("preferences", 6000018, upgrade.upgradePreferences), + ("machine_stack", 5000016): ("machine_stack", 5000018, upgrade.upgradeStack), + ("extruder_train", 5000016): ("extruder_train", 5000018, upgrade.upgradeStack), + ("machine_stack", 4000018): ("machine_stack", 5000018, upgrade.upgradeStack), # We made a mistake in the arachne beta 1 + ("extruder_train", 4000018): ("extruder_train", 5000018, upgrade.upgradeStack), # We made a mistake in the arachne beta 1 + ("definition_changes", 4000016): ("definition_changes", 4000018, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000016): ("quality_changes", 4000018, upgrade.upgradeInstanceContainer), + ("quality", 4000016): ("quality", 4000018, upgrade.upgradeInstanceContainer), + ("user", 4000016): ("user", 4000018, upgrade.upgradeInstanceContainer), + }, + "sources": { + "preferences": { + "get_version": upgrade.getCfgVersion, + "location": {"."} + }, + "machine_stack": { + "get_version": upgrade.getCfgVersion, + "location": {"./machine_instances"} + }, + "extruder_train": { + "get_version": upgrade.getCfgVersion, + "location": {"./extruders"} + }, + "definition_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./definition_changes"} + }, + "quality_changes": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality_changes"} + }, + "quality": { + "get_version": upgrade.getCfgVersion, + "location": {"./quality"} + }, + "user": { + "get_version": upgrade.getCfgVersion, + "location": {"./user"} + } + } + } + + +def register(app: "Application") -> Dict[str, Any]: + return {"version_upgrade": upgrade} diff --git a/plugins/VersionUpgrade/VersionUpgrade49to50/plugin.json b/plugins/VersionUpgrade/VersionUpgrade49to50/plugin.json new file mode 100644 index 0000000000..bedc7d46e8 --- /dev/null +++ b/plugins/VersionUpgrade/VersionUpgrade49to50/plugin.json @@ -0,0 +1,8 @@ +{ + "name": "Version Upgrade 4.9 to 5.0", + "author": "Ultimaker B.V.", + "version": "1.0.0", + "description": "Upgrades configurations from Cura 4.9 to Cura 5.0.", + "api": "7.4.0", + "i18n-catalog": "cura" +} diff --git a/resources/definitions/anet3d.def.json b/resources/definitions/anet3d.def.json index db56c9cbb0..54092bcf25 100644 --- a/resources/definitions/anet3d.def.json +++ b/resources/definitions/anet3d.def.json @@ -74,7 +74,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, @@ -87,7 +86,6 @@ "infill_wipe_dist": { "value": 0 }, "wall_0_wipe_dist": { "value": 0.2 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": true }, diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index 57ada7f548..f73c57ce81 100644 --- a/resources/definitions/anycubic_i3_mega_s.def.json +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -78,7 +78,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature + 10" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "infill_sparse_density": { "value": 25 }, "infill_before_walls": { "value": false }, @@ -91,21 +90,21 @@ "retraction_hop_enabled": { "value": true }, "retraction_hop": { "value": 0.075 }, - "retraction_hop_only_when_collides": { "value": true }, + "retraction_hop_only_when_collides": { "value": true }, "retraction_combing": { "value": "'off'" }, "retraction_combing_max_distance": { "value": 30 }, "travel_avoid_other_parts": { "value": true }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - - "retraction_amount": { "value": 6 }, + + "retraction_amount": { "value": 6 }, "retraction_enable": { "value": true }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_speed": { "value": 70 }, - "cool_fan_speed_0": { "value": 30 }, + "cool_fan_speed": { "value": 70 }, + "cool_fan_speed_0": { "value": 30 }, "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, @@ -116,7 +115,6 @@ "skirt_line_count": { "value": 4 }, "meshfix_maximum_deviation": { "value": 0.05 }, - "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" }, diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index 586fa1a8b3..76e2cb3fef 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -179,7 +179,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, @@ -192,7 +191,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index 187ef50646..0d1c5a75c2 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -258,7 +258,6 @@ "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, "line_width": { "value": "machine_nozzle_size * 1.125" }, "wall_line_width": { "value": "machine_nozzle_size" }, - "fill_perimeter_gaps": { "default_value": "everywhere" }, "fill_outline_gaps": { "value": "True" }, "meshfix_maximum_resolution": { "value": "0.01" }, "meshfix_maximum_deviation": { "value": "layer_height / 2" }, diff --git a/resources/definitions/atom2.def.json b/resources/definitions/atom2.def.json index d7a26546d8..9ad42c0f36 100644 --- a/resources/definitions/atom2.def.json +++ b/resources/definitions/atom2.def.json @@ -22,8 +22,8 @@ "machine_heated_bed": { "default_value": false }, "machine_center_is_zero": { "default_value": true }, - "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG92 E0\nG1 F200 E3\nG92 E0" }, - "machine_end_gcode": { "default_value": "M104 S0\nG28\nG91\nG1 E-6 F300\nM84\nG90" }, + "machine_start_gcode": { "default_value": "G21\nG90 \nM107\nG28\nG1 Y-110 Z15\nG0 Z{layer_height_0}\nG92 E0\nG1 F200 Y-100 E6\nG92 E0" }, + "machine_end_gcode": { "default_value": "G28\nG91\nG1 E-6 F300\nM104 S0\nG1 E-1000 F5000\nM84\nG90" }, "layer_height": { "default_value": 0.2 }, "default_material_print_temperature": { "default_value": 210 }, diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json index 29aa69ec54..748660742d 100755 --- a/resources/definitions/biqu_base.def.json +++ b/resources/definitions/biqu_base.def.json @@ -83,7 +83,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" }, @@ -97,7 +96,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/blv_mgn_cube_base.def.json b/resources/definitions/blv_mgn_cube_base.def.json index c97bd97063..2c73b80cfc 100644 --- a/resources/definitions/blv_mgn_cube_base.def.json +++ b/resources/definitions/blv_mgn_cube_base.def.json @@ -45,9 +45,6 @@ "machine_gcode_flavor": {
"default_value": "RepRap (RepRap)"
},
- "fill_perimeter_gaps": {
- "value": "'everywhere'"
- },
"fill_outline_gaps": {
"value": true
},
diff --git a/resources/definitions/crazy3dprint_cz_300.def.json b/resources/definitions/crazy3dprint_cz_300.def.json index b6bf2061e9..494277c3fc 100644 --- a/resources/definitions/crazy3dprint_cz_300.def.json +++ b/resources/definitions/crazy3dprint_cz_300.def.json @@ -1,5 +1,5 @@ { - "version": 2, + "version": 2, "name": "Crazy3DPrint CZ-300", "inherits": "crazy3dprint_base", "metadata": { @@ -52,9 +52,9 @@ "skirt_line_count": { "default_value" : 5 }, "initial_layer_line_width_factor": { "default_value" : 140 }, "top_bottom_pattern": { "default_value" : "concentric" }, - "outer_inset_first": { "default_value": true }, "fill_outline_gaps": { "default_value": true }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "inset_direction": {"value": "'outside_in'" }, "machine_start_gcode": { "default_value": "G28 ; home all axes\nG1 Z15 F5000 ; lift nozzle\nG92 E0\nG1 F200 E3\n" }, diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index ff7cb23ab2..6aebd0db4e 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -183,7 +183,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, @@ -196,7 +195,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/creality_cr100.def.json b/resources/definitions/creality_cr100.def.json new file mode 100644 index 0000000000..ed528a00b6 --- /dev/null +++ b/resources/definitions/creality_cr100.def.json @@ -0,0 +1,25 @@ +{ + "name": "Creality CR-100", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality CR-100" }, + "machine_width": { "default_value": 100 }, + "machine_depth": { "default_value": 100 }, + "machine_height": { "default_value": 80 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +}
\ No newline at end of file diff --git a/resources/definitions/creality_ender5.def.json b/resources/definitions/creality_ender5.def.json index 896f532c81..2f913fdd4e 100644 --- a/resources/definitions/creality_ender5.def.json +++ b/resources/definitions/creality_ender5.def.json @@ -4,7 +4,7 @@ "inherits": "creality_base", "overrides": { "machine_name": { "default_value": "Creality Ender-5" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG28 X0 Y0 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" }, "machine_width": { "default_value": 220 }, "machine_depth": { "default_value": 220 }, "machine_height": { "default_value": 300 }, diff --git a/resources/definitions/creality_sermoond1.def.json b/resources/definitions/creality_sermoond1.def.json new file mode 100644 index 0000000000..c09019c6f4 --- /dev/null +++ b/resources/definitions/creality_sermoond1.def.json @@ -0,0 +1,25 @@ +{
+ "name": "Creality Sermoon D1",
+ "version": 2,
+ "inherits": "creality_base",
+ "overrides": {
+ "machine_name": { "default_value": "Creality Sermoon D1" },
+ "machine_width": { "default_value": 280 },
+ "machine_depth": { "default_value": 260 },
+ "machine_height": { "default_value": 310 },
+ "machine_head_with_fans_polygon": { "default_value": [
+ [-26, 34],
+ [-26, -32],
+ [32, -32],
+ [32, 34]
+ ]
+ },
+
+ "gantry_height": { "value": 25 }
+
+ },
+ "metadata": {
+ "quality_definition": "creality_base",
+ "visible": true
+ }
+}
diff --git a/resources/definitions/cubicon_common.def.json b/resources/definitions/cubicon_common.def.json index 61e684a283..f700df7ae6 100644 --- a/resources/definitions/cubicon_common.def.json +++ b/resources/definitions/cubicon_common.def.json @@ -20,9 +20,6 @@ "machine_heated_bed": { "default_value": true }, - "travel_compensate_overlapping_walls_enabled": { - "default_value": false - }, "layer_height": { "default_value": 0.2 }, @@ -33,7 +30,6 @@ "default_value": "raft" }, "top_bottom_pattern": { "default_value": "lines" }, - "fill_perimeter_gaps": { "default_value": "everywhere" }, "infill_sparse_density": { "default_value": 20 }, "infill_before_walls": { "default_value": false }, "top_bottom_thickness": { diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index a5b935245d..63286a1333 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -84,7 +84,6 @@ "wall_thickness": {"value":3.0}, "optimize_wall_printing_order": { "value": "True" }, - "travel_compensate_overlapping_walls_enabled": { "value": false}, "top_bottom_thickness": {"value":0}, "bottom_layers":{"value":2}, diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json index 236ef63188..2f5f02d7db 100644 --- a/resources/definitions/eryone_er20.def.json +++ b/resources/definitions/eryone_er20.def.json @@ -48,10 +48,10 @@ }, "gantry_height":{ "value": "0" }, "machine_start_gcode": { - "default_value": "G90 ; use absolute coordinates\nM140 S[first_layer_bed_temperature] ; set bed temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling/ABL\nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0.0\nG1 Y-2.0 X150 F2400G1 Z3 F720\nM109 S[first_layer_temperature] ; wait for extruder temp\nG1 X150 F1000\nG1 Z0.2 F720\nG1 X80.0 E8.0 F900\nG1 X20.0 E10.0 F700\nG92 E0.0\nM221 S95 ; set flow\n" + "default_value": "G21 ;Metric values\nG90 ;Absolute positioning\nM82 ;Set extruder to absolute mode\nM107 ;Start with the fan off\nG28 ;Homing the hotend\nG29 ;Auto bed leveling detecting\nG92 E0 ;Reset the extruded length\nG1 F200 E3 ;Extrude 3mm of filament\nG92 E0 ;Reset the extruded length again\nG1 Y-3 F1200 ;Move y axis to prime\nG1 X150 F6000 ;Move x axis to prime\nG1 Z0.2 F720 ;Move z axis to prime\nG1 X80.0 E8.0 F900 ;Prime line\nG1 X20.0 E10.0 F700 ;Prime line\nG92 E0 ;Reset the extruded length\nG5 ;Enable resume from power failure\nM117 Printing...\n" }, "machine_end_gcode": { - "default_value": "M104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM84 ; disable motors\nM107\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;X-20 Y-20 F{speed_travel} ;move Z up a bit and retract filament even more\nG28 X0 ;Y0 ;move X/Y to min endstops, so the head is out of the way\nG1 Y180 F2000\nM84 ;steppers off\nG90\nM300 P300 S4000" + "default_value": "G91 ;Relative positioning\nG1 Z5 F720 ;Raise Z\nG1 E-5 F300 ;Retract a bit to protect nozzle\nM104 S0 ;Turn off extruder\nM140 S0 ;Turn off bed\nM107 ;Turn off all fans\nG90 ;Absolute positioning\nG1 X230 Y200 F4800 ;Parking the hotend\nM84 X Y E ;All steppers off but left Z\n" }, "material_print_temperature": { "value": 205 diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json index f5487f986a..34e333f9cc 100644 --- a/resources/definitions/eryone_thinker.def.json +++ b/resources/definitions/eryone_thinker.def.json @@ -54,7 +54,7 @@ "value": 30 }, "machine_gcode_flavor": { - "default_value": "Marlin" + "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 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nM413 S1 ;enable resume from power failure\nM117 Printing..." @@ -62,85 +62,135 @@ "machine_end_gcode": { "default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off" }, - "acceleration_enabled": { - "value": true + "layer_height": { + "value": 0.2 }, - "acceleration_print": { - "value": 750 + "layer_height_0": { + "resolve": "max(0.1, layer_height)" }, - "acceleration_travel": { - "value": 1500 + "initial_layer_line_width_factor": { + "value": 120 }, - "adhesion_type": { - "value": "'skirt'" + "wall_line_count": { + "value": 3 }, - "brim_width": { - "value": 5 + "wall_thickness": { + "value": "line_width * wall_line_count" + }, + "optimize_wall_printing_order": { + "default_value": true + }, + "z_seam_type": { + "value": "'shortest'" }, - "cool_fan_full_at_height": { - "value": 0.5 + "z_seam_corner": { + "value": "'z_seam_corner_inner'" }, - "cool_fan_speed": { - "value": 100 + "roofing_layer_count": { + "value": 1 }, - "cool_fan_speed_0": { - "value": 0 + "top_layers": { + "value": 6 }, - "infill_overlap": { - "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0", - "maximum_value_warning": 100, - "minimum_value_warning": -50 + "top_thickness":{ + "value": "layer_height * top_layers" }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 25 else 'grid'" + "bottom_layers": { + "value": 4 + }, + "bottom_thickness":{ + "value": "layer_height * bottom_layers" + }, + "skin_overlap": { + "value": 10 }, "infill_sparse_density": { "value": 20 }, - "initial_layer_line_width_factor": { - "value": 120 + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 25 else 'grid'" + }, + "infill_overlap": { + "value": "25 if infill_sparse_density < 95 and infill_pattern != 'concentric' else 0" }, "infill_before_walls": { "value": false }, - "jerk_enabled": { - "value": true + "inset_direction": { + "default_value": "inside_out" }, - "jerk_print": { - "value": 10 + "material_print_temperature": { + "value": "default_material_print_temperature", + "maximum_value_warning": 250 }, - "jerk_travel": { - "value": 15 + "material_print_temperature_layer_0": { + "value": "material_print_temperature + 5", + "maximum_value_warning": 250 + }, + "material_initial_print_temperature": { + "value": "material_print_temperature", + "maximum_value_warning": 250 + }, + "material_final_print_temperature": { + "value": "material_print_temperature" }, "material_bed_temperature": { + "value": "default_material_bed_temperature", "maximum_value_warning": 100 }, - "material_print_temperature": { - "maximum_value_warning": 250 + "material_bed_temperature_layer_0": { + "value": "material_bed_temperature" }, - "optimize_wall_printing_order": { - "default_value": true + "speed_infill": { + "value": "speed_print" }, - "outer_inset_first": { - "default_value": false + "speed_wall": { + "value": "speed_print" }, - "retract_at_layer_change": { + "speed_wall_0": { + "value": "math.ceil(speed_print * 30 / 50)" + }, + "speed_wall_x": { + "value": "speed_print" + }, + "speed_topbottom": { + "value": "math.ceil(speed_print * 20 / 50)" + }, + "speed_travel": { + "value": "speed_print if magic_spiralize else 120" + }, + "speed_layer_0": { + "value": "math.ceil(speed_print * 30 / 50)" + }, + "skirt_brim_speed": { + "value": "math.ceil(speed_print * 40 / 60)" + }, + "speed_z_hop": { + "value": "math.ceil(speed_print * 30 / 60)" + }, + "acceleration_enabled": { "value": true }, - "retraction_amount": { - "default_value": 4 + "acceleration_print": { + "value": 750 }, - "retraction_hop": { - "value": 0.075 + "acceleration_travel": { + "value": 1500 }, - "retraction_hop_enabled": { - "value": false + "jerk_enabled": { + "value": true }, - "retraction_hop_only_when_collides": { + "jerk_print": { + "value": 10 + }, + "jerk_travel": { + "value": 15 + }, + "retract_at_layer_change": { "value": true }, - "retraction_min_travel": { - "value": 1.5 + "retraction_amount": { + "default_value": 4.5 }, "retraction_speed": { "default_value": 85, @@ -153,101 +203,56 @@ "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 }, + "retraction_min_travel": { + "value": "max(line_width * 2, 1.5)" + }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, - "skin_overlap": { - "value": 10 - }, - "skirt_brim_speed": { - "value": "math.ceil(speed_print * 40 / 60)" - }, - "skirt_gap": { - "value": 5 - }, - "skirt_line_count": { - "value": 3 - }, - "speed_infill": { - "value": "speed_print" - }, - "speed_topbottom": { - "value": "math.ceil(speed_print * 20 / 50)" - }, - "speed_travel": { - "value": "120" - }, - "speed_layer_0": { - "value": "math.ceil(speed_print * 30 / 50)" + "travel_retract_before_outer_wall": { + "value": true }, - "speed_wall": { - "value": "speed_print" + "retraction_hop_enabled": { + "value": false }, - "speed_wall_0": { - "value": "math.ceil(speed_print * 30 / 50)" + "retraction_hop_only_when_collides": { + "value": true }, - "speed_wall_x": { - "value": "speed_print" + "retraction_hop": { + "value": 0.1 }, - "support_angle": { - "value": 50 + "support_pattern": { + "value": "'triangles'" }, - "support_enable": { - "default_value": false + "support_z_distance": { + "value": 0.3 }, "support_interface_enable": { "value": true }, - "support_pattern": { - "value": "'triangles'" - }, "support_roof_enable": { "value": true }, - "support_type": { - "value": "'everywhere'" - }, "support_use_towers": { "value": false }, - "support_z_distance": { - "value": 0.3 + "adhesion_type": { + "value": "'skirt'" }, - "support_xy_distance": { - "value": 0.7 + "skirt_line_count": { + "value": 3 }, - "support_xy_distance_overhang": { - "value": 0.2 + "skirt_gap": { + "value": 5 + }, + "brim_width": { + "value": 5 }, "smooth_spiralized_contours": { "value": false }, - "travel_retract_before_outer_wall": { + "roofing_monotonic": { "value": true - }, - "wall_line_count": { - "value": 3 - }, - "wall_thickness": { - "value": "line_width * wall_line_count" - }, - "bottom_layers": { - "value": "4" - }, - "bottom_thickness":{ - "value": "layer_height * bottom_layers" - }, - "top_layers": { - "value": "6" - }, - "top_thickness":{ - "value": "layer_height * top_layers" - }, - "z_seam_type": { - "value": "'shortest'" - }, - "z_seam_corner": { - "value": "'z_seam_corner_inner'" } } }
\ No newline at end of file diff --git a/resources/definitions/erzay3d.def.json b/resources/definitions/erzay3d.def.json index 2904b9ecfa..dc1ad9a509 100644 --- a/resources/definitions/erzay3d.def.json +++ b/resources/definitions/erzay3d.def.json @@ -62,8 +62,6 @@ "retraction_amount": { "default_value": 6.5 }, "speed_print": { "default_value": 40 }, - "speed_equalize_flow_enabled": { "default_value": true }, - "speed_equalize_flow_max": { "default_value": 100 }, "acceleration_print": { "default_value": 1000 }, diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 9a3cc32f39..3ef51c5a46 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -448,7 +448,7 @@ "machine_head_with_fans_polygon": { "label": "Machine Head & Fan Polygon", - "description": "A 2D silhouette of the print head (fan caps included).", + "description": "The shape of the print head. These are coordinates relative to the position of the print head, which is usually the position of its first extruder. The dimensions left and in front of the print head must be negative coordinates.", "type": "polygon", "default_value": [ @@ -831,7 +831,7 @@ "description": "Width of the outermost wall line. By lowering this value, higher levels of detail can be printed.", "unit": "mm", "minimum_value": "0.001", - "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if outer_inset_first else 0.1 * machine_nozzle_size", + "minimum_value_warning": "(0.1 + 0.4 * machine_nozzle_size) if inset_direction == \"outside_in\" else 0.1 * machine_nozzle_size", "maximum_value_warning": "2 * machine_nozzle_size", "default_value": 0.4, "value": "wall_line_width", @@ -1078,6 +1078,98 @@ } } }, + "beading_strategy_type": + { + "label": "Variable Line Strategy", + "description": "Strategy to use to print the width of a part with a number of walls. This determines how many walls it will use for a certain total width, and how wide each of these lines are. \"Center Deviation\" will print all walls at the nominal line width except the central one(s), causing big variations in the center but very consistent outsides. \"Distributed\" distributes the width equally over all walls. \"Inward Distributed\" is a balance between the other two, distributing the changes in width over all walls but keeping the walls on the outside slightly more consistent.", + "type": "enum", + "options": + { + "center_deviation": "Center Deviation", + "distributed": "Distributed", + "inward_distributed": "Inward Distributed" + }, + "default_value": "inward_distributed", + "limit_to_extruder": "wall_0_extruder_nr" + }, + "wall_transition_threshold": { + "label": "Middle Line Threshold", + "description": "The smallest line width, as a factor of the normal line width, below which it will choose to use fewer, but wider lines to fill the available space the wall needs to occupy. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.", + "type": "float", + "unit": "%", + "default_value": 90, + "minimum_value": "1", + "maximum_value": "99", + "children": + { + "wall_split_middle_threshold": { + "label": "Split Middle Line Threshold", + "description": "The smallest line width, as a factor of the normal line width, above which the middle line (if there is one) will be split into two. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.", + "type": "float", + "unit": "%", + "default_value": 50, + "value": "wall_transition_threshold", + "minimum_value": "1", + "maximum_value": "99" + }, + "wall_add_middle_threshold": { + "label": "Add Middle Line Threshold", + "description": "The smallest line width, as a factor of the normal line width, above which a middle line (if there wasn't one already) will be added. Reduce this setting to use more, thinner lines. Increase to use fewer, wider lines. Note that this applies -as if- the entire shape should be filled with wall, so the middle here refers to the middle of the object between two outer edges of the shape, even if there actually is fill or (other) skin in the print instead of wall.", + "type": "float", + "unit": "%", + "default_value": 50, + "value": "wall_transition_threshold * 8 / 9", + "minimum_value": "1", + "maximum_value": "99" + } + } + }, + "wall_transition_length": + { + "label": "Wall Transition Length", + "description": "When transitioning between different numbers of walls as the part becomes thinner, a certain amount of space is allotted to split or join the wall lines.", + "type": "float", + "unit": "mm", + "default_value": 0.4, + "value": "line_width", + "minimum_value": "0.001", + "minimum_value_warning": "0.5 * line_width", + "maximum_value_warning": "2 * line_width", + "maximum_value": "min_bead_width * 3 * math.pi" + }, + "wall_distribution_count": + { + "label": "Wall Distribution Count", + "description": "The number of walls, counted from the center, over which the variation needs to be spread. Lower values mean that the outer walls don't change in width.", + "type": "int", + "default_value": 1, + "minimum_value": "1", + "enabled": "beading_strategy_type == 'inward_distributed'" + }, + "wall_transition_angle": + { + "label": "Wall Transition Angle", + "description": "When transitioning between different numbers of walls as the part becomes thinner, two adjacent walls will join together at this angle. This can make the walls come together faster than what the Wall Transition Length indicates, filling the space better.", + "type": "float", + "unit": "°", + "default_value": 10, + "minimum_value": "1", + "minimum_value_warning": "5", + "maximum_value_warning": "50", + "maximum_value": "59" + }, + "wall_transition_filter_distance": + { + "label": "Wall Transition Distance Filter", + "description": "If it would be transitioning back and forth between different numbers of walls in quick succession, don't transition at all. Remove transitions if they are closer together than this distance.", + "type": "float", + "unit": "mm", + "default_value": 1.4, + "value": "4 * math.cos(wall_transition_angle / 180 * math.pi) * wall_line_width_x", + "minimum_value": "wall_transition_length", + "minimum_value_warning": "math.cos(wall_transition_angle / 180 * math.pi) * wall_line_width_x", + "maximum_value_warning": "10 * math.cos(wall_transition_angle / 180 * math.pi) * wall_line_width_x" + }, "wall_0_wipe_dist": { "label": "Outer Wall Wipe Distance", @@ -1098,7 +1190,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "value": "(machine_nozzle_size - wall_line_width_0) / 2 if (wall_line_width_0 < machine_nozzle_size and not outer_inset_first) else 0", + "value": "(machine_nozzle_size - wall_line_width_0) / 2 if (wall_line_width_0 < machine_nozzle_size and inset_direction != \"outside_in\") else 0", "minimum_value_warning": "0", "maximum_value_warning": "machine_nozzle_size", "limit_to_extruder": "wall_0_extruder_nr", @@ -1106,19 +1198,23 @@ }, "optimize_wall_printing_order": { - "label": "Optimize Wall Printing Order", - "description": "Optimize the order in which walls are printed so as to reduce the number of retractions and the distance travelled. Most parts will benefit from this being enabled but some may actually take longer so please compare the print time estimates with and without optimization. First layer is not optimized when choosing brim as build plate adhesion type.", + "label": "Order Inner Walls By Inset", + "description": "Order inner wall printing by inset-index, instead of by (hole) region.", "type": "bool", "default_value": false, "settable_per_mesh": true }, - "outer_inset_first": + "inset_direction": { - "label": "Outer Before Inner Walls", - "description": "Prints walls in order of outside to inside when enabled. This can help improve dimensional accuracy in X and Y when using a high viscosity plastic like ABS; however it can decrease outer surface print quality, especially on overhangs.", - "type": "bool", - "default_value": false, - "enabled": "wall_0_extruder_nr == wall_x_extruder_nr", + "label": "Wall Ordering", + "description": "Determines the order in which walls are printed. Printing outer walls earlier helps with dimensional accuracy, as faults from inner walls cannot propagate to the outside. However printing them later allows them to stack better when overhangs are printed.", + "type": "enum", + "options": { + "inside_out": "Inside To Outside", + "outside_in": "Outside To Inside", + "center_last": "Center Last" + }, + "default_value": "center_last", "settable_per_mesh": true }, "alternate_extra_perimeter": @@ -1130,72 +1226,6 @@ "limit_to_extruder": "infill_extruder_nr", "settable_per_mesh": true }, - "travel_compensate_overlapping_walls_enabled": - { - "label": "Compensate Wall Overlaps", - "description": "Compensate the flow for parts of a wall being printed where there is already a wall in place.", - "type": "bool", - "default_value": true, - "limit_to_extruder": "wall_x_extruder_nr", - "settable_per_mesh": true, - "children": - { - "travel_compensate_overlapping_walls_0_enabled": - { - "label": "Compensate Outer Wall Overlaps", - "description": "Compensate the flow for parts of an outer wall being printed where there is already a wall in place.", - "type": "bool", - "default_value": true, - "value": "travel_compensate_overlapping_walls_enabled", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_mesh": true - }, - "travel_compensate_overlapping_walls_x_enabled": - { - "label": "Compensate Inner Wall Overlaps", - "description": "Compensate the flow for parts of an inner wall being printed where there is already a wall in place.", - "type": "bool", - "default_value": true, - "value": "travel_compensate_overlapping_walls_enabled", - "limit_to_extruder": "wall_x_extruder_nr", - "settable_per_mesh": true - } - } - }, - "wall_min_flow": - { - "label": "Minimum Wall Flow", - "description": "Minimum allowed percentage flow for a wall line. The wall overlap compensation reduces a wall's flow when it lies close to an existing wall. Walls whose flow is less than this value will be replaced with a travel move. When using this setting, you must enable the wall overlap compensation and print the outer wall before inner walls.", - "unit": "%", - "minimum_value": "0", - "maximum_value": "100", - "default_value": 0, - "type": "float", - "enabled": "travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled", - "settable_per_mesh": true - }, - "wall_min_flow_retract": - { - "label": "Prefer Retract", - "description": "If enabled, retraction is used rather than combing for travel moves that replace walls whose flow is below the minimum flow threshold.", - "type": "bool", - "default_value": false, - "enabled": "(travel_compensate_overlapping_walls_0_enabled or travel_compensate_overlapping_walls_x_enabled) and wall_min_flow > 0", - "settable_per_mesh": true - }, - "fill_perimeter_gaps": - { - "label": "Fill Gaps Between Walls", - "description": "Fills the gaps between walls where no walls fit.", - "type": "enum", - "options": { - "nowhere": "Nowhere", - "everywhere": "Everywhere" - }, - "default_value": "everywhere", - "limit_to_extruder": "wall_0_extruder_nr", - "settable_per_mesh": true - }, "filter_out_tiny_gaps": { "label": "Filter Out Tiny Gaps", @@ -1209,10 +1239,36 @@ "label": "Print Thin Walls", "description": "Print pieces of the model which are horizontally thinner than the nozzle size.", "type": "bool", - "default_value": false, + "default_value": true, "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, + "min_feature_size": + { + "label": "Minimum Feature Size", + "description": "Minimum thickness of thin features. Model features that are thinner than this value will not be printed, while features thicker than the Minimum Feature Size will be widened to the Minimum Wall Line Width.", + "unit": "mm", + "value": "wall_line_width_0 / 4", + "minimum_value": "0", + "maximum_value": "wall_line_width_0", + "type": "float", + "limit_to_extruder": "wall_0_extruder_nr", + "enabled": "fill_outline_gaps" + }, + "min_bead_width": + { + "label": "Minimum Wall Line Width", + "description": "Width of the wall that will replace thin features (according to the Minimum Feature Size) of the model. If the Minimum Wall Line Width is thinner than the thickness of the feature, the wall will become as thick as the feature itself.", + "unit": "mm", + "value": "wall_line_width_0 * (100.0 + wall_split_middle_threshold)/200", + "default_value": "0.2", + "minimum_value": "0.001", + "minimum_value_warning": "min_feature_size", + "maximum_value_warning": "wall_line_width_0", + "type": "float", + "limit_to_extruder": "wall_0_extruder_nr", + "enabled": "fill_outline_gaps" + }, "xy_offset": { "label": "Horizontal Expansion", @@ -2456,7 +2512,42 @@ "maximum_value_warning": "120", "settable_per_mesh": false, "settable_per_extruder": false, - "resolve": "sum(extruderValues(\"material_shrinkage_percentage\")) / len(extruderValues(\"material_shrinkage_percentage\"))" + "resolve": "sum(extruderValues(\"material_shrinkage_percentage\")) / len(extruderValues(\"material_shrinkage_percentage\"))", + "children": + { + "material_shrinkage_percentage_xy": + { + "label": "Horizontal Scaling Factor Shrinkage Compensation", + "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the XY-direction (horizontally).", + "unit": "%", + "type": "float", + "default_value": 100.0, + "enabled": false, + "minimum_value": "0.001", + "minimum_value_warning": "100", + "maximum_value_warning": "120", + "settable_per_mesh": false, + "settable_per_extruder": false, + "resolve": "sum(extruderValues(\"material_shrinkage_percentage_xy\")) / len(extruderValues(\"material_shrinkage_percentage_xy\"))", + "value": "material_shrinkage_percentage" + }, + "material_shrinkage_percentage_z": + { + "label": "Vertical Scaling Factor Shrinkage Compensation", + "description": "To compensate for the shrinkage of the material as it cools down, the model will be scaled with this factor in the Z-direction (vertically).", + "unit": "%", + "type": "float", + "default_value": 100.0, + "enabled": false, + "minimum_value": "0.001", + "minimum_value_warning": "100", + "maximum_value_warning": "120", + "settable_per_mesh": false, + "settable_per_extruder": false, + "resolve": "sum(extruderValues(\"material_shrinkage_percentage_z\")) / len(extruderValues(\"material_shrinkage_percentage_z\"))", + "value": "material_shrinkage_percentage" + } + } }, "material_crystallinity": { @@ -3167,26 +3258,15 @@ "settable_per_mesh": false, "settable_per_extruder": false }, - "speed_equalize_flow_enabled": - { - "label": "Equalize Filament Flow", - "description": "Print thinner than normal lines faster so that the amount of material extruded per second remains the same. Thin pieces in your model might require lines printed with smaller line width than provided in the settings. This setting controls the speed changes for such lines.", - "type": "bool", - "default_value": false, - "settable_per_mesh": false, - "settable_per_extruder": true - }, - "speed_equalize_flow_max": + "speed_equalize_flow_width_factor": { - "label": "Maximum Speed for Flow Equalization", - "description": "Maximum print speed when adjusting the print speed in order to equalize flow.", + "label": "Flow Equalization Ratio", + "description": "Extrusion width based correction factor on the speed. At 0% the movement speed is kept constant at the Print Speed. At 100% the movement speed is adjusted so that the flow (in mm³/s) is kept constant, i.e. lines half the normal Line Width are printed twice as fast and lines twice as wide are printed half as fast. A value larger than 100% can help to compensate for the higher pressure required to extrude wide lines.", "type": "float", - "unit": "mm/s", - "enabled": "speed_equalize_flow_enabled", - "default_value": 150, - "minimum_value": "0.1", - "maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)", - "maximum_value_warning": "150", + "unit": "%", + "default_value": 100.0, + "minimum_value": "0.0", + "maximum_value_warning": "200.0", "settable_per_mesh": false, "settable_per_extruder": true }, @@ -5466,7 +5546,7 @@ "default_value": 5, "minimum_value": "0", "minimum_value_warning": "raft_interface_line_width", - "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "enabled": "resolveOrValue('adhesion_type') == 'raft' and not raft_remove_inside_corners", "limit_to_extruder": "adhesion_extruder_nr", "settable_per_mesh": false, "settable_per_extruder": true @@ -6252,6 +6332,18 @@ "minimum_value_warning": "0.01", "maximum_value_warning": "0.3", "settable_per_mesh": true + }, + "meshfix_maximum_extrusion_area_deviation": + { + "label": "Maximum Extrusion Area Deviation", + "description": "The maximum extrusion area deviation allowed when removing intermediate points from a straight line. An intermediate point may serve as width-changing point in a long straight line. Therefore, if it is removed, it will cause the line to have a uniform width and, as a result, lose (or gain) a bit of extrusion area. If you increase this you may notice slight under- (or over-) extrusion in between straight parallel walls, as more intermediate width-changing points will be allowed to be removed. Your print will be less accurate, but the g-code will be smaller.", + "type": "float", + "unit": "μm²", + "default_value": 2000, + "minimum_value": "0", + "minimum_value_warning": "500", + "maximum_value_warning": "50000", + "settable_per_mesh": true } } }, @@ -6801,6 +6893,7 @@ "type": "bool", "default_value": false, "limit_to_extruder": "wall_0_extruder_nr", + "enabled": false, "settable_per_mesh": true }, "magic_fuzzy_skin_outside_only": @@ -6809,7 +6902,7 @@ "description": "Jitter only the parts' outlines and not the parts' holes.", "type": "bool", "default_value": false, - "enabled": "magic_fuzzy_skin_enabled", + "enabled": "magic_fuzzy_skin_enabled and False" , "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -6822,7 +6915,7 @@ "default_value": 0.3, "minimum_value": "0.001", "maximum_value_warning": "wall_line_width_0", - "enabled": "magic_fuzzy_skin_enabled", + "enabled": "magic_fuzzy_skin_enabled and False", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true }, @@ -6837,7 +6930,7 @@ "minimum_value_warning": "0.1", "maximum_value_warning": "10", "maximum_value": "2 / magic_fuzzy_skin_thickness", - "enabled": "magic_fuzzy_skin_enabled", + "enabled": "magic_fuzzy_skin_enabled and False", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true, "children": @@ -6853,7 +6946,7 @@ "minimum_value_warning": "0.1", "maximum_value_warning": "10", "value": "10000 if magic_fuzzy_skin_point_density == 0 else 1 / magic_fuzzy_skin_point_density", - "enabled": "magic_fuzzy_skin_enabled", + "enabled": "magic_fuzzy_skin_enabled and False", "limit_to_extruder": "wall_0_extruder_nr", "settable_per_mesh": true } @@ -7429,7 +7522,8 @@ "unit": "%", "default_value": 100, "type": "float", - "minimum_value": "0.001", + "minimum_value": "5", + "maximum_value": "100", "minimum_value_warning": "20", "maximum_value_warning": "100", "enabled": "bridge_settings_enabled", @@ -7812,6 +7906,36 @@ "minimum_value_warning": "25", "maximum_value_warning": "100", "settable_per_mesh": true + }, + "material_alternate_walls": + { + "label": "Alternate Wall Directions", + "description": "Alternate wall directions every other layer and inset. Useful for materials that can build up stress, like for metal printing.", + "type": "bool", + "default_value": false, + "enabled": false, + "settable_per_mesh": true, + "settable_per_extruder": true + }, + "raft_remove_inside_corners": + { + "label": "Remove Raft Inside Corners", + "description": "Remove inside corners from the raft, causing the raft to become convex.", + "type": "bool", + "default_value": false, + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": false + }, + "raft_base_wall_count": + { + "label": "Raft Base Wall Count", + "description": "The number of contours to print around the linear pattern in the base layer of the raft.", + "type": "int", + "default_value": 1, + "enabled": "resolveOrValue('adhesion_type') == 'raft'", + "settable_per_mesh": false, + "settable_per_extruder": false } } }, diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index a00a97deb6..b0c839ea89 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -175,8 +175,6 @@ "wall_0_wipe_dist": { "value": 0.0 }, "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3 if layer_height > 0.15 else 0.8" }, "optimize_wall_printing_order": { "value": true }, - "travel_compensate_overlapping_walls_0_enabled": { "value": false }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "filter_out_tiny_gaps": { "value": false }, "fill_outline_gaps": { "value": false }, "z_seam_type": { "value": "'sharpest_corner'" }, diff --git a/resources/definitions/fusedform_base.def.json b/resources/definitions/fusedform_base.def.json index 24b841f704..1777b93913 100644 --- a/resources/definitions/fusedform_base.def.json +++ b/resources/definitions/fusedform_base.def.json @@ -48,7 +48,6 @@ "speed_topbottom": {"value": 40 }, "speed_wall": { "value": 35 }, "speed_wall_x": { "value": 40 }, - "speed_equalize_flow_max": { "value": 70 }, "retraction_enable": {"default_value":true}, "retraction_amount": { "default_value": 4 }, diff --git a/resources/definitions/fusedform_doppia_base.def.json b/resources/definitions/fusedform_doppia_base.def.json index ddee568e28..add20dfc77 100644 --- a/resources/definitions/fusedform_doppia_base.def.json +++ b/resources/definitions/fusedform_doppia_base.def.json @@ -48,7 +48,6 @@ "speed_topbottom": {"value": 40 }, "speed_wall": { "value": 35 }, "speed_wall_x": { "value": 40 }, - "speed_equalize_flow_max": { "value": 70 }, "retraction_enable": {"default_value":true}, "retraction_amount": { "default_value": 4 }, diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json index a305cc3229..67a5a4f4cc 100644 --- a/resources/definitions/goofoo_base.def.json +++ b/resources/definitions/goofoo_base.def.json @@ -84,7 +84,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, @@ -97,7 +96,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/hellbot_magna_2_230_dual.def.json b/resources/definitions/hellbot_magna_2_230_dual.def.json index b7a0e6f820..7768f51ac0 100644 --- a/resources/definitions/hellbot_magna_2_230_dual.def.json +++ b/resources/definitions/hellbot_magna_2_230_dual.def.json @@ -38,8 +38,14 @@ "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { + "default_value": true + }, + "machine_extruders_share_nozzle": { + "default_value": true + }, "machine_start_gcode": { - "default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0" + "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" diff --git a/resources/definitions/hellbot_magna_2_300_dual.def.json b/resources/definitions/hellbot_magna_2_300_dual.def.json index 52efac0ed2..ed22bfa079 100644 --- a/resources/definitions/hellbot_magna_2_300_dual.def.json +++ b/resources/definitions/hellbot_magna_2_300_dual.def.json @@ -38,8 +38,14 @@ "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { + "default_value": true + }, + "machine_extruders_share_nozzle": { + "default_value": true + }, "machine_start_gcode": { - "default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0" + "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, "machine_end_gcode": { "default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84" diff --git a/resources/definitions/hellbot_magna_2_400_dual.def.json b/resources/definitions/hellbot_magna_2_400_dual.def.json index 963a7f7bc1..2dbdb1f6ca 100644 --- a/resources/definitions/hellbot_magna_2_400_dual.def.json +++ b/resources/definitions/hellbot_magna_2_400_dual.def.json @@ -38,6 +38,12 @@ "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { + "default_value": true + }, + "machine_extruders_share_nozzle": { + "default_value": true + }, "machine_start_gcode": { "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, diff --git a/resources/definitions/hellbot_magna_2_500_dual.def.json b/resources/definitions/hellbot_magna_2_500_dual.def.json index 5b3f05ec4d..ba7f18d702 100644 --- a/resources/definitions/hellbot_magna_2_500_dual.def.json +++ b/resources/definitions/hellbot_magna_2_500_dual.def.json @@ -38,6 +38,12 @@ "machine_extruder_count": { "default_value": 2 }, + "machine_extruders_share_heater": { + "default_value": true + }, + "machine_extruders_share_nozzle": { + "default_value": true + }, "machine_start_gcode": { "default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0" }, diff --git a/resources/definitions/hellbot_magna_SE.def.json b/resources/definitions/hellbot_magna_SE.def.json new file mode 100644 index 0000000000..7420eaee63 --- /dev/null +++ b/resources/definitions/hellbot_magna_SE.def.json @@ -0,0 +1,41 @@ +{
+ "version": 2,
+ "name": "Hellbot Magna SE",
+ "inherits": "fdmprinter",
+ "metadata": {
+ "visible": true,
+ "author": "Hellbot Development Team",
+ "manufacturer": "Hellbot",
+ "file_formats": "text/x-gcode",
+ "platform": "hellbot_magna_SE.obj",
+ "platform_texture": "hellbot_magna_SE.png",
+ "has_materials": true,
+ "machine_extruder_trains":
+ {
+ "0": "hellbot_magna_SE_extruder"
+ }
+
+ },
+
+ "overrides": {
+ "machine_name": { "default_value": "Hellbot Magna SE" },
+ "machine_width": {
+ "default_value": 230
+ },
+ "machine_depth": {
+ "default_value": 230
+ },
+ "machine_height": {
+ "default_value": 250
+ },
+ "machine_heated_bed": {
+ "default_value": true
+ },
+ "machine_center_is_zero": {
+ "default_value": false
+ },
+ "machine_extruder_count": {
+ "default_value": 1
+ }
+ }
+}
diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 7d76f24497..20acb6e3cf 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -89,9 +89,8 @@ "top_layers": {"value": "4 if infill_sparse_density < 95 else 1" }, "bottom_layers": {"value": "(top_layers)" }, "wall_0_inset": {"value": "0" }, - "outer_inset_first": {"value": true }, + "inset_direction": {"value": "'outside_in'" }, "alternate_extra_perimeter": {"value": false }, - "travel_compensate_overlapping_walls_enabled": {"value": false }, "filter_out_tiny_gaps": {"value": true }, "fill_outline_gaps": {"value": true }, "z_seam_type": {"value": "'shortest'"}, diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json index c458e684bd..83c8da9f0f 100644 --- a/resources/definitions/kingroon_base.def.json +++ b/resources/definitions/kingroon_base.def.json @@ -194,7 +194,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": false }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, @@ -207,7 +206,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index acfd674ad1..b0791dd251 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -112,7 +112,6 @@ "minimum_support_area": { "value": 2 }, "minimum_interface_area": { "value": 10 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/koonovo_kn3.def.json b/resources/definitions/koonovo_kn3.def.json index 5d490a75fe..0750eec47a 100644 --- a/resources/definitions/koonovo_kn3.def.json +++ b/resources/definitions/koonovo_kn3.def.json @@ -129,7 +129,6 @@ "minimum_support_area": { "value": 2 },
"minimum_interface_area": { "value": 10 },
- "fill_perimeter_gaps": { "value": "'everywhere'" },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
diff --git a/resources/definitions/koonovo_kn5.def.json b/resources/definitions/koonovo_kn5.def.json index 3e0f3c8df5..16d34caf15 100644 --- a/resources/definitions/koonovo_kn5.def.json +++ b/resources/definitions/koonovo_kn5.def.json @@ -130,7 +130,6 @@ "minimum_support_area": { "value": 2 },
"minimum_interface_area": { "value": 10 },
- "fill_perimeter_gaps": { "value": "'everywhere'" },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
diff --git a/resources/definitions/liquid.def.json b/resources/definitions/liquid.def.json index 77262a494f..0fc0f3c9ca 100644 --- a/resources/definitions/liquid.def.json +++ b/resources/definitions/liquid.def.json @@ -144,7 +144,6 @@ "retraction_prime_speed": { "value": "35" }, "skin_overlap": { "value": "10" }, - "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json index c0d06ce135..09ac8c3692 100644 --- a/resources/definitions/longer_base.def.json +++ b/resources/definitions/longer_base.def.json @@ -84,7 +84,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, @@ -97,7 +96,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json index ddb936cd36..efe5b18ec8 100644 --- a/resources/definitions/maker_made_300x.def.json +++ b/resources/definitions/maker_made_300x.def.json @@ -49,13 +49,8 @@ "top_bottom_pattern_0": {"value": "'lines'" },
"wall_0_inset": {"value": 0},
"optimize_wall_printing_order": {"value": false },
- "outer_inset_first": {"value": false },
+ "inset_direction": {"value": "'inside_out'" },
"alternate_extra_perimeter": {"value": false },
- "travel_compensate_overlapping_walls_enabled": {"value": true },
- "travel_compensate_overlapping_walls_0_enabled": {"value": true },
- "travel_compensate_overlapping_walls_x_enabled": {"value": true },
- "wall_min_flow": {"value": 0},
- "fill_perimeter_gaps": {"value": "'everywhere'" },
"filter_out_tiny_gaps": {"value": true },
"fill_outline_gaps": {"value": true },
"xy_offset": {"value": 0},
@@ -97,7 +92,6 @@ "speed_layer_0": {"value": 10},
"speed_travel_layer_0": {"value": 50},
"speed_slowdown_layers": {"value": 2},
- "speed_equalize_flow_enabled": {"value": false },
"acceleration_enabled": {"value": false },
"acceleration_roofing": {"value": 3000 },
"jerk_enabled": {"value": false },
diff --git a/resources/definitions/maker_starter.def.json b/resources/definitions/maker_starter.def.json index d847bd4fe5..ea849b7039 100644 --- a/resources/definitions/maker_starter.def.json +++ b/resources/definitions/maker_starter.def.json @@ -78,7 +78,7 @@ "default_value": 0.2 }, "support_pattern": { - "default_value": "ZigZag" + "default_value": "zigzag" }, "support_infill_rate": { "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index 1051e53c2a..5dd9eeed7a 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -179,7 +179,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": false }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, @@ -192,7 +191,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json new file mode 100644 index 0000000000..0e82f1d4a3 --- /dev/null +++ b/resources/definitions/mixware_hyper_s.def.json @@ -0,0 +1,372 @@ +{ + "name": "Hyper S", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Mixware", + "manufacturer": "Mixware", + "file_formats": "text/x-gcode", + "platform": "mixware_hyper_s_platform.stl", + "has_materials": true, + "has_machine_quality": true, + "preferred_material": "generic_pla", + "preferred_quality": "coarse", + "machine_extruder_trains": { + "0": "mixware_hyper_s_extruder_0" + } + }, + "overrides": { + "machine_name": { + "default_value": "Hyper S" + }, + "machine_start_gcode": { + "default_value": "M140 S{material_bed_temperature} ; Heat bed\nM109 S{material_print_temperature} ; Heat nozzle\nM190 S{material_bed_temperature} ; Wait for bed heating\nG28 ; home all axes\nM117 Purge extruder\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface\nG1 X0.1 Y20 Z0.3 F5000.0 ; move to start-line position\nG1 X0.1 Y100.0 Z0.3 F1500.0 E15 ; draw 1st line\nG1 X0.4 Y100.0 Z0.3 F5000.0 ; move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; draw 2nd line\nG92 E0 ; reset extruder\nG1 Z5.0 F1000 ; move z up little to prevent scratching of surface" + }, + "machine_end_gcode": { + "default_value": "G91; relative positioning\nG1 Z1.0 F3000 ; move z up little to prevent scratching of print\nG90; absolute positioning\nG1 X0 Y200 F1000 ; prepare for part removal\nM104 S0; turn off extruder\nM140 S0 ; turn off bed\nG1 X0 Y220 F1000 ; prepare for part removal\nM84 ; disable motors\nM106 S0 ; turn off fan" + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "raft_margin": { + "default_value": 3, + "minimum_value_warning": "0.01" + }, + "raft_airgap": { + "default_value": 0.24 + }, + "brim_width": { + "default_value": 3 + }, + "machine_heated_bed": { + "default_value": true + }, + "material_diameter": { + "default_value": 1.75 + }, + "top_bottom_pattern": { + "default_value": "zigzag" + }, + "ironing_line_spacing": { + "default_value": 0.4 + }, + "ironing_pattern": { + "default_value": "concentric" + }, + "skin_no_small_gaps_heuristic": { + "default_value": false + }, + "retraction_hop_enabled": { + "default_value": false + }, + "support_enable": { + "default_value": true + }, + "support_type": { + "default_value": "buildplate" + }, + "support_angle": { + "default_value": 60 + }, + "support_pattern": { + "default_value": "zigzag" + }, + "support_infill_rate": { + "value": 15 + }, + "gantry_height": { + "value": 25 + }, + "machine_max_feedrate_x": { + "default_value": 500 + }, + "machine_max_feedrate_y": { + "default_value": 500 + }, + "machine_max_feedrate_z": { + "default_value": 10 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 500 + }, + "machine_max_acceleration_y": { + "default_value": 500 + }, + "machine_max_acceleration_z": { + "default_value": 100 + }, + "machine_max_acceleration_e": { + "default_value": 500 + }, + "machine_acceleration": { + "default_value": 500 + }, + "machine_max_jerk_xy": { + "default_value": 10 + }, + "machine_max_jerk_z": { + "default_value": 0.4 + }, + "machine_max_jerk_e": { + "default_value": 5 + }, + "acceleration_print": { + "default_value": 1000 + }, + "jerk_print": { + "default_value": 10 + }, + "acceleration_enabled": { + "default_value": false + }, + "jerk_enabled": { + "default_value": false + }, + "speed_print": { + "default_value": 40.0 + }, + "optimize_wall_printing_order": { + "default_value": "True" + }, + "z_seam_type": { + "default_value": "shortest" + }, + "infill_before_walls": { + "default_value": false + }, + "infill_sparse_density": { + "default_value": 15 + }, + "fill_outline_gaps": { + "default_value": false + }, + "filter_out_tiny_gaps": { + "default_value": false + }, + "retraction_hop": { + "default_value": 0.2 + }, + "travel_avoid_other_parts": { + "default_value": false + }, + "travel_retract_before_outer_wall": { + "default_value": true + }, + "retraction_amount": { + "default_value": 2 + }, + "retraction_enable": { + "default_value": true + }, + "retraction_count_max": { + "default_value": 100 + }, + "cool_fan_enabled": { + "default_value": true + }, + "cool_min_layer_time": { + "default_value": 10 + }, + "skirt_gap": { + "default_value": 8.0 + }, + "skirt_line_count": { + "default_value": 3 + }, + "adaptive_layer_height_variation": { + "default_value": 0.04 + }, + "adaptive_layer_height_variation_step": { + "default_value": 0.04 + }, + "support_use_towers": { + "default_value": false + }, + "support_interface_enable": { + "default_value": true + }, + "support_interface_density": { + "default_value": 33.333 + }, + "support_interface_pattern": { + "default_value": "grid" + }, + "support_interface_skip_height": { + "default_value": 0.24 + }, + "top_bottom_thickness": { + "default_value": 0.8 + }, + "material_flow": { + "default_value": 100 + }, + "material_print_temperature": { + "maximum_value_warning": "330" + }, + "acceleration_roofing": { + "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" + }, + "retraction_speed": { + "default_value": 40, + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": "200" + }, + "retraction_retract_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": "200" + }, + "retraction_prime_speed": { + "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", + "maximum_value": "200" + }, + "speed_layer_0": { + "value": "speed_print / 2" + }, + "acceleration_travel_layer_0": { + "value": "acceleration_travel" + }, + "jerk_travel": { + "value": "jerk_print" + }, + "jerk_travel_layer_0": { + "value": "jerk_travel" + }, + "skirt_brim_speed": { + "value": "speed_layer_0" + }, + "speed_infill": { + "value": "speed_print" + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_wall_0": { + "value": "speed_wall" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "speed_topbottom": { + "value": "speed_print / 2" + }, + "speed_roofing": { + "value": "speed_topbottom" + }, + "speed_travel": { + "value": "150.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" + }, + "speed_print_layer_0": { + "value": "speed_layer_0" + }, + "speed_travel_layer_0": { + "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" + }, + "speed_prime_tower": { + "value": "speed_topbottom" + }, + "speed_support": { + "value": "speed_wall_0" + }, + "speed_support_interface": { + "value": "speed_topbottom" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature" + }, + "material_final_print_temperature": { + "value": "material_print_temperature" + }, + "cool_fan_full_at_height": { + "value": "layer_height_0 + 2 * layer_height" + }, + "adhesion_type": { + "default_value": "skirt" + }, + "meshfix_maximum_travel_resolution": { + "value": "meshfix_maximum_resolution" + }, + "support_xy_distance": { + "value": "wall_line_width_0 * 2" + }, + "support_xy_distance_overhang": { + "value": "wall_line_width_0" + }, + "support_z_distance": { + "value": "layer_height if layer_height >= 0.16 else layer_height * 2" + }, + "support_xy_overrides_z": { + "default_value": "xy_overrides_z" + }, + "support_interface_height": { + "value": "layer_height * 4" + }, + "wall_thickness": { + "value": "line_width * 2" + }, + "acceleration_travel": { + "value": 1000 + }, + "line_width": { + "value": 0.4 + }, + "speed_z_hop": { + "default_value": 5 + }, + "retraction_combing_max_distance": { + "default_value": 30 + }, + "travel_avoid_supports": { + "default_value": true + }, + "brim_replaces_support": { + "default_value": false + }, + "support_brim_width": { + "default_value": 4 + }, + "minimum_support_area": { + "default_value": 2 + }, + "minimum_interface_area": { + "default_value": 10 + }, + "support_wall_count": { + "value": 1 + }, + "support_brim_enable": { + "value": false + }, + "retraction_combing": { + "value": "all" + }, + "retraction_extrusion_window": { + "value": 10, + "maximum_value_warning": "20" + }, + "retraction_min_travel": { + "value": 1.5 + }, + "infill_wipe_dist": { + "value": 0.0 + }, + "skin_overlap": { + "value": 10.0 + }, + "infill_overlap": { + "value": 30.0 + }, + "wall_0_wipe_dist": { + "value": 0.0 + } + } +} diff --git a/resources/definitions/peopoly_moai.def.json b/resources/definitions/peopoly_moai.def.json index e19fed8b4d..cbc668dc74 100644 --- a/resources/definitions/peopoly_moai.def.json +++ b/resources/definitions/peopoly_moai.def.json @@ -176,15 +176,6 @@ "skin_outline_count": { "value": 0 }, - "travel_compensate_overlapping_walls_enabled": { - "value": "False" - }, - "travel_compensate_overlapping_walls_0_enabled": { - "value": "False" - }, - "travel_compensate_overlapping_walls_x_enabled": { - "value": "False" - }, "wall_0_wipe_dist": { "value": "machine_nozzle_size / 3" }, @@ -218,10 +209,6 @@ "material_flow_layer_0": { "enabled": false }, - "speed_equalize_flow_enabled": { - "enabled": false, - "value": "False" - }, "draft_shield_enabled": { "enabled": false, "value": "False" diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index de6365c415..bd1995f3dc 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -88,9 +88,6 @@ "wall_0_wipe_dist": { "value": 0.05 }, "optimize_wall_printing_order": { "value": "True" }, - "travel_compensate_overlapping_walls_enabled": { "value": "False" }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, - "travel_compensate_overlapping_walls_x_enabled": { "value": "False" }, "infill_sparse_density": { "value": 16 }, "infill_wipe_dist": { "value": 0 }, diff --git a/resources/definitions/sh65.def.json b/resources/definitions/sh65.def.json new file mode 100644 index 0000000000..d26898d9dd --- /dev/null +++ b/resources/definitions/sh65.def.json @@ -0,0 +1,51 @@ +{
+ "version": 2,
+ "name": "Volumic SH65",
+ "inherits": "fdmprinter",
+ "metadata": {
+ "visible": true,
+ "author": "Volumic",
+ "manufacturer": "Volumic",
+ "file_formats": "text/x-gcode",
+ "icon": "volumic-icon",
+ "platform": "SH65_platform.STL",
+ "has_materials": true,
+ "has_machine_quality": true,
+ "machine_extruder_trains":{"0": "sh65_extruder"}
+ },
+
+ "overrides": {
+ "machine_name": { "default_value": "VOLUMIC SH65" },
+ "machine_heated_bed": { "default_value": true },
+ "machine_width": { "default_value": 650 },
+ "machine_height": { "default_value": 300 },
+ "machine_depth": { "default_value": 300 },
+ "machine_center_is_zero": { "default_value": false },
+ "material_diameter": { "default_value": 1.75 },
+ "machine_nozzle_size": { "default_value": 0.4 },
+ "layer_height": { "default_value": 0.1 },
+ "layer_height_0": { "default_value": 0.1 },
+ "retraction_amount": { "default_value": 2.40 },
+ "retraction_speed": { "default_value": 30 },
+ "adhesion_type": { "default_value": "none" },
+ "infill_sparse_density": { "default_value": 25 },
+ "fill_outline_gaps": { "default_value": true },
+ "retract_at_layer_change": { "default_value": true },
+ "retraction_combing_max_distance": { "default_value": 200 },
+ "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
+ "machine_max_feedrate_z": { "default_value": 30 },
+ "machine_max_feedrate_e": { "default_value": 60 },
+ "machine_max_acceleration_z": { "default_value": 500 },
+ "machine_acceleration": { "default_value": 2000 },
+ "machine_max_jerk_xy": { "default_value": 10 },
+ "machine_max_jerk_z": { "default_value": 0.4 },
+ "machine_max_jerk_e": { "default_value": 5 },
+ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+ "machine_start_gcode": {
+ "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression"
+ },
+ "machine_end_gcode": {
+ "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300"
+ }
+ }
+}
diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index ed047eb637..dbcf140585 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -110,9 +110,6 @@ "switch_extruder_retraction_speed": { "value": "30" }, - "travel_compensate_overlapping_walls_enabled": { - "default_value": false - }, "raft_base_acceleration": { "value": "400" }, @@ -389,9 +386,6 @@ "acceleration_support_infill": { "value": "400" }, - "travel_compensate_overlapping_walls_0_enabled": { - "value": "False" - }, "support_bottom_material_flow": { "value": "99" }, @@ -584,9 +578,6 @@ "infill_material_flow": { "value": "99" }, - "speed_equalize_flow_max": { - "default_value": 40 - }, "skin_preshrink": { "value": "0.0" }, @@ -644,9 +635,6 @@ "skirt_line_count": { "default_value": 2 }, - "travel_compensate_overlapping_walls_x_enabled": { - "value": "False" - }, "jerk_wall_0": { "value": "5" }, diff --git a/resources/definitions/stream30mk3.def.json b/resources/definitions/stream30mk3.def.json new file mode 100644 index 0000000000..13a2571f02 --- /dev/null +++ b/resources/definitions/stream30mk3.def.json @@ -0,0 +1,51 @@ +{
+ "version": 2,
+ "name": "Volumic Stream30Pro MK3",
+ "inherits": "fdmprinter",
+ "metadata": {
+ "visible": true,
+ "author": "Volumic",
+ "manufacturer": "Volumic",
+ "file_formats": "text/x-gcode",
+ "icon": "volumic-icon",
+ "platform": "STREAM30ULTRA_platform.STL",
+ "has_materials": true,
+ "has_machine_quality": true,
+ "machine_extruder_trains":{"0": "stream30mk3_extruder"}
+ },
+
+ "overrides": {
+ "machine_name": { "default_value": "VOLUMIC STREAM30PRO MK3" },
+ "machine_heated_bed": { "default_value": true },
+ "machine_width": { "default_value": 300 },
+ "machine_height": { "default_value": 310 },
+ "machine_depth": { "default_value": 200 },
+ "machine_center_is_zero": { "default_value": false },
+ "material_diameter": { "default_value": 1.75 },
+ "machine_nozzle_size": { "default_value": 0.4 },
+ "layer_height": { "default_value": 0.1 },
+ "layer_height_0": { "default_value": 0.1 },
+ "retraction_amount": { "default_value": 2.40 },
+ "retraction_speed": { "default_value": 30 },
+ "adhesion_type": { "default_value": "none" },
+ "infill_sparse_density": { "default_value": 25 },
+ "fill_outline_gaps": { "default_value": true },
+ "retract_at_layer_change": { "default_value": true },
+ "retraction_combing_max_distance": { "default_value": 200 },
+ "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
+ "machine_max_feedrate_z": { "default_value": 30 },
+ "machine_max_feedrate_e": { "default_value": 60 },
+ "machine_max_acceleration_z": { "default_value": 500 },
+ "machine_acceleration": { "default_value": 2000 },
+ "machine_max_jerk_xy": { "default_value": 10 },
+ "machine_max_jerk_z": { "default_value": 0.4 },
+ "machine_max_jerk_e": { "default_value": 5 },
+ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+ "machine_start_gcode": {
+ "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression"
+ },
+ "machine_end_gcode": {
+ "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300"
+ }
+ }
+}
diff --git a/resources/definitions/stream30ultrasc2.def.json b/resources/definitions/stream30ultrasc2.def.json new file mode 100644 index 0000000000..b1994044cf --- /dev/null +++ b/resources/definitions/stream30ultrasc2.def.json @@ -0,0 +1,51 @@ +{
+ "version": 2,
+ "name": "Volumic Stream30Ultra SC2",
+ "inherits": "fdmprinter",
+ "metadata": {
+ "visible": true,
+ "author": "Volumic",
+ "manufacturer": "Volumic",
+ "file_formats": "text/x-gcode",
+ "icon": "volumic-icon",
+ "platform": "STREAM30ULTRA_platform.STL",
+ "has_materials": true,
+ "has_machine_quality": true,
+ "machine_extruder_trains":{"0": "stream30ultrasc2_extruder"}
+ },
+
+ "overrides": {
+ "machine_name": { "default_value": "VOLUMIC STREAM30ULTRA SC2" },
+ "machine_heated_bed": { "default_value": true },
+ "machine_width": { "default_value": 300 },
+ "machine_height": { "default_value": 310 },
+ "machine_depth": { "default_value": 200 },
+ "machine_center_is_zero": { "default_value": false },
+ "material_diameter": { "default_value": 1.75 },
+ "machine_nozzle_size": { "default_value": 0.4 },
+ "layer_height": { "default_value": 0.1 },
+ "layer_height_0": { "default_value": 0.1 },
+ "retraction_amount": { "default_value": 2.40 },
+ "retraction_speed": { "default_value": 30 },
+ "adhesion_type": { "default_value": "none" },
+ "infill_sparse_density": { "default_value": 25 },
+ "fill_outline_gaps": { "default_value": true },
+ "retract_at_layer_change": { "default_value": true },
+ "retraction_combing_max_distance": { "default_value": 200 },
+ "machine_head_with_fans_polygon": { "default_value": [[-38,30],[38,30],[38,-40],[-38,-40]] },
+ "machine_max_feedrate_z": { "default_value": 30 },
+ "machine_max_feedrate_e": { "default_value": 60 },
+ "machine_max_acceleration_z": { "default_value": 500 },
+ "machine_acceleration": { "default_value": 2000 },
+ "machine_max_jerk_xy": { "default_value": 10 },
+ "machine_max_jerk_z": { "default_value": 0.4 },
+ "machine_max_jerk_e": { "default_value": 5 },
+ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" },
+ "machine_start_gcode": {
+ "default_value": "M117 Demarrage\nM106 S0\nM140 S{material_bed_temperature_layer_0}\nM104 T0 S{material_print_temperature_layer_0}\nG28\nG90\nM82\nG92 E0\nG1 Z3 F600\n;M190 S{material_bed_temperature_layer_0}\nM109 T0 S{material_print_temperature_layer_0}\nM300 P350\nM117 Purge\nG1 Z0.15 F600\nG1 E10 F400\nG92 E0\nM117 Impression"
+ },
+ "machine_end_gcode": {
+ "default_value": "M107\nG91\nT0\nG1 E-1\nM104 T0 S0\nG90\nG0 X1 Y190 F5000\nG92 E0\nM140 S0\nM84\nM300"
+ }
+ }
+}
diff --git a/resources/definitions/tinyboy_fabrikator15.def.json b/resources/definitions/tinyboy_fabrikator15.def.json index e115be6839..9f440a249f 100644 --- a/resources/definitions/tinyboy_fabrikator15.def.json +++ b/resources/definitions/tinyboy_fabrikator15.def.json @@ -9,7 +9,8 @@ "file_formats": "text/x-gcode",
"platform": "tinyboy_fabrikator15.stl",
"platform_offset": [-95, -3, -46],
- "has_materials": false,
+ "has_materials": true,
+ "preferred_material": "generic_pla_175",
"has_machine_quality": true,
"preferred_quality_type": "normal",
"machine_extruder_trains":
@@ -33,12 +34,10 @@ "gantry_height": { "value": 45 },
"machine_center_is_zero": { "default_value": false },
"machine_start_gcode": {
- "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\n;M190 S{print_bed_temperature} ;Uncomment to add your own bed temperature line\n;M109 S{print_temperature} ;Uncomment to add your own temperature line\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 X0.0 Y0.0 Z15.0 F{travel_speed} ;move the printhead up 15mm\nG92 E0 ;zero the extruded length\n;M109 S{print_temperature} ;set extruder temperature\nG1 F200 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F{travel_speed}\n;Put printing message on LCD screen\nM117 Printing..."
-
+ "default_value": ";Sliced at: {day} {date} {time}\n;Basic settings: Layer height: {layer_height} Walls: {wall_thickness} Fill: {infill_sparse_density}\n;Print time: {print_time}\n;Filament used: {filament_amount}m {filament_weight}g\n;Filament cost: {filament_cost}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 X0.0 Y0.0 Z15.0 F6000 ;move the printhead up 15mm\nG92 E0 ;zero the extruded length\nM104 S{material_print_temperature} ;set extruder temperature\nM105\nM109 S{material_print_temperature} ;wait for extruder temperature\nG1 F200 E30 ;extrude 30mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F6000\n;Put printing message on LCD screen\nM117 Printing..."
},
"machine_end_gcode": {
- "default_value": ";End GCode\nM104 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\nG1 Z+0.5 E-5 X-20 Y-20 F{travel_speed} ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n;{jobname}"
-
+ "default_value": ";End GCode\nM104 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\nG1 Z+0.5 E-5 X-20 Y-20 F6000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\n;{jobname}"
}
}
}
diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index aa61474f81..10b020267d 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -83,7 +83,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_flow": { "value": 100 }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, @@ -96,7 +95,6 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, diff --git a/resources/definitions/two_trees_base.def.json b/resources/definitions/two_trees_base.def.json index d72843acbc..2da670cdf6 100644 --- a/resources/definitions/two_trees_base.def.json +++ b/resources/definitions/two_trees_base.def.json @@ -31,8 +31,7 @@ "machine_heated_bed": { "default_value": true }, "material_diameter": { "default_value": 1.75 }, - - + "speed_print": { "value": 50.0 } , "speed_infill": { "value": "speed_print" }, "speed_wall": { "value": "speed_print / 2" }, @@ -64,11 +63,9 @@ "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "fill_perimeter_gaps": { "value": "'everywhere'" }, "fill_outline_gaps": { "value": false }, "filter_out_tiny_gaps": { "value": false }, - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, @@ -121,6 +118,5 @@ "minimum_interface_area": { "value": 10 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" } - } } diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 9db73fa7f1..e8eae781d1 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -44,17 +44,29 @@ "skin_angles": { "value": "[] if infill_pattern not in ['cross', 'cross_3d'] else [20, 110]" }, + "line_width": { + "value": "machine_nozzle_size" + }, + "infill_before_walls": { + "value": "False" + }, + "retraction_combing": { + "value": "'no_outer_surfaces'" + }, + "skin_monotonic" : { + "value": true + }, + "speed_equalize_flow_width_factor": { + "value": "110.0" + }, + "meshfix_maximum_extrusion_area_deviation": { + "value": "50000" + }, "top_layers": { "value": "math.ceil(round(top_thickness / resolveOrValue('layer_height'), 4))" }, "bottom_layers": { "value": "math.ceil(round(bottom_thickness / resolveOrValue('layer_height'), 4))" - }, - "skin_material_flow": { - "value": "0.97 * material_flow" - }, - "infill_material_flow": { - "value": "(1.95-infill_sparse_density / 100 if infill_sparse_density > 95 else 1) * material_flow" } } } diff --git a/resources/definitions/ultimaker2.def.json b/resources/definitions/ultimaker2.def.json index 22054b3fe7..c028363239 100644 --- a/resources/definitions/ultimaker2.def.json +++ b/resources/definitions/ultimaker2.def.json @@ -86,15 +86,6 @@ }, "machine_acceleration": { "default_value": 3000 - }, - "infill_before_walls": { - "value": false - }, - "retraction_combing": { - "value": "'no_outer_surfaces'" - }, - "skin_monotonic" : { - "value": true } } } diff --git a/resources/definitions/ultimaker2_plus.def.json b/resources/definitions/ultimaker2_plus.def.json index 8250e70104..7c0e81b428 100644 --- a/resources/definitions/ultimaker2_plus.def.json +++ b/resources/definitions/ultimaker2_plus.def.json @@ -35,7 +35,7 @@ "value": "round(machine_nozzle_size / 1.5, 2)" }, "line_width": { - "value": "round(machine_nozzle_size * 0.875, 2)" + "value": "machine_nozzle_size" }, "speed_support": { "value": "speed_wall_0" diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index fd1f77d573..ba29cc36bd 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -59,7 +59,7 @@ "speed_infill": { "value": "speed_print" }, "speed_wall_x": { "value": "speed_wall" }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, - "line_width": { "value": "round(machine_nozzle_size * 0.875, 2)" }, + "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, "speed_support": { "value": "speed_wall_0" }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index d7b834c87c..197bfa4513 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -84,20 +84,18 @@ "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, - "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, - "acceleration_print": { "value": "4000" }, - "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, + "acceleration_print": { "value": "3500" }, + "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3500)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 3500)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 3500)" }, "brim_width": { "value": "3" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" }, "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, - "infill_before_walls": { "value": false }, - "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, @@ -121,7 +119,6 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "line_width": { "value": "round(machine_nozzle_size * 0.875, 3)" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, @@ -140,7 +137,6 @@ "raft_margin": { "value": "10" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": {"value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -149,7 +145,6 @@ "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, "skin_overlap": { "value": "10" }, - "skin_monotonic" : { "value": true }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -171,7 +166,6 @@ "top_bottom_thickness": { "value": "1" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "wall_line_width_x": { "value": "round(wall_line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index d209c28a07..15b381f4da 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -59,6 +59,9 @@ }, "machine_end_gcode": { "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" + }, + "infill_before_walls": { + "value": "False" } } } diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index edc8753a0c..6ecf2fe848 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -77,20 +77,18 @@ "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, - "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, - "acceleration_print": { "value": "4000" }, - "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, + "acceleration_print": { "value": "3500" }, + "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3500)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 3500)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "brim_width": { "value": "3" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" }, "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, - "infill_before_walls": { "value": false }, - "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, @@ -113,7 +111,6 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "line_width": { "value": "machine_nozzle_size * 0.875" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, @@ -132,7 +129,6 @@ "raft_speed": { "value": "25" }, "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, - "retraction_combing": { "value": "'no_outer_surfaces'"}, "retraction_count_max": { "value": "10" }, "retraction_extrusion_window": { "value": "1" }, "retraction_hop": { "value": "2" }, @@ -140,9 +136,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, - "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -164,11 +158,9 @@ "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, - "optimize_wall_printing_order": { "value": "True" }, "initial_layer_line_width_factor": { "value": "120" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" } } diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 93dda19594..ea58cfef33 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -79,20 +79,18 @@ "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, - "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, - "acceleration_print": { "value": "4000" }, - "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, + "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, + "acceleration_print": { "value": "3500" }, + "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_support_interface": { "value": "acceleration_topbottom" }, - "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 500 / 4000)" }, - "acceleration_wall": { "value": "math.ceil(acceleration_print * 1000 / 4000)" }, - "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 500 / 1000)" }, + "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 3500)" }, + "acceleration_wall": { "value": "math.ceil(acceleration_print * 1500 / 3500)" }, + "acceleration_wall_0": { "value": "math.ceil(acceleration_wall * 1000 / 1000)" }, "brim_width": { "value": "3" }, "cool_fan_full_at_height": { "value": "layer_height_0 + 4 * layer_height" }, "cool_fan_speed": { "value": "50" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_speed": { "value": "5" }, - "infill_before_walls": { "value": false }, - "infill_line_width": { "value": "round(line_width * 0.5 / 0.35, 2)" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, @@ -115,7 +113,6 @@ "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "line_width": { "value": "machine_nozzle_size * 0.875" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, "material_standby_temperature": { "value": "100" }, @@ -141,9 +138,7 @@ "retraction_hop_only_when_collides": { "value": "True" }, "retraction_min_travel": { "value": "5" }, "retraction_prime_speed": { "value": "15" }, - "skin_monotonic" : { "value": true }, "skin_overlap": { "value": "10" }, - "speed_equalize_flow_enabled": { "value": "True" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_print": { "value": "35" }, @@ -165,7 +160,6 @@ "travel_avoid_supports": { "value": "True" }, "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, "wall_0_inset": { "value": "0" }, - "wall_line_width_x": { "value": "round(line_width * 0.3 / 0.35, 2)" }, "wall_thickness": { "value": "1" }, "meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 60" }, "meshfix_maximum_deviation": { "value": "layer_height / 4" }, diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index ef1e79cc78..ec069b24fb 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -136,7 +136,6 @@ "layer_height_0": { "resolve": "max(0.2, min(extruderValues('layer_height')))" }, "line_width": { "value": "machine_nozzle_size * 1.125" }, "wall_line_width": { "value": "machine_nozzle_size" }, - "fill_perimeter_gaps": { "default_value": "nowhere" }, "fill_outline_gaps": { "default_value": true }, "meshfix_maximum_resolution": { "default_value": 0.01 }, "infill_before_walls": { "default_value": false }, diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index 465edff6b4..6dc45612b1 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -210,7 +210,6 @@ "cool_fan_speed": { "value": "50" },
"cool_fan_speed_max": { "value": "100" },
"cool_min_speed": { "value": "7" },
- "fill_perimeter_gaps": { "value": "'everywhere'" },
"fill_outline_gaps": { "value": false },
"filter_out_tiny_gaps": { "value": false },
"infill_line_width": { "value": "round(line_width * 0.42 / 0.35, 2)" },
@@ -273,7 +272,6 @@ "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" },
"support_supported_skin_fan_speed": { "value": 100 },
"switch_extruder_retraction_amount": { "value": 0 },
- "travel_compensate_overlapping_walls_0_enabled": { "value": "False" },
"travel_avoid_other_parts": { "value": true },
"travel_retract_before_outer_wall": { "value": true },
"top_bottom_thickness": {"value": "line_width * 2" },
diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 2798abffc2..746b9ce2fe 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -107,7 +107,6 @@ "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_equalize_flow_enabled": { "value": "False" }, "support_angle": { "value": "50" }, "support_xy_distance": { "value": "1" }, "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" }, @@ -129,7 +128,6 @@ "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, - "z_seam_type": { "value": "'shortest'" }, - "speed_equalize_flow_max": { "value": "65" } + "z_seam_type": { "value": "'shortest'" } } } diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index a43948a49d..903142010b 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -107,7 +107,6 @@ "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_equalize_flow_enabled": { "value": "False" }, "support_angle": { "value": "50" }, "support_xy_distance": { "value": "1" }, "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" }, @@ -129,7 +128,6 @@ "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, - "z_seam_type": { "value": "'shortest'" }, - "speed_equalize_flow_max": { "value": "65" } + "z_seam_type": { "value": "'shortest'" } } } diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 2da031cb99..055967f8ab 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -96,7 +96,6 @@ "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, "speed_wall_0": { "value": "math.ceil(speed_wall * 0.6)" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_equalize_flow_enabled": { "value": "False" }, "support_angle": { "value": "50" }, "support_xy_distance": { "value": "1" }, "support_z_distance": { "value": "max((0.2 if(0.2%layer_height==0) else layer_height*int((0.2+layer_height)/layer_height)),layer_height)" }, @@ -118,7 +117,6 @@ "support_interface_enable": { "value": "True" }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, - "z_seam_type": { "value": "'shortest'" }, - "speed_equalize_flow_max": { "value": "65" } + "z_seam_type": { "value": "'shortest'" } } } diff --git a/resources/extruders/eryone_er20_extruder_0.def.json b/resources/extruders/eryone_er20_extruder_0.def.json index 9b1c1fa435..4dcf363af9 100644 --- a/resources/extruders/eryone_er20_extruder_0.def.json +++ b/resources/extruders/eryone_er20_extruder_0.def.json @@ -18,7 +18,7 @@ "default_value": 1.75 }, "machine_nozzle_offset_x": { - "default_value": -10.0 + "default_value": 5 }, "machine_nozzle_offset_y": { "default_value": 8.0 diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json index b572ea4318..2dc919ea68 100644 --- a/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_0.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } } diff --git a/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json index 398822b156..6b5c6214cb 100644 --- a/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_230_dual_extruder_1.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X230 Y200 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } } diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json index af68cc9422..403001b86f 100644 --- a/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_0.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T0 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } } diff --git a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json index 3585978d6e..ee3663f610 100644 --- a/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json +++ b/resources/extruders/hellbot_magna_2_300_dual_extruder_1.def.json @@ -13,6 +13,12 @@ "maximum_value": "1" }, "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "T1 \nG92 E0 \nG1 F1000 E100 \nG92 E0 \nM104 S{material_print_temperature}" + }, + "machine_extruder_end_code": { + "default_value": "G92 E0 \nG1 F2500 E-5 \nG1 F2400 X300 Y250 \nG1 F3000 E-100 \nG92 E0 \nG90" + } } } diff --git a/resources/extruders/hellbot_magna_SE_extruder.def.json b/resources/extruders/hellbot_magna_SE_extruder.def.json new file mode 100644 index 0000000000..23c267b63b --- /dev/null +++ b/resources/extruders/hellbot_magna_SE_extruder.def.json @@ -0,0 +1,18 @@ +{
+ "version": 2,
+ "name": "Extruder 1",
+ "inherits": "fdmextruder",
+ "metadata": {
+ "machine": "hellbot_magna_SE",
+ "position": "0"
+ },
+
+ "overrides": {
+ "extruder_nr": {
+ "default_value": 0,
+ "maximum_value": "1"
+ },
+ "machine_nozzle_size": { "default_value": 0.4 },
+ "material_diameter": { "default_value": 1.75 }
+ }
+}
diff --git a/resources/extruders/mixware_hyper_s_extruder_0.def.json b/resources/extruders/mixware_hyper_s_extruder_0.def.json new file mode 100644 index 0000000000..09971ee688 --- /dev/null +++ b/resources/extruders/mixware_hyper_s_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "mixware_hyper_s", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/sh65_extruder.def.json b/resources/extruders/sh65_extruder.def.json new file mode 100644 index 0000000000..f01011e281 --- /dev/null +++ b/resources/extruders/sh65_extruder.def.json @@ -0,0 +1,21 @@ +{
+ "version": 2,
+ "name": "Extruder",
+ "inherits": "fdmextruder",
+ "metadata": {
+ "machine": "sh65",
+ "position": "0"
+ },
+
+ "overrides": {
+ "extruder_nr": {
+ "default_value": 0
+ },
+ "machine_nozzle_size": {
+ "default_value": 0.4
+ },
+ "material_diameter": {
+ "default_value": 1.75
+ }
+ }
+}
diff --git a/resources/extruders/stream30mk3_extruder.def.json b/resources/extruders/stream30mk3_extruder.def.json new file mode 100644 index 0000000000..8a9bbfa1f9 --- /dev/null +++ b/resources/extruders/stream30mk3_extruder.def.json @@ -0,0 +1,21 @@ +{
+ "version": 2,
+ "name": "Extruder",
+ "inherits": "fdmextruder",
+ "metadata": {
+ "machine": "stream30mk3",
+ "position": "0"
+ },
+
+ "overrides": {
+ "extruder_nr": {
+ "default_value": 0
+ },
+ "machine_nozzle_size": {
+ "default_value": 0.4
+ },
+ "material_diameter": {
+ "default_value": 1.75
+ }
+ }
+}
diff --git a/resources/extruders/stream30ultrasc2_extruder.def.json b/resources/extruders/stream30ultrasc2_extruder.def.json new file mode 100644 index 0000000000..56c34a34e1 --- /dev/null +++ b/resources/extruders/stream30ultrasc2_extruder.def.json @@ -0,0 +1,21 @@ +{
+ "version": 2,
+ "name": "Extruder",
+ "inherits": "fdmextruder",
+ "metadata": {
+ "machine": "stream30ultrasc2",
+ "position": "0"
+ },
+
+ "overrides": {
+ "extruder_nr": {
+ "default_value": 0
+ },
+ "machine_nozzle_size": {
+ "default_value": 0.4
+ },
+ "material_diameter": {
+ "default_value": 1.75
+ }
+ }
+}
diff --git a/resources/i18n/de_DE/fdmprinter.def.json.po b/resources/i18n/de_DE/fdmprinter.def.json.po index 96cad93706..e7b765f9c7 100644 --- a/resources/i18n/de_DE/fdmprinter.def.json.po +++ b/resources/i18n/de_DE/fdmprinter.def.json.po @@ -1263,7 +1263,7 @@ msgstr "Intelligent verbergen" #: fdmprinter.def.json msgctxt "z_seam_relative label" msgid "Z Seam Relative" -msgstr "Realitvwert der Z-Naht" +msgstr "Relativwert der Z-Naht" #: fdmprinter.def.json msgctxt "z_seam_relative description" diff --git a/resources/images/cura-icon-32_wip.png b/resources/images/cura-icon-32_wip.png Binary files differnew file mode 100644 index 0000000000..4c8791d2e1 --- /dev/null +++ b/resources/images/cura-icon-32_wip.png diff --git a/resources/images/cura-icon_wip.png b/resources/images/cura-icon_wip.png Binary files differnew file mode 100644 index 0000000000..a10357ea96 --- /dev/null +++ b/resources/images/cura-icon_wip.png diff --git a/resources/images/cura_wip.png b/resources/images/cura_wip.png Binary files differnew file mode 100644 index 0000000000..e62768f11e --- /dev/null +++ b/resources/images/cura_wip.png diff --git a/resources/images/hellbot_magna_SE.png b/resources/images/hellbot_magna_SE.png Binary files differnew file mode 100644 index 0000000000..381490361b --- /dev/null +++ b/resources/images/hellbot_magna_SE.png diff --git a/resources/images/whats_new/1.png b/resources/images/whats_new/1.png Binary files differnew file mode 100644 index 0000000000..f1213a6b5a --- /dev/null +++ b/resources/images/whats_new/1.png diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg index ec2972cfcf..04c0eb7fe8 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg index 227be45979..8647dfc34b 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_DBE0.40_ABS_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg index 9a1185ce6f..bf6e247fd2 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg index 1e4ac64616..aad18a70cf 100644 --- a/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg +++ b/resources/intent/deltacomb/ABS/deltacomb_FBE0.40_ABS_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg index be3487192f..4304a5e203 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_C.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg index be3487192f..4304a5e203 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg index ff21b41252..6ffc2e6157 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_DBE0.40_PETG_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg index 319ab7b142..0a8f46e248 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_C.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg index 50bca71843..87ec8ec80b 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg index ad4e20997c..a02011a518 100644 --- a/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PETG/deltacomb_FBE0.40_PETG_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall = =speed_print speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg index 11e404cc00..c02f791ec4 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg index c9e848ada7..850da180ba 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_DBE0.40_PLA_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg index 61def1d585..12e29f6524 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_D.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg index 9afd04d1b0..e555e01939 100644 --- a/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg +++ b/resources/intent/deltacomb/PLA/deltacomb_FBE0.40_PLA_quick_E.inst.cfg @@ -19,7 +19,6 @@ speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 30 diff --git a/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg index f7469c8e64..48e5aedae9 100644 --- a/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_ABS_Draft_Print_Quick.inst.cfg @@ -20,7 +20,6 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 10 diff --git a/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg index b8a0f84810..1e86769f51 100644 --- a/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PETG_Draft_Print_Quick.inst.cfg @@ -20,7 +20,6 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 15 diff --git a/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg index 2d4872a0d4..b0bd758b0f 100644 --- a/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/liquid/liquid_vo0.4_PLA_Draft_Print_Quick.inst.cfg @@ -20,7 +20,6 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 infill_line_width = =line_width jerk_print = 15 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg index aab41000ef..5028a193e1 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -20,9 +20,8 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -30,5 +29,5 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width + + diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 44a4ae7897..39d3455341 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,6 +29,6 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index 8c753ef948..0d2b0df40b 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,6 +29,6 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 9b6104da25..36bd136f11 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe_plus variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index a1e3e05ba5..92b83b0daa 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe_plus variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index 0804f60436..0dd1d9e6cb 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index c2bafc30c6..adf9744b20 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index 8844a15e45..3b56baa68b 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_nylon variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 52fe55ed0a..8a453f1423 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_nylon variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg index d5093dd2b7..be3b0e768f 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pc variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index bd329948f8..2088491e1e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pc variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index 53bfb3b116..9396ad1ab1 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_petg variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index 799fab36e0..a8f85b6da3 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_petg variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 16ac3806aa..5d869888c5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -20,9 +20,8 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -30,5 +29,5 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width + + diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 1b404665d4..406b45f226 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,6 +29,6 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 74aabdaf9c..3edfa90da5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,6 +29,6 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg index bd0db31570..83ebefc18c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg @@ -39,6 +39,4 @@ line_width = =machine_nozzle_size wall_line_width_x = =line_width infill_line_width = =line_width wall_thickness = =line_width * 2 -top_bottom_thickness = =wall_thickness - -fill_perimeter_gaps = nowhere
\ No newline at end of file +top_bottom_thickness = =wall_thickness
\ No newline at end of file diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index eeba9a34c7..3dbb03b38c 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -20,9 +20,8 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -30,5 +29,5 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width + + diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index 195a57b041..513e8b63d9 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_tough_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,6 +29,6 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 402ffb8a51..3d80753d3f 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_tough_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,6 +29,6 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg index 73144c2618..7f160079d2 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg @@ -39,6 +39,4 @@ line_width = =machine_nozzle_size wall_line_width_x = =line_width infill_line_width = =line_width wall_thickness = =line_width * 2 -top_bottom_thickness = =wall_thickness - -fill_perimeter_gaps = nowhere
\ No newline at end of file +top_bottom_thickness = =wall_thickness
\ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg index 7a9a7c2afb..374cb1bca4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print_Quick.inst.cfg @@ -20,9 +20,8 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -30,5 +29,5 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width + + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg index 9536c24b86..ab2e9bc6f6 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg index faa957ddea..a58642f073 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg index 0bcba30cf2..916b80c811 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe_plus variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg index cb601ff61e..a3d99c2ed0 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe_plus variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg index a9dd2e0863..d9929fc35c 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg index 81424cb862..45df698f7e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_cpe variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg index b1a2905659..fcd58dd33e 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_nylon variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg index 853307f093..cadc30da58 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_nylon variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg index a4f9cafae9..d23ff28b91 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pc variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg index d49a121334..950f420016 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pc variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg index a06922a0d1..fba5e369ee 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_petg variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg index b4a7b7e3ac..29d052675d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_petg variant = AA 0.4
[values]
-infill_line_width = =line_width
+
jerk_print = 30
jerk_infill = =jerk_print
jerk_topbottom = =jerk_print
@@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall
jerk_wall_x = =jerk_wall
jerk_layer_0 = 5
-line_width = =machine_nozzle_size
+
speed_print = 30
speed_infill = =speed_print
speed_layer_0 = 20
@@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall
speed_wall_x = =speed_wall
top_bottom_thickness = =wall_thickness
-wall_line_width_x = =line_width
+
wall_thickness = =line_width * 3
xy_offset = =-layer_height * 0.2
xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg index 871ce16206..25dcb1a793 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print_Quick.inst.cfg @@ -20,9 +20,8 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -30,5 +29,5 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width + + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg index 3d6336fce5..cc76a5706a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg index 3c1bd032af..28353777bf 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg index b99fc603ab..f082f0c698 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print_Quick.inst.cfg @@ -39,6 +39,4 @@ line_width = =machine_nozzle_size wall_line_width_x = =line_width infill_line_width = =line_width wall_thickness = =line_width * 2 -top_bottom_thickness = =wall_thickness - -fill_perimeter_gaps = nowhere
\ No newline at end of file +top_bottom_thickness = =wall_thickness
\ No newline at end of file diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg index 836183f265..a811b9d673 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print_Quick.inst.cfg @@ -20,9 +20,8 @@ speed_wall_x = =speed_wall speed_layer_0 = 20 top_bottom_thickness = =wall_thickness wall_thickness = =line_width * 2 -fill_perimeter_gaps = nowhere infill_sparse_density = 15 -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -30,5 +29,5 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size -wall_line_width_x = =line_width + + diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg index c0ddc08d88..5db4117aa1 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_tough_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg index 1809422b15..22485e8777 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality_Accurate.inst.cfg @@ -12,7 +12,7 @@ material = generic_tough_pla variant = AA 0.4 [values] -infill_line_width = =line_width + jerk_print = 30 jerk_infill = =jerk_print jerk_topbottom = =jerk_print @@ -20,7 +20,7 @@ jerk_wall = =jerk_print jerk_wall_0 = =jerk_wall jerk_wall_x = =jerk_wall jerk_layer_0 = 5 -line_width = =machine_nozzle_size + speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 @@ -29,7 +29,7 @@ speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 xy_offset = =-layer_height * 0.2 xy_offset_layer_0 = =((-0.2 + layer_height * 0.2) if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg index bd530ac443..cc5104fb5a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print_Quick.inst.cfg @@ -39,6 +39,4 @@ line_width = =machine_nozzle_size wall_line_width_x = =line_width infill_line_width = =line_width wall_thickness = =line_width * 2 -top_bottom_thickness = =wall_thickness - -fill_perimeter_gaps = nowhere
\ No newline at end of file +top_bottom_thickness = =wall_thickness
\ No newline at end of file diff --git a/resources/meshes/SH65_platform.STL b/resources/meshes/SH65_platform.STL Binary files differnew file mode 100644 index 0000000000..5cddf2d187 --- /dev/null +++ b/resources/meshes/SH65_platform.STL diff --git a/resources/meshes/hellbot_magna_SE.obj b/resources/meshes/hellbot_magna_SE.obj new file mode 100644 index 0000000000..e877b555d9 --- /dev/null +++ b/resources/meshes/hellbot_magna_SE.obj @@ -0,0 +1,770 @@ +o Object.1 +v -55.084007 114.999969 0.966387 +v -55.084007 114.999969 0.414166 +v -110.122032 114.999969 0.966387 +v 0.046021 114.999969 0.966387 +v 0.046021 114.999969 -0.046018 +v -110.122032 114.999969 -0.966387 +v 55.084045 114.999969 0.966387 +v 55.084045 114.999969 0.414166 +v 55.084045 114.999969 -0.966387 +v 55.084045 114.999969 -0.506202 +v 110.122047 114.999969 -0.966387 +v -55.084007 114.999969 -0.966387 +v -55.084007 114.999969 -0.506202 +v 0.046021 114.999969 -0.966387 +v 110.122047 114.999969 0.966387 +v 110.674294 114.999969 0.966387 +v 110.674294 114.999969 -0.966387 +v 111.134460 114.907990 0.966387 +v 111.134460 114.907990 -0.966387 +v 111.686676 114.815979 0.966387 +v 111.686676 114.815979 -0.966387 +v 112.146866 114.631836 0.966387 +v 112.146866 114.631836 -0.966387 +v 112.607048 114.355743 0.966387 +v 112.607048 114.355743 -0.966387 +v 113.067238 114.079620 0.966387 +v 113.067238 114.079620 -0.966387 +v 113.435387 113.803528 0.966387 +v 113.435387 113.803528 -0.966387 +v 113.803520 113.435394 -0.966387 +v 113.803520 113.435394 0.966387 +v 114.079643 113.067200 -0.966387 +v 114.079643 113.067200 0.966387 +v 114.355743 112.607025 -0.966387 +v 114.355743 112.607025 0.966387 +v 114.631866 112.146820 -0.966387 +v 114.631866 112.146820 0.966387 +v 114.815948 111.686676 -0.966387 +v 114.815948 111.686676 0.966387 +v 114.907982 111.134430 -0.966387 +v 114.907982 111.134430 0.966387 +v 115.000000 110.674286 -0.966387 +v 115.000000 110.674286 0.966387 +v 115.000000 110.122040 -0.966387 +v 115.000000 110.122040 0.966387 +v 115.000000 55.084015 0.414166 +v 115.000000 55.084015 0.966387 +v 115.000000 55.084015 -0.506202 +v 115.000000 0.046021 -0.966387 +v 115.000000 55.084015 -0.966387 +v 115.000000 -55.084030 0.966387 +v 115.000000 -110.122032 0.966387 +v 115.000000 -55.084030 0.414166 +v 115.000000 0.046021 0.966387 +v 115.000000 -55.084030 -0.506202 +v 115.000000 -110.122032 -0.966387 +v 115.000000 -55.084030 -0.966387 +v 115.000000 0.046021 -0.046018 +v 110.674294 -114.999992 0.966387 +v 110.122047 -114.999992 0.966387 +v 110.674294 -114.999992 -0.966387 +v 110.122047 -114.999992 -0.966387 +v 111.134460 -114.907959 0.966387 +v 111.134460 -114.907959 -0.966387 +v 111.686676 -114.815918 0.966387 +v 111.686676 -114.815918 -0.966387 +v 112.146866 -114.631844 0.966387 +v 112.146866 -114.631844 -0.966387 +v 112.607048 -114.355736 0.966387 +v 112.607048 -114.355736 -0.966387 +v 113.067238 -114.079620 0.966387 +v 113.067238 -114.079620 -0.966387 +v 113.435387 -113.803513 0.966387 +v 113.435387 -113.803513 -0.966387 +v 113.803520 -113.435364 0.966387 +v 113.803520 -113.435364 -0.966387 +v 114.079643 -113.067223 0.966387 +v 114.079643 -113.067223 -0.966387 +v 114.355743 -112.607033 0.966387 +v 114.355743 -112.607033 -0.966387 +v 114.631866 -112.146843 0.966387 +v 114.631866 -112.146843 -0.966387 +v 114.815948 -111.686668 0.966387 +v 114.815948 -111.686668 -0.966387 +v 114.907982 -111.134445 0.966387 +v 114.907982 -111.134445 -0.966387 +v 115.000000 -110.674271 0.966387 +v 115.000000 -110.674271 -0.966387 +v 0.046021 -114.999992 -0.966387 +v 55.084045 -114.999992 -0.966387 +v 55.084045 -114.999992 -0.506202 +v 55.084045 -114.999992 0.966387 +v 55.084045 -114.999992 0.414166 +v 0.046021 -114.999992 0.966387 +v -55.084007 -114.999992 0.966387 +v -110.122032 -114.999992 0.966387 +v -55.084007 -114.999992 0.414166 +v 0.046021 -114.999992 -0.046018 +v -110.122032 -114.999992 -0.966387 +v -55.084007 -114.999992 -0.966387 +v -55.084007 -114.999992 -0.506202 +v -58.765495 111.410553 0.966387 +v -2.438972 112.607025 0.966387 +v -56.280479 113.803528 0.966387 +v 110.122047 0.046021 0.966387 +v 112.607048 2.438995 0.966387 +v 110.122047 57.476990 0.966387 +v 113.803520 56.280518 0.966387 +v 111.410561 58.765503 0.966387 +v -114.999992 110.122040 0.966387 +v -112.607033 114.355743 0.966387 +v -114.999992 110.674286 0.966387 +v -58.765495 -111.410553 0.966387 +v -2.438972 -112.607033 0.966387 +v -58.765495 -53.887558 0.966387 +v 110.122047 -57.569016 0.966387 +v 112.607048 -55.084030 0.966387 +v -56.280479 -113.803513 0.966387 +v -114.999992 -110.122032 0.966387 +v -2.438972 2.438995 0.966387 +v 53.887554 58.765503 0.966387 +v -2.438972 57.476990 0.966387 +v 113.803520 -53.887558 0.966387 +v 53.887554 113.803528 0.966387 +v 53.887554 -113.803513 0.966387 +v -58.765495 56.280518 0.966387 +v 53.887554 -56.280518 0.966387 +v 53.887554 1.242477 0.966387 +v -114.999992 -55.084030 0.966387 +v -114.999992 0.046021 0.966387 +v -58.765495 1.242477 0.966387 +v -114.999992 55.084015 0.966387 +v -2.438972 -55.084030 0.966387 +v -110.674248 -114.999992 0.966387 +v -114.631844 112.146820 0.966387 +v -114.907951 111.134430 0.966387 +v -110.674248 114.999969 0.966387 +v -112.146843 114.631836 0.966387 +v -111.686684 -114.815918 0.966387 +v -114.999992 -110.674271 0.966387 +v -111.686684 114.815979 0.966387 +v -114.355736 -112.607033 0.966387 +v -112.146843 -114.631844 0.966387 +v -111.134438 -114.907959 0.966387 +v -111.134438 114.907990 0.966387 +v -113.067223 114.079620 0.966387 +v -113.435326 113.803528 0.966387 +v -114.355736 112.607025 0.966387 +v -114.631844 -112.146843 0.966387 +v -114.079628 113.067200 0.966387 +v -113.803520 113.435394 0.966387 +v -114.907951 -111.134445 0.966387 +v -114.815910 -111.686668 0.966387 +v -112.607033 -114.355736 0.966387 +v -113.067223 -114.079620 0.966387 +v -113.803520 -113.435364 0.966387 +v -113.435326 -113.803513 0.966387 +v -114.079628 -113.067223 0.966387 +v -114.815910 111.686676 0.966387 +v -111.410545 58.765503 -0.966387 +v -112.607033 2.438995 -0.966387 +v -113.803520 56.280518 -0.966387 +v 56.280518 -113.803513 -0.966387 +v 2.438988 -112.607033 -0.966387 +v 58.765518 -111.410553 -0.966387 +v -114.999992 110.122040 -0.966387 +v -114.999992 55.084015 -0.966387 +v 113.803520 56.280518 -0.966387 +v 112.607048 2.438995 -0.966387 +v 111.410561 58.765503 -0.966387 +v -55.084007 57.476990 -0.966387 +v -55.084007 0.046021 -0.966387 +v -55.084007 -57.569016 -0.966387 +v -110.122032 0.046021 -0.966387 +v 0.046021 0.046021 -0.966387 +v 55.084045 57.476990 -0.966387 +v 57.476994 -55.084030 -0.966387 +v 113.803520 -53.887558 -0.966387 +v 1.242508 -56.280518 -0.966387 +v -113.803520 -53.887558 -0.966387 +v 0.046021 57.476990 -0.966387 +v -110.122032 -57.569016 -0.966387 +v 56.280518 1.242477 -0.966387 +v -53.887550 -113.803513 -0.966387 +v -114.999992 -110.122032 -0.966387 +v -114.999992 -55.084030 -0.966387 +v -110.122032 57.476990 -0.966387 +v -114.999992 0.046021 -0.966387 +v -112.607033 -55.084030 -0.966387 +v -110.674248 114.999969 -0.966387 +v -111.686684 -114.815918 -0.966387 +v -114.999992 -110.674271 -0.966387 +v -111.134438 -114.907959 -0.966387 +v -110.674248 -114.999992 -0.966387 +v -114.907951 -111.134445 -0.966387 +v -114.999992 110.674286 -0.966387 +v -113.067223 114.079620 -0.966387 +v -112.607033 114.355743 -0.966387 +v -112.146843 114.631836 -0.966387 +v -113.067223 -114.079620 -0.966387 +v -114.079628 -113.067223 -0.966387 +v -114.355736 -112.607033 -0.966387 +v -112.607033 -114.355736 -0.966387 +v -112.146843 -114.631844 -0.966387 +v -114.631844 -112.146843 -0.966387 +v -113.803520 113.435394 -0.966387 +v -113.435326 113.803528 -0.966387 +v -111.686684 114.815979 -0.966387 +v -111.134438 114.907990 -0.966387 +v -114.815910 -111.686668 -0.966387 +v -113.803520 -113.435364 -0.966387 +v -113.435326 -113.803513 -0.966387 +v -114.631844 112.146820 -0.966387 +v -114.355736 112.607025 -0.966387 +v -114.079628 113.067200 -0.966387 +v -114.907951 111.134430 -0.966387 +v -114.815910 111.686676 -0.966387 +v -114.999992 0.046021 -0.046018 +v -114.999992 55.084015 -0.506202 +v -114.999992 55.084015 0.414166 +v -114.999992 -55.084030 -0.506202 +v -114.999992 -55.084030 0.414166 + +usemtl Default_0 +f 1 2 3 +f 15 8 7 +f 15 11 8 +f 8 11 10 +f 8 10 5 +f 5 4 8 +f 4 5 2 +f 13 2 5 +f 5 14 13 +f 12 13 14 +f 171 12 14 +f 14 181 171 +f 181 175 171 +f 172 171 175 +f 173 172 175 +f 173 175 179 +f 173 179 164 +f 164 184 173 +f 99 173 184 +f 184 100 99 +f 99 100 101 +f 99 101 97 +f 99 97 96 +f 96 134 99 +f 194 99 134 +f 134 144 194 +f 193 194 144 +f 144 139 193 +f 191 193 139 +f 139 143 191 +f 204 191 143 +f 143 154 204 +f 203 204 154 +f 154 155 203 +f 200 203 155 +f 155 157 200 +f 212 200 157 +f 157 156 212 +f 211 212 156 +f 211 156 158 +f 158 201 211 +f 200 211 201 +f 200 201 202 +f 142 202 201 +f 202 142 149 +f 149 205 202 +f 191 202 205 +f 191 205 210 +f 191 210 195 +f 191 195 192 +f 191 192 185 +f 119 185 192 +f 192 140 119 +f 210 153 152 +f 195 152 140 +f 185 119 221 +f 221 186 185 +f 185 186 180 +f 185 180 189 +f 185 189 182 +f 182 99 185 +f 174 182 189 +f 182 174 173 +f 174 189 180 +f 180 161 174 +f 187 174 161 +f 161 160 187 +f 6 187 160 +f 6 160 166 +f 166 190 6 +f 190 3 6 +f 3 190 137 +f 166 110 112 +f 112 196 166 +f 166 196 198 +f 166 198 199 +f 166 199 208 +f 166 208 209 +f 208 145 209 +f 199 141 208 +f 198 138 199 +f 196 197 198 +f 197 111 198 +f 111 197 146 +f 207 146 197 +f 146 207 147 +f 216 136 159 +f 159 217 216 +f 216 217 213 +f 196 216 213 +f 196 213 214 +f 196 214 215 +f 196 215 206 +f 196 206 207 +f 151 206 215 +f 150 215 214 +f 148 214 213 +f 135 213 217 +f 136 216 196 +f 217 159 135 +f 213 135 148 +f 214 148 150 +f 215 150 151 +f 147 206 151 +f 206 147 207 +f 196 207 197 +f 196 112 136 +f 110 166 219 +f 219 220 110 +f 220 132 110 +f 46 45 47 +f 47 54 46 +f 58 46 54 +f 54 53 58 +f 55 58 53 +f 53 56 55 +f 55 56 57 +f 57 49 55 +f 49 57 178 +f 49 178 169 +f 50 49 169 +f 169 168 50 +f 44 50 168 +f 44 168 170 +f 44 170 11 +f 11 17 44 +f 17 42 44 +f 44 42 45 +f 43 45 42 +f 42 40 43 +f 41 43 40 +f 40 38 41 +f 39 41 38 +f 38 36 39 +f 37 39 36 +f 36 34 37 +f 35 37 34 +f 34 32 35 +f 33 35 32 +f 32 30 33 +f 31 33 30 +f 30 29 31 +f 28 31 29 +f 27 28 29 +f 27 29 38 +f 25 27 38 +f 25 26 27 +f 26 25 24 +f 23 24 25 +f 23 25 42 +f 21 23 42 +f 19 21 42 +f 19 20 21 +f 22 21 20 +f 18 17 16 +f 17 18 19 +f 20 19 18 +f 21 22 23 +f 24 23 22 +f 28 27 26 +f 29 30 38 +f 30 32 38 +f 32 34 38 +f 34 36 38 +f 25 38 40 +f 25 40 42 +f 17 19 42 +f 11 16 17 +f 176 11 170 +f 176 170 169 +f 169 183 176 +f 175 176 183 +f 175 183 177 +f 169 177 183 +f 176 9 11 +f 9 176 14 +f 14 10 9 +f 50 44 48 +f 48 44 46 +f 168 169 170 +f 48 49 50 +f 49 48 58 +f 177 169 178 +f 177 178 56 +f 56 165 177 +f 164 177 165 +f 165 163 164 +f 163 90 164 +f 89 164 90 +f 89 90 91 +f 89 91 98 +f 98 101 89 +f 93 98 91 +f 60 93 91 +f 60 91 62 +f 62 61 60 +f 59 60 61 +f 61 64 59 +f 63 59 64 +f 64 66 63 +f 65 63 66 +f 66 68 65 +f 67 65 68 +f 68 70 67 +f 69 67 70 +f 70 72 69 +f 71 69 72 +f 72 74 71 +f 73 71 74 +f 74 76 73 +f 75 73 76 +f 76 78 75 +f 77 75 78 +f 78 80 77 +f 79 77 80 +f 80 82 79 +f 81 79 82 +f 82 84 81 +f 83 81 84 +f 84 86 83 +f 85 83 86 +f 86 88 85 +f 87 85 88 +f 88 56 87 +f 52 87 56 +f 92 94 93 +f 222 129 130 +f 130 218 222 +f 221 222 218 +f 218 188 221 +f 188 218 219 +f 219 167 188 +f 188 167 161 +f 167 162 161 +f 167 166 162 +f 218 130 220 +f 129 222 119 +f 94 95 97 +f 94 97 98 +f 51 52 53 +f 56 88 62 +f 88 86 62 +f 86 84 62 +f 84 82 62 +f 82 80 74 +f 80 78 74 +f 78 76 74 +f 82 74 72 +f 82 72 70 +f 82 70 68 +f 82 68 66 +f 82 66 64 +f 82 64 61 +f 82 61 62 +f 60 92 93 +f 98 93 94 +f 90 62 91 +f 90 163 62 +f 163 165 62 +f 56 62 165 +f 57 56 178 +f 56 53 52 +f 58 55 49 +f 53 54 51 +f 46 58 48 +f 45 46 44 +f 132 220 130 +f 220 219 218 +f 167 219 166 +f 138 198 111 +f 141 199 138 +f 145 208 141 +f 137 209 145 +f 209 137 190 +f 166 209 190 +f 160 162 166 +f 187 6 171 +f 160 161 162 +f 174 187 171 +f 161 180 188 +f 186 188 180 +f 186 221 188 +f 222 221 119 +f 140 192 195 +f 152 195 210 +f 153 210 205 +f 205 149 153 +f 201 158 142 +f 200 212 211 +f 203 200 202 +f 204 203 202 +f 191 204 202 +f 193 191 185 +f 194 193 185 +f 99 194 185 +f 95 96 97 +f 101 98 97 +f 100 89 101 +f 100 184 89 +f 99 182 173 +f 164 89 184 +f 177 164 179 +f 177 179 175 +f 172 173 174 +f 171 172 174 +f 175 181 176 +f 181 14 176 +f 12 171 6 +f 6 13 12 +f 6 2 13 +f 14 5 10 +f 9 10 11 +f 16 11 15 +f 7 8 4 +f 6 3 2 +f 4 2 1 + +vt 0.490063 0.010300 +vt 0.732512 0.252749 +vt 0.490063 0.257899 +vt 0.732512 0.005150 +vt 0.974564 -0.000000 +vt 0.974564 0.247203 +vt 0.995561 0.020996 +vt 0.995561 0.018619 +vt 0.995165 0.016639 +vt 0.994769 0.014262 +vt 0.993976 0.012281 +vt 0.976942 -0.000000 +vt 0.978922 0.000396 +vt 0.981299 0.000792 +vt 0.983280 0.001585 +vt 0.985261 0.002773 +vt 0.987242 0.003962 +vt 0.988826 0.005150 +vt 0.992788 0.010300 +vt 0.991599 0.008319 +vt 0.990411 0.006735 +vt 0.985261 0.257899 +vt 0.974564 0.495198 +vt 0.732512 0.500348 +vt 0.732512 0.747947 +vt 0.490063 0.505498 +vt 0.490063 0.742401 +vt 0.490063 0.979700 +vt 0.247614 0.737251 +vt 0.247614 0.974550 +vt 0.005561 0.969004 +vt 0.005561 0.732101 +vt 0.005561 0.495198 +vt 0.247614 0.500348 +vt 0.247614 0.263049 +vt 0.247614 0.015450 +vt 0.005561 0.020996 +vt 0.026557 -0.000000 +vt 0.258310 0.005150 +vt 0.263460 -0.000000 +vt 0.500759 -0.000000 +vt 0.737662 -0.000000 +vt 0.024180 -0.000000 +vt 0.022200 0.000396 +vt 0.019823 0.000792 +vt 0.005561 0.018619 +vt 0.005957 0.016639 +vt 0.006353 0.014262 +vt 0.007146 0.012281 +vt 0.008334 0.010300 +vt 0.017842 0.001585 +vt 0.015861 0.002773 +vt 0.013880 0.003962 +vt 0.009523 0.008319 +vt 0.010711 0.006735 +vt 0.012296 0.005150 +vt 0.005561 0.257899 +vt 0.026557 0.990000 +vt 0.024180 0.990000 +vt 0.022200 0.989604 +vt 0.019823 0.989208 +vt 0.017842 0.988415 +vt 0.015861 0.987227 +vt 0.005561 0.971381 +vt 0.013880 0.986038 +vt 0.012296 0.984850 +vt 0.010711 0.983266 +vt 0.009523 0.981681 +vt 0.008334 0.979700 +vt 0.007146 0.977719 +vt 0.005957 0.973361 +vt 0.006353 0.975738 +vt 0.258310 0.984850 +vt 0.263460 0.990000 +vt 0.500759 0.990000 +vt 0.732512 0.984850 +vt 0.974564 0.990000 +vt 0.737662 0.990000 +vt 0.974564 0.742401 +vt 0.985261 0.505498 +vt 0.990411 0.263049 +vt 0.995561 0.257899 +vt 0.995561 0.495198 +vt 0.995561 0.732101 +vt 0.990411 0.737251 +vt 0.995561 0.969004 +vt 0.980111 0.747947 +vt 0.976942 0.990000 +vt 0.978922 0.989604 +vt 0.981299 0.989208 +vt 0.983280 0.988415 +vt 0.985261 0.987227 +vt 0.995561 0.971381 +vt 0.995165 0.973361 +vt 0.994769 0.975738 +vt 0.987242 0.986038 +vt 0.993976 0.977719 +vt 0.992788 0.979700 +vt 0.991599 0.981681 +vt 0.990411 0.983266 +vt 0.988826 0.984850 + +usemtl Mat_0 +f 1/74 3/58 104/73 +f 104/73 103/28 1/74 +f 4/75 1/74 103/28 +f 103/28 124/76 4/75 +f 7/78 4/75 124/76 +f 124/76 15/77 7/78 +f 139/45 119/37 140/46 +f 139/45 140/46 152/47 +f 139/45 152/47 153/48 +f 139/45 153/48 149/49 +f 110/31 3/58 137/59 +f 110/31 137/59 145/60 +f 110/31 145/60 141/61 +f 110/31 141/61 138/62 +f 110/31 138/62 111/63 +f 110/31 111/63 112/64 +f 112/64 146/65 147/66 +f 112/64 147/66 151/67 +f 112/64 151/67 150/68 +f 112/64 150/68 148/69 +f 112/64 148/69 135/70 +f 112/64 135/70 136/71 +f 136/71 135/70 159/72 +f 132/32 126/29 110/31 +f 102/30 110/31 126/29 +f 126/29 103/28 102/30 +f 103/28 126/29 122/27 +f 122/27 121/25 103/28 +f 120/26 121/25 122/27 +f 121/25 120/26 128/24 +f 128/24 105/23 121/25 +f 107/79 121/25 105/23 +f 105/23 106/80 107/79 +f 107/79 106/80 109/87 +f 107/79 109/87 15/77 +f 45/86 15/77 109/87 +f 45/86 109/87 108/85 +f 45/86 108/85 47/84 +f 24/92 39/95 26/96 +f 20/90 45/86 22/91 +f 22/91 45/86 24/92 +f 18/89 45/86 20/90 +f 16/88 45/86 18/89 +f 26/96 31/100 28/101 +f 26/96 33/99 31/100 +f 26/96 35/98 33/99 +f 26/96 37/97 35/98 +f 26/96 39/95 37/97 +f 24/92 41/94 39/95 +f 24/92 43/93 41/94 +f 24/92 45/86 43/93 +f 52/7 60/5 87/8 +f 60/5 52/7 116/6 +f 116/6 127/2 60/5 +f 125/4 60/5 127/2 +f 127/2 114/1 125/4 +f 125/4 114/1 94/41 +f 94/41 92/42 125/4 +f 95/40 94/41 114/1 +f 114/1 118/39 95/40 +f 96/38 95/40 118/39 +f 96/38 118/39 113/36 +f 113/36 119/37 96/38 +f 115/35 119/37 113/36 +f 113/36 114/1 115/35 +f 133/3 115/35 114/1 +f 120/26 115/35 133/3 +f 133/3 127/2 120/26 +f 115/35 120/26 131/34 +f 131/34 130/33 115/35 +f 129/57 115/35 130/33 +f 126/29 130/33 131/34 +f 131/34 120/26 126/29 +f 119/37 115/35 129/57 +f 114/1 113/36 118/39 +f 114/1 127/2 133/3 +f 60/5 125/4 92/42 +f 105/23 127/2 116/6 +f 116/6 117/22 105/23 +f 123/81 105/23 117/22 +f 117/22 52/7 123/81 +f 51/82 123/81 52/7 +f 54/83 123/81 51/82 +f 54/83 106/80 123/81 +f 116/6 52/7 117/22 +f 87/8 60/5 85/9 +f 85/9 60/5 83/10 +f 83/10 60/5 81/11 +f 81/11 73/18 79/19 +f 79/19 73/18 77/20 +f 77/20 73/18 75/21 +f 81/11 71/17 73/18 +f 81/11 69/16 71/17 +f 81/11 67/15 69/16 +f 81/11 65/14 67/15 +f 81/11 63/13 65/14 +f 81/11 59/12 63/13 +f 81/11 60/5 59/12 +f 47/84 106/80 54/83 +f 106/80 47/84 108/85 +f 15/77 45/86 16/88 +f 108/85 109/87 106/80 +f 105/23 123/81 106/80 +f 15/77 121/25 107/79 +f 127/2 105/23 128/24 +f 128/24 120/26 127/2 +f 122/27 126/29 120/26 +f 130/33 126/29 132/32 +f 112/64 111/63 146/65 +f 110/31 102/30 3/58 +f 139/45 149/49 142/50 +f 155/53 142/50 158/54 +f 155/53 158/54 156/55 +f 155/53 156/55 157/56 +f 154/52 142/50 155/53 +f 143/51 142/50 154/52 +f 139/45 142/50 143/51 +f 144/44 119/37 139/45 +f 134/43 119/37 144/44 +f 96/38 119/37 134/43 +f 121/25 15/77 124/76 +f 124/76 103/28 121/25 +f 102/30 103/28 104/73 +f 104/73 3/58 102/30 + diff --git a/resources/meshes/mixware_hyper_s_platform.stl b/resources/meshes/mixware_hyper_s_platform.stl Binary files differnew file mode 100644 index 0000000000..a1cff2b92e --- /dev/null +++ b/resources/meshes/mixware_hyper_s_platform.stl diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg index 94bf466497..06279be937 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_brass0.4_abs_natural_standard.inst.cfg @@ -21,10 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner z_seam_corner = hide_seam @@ -55,8 +51,6 @@ speed_layer_0 = 25 speed_support = 40 speed_travel_layer_0 = 45 speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 retraction_combing = all travel_avoid_other_parts = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg index 5cdbf8d34e..9aecb0a4ad 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/abs/Leapfrog_Bolt_Pro_nozzlex0.4_abs_natural_standard.inst.cfg @@ -21,10 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner z_seam_corner = hide_seam @@ -55,8 +51,6 @@ speed_layer_0 = 25 speed_support = 40 speed_travel_layer_0 = 45 speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 retraction_combing = all travel_avoid_other_parts = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg index 8fb770b322..7b26429143 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_brass0.4_epla_natural_standard.inst.cfg @@ -21,10 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner z_seam_corner = hide_seam @@ -55,8 +51,6 @@ speed_layer_0 = 25 speed_support = 50 speed_travel_layer_0 = 45 speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 acceleration_enabled = False retraction_combing = all diff --git a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg index 05343bad9c..2dbeb02c97 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/epla/Leapfrog_Bolt_Pro_nozzlex0.4_epla_natural_standard.inst.cfg @@ -21,10 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner z_seam_corner = hide_seam @@ -55,8 +51,6 @@ speed_layer_0 = 25 speed_support = 50 speed_travel_layer_0 = 45 speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 acceleration_enabled = False retraction_combing = all diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg index 3e7dd180a5..ea6db5e006 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_brass0.4_pva_natural_standard.inst.cfg @@ -21,10 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner z_seam_corner = hide_seam @@ -55,8 +51,6 @@ speed_layer_0 = 25 speed_support = 40 speed_travel_layer_0 = 45 speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 retraction_combing = all travel_avoid_other_parts = True diff --git a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg index 857980faae..7f59ef60b1 100644 --- a/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg +++ b/resources/quality/Leapfrog_Bolt_Pro/pva/Leapfrog_Bolt_Pro_nozzlex0.4_pva_natural_standard.inst.cfg @@ -21,10 +21,6 @@ wall_0_wipe_dist = 0.2 top_bottom_thickness = 0.8 top_bottom_pattern = lines optimize_wall_printing_order = True -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True z_seam_type = sharpest_corner z_seam_corner = hide_seam @@ -55,8 +51,6 @@ speed_layer_0 = 25 speed_support = 40 speed_travel_layer_0 = 45 speed_slowdown_layers = 1 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 retraction_combing = all travel_avoid_other_parts = True diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg index d08770101b..7bf45c9d57 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg index 3ac33ed683..c7849189d5 100644 --- a/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.25_abs_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg index 1528bf2fff..4e201b3862 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg index 9d5119dbff..664c4fa94e 100644 --- a/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.4_abs_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg index 4ee4e2fbd2..35b463f919 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg index c7c957bdb2..3fd0d3ba5c 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_extra_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg index 50e189859a..31754c0ff4 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg index 084a4b846b..89549fc794 100644 --- a/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg +++ b/resources/quality/cartesio/abs/cartesio_0.8_abs_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg index 183943fe31..b1d48930e4 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid @@ -41,8 +39,6 @@ speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel speed_support_interface = =speed_topbottom -speed_equalize_flow_enabled = True -speed_equalize_flow_max = =speed_print acceleration_enabled = True acceleration_print = 100 diff --git a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg index faaaab75ec..21ca899e62 100644 --- a/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg +++ b/resources/quality/cartesio/arnitel/cartesio_0.4_arnitel2045_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid @@ -41,8 +39,6 @@ speed_topbottom = =round(speed_print / 5 * 4) speed_travel = =round(speed_print if magic_spiralize else 150) speed_travel_layer_0 = =speed_travel speed_support_interface = =speed_topbottom -speed_equalize_flow_enabled = True -speed_equalize_flow_max = =speed_print acceleration_enabled = True acceleration_print = 100 diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg index ddc8764c70..75b287b7be 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg index fc586a4d07..2981397bf1 100644 --- a/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.25_hips_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg index 65147a2170..a240c27d8f 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg index 203548eb12..63bdc80cdd 100644 --- a/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.4_hips_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg index d77c4a888d..3631816337 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg index 0275eca4a4..ed0953e980 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_extra_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg index b336b5916c..be1332cc63 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg index 652047ab8e..7edaeb1461 100644 --- a/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg +++ b/resources/quality/cartesio/hips/cartesio_0.8_hips_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg index b52961d4e6..7b3581a9f9 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg index dd7dfdbdd0..a78d9f2bdc 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.25_nylon_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg index d6c0cbb86e..52dc915702 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg index 1d7ef0b9f9..4b8dfc769f 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.4_nylon_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg index e57ba4a54e..68fef6a52e 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg index c2ca4583d9..6fd8f98820 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_extra_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg index 3994a9e06d..7dae91f4f0 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg index 7df296dc3f..8f3c99afa1 100644 --- a/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg +++ b/resources/quality/cartesio/nylon/cartesio_0.8_nylon_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg index 93c6810de9..25cfec3660 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg index 8e0873a07b..7413573fb2 100644 --- a/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.25_pc_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg index dc568aa0ca..7144b584b5 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg index d1cd99d8cd..c0dfffe4e3 100644 --- a/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.4_pc_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg index 8f1c824693..e2e34adb91 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg index 0d469e4937..dd605d551b 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_extra_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg index dfd5a45d6d..3f2edcab38 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg index 8062c0f07a..f85e3fc0ad 100644 --- a/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg +++ b/resources/quality/cartesio/pc/cartesio_0.8_pc_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg index 0cf1c89cb2..cbfb71be69 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg index a5950f743e..28f78ef6cf 100644 --- a/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.25_petg_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg index 0d37df7f0c..3fded04ee5 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg index ab5725bbbb..19da426b69 100644 --- a/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.4_petg_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg index fd65b7cc07..543c328251 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg index 56018f58f6..5ab674e433 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_extra_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg index 4aeb1e237e..d2b4577c97 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 50 infill_pattern = grid diff --git a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg index da49dd837c..f0ae097707 100644 --- a/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg +++ b/resources/quality/cartesio/petg/cartesio_0.8_petg_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg index cbb66df1be..67770a9c19 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg index efc3ba7317..f7e2d0ab93 100644 --- a/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.25_pla_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg index de9bc63acc..2ac5c748dd 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg index dfde11a605..6ad75bb3c0 100644 --- a/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.4_pla_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg index 46697e34b1..917e04a248 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg index a9a675fffa..da88f49160 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_extra_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg index fd920bb77b..5339f3a6cd 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg index 979b110ffa..8be6d9cfe6 100644 --- a/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg +++ b/resources/quality/cartesio/pla/cartesio_0.8_pla_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg index 59d84da559..c33dbbb1af 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg index c1329ad459..60579bc8ec 100644 --- a/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.25_pva_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.3 wall_thickness = 1 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg index 2b531e9aa4..4e72d5ee17 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg index 03da4c3f5c..0ec3d98cb8 100644 --- a/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.4_pva_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.5 wall_thickness = 1.2 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg index bd8ff02884..f711ef7916 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg index 34ba2dd9a1..7ed306adf2 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_extra_coarse.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = =layer_height * 3 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg index 57f4771d33..804460a331 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_high.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid diff --git a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg index 2a96cc5db1..87023e2b7a 100644 --- a/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg +++ b/resources/quality/cartesio/pva/cartesio_0.8_pva_normal.inst.cfg @@ -17,8 +17,6 @@ infill_line_width = 0.9 wall_thickness = 2.4 top_bottom_thickness = 0.8 wall_0_inset = -0.05 -fill_perimeter_gaps = nowhere -travel_compensate_overlapping_walls_enabled = infill_sparse_density = 40 infill_pattern = grid 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 index 46bfac5a92..46bfac5a92 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_A.inst.cfg 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 index 73112be4a9..73112be4a9 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_B.inst.cfg 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 index 7d1435ff30..7d1435ff30 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.25_ABS_C.inst.cfg 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 index c9852be1ce..c9852be1ce 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_A.inst.cfg 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 index 2a00de77e7..2a00de77e7 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_B.inst.cfg 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 index 444c9a097b..444c9a097b 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_C.inst.cfg 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 index 123d195593..123d195593 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_D.inst.cfg 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 index f7b35c05a7..f7b35c05a7 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.40_ABS_E.inst.cfg 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 index a9f5f60b0a..a9f5f60b0a 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_C.inst.cfg 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 index 270f78a7bd..270f78a7bd 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_D.inst.cfg 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 index 85d4f20682..85d4f20682 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_E.inst.cfg 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 index 7c455b5643..7c455b5643 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_DBE0.60_ABS_F.inst.cfg 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 index 0c8ec58702..0c8ec58702 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_A.inst.cfg 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 index 9816c3faad..9816c3faad 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_B.inst.cfg 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 index 716273e7ce..716273e7ce 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.25_ABS_C.inst.cfg 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 index 977eedd2ac..977eedd2ac 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_A.inst.cfg 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 index fd911c65b0..fd911c65b0 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_B.inst.cfg 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 index f1cac86274..f1cac86274 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_C.inst.cfg 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 index 5cd11db079..5cd11db079 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_D.inst.cfg 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 index 2554ad3944..2554ad3944 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.40_ABS_E.inst.cfg 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 index 296b4c3457..296b4c3457 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_C.inst.cfg 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 index e9e38003df..e9e38003df 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_D.inst.cfg 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 index e25d659ba4..e25d659ba4 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_E.inst.cfg 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 index 88ea1264df..88ea1264df 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_FBE0.60_ABS_F.inst.cfg 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 index 837dfbf0b9..837dfbf0b9 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_D.inst.cfg 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 index 9c03fc9878..9c03fc9878 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_E.inst.cfg 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 index 20ba238eef..20ba238eef 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_F.inst.cfg 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 index f9a9e799c9..f9a9e799c9 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VDBE0.80_ABS_G.inst.cfg 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 index 17ad5e7846..17ad5e7846 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_D.inst.cfg 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 index 7f1ac2069b..7f1ac2069b 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_E.inst.cfg 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 index 97a3d25fff..97a3d25fff 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_F.inst.cfg 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 index 19624e50cf..19624e50cf 100644..100755 --- a/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg +++ b/resources/quality/deltacomb/ABS/deltacomb_VFBE0.80_ABS_G.inst.cfg 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 index d017063491..d017063491 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_A.inst.cfg diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg index 46e1ab6b98..46e1ab6b98 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_B.inst.cfg diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg index 0ddadc4d94..0ddadc4d94 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.25_PLA_C.inst.cfg 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 index c4fd23106f..c4fd23106f 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_A.inst.cfg 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 index 103a165b64..103a165b64 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_B.inst.cfg 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 index 34dc03f70f..34dc03f70f 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_C.inst.cfg 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 index 24a62e56a0..24a62e56a0 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_D.inst.cfg 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 index 6a433e5d9a..6a433e5d9a 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.40_PLA_E.inst.cfg 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 index 10290a973f..10290a973f 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_C.inst.cfg 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 index 9cd0c08f83..9cd0c08f83 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_D.inst.cfg diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg index dbd9676d6c..dbd9676d6c 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_E.inst.cfg diff --git a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg index 936889a218..936889a218 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_DBE0.60_PLA_F.inst.cfg 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 index f599f946cf..f599f946cf 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_A.inst.cfg 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 index cdfedf1c9d..cdfedf1c9d 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_B.inst.cfg 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 index b77cf87ddc..b77cf87ddc 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.25_PLA_C.inst.cfg 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 index 5a8bf5eaf6..5a8bf5eaf6 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_A.inst.cfg 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 index 6220e5aa8b..6220e5aa8b 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_B.inst.cfg 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 index 2fc3240217..2fc3240217 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_C.inst.cfg 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 index e0a03c9c9c..e0a03c9c9c 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_D.inst.cfg 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 index 3c73238099..3c73238099 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.40_PLA_E.inst.cfg 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 index 1cae631ca8..1cae631ca8 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_C.inst.cfg 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 index 0f12ed5530..0f12ed5530 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_D.inst.cfg 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 index eef841e29a..eef841e29a 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_E.inst.cfg 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 index 4e304f480e..4e304f480e 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_FBE0.60_PLA_F.inst.cfg 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 index 12a36226cf..12a36226cf 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_D.inst.cfg 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 index 9f6fbe9f72..9f6fbe9f72 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_E.inst.cfg 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 index da2b9cf37a..da2b9cf37a 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_F.inst.cfg 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 index bf63f90f7b..bf63f90f7b 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VDBE0.80_PLA_G.inst.cfg 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 index 9f10b849b5..9f10b849b5 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_D.inst.cfg 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 index a121263db3..a121263db3 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_E.inst.cfg 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 index 3eb6b717ac..3eb6b717ac 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_F.inst.cfg 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 index 01c97bd882..01c97bd882 100644..100755 --- a/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg +++ b/resources/quality/deltacomb/PLA/deltacomb_VFBE0.80_PLA_G.inst.cfg diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg index 3d58033a34..3d58033a34 100644..100755 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_B.inst.cfg diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg index faa02ccfee..faa02ccfee 100644..100755 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_C.inst.cfg diff --git a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg index 4a736832ff..4a736832ff 100644..100755 --- a/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg +++ b/resources/quality/deltacomb/TPU/deltacomb_FBE0.40_TPU_D.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_global_A.inst.cfg b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg index 563007b37f..563007b37f 100644..100755 --- a/resources/quality/deltacomb/deltacomb_global_A.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_A.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_global_B.inst.cfg b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg index f6a345a2b5..f6a345a2b5 100644..100755 --- a/resources/quality/deltacomb/deltacomb_global_B.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_B.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_global_C.inst.cfg b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg index 0765dbdcd9..0765dbdcd9 100644..100755 --- a/resources/quality/deltacomb/deltacomb_global_C.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_C.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_global_D.inst.cfg b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg index 9f39999647..9f39999647 100644..100755 --- a/resources/quality/deltacomb/deltacomb_global_D.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_D.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_global_E.inst.cfg b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg index 886787259a..886787259a 100644..100755 --- a/resources/quality/deltacomb/deltacomb_global_E.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_E.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_global_F.inst.cfg b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg index 9f83e06db8..9f83e06db8 100644..100755 --- a/resources/quality/deltacomb/deltacomb_global_F.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_F.inst.cfg diff --git a/resources/quality/deltacomb/deltacomb_global_G.inst.cfg b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg index b934659fc0..b934659fc0 100644..100755 --- a/resources/quality/deltacomb/deltacomb_global_G.inst.cfg +++ b/resources/quality/deltacomb/deltacomb_global_G.inst.cfg diff --git a/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg index 92d3e28135..c40ba65456 100644 --- a/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg +++ b/resources/quality/eryone_er20/eryone_er20_draft.inst.cfg @@ -15,4 +15,4 @@ acceleration_print = 1500 layer_height = 0.3 layer_height_0 = 0.3 speed_print = 80 -speed_support = 60
\ No newline at end of file +speed_support = 60 diff --git a/resources/quality/eryone_er20/eryone_er20_high.inst.cfg b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg index 3d9e7ed2a6..2a11587e0c 100644 --- a/resources/quality/eryone_er20/eryone_er20_high.inst.cfg +++ b/resources/quality/eryone_er20/eryone_er20_high.inst.cfg @@ -15,4 +15,4 @@ acceleration_print = 500 layer_height = 0.15 layer_height_0 = 0.2 speed_print = 50 -speed_support = 30
\ No newline at end of file +speed_support = 30 diff --git a/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg index 4f5de7f860..7ecb7307c9 100644 --- a/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg +++ b/resources/quality/eryone_er20/eryone_er20_normal.inst.cfg @@ -15,4 +15,4 @@ acceleration_print = 1000 layer_height = 0.2 layer_height_0 = 0.2 speed_print = 50 -speed_support = 30
\ No newline at end of file +speed_support = 30 diff --git a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg index 8eeedbf299..4ebf2f56df 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_extra_fast.inst.cfg @@ -16,13 +16,6 @@ acceleration_travel = 3000 infill_sparse_density = 10 initial_layer_line_width_factor = 100.0 layer_height = 0.3 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) skirt_brim_speed = =math.ceil(speed_print * 40 / 50) speed_print = 100.0 speed_infill = =math.ceil(speed_print * 60 / 50) @@ -31,7 +24,6 @@ speed_travel = =speed_print if magic_spiralize else 150 speed_layer_0 = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_print * 40 / 50) speed_wall_x = =math.ceil(speed_print * 60 / 50) -speed_z_hop = =math.ceil(speed_print * 30 / 60) top_layers = 4 bottom_layers = 2 wall_line_count = 2 diff --git a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg index e44d39ae7d..0a173b8c56 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_fast.inst.cfg @@ -14,20 +14,12 @@ global_quality = True acceleration_print = 1500 acceleration_travel = 3000 infill_sparse_density = 15 -initial_layer_line_width_factor = 100.0 +initial_layer_line_width_factor = 110.0 layer_height = 0.25 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) speed_infill = =math.ceil(speed_print * 80 / 60) speed_topbottom = =math.ceil(speed_print * 40 / 60) speed_travel = =speed_print if magic_spiralize else 150 speed_wall_x = =math.ceil(speed_print * 80 / 60) -speed_z_hop = =math.ceil(speed_print * 30 / 60) -top_layers = 4 -bottom_layers = 2 -wall_line_count = 2 +top_layers = 5 +bottom_layers = 3 +wall_line_count = 2
\ No newline at end of file diff --git a/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg new file mode 100644 index 0000000000..05c7760d98 --- /dev/null +++ b/resources/quality/eryone_thinker/eryone_thinker_fine.inst.cfg @@ -0,0 +1,22 @@ +[general] +version = 4 +name = Fine +definition = eryone_thinker + +[metadata] +setting_version = 19 +type = quality +quality_type = fine +weight = 2 +global_quality = True + +[values] +alternate_extra_perimeter = true +infill_sparse_density = 30 +initial_layer_line_width_factor = 130.0 +layer_height = 0.1 +speed_print = 40.0 +speed_topbottom = =math.ceil(speed_print * 30 / 60) +speed_travel = =speed_print if magic_spiralize else 100 +top_layers = 12 +bottom_layers = 8 diff --git a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg index f7ad19e93f..c535a24198 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_high.inst.cfg @@ -13,18 +13,10 @@ global_quality = True [values] alternate_extra_perimeter = true infill_sparse_density = 25 -initial_layer_line_width_factor = 130.0 -layer_height = 0.1 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) +initial_layer_line_width_factor = 125.0 +layer_height = 0.15 speed_print = 50.0 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_travel = =speed_print if magic_spiralize else 100 -speed_z_hop = =math.ceil(speed_print * 30 / 60) -top_layers = 12 -bottom_layers = 8 +top_layers = 8 +bottom_layers = 6 diff --git a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg index 458e3d0e3c..cc12b5cb79 100644 --- a/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg +++ b/resources/quality/eryone_thinker/eryone_thinker_normal.inst.cfg @@ -11,18 +11,3 @@ weight = 0 global_quality = True [values] -infill_sparse_density = 20 -initial_layer_line_width_factor = 120.0 -layer_height = 0.2 -layer_height_0 = =layer_height -material_bed_temperature = =default_material_bed_temperature -material_bed_temperature_layer_0 = =material_bed_temperature -material_final_print_temperature = =material_print_temperature -material_initial_print_temperature = =material_print_temperature -material_print_temperature = =default_material_print_temperature -material_print_temperature_layer_0 = =max(-273.15, material_print_temperature + 5) -speed_travel = =speed_print if magic_spiralize else 120 -speed_z_hop = =math.ceil(speed_print * 30 / 60) -top_layers = 6 -bottom_layers = 4 - diff --git a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg index 73baf89322..1e460ba4ae 100644 --- a/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg +++ b/resources/quality/flsun_sr/flsun_sr_fine.inst.cfg @@ -34,8 +34,6 @@ retraction_hop_only_when_collides = True skin_no_small_gaps_heuristic = True skin_overlap = 10 small_hole_max_size = 5 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 120 speed_support = 80 support_enable = True support_type = everywhere @@ -54,7 +52,6 @@ support_z_distance = 0.2 top_bottom_thickness = =layer_height*7 travel_avoid_other_parts = True travel_avoid_supports = True -travel_compensate_overlapping_walls_enabled = True acceleration_enabled = False jerk_enabled = False infill_pattern = grid diff --git a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg index 9ffc5e9e77..826a2524bb 100644 --- a/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg +++ b/resources/quality/flsun_sr/flsun_sr_normal.inst.cfg @@ -34,8 +34,6 @@ retraction_hop_only_when_collides = True skin_no_small_gaps_heuristic = True skin_overlap = 10 small_hole_max_size = 5 -speed_equalize_flow_enabled = True -speed_equalize_flow_max = 150 speed_support = 80 support_enable = True support_type = everywhere @@ -54,7 +52,6 @@ support_z_distance = 0.2 top_bottom_thickness = =layer_height*5 travel_avoid_other_parts = True travel_avoid_supports = True -travel_compensate_overlapping_walls_enabled = True acceleration_enabled = False jerk_enabled = False infill_pattern = grid diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg index 7cd2201ecc..04289b14d8 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg index 5ffe31bb00..14e43fe04e 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg index de55ca37b0..baa67ddeb2 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg index 738aea3851..cf26ceb2f4 100644 --- a/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg index c63b2e936c..586dfd28fa 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_coarse.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg index 3e9d0b4b4a..c20c79abce 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_fine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg index 9e38240aeb..863d583e87 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_normal.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg index b9da934d1c..1297783fb3 100644 --- a/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg +++ b/resources/quality/imade3d_jellybox_2/jb2_global_ultrafine.inst.cfg @@ -63,8 +63,6 @@ support_use_towers = False support_xy_distance = 0.8 support_xy_distance_overhang = =machine_nozzle_size / 2 support_z_distance = 0.2 -travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled travel_retract_before_outer_wall = True wall_0_wipe_dist = =round(line_width * 1.2,1) bridge_settings_enabled = True diff --git a/resources/quality/key3d/key3d_tyro_best.inst.cfg b/resources/quality/key3d/key3d_tyro_best.inst.cfg index 2a7a573190..d6db1f83da 100644 --- a/resources/quality/key3d/key3d_tyro_best.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_best.inst.cfg @@ -28,13 +28,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -78,7 +73,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/key3d/key3d_tyro_fast.inst.cfg b/resources/quality/key3d/key3d_tyro_fast.inst.cfg index c772b51954..7b33630c3b 100644 --- a/resources/quality/key3d/key3d_tyro_fast.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_fast.inst.cfg @@ -27,13 +27,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -77,7 +72,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/key3d/key3d_tyro_normal.inst.cfg b/resources/quality/key3d/key3d_tyro_normal.inst.cfg index eeb60b5970..fc6e2a93aa 100644 --- a/resources/quality/key3d/key3d_tyro_normal.inst.cfg +++ b/resources/quality/key3d/key3d_tyro_normal.inst.cfg @@ -27,13 +27,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -77,7 +72,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg index b17d86f7ca..06ea24bb9c 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Draft_Print.inst.cfg @@ -46,7 +46,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg index e4f57f4f78..fea1b31bc5 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Fast_Print.inst.cfg @@ -46,7 +46,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg index 84bbe1c27d..912845067f 100644 --- a/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_PP_Normal_Quality.inst.cfg @@ -46,7 +46,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg index d4ea07f5e1..c94b582d89 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Draft_Print.inst.cfg @@ -45,7 +45,6 @@ retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg index 2b87230986..762293c2dc 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Fast_Print.inst.cfg @@ -45,7 +45,6 @@ retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg index 9fd99e759d..9619e7dcc5 100644 --- a/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.4_TPU_Normal_Quality.inst.cfg @@ -44,7 +44,6 @@ retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg index 72d4708518..623aa7494c 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Draft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg index c3ee6c64cb..51167a330b 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Superdraft_Print.inst.cfg @@ -46,7 +46,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg index fa29e6d644..85c8c249b2 100644 --- a/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_PP_Verydraft_Print.inst.cfg @@ -45,7 +45,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg index 7f8c1eac12..11524250ab 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Draft_Print.inst.cfg @@ -54,7 +54,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg index 7350448830..75f1500380 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Superdraft_Print.inst.cfg @@ -55,7 +55,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg index 486af5555e..2664ab55f7 100644 --- a/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/liquid/liquid_vo0.8_TPU_Verydraft_Print.inst.cfg @@ -54,7 +54,6 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg new file mode 100644 index 0000000000..2b79acb9e3 --- /dev/null +++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_draft.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Draft +definition = mixware_hyper_s + +[metadata] +type = quality +quality_type = draft +global_quality = True +setting_version = 19 + +[values] +layer_height = 0.15 +retraction_combing = all +retraction_extrusion_window = 10 +retraction_min_travel = 1.5 +infill_wipe_dist = 0.0 +skin_overlap = 10.0 +infill_overlap = 30.0 +wall_0_wipe_dist = 0.0 +support_wall_count = 1 +support_brim_enable = false +infill_before_walls = false +acceleration_enabled = false +support_enable = true diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg new file mode 100644 index 0000000000..f711f84655 --- /dev/null +++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_extra_fast.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Coarse +definition = mixware_hyper_s + +[metadata] +type = quality +quality_type = coarse +setting_version = 19 +global_quality = True + +[values] +layer_height = 0.2 +retraction_combing = all +retraction_extrusion_window = 10 +retraction_min_travel = 1.5 +infill_wipe_dist = 0.0 +skin_overlap = 10.0 +infill_overlap = 30.0 +wall_0_wipe_dist = 0.0 +support_wall_count = 1 +support_brim_enable = false +infill_before_walls = false +acceleration_enabled = false +support_enable = true diff --git a/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg b/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg new file mode 100644 index 0000000000..95ad1c6631 --- /dev/null +++ b/resources/quality/mixware_hyper_s/mixware_hyper_s_normal.inst.cfg @@ -0,0 +1,25 @@ +[general] +version = 4 +name = Fine +definition = mixware_hyper_s + +[metadata] +setting_version = 19 +type = quality +quality_type = normal +global_quality = True + +[values] +layer_height = 0.1 +retraction_combing = all +retraction_extrusion_window = 10 +retraction_min_travel = 1.5 +infill_wipe_dist = 0.0 +skin_overlap = 10.0 +infill_overlap = 30.0 +wall_0_wipe_dist = 0.0 +support_wall_count = 1 +support_brim_enable = false +infill_before_walls = false +acceleration_enabled = false +support_enable = true diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg index ff2acb4e92..d38d7eff39 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_best.inst.cfg @@ -29,13 +29,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -78,7 +73,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg index 00e954392a..d11a4e4b41 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_e.inst.cfg @@ -26,13 +26,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -75,7 +70,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 40 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False jerk_enabled = False retraction_combing = off diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg index ecacbf74a9..a91cf710e2 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_fast.inst.cfg @@ -29,13 +29,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -78,7 +73,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg index 08204c04f9..d26c842193 100644 --- a/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg +++ b/resources/quality/nwa3d_a31/nwa3d_a31_normal.inst.cfg @@ -28,13 +28,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -77,7 +72,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg index 6715696585..eda1c583d8 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_best.inst.cfg @@ -27,13 +27,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -76,7 +71,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg index 527881b076..b7aa84ac2b 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_fast.inst.cfg @@ -27,13 +27,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -76,7 +71,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg index 00e9652d89..3582f318af 100644 --- a/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg +++ b/resources/quality/nwa3d_a5/nwa3d_a5_normal.inst.cfg @@ -27,13 +27,8 @@ top_bottom_pattern = lines top_bottom_pattern_0 = lines wall_0_inset = 0 optimize_wall_printing_order = False -outer_inset_first = False +inset_direction = inside_out alternate_extra_perimeter = False -travel_compensate_overlapping_walls_enabled = True -travel_compensate_overlapping_walls_0_enabled = True -travel_compensate_overlapping_walls_x_enabled = True -wall_min_flow = 0 -fill_perimeter_gaps = everywhere filter_out_tiny_gaps = True fill_outline_gaps = True xy_offset = 0 @@ -76,7 +71,6 @@ speed_travel = 150 speed_layer_0 = 10 speed_travel_layer_0 = 50 speed_slowdown_layers = 2 -speed_equalize_flow_enabled = False acceleration_enabled = False acceleration_roofing = 3000 jerk_enabled = False diff --git a/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg index 1b6e7b3bc7..61fc8faacc 100644 --- a/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_fast.inst.cfg @@ -21,7 +21,7 @@ top_thickness = 0.8 top_layers = 4
bottom_thickness = 0.8
bottom_layers = 4
-outer_inset_first = False
+inset_direction = inside_out
skin_outline_count = 0
; infill_line_distance = 8
@@ -63,4 +63,4 @@ support_pattern = zigzag support_angle = 50
support_infill_rate = 15
support_line_distance = 2.66
-support_initial_layer_line_distance = 2.66
\ No newline at end of file +support_initial_layer_line_distance = 2.66
diff --git a/resources/quality/snapmaker2/snapmaker2_high.inst.cfg b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg index ebfa69a032..b29b00acd1 100644 --- a/resources/quality/snapmaker2/snapmaker2_high.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_high.inst.cfg @@ -21,7 +21,7 @@ top_thickness = 0.8 top_layers = 10 bottom_thickness = 0.8 bottom_layers = 10 -outer_inset_first = False +inset_direction = inside_out skin_outline_count = 1 ; infill_line_distance = 8 diff --git a/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg index c98b45cbff..cb1127cf35 100644 --- a/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg +++ b/resources/quality/snapmaker2/snapmaker2_normal.inst.cfg @@ -21,7 +21,7 @@ top_thickness = 0.8 top_layers = 5
bottom_thickness = 0.8
bottom_layers = 5
-outer_inset_first = False
+inset_direction = inside_out
skin_outline_count = 0
; infill_line_distance = 8
@@ -63,4 +63,4 @@ support_pattern = zigzag support_angle = 50
support_infill_rate = 15
support_line_distance = 2.66
-support_initial_layer_line_distance = 2.66
\ No newline at end of file +support_initial_layer_line_distance = 2.66
diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg index a47eee4c3d..a5d2e4ef1e 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_draft.inst.cfg @@ -30,8 +30,6 @@ layer_height = 0.3 layer_height_0 = 0.3 material_bed_temperature = 60 material_diameter = 1.75 -material_print_temperature = 200 -material_print_temperature_layer_0 = 0 retract_at_layer_change = False retraction_amount = 6 retraction_hop = 0.075 diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg index 6a30a9483d..74f2b08204 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_high.inst.cfg @@ -30,8 +30,6 @@ layer_height = 0.1 layer_height_0 = 0.1 material_bed_temperature = 60 material_diameter = 1.75 -material_print_temperature = 200 -material_print_temperature_layer_0 = 0 retract_at_layer_change = False retraction_amount = 6 retraction_hop = 0.075 diff --git a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg index 4349fb00a9..835bc555a1 100644 --- a/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg +++ b/resources/quality/tinyboy/tinyboy_fabrikator15_normal.inst.cfg @@ -30,8 +30,6 @@ layer_height = 0.2 layer_height_0 = 0.2 material_bed_temperature = 60 material_diameter = 1.75 -material_print_temperature = 210 -material_print_temperature_layer_0 = 0 retract_at_layer_change = False retraction_amount = 6 retraction_hop = 0.075 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg index f194ca2278..c4d4798cef 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_draft.inst.cfg @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 -line_width = 0.38 raft_airgap = 0.37 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg index 90ab564cc6..e0fa416aaf 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.4_normal.inst.cfg @@ -20,7 +20,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 -line_width = 0.38 raft_airgap = 0.37 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg index ab8075284c..29bcd5e3b9 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_draft.inst.cfg @@ -20,7 +20,7 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -line_width = 0.57 + raft_airgap = 0.37 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg index 60c81e71cc..1b1102ae41 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.6_normal.inst.cfg @@ -20,7 +20,7 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 -line_width = 0.57 + raft_airgap = 0.37 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg index 52760e6adf..10f6d07dba 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_fast.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.4 / 0.38, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -66,7 +64,6 @@ support_xy_distance_overhang = =wall_line_width_0 support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.38 / 0.38, 2) wall_thickness = 0.76 speed_wall_x = =math.ceil(speed_print * 25 / 25) speed_infill = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg index 8ea3d90be4..ca4f9ec1d9 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.4_normal.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.4 / 0.38, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -66,5 +64,4 @@ support_xy_distance_overhang = =wall_line_width_0 support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.38 / 0.38, 2) wall_thickness = 0.76 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg index e7c3ec44fe..c77c6fcb95 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_draft.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.6 / 0.57, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.6 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.57 / 0.57, 2) wall_thickness = 1.14 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg index 8487dbeb8d..58b93a9af1 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.6_fast.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.6 / 0.57, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.6 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,7 +64,6 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.57 / 0.57, 2) wall_thickness = 1.14 speed_wall_x = =math.ceil(speed_print * 25 / 25) speed_infill = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg index 8a9d640f5f..b066ba3929 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.8 / 0.76, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.8 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.76 / 0.76, 2) wall_thickness = 1.52 diff --git a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg index a205ef4220..a89ac4f68b 100644 --- a/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.8 / 0.76, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.8 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.76 / 0.76, 2) wall_thickness = 1.52 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg index 231b897127..739f949dfc 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.6_fast.inst.cfg @@ -19,7 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60 cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.12 -line_width = 0.57 raft_airgap = 0.24 raft_base_line_spacing = 1.2 raft_base_line_width = 0.6 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg index 826c5deff1..d37743423b 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_draft.inst.cfg @@ -19,7 +19,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 -line_width = 0.38 raft_airgap = 0.37 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg index 444080256c..a0fd902e31 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.4_normal.inst.cfg @@ -19,7 +19,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 -line_width = 0.38 raft_airgap = 0.37 raft_base_line_spacing = 1.6 raft_base_line_width = 0.8 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg index f4421c4e0f..b96242f569 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_draft.inst.cfg @@ -19,7 +19,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 -line_width = 0.57 raft_airgap = 0.37 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg index 0a870fe5df..58e7974fe6 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.6_normal.inst.cfg @@ -19,7 +19,6 @@ cool_min_speed = 8 infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 -line_width = 0.57 raft_airgap = 0.37 raft_base_line_spacing = 2.4 raft_base_line_width = 1.2 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg index 92d07698d6..077ce01713 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_fast.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.4 / 0.38, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -66,7 +64,6 @@ support_xy_distance_overhang = =wall_line_width_0 support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.38 / 0.38, 2) wall_thickness = 0.76 speed_wall_x = =math.ceil(speed_print * 25 / 25) speed_infill = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg index 52d284fc69..9e827e0da6 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.4_normal.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.4 / 0.38, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -66,5 +64,4 @@ support_xy_distance_overhang = =wall_line_width_0 support_z_distance = =layer_height * 2 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.38 / 0.38, 2) wall_thickness = 0.76 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg index 0aedc524e4..afc75d1238 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_draft.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.6 / 0.57, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.6 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.57 / 0.57, 2) wall_thickness = 1.14 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg index e03ae48831..52b963bb90 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.6_fast.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.6 / 0.57, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.6 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,7 +64,6 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.1 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.57 / 0.57, 2) wall_thickness = 1.14 speed_wall_x = =math.ceil(speed_print * 25 / 25) speed_infill = =math.ceil(speed_print * 25 / 25) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg index 47b1c7a96a..b13fcb5572 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_draft.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.8 / 0.76, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.8 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.76 / 0.76, 2) wall_thickness = 1.52 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg index 14ee58c517..935c0bb603 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pp_0.8_verydraft.inst.cfg @@ -26,7 +26,6 @@ cool_fan_full_at_height = =layer_height_0 + 4 * layer_height cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 20 -infill_line_width = =round(line_width * 0.8 / 0.76, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 @@ -39,7 +38,6 @@ jerk_support_interface = =jerk_topbottom jerk_topbottom = =math.ceil(jerk_print * 5 / 25) jerk_wall = =math.ceil(jerk_print * 10 / 25) jerk_wall_0 = =math.ceil(jerk_wall * 5 / 10) -line_width = =machine_nozzle_size * 0.95 multiple_mesh_overlap = 0 retraction_count_max = 12 retraction_extrusion_window = 1 @@ -48,7 +46,6 @@ retraction_hop_enabled = True retraction_hop_only_when_collides = True retraction_prime_speed = 15 skin_overlap = 10 -skirt_brim_line_width = 0.8 speed_layer_0 = =speed_print speed_prime_tower = =speed_topbottom speed_print = 25 @@ -67,5 +64,4 @@ support_z_distance = =layer_height * 2 top_bottom_thickness = 1.5 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.76 / 0.76, 2) wall_thickness = 1.52 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg index eee29b553e..f7fbb956b7 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.6_fast.inst.cfg @@ -19,7 +19,6 @@ cool_fan_speed_min = =cool_fan_speed cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.12 -line_width = 0.57 raft_airgap = 0.24 raft_base_line_spacing = 1.2 raft_base_line_width = 0.6 diff --git a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg index 8ae4ce87ac..a080ca08d8 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.25 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 @@ -32,4 +31,3 @@ speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width diff --git a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg index e653571745..1eaab8a586 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PC_Normal_Quality.inst.cfg @@ -13,15 +13,12 @@ variant = AA 0.25 is_experimental = True [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 -infill_line_width = =line_width infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 jerk_enabled = True @@ -52,5 +49,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg index c0db3487d9..fe621363d4 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_PP_Normal_Quality.inst.cfg @@ -13,18 +13,14 @@ variant = AA 0.25 is_experimental = True [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 10 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.92 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_final_print_temperature = =material_print_temperature - 10 @@ -42,7 +38,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 13 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_travel = 300 @@ -56,5 +51,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg index 997ae21f27..0da1ac1283 100644 --- a/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -15,10 +15,8 @@ variant = AA 0.25 brim_width = 8 cool_fan_full_at_height = =layer_height_0 cool_min_speed = 7 -infill_line_width = =line_width infill_overlap = =0 if infill_sparse_density > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' -line_width = =machine_nozzle_size * 0.92 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,6 +32,4 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 -wall_line_width = =line_width -wall_line_width_x= =line_width wall_thickness = 0.7 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg index 9d72338d03..6175c54619 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -12,11 +12,8 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 80 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg index 57e1c3cb40..bfd389413b 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -12,11 +12,8 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 80 cool_min_speed = 6 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg index 56a18c4218..72ba53f1a9 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_High_Quality.inst.cfg @@ -12,11 +12,8 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 50 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg index 73098a9999..12e23cdd52 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -12,11 +12,8 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 50 cool_min_speed = 7 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg index 72718284aa..f7389e904c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 @@ -33,4 +31,3 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg index be5afce522..54b8ecde2d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 @@ -33,4 +31,3 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg index e2bdbd8e19..2ac939ce56 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_High_Quality.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 @@ -32,4 +30,3 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width diff --git a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg index f6ef38684d..8d8ea8b8f8 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 @@ -32,4 +30,3 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg index f054cbb5a8..c2129652ee 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Draft_Print.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = raft brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 90 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 6 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -61,5 +59,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg index 1885be1718..1b3fc14f06 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Fast_Print.inst.cfg @@ -12,15 +12,12 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = raft brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 85 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 7 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 @@ -60,5 +57,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg index 60f04fb1d0..c704d6ca5d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_High_Quality.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = raft brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 8 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -61,5 +59,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg index d98212365f..2964528789 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PC_Normal_Quality.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = raft brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 @@ -58,5 +56,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg index 6f9c60e12d..818e01f742 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Draft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -infill_line_width = =round(line_width * 0.42 / 0.35, 2) machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg index a4055edb6b..22a6b35322 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Fast_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -infill_line_width = =round(line_width * 0.42 / 0.35, 2) machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg index e40f7f5aaf..bfc4c38c8c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_High_Quality.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 10 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg index 3c98e56842..c47f454305 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg index be5c05b20c..3d74fc55b3 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Draft_Print.inst.cfg @@ -12,21 +12,18 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 layer_height = 0.2 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -48,7 +45,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -61,5 +57,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg index 05e5ab968a..70935140fb 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Fast_Print.inst.cfg @@ -12,21 +12,18 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 layer_height = 0.15 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -47,7 +44,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -61,5 +57,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1.1 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg index e44ec565e9..8c84e4787c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PP_Normal_Quality.inst.cfg @@ -12,20 +12,17 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -46,7 +43,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -60,5 +56,4 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg index 0985d97797..b700f8e80d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -infill_line_width = =round(line_width * 0.45/0.35,2) jerk_print = 25 jerk_roofing = 1 layer_height_0 = 0.2 @@ -33,5 +32,4 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) top_bottom_thickness = 1.2 -wall_line_width_x = =round(line_width * 0.35/0.35,2) wall_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg index 8119457582..71f674616f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -infill_line_width = =round(line_width * 1.285, 2) layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -27,6 +26,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 -wall_line_width_x = =round(line_width * 0.35/0.35,2) wall_thickness = 1.23 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg index 17c01567e9..42de88a562 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -infill_line_width = =round(line_width * 1.285, 2) layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg index 0ec8263f43..370f636bc4 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Draft_Print.inst.cfg @@ -12,14 +12,12 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 @@ -27,7 +25,6 @@ infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 layer_height = 0.2 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -48,7 +45,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -62,5 +58,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = 0.76 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg index 068edf5972..d7992a20b9 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Fast_Print.inst.cfg @@ -12,14 +12,12 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 @@ -27,7 +25,6 @@ infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 layer_height = 0.15 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -49,7 +46,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -63,5 +59,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = 0.76 diff --git a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg index 947b33a6cb..59f0cae71d 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -12,21 +12,18 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -46,7 +43,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -60,5 +56,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = 0.76 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg index 8e66a82d08..88ffd1aeb1 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Draft_Print.inst.cfg @@ -12,7 +12,6 @@ material = generic_abs variant = AA 0.8 [values] -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 25 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg index 9b45fa6a6b..344c8ec47b 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] layer_height = 0.4 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 30 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg index c84c55356c..a444a70796 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] layer_height = 0.3 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 27 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg index 63df3b4ad6..1da10d84ed 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 @@ -33,6 +31,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 7de459f585..633f48893d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -15,9 +15,7 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True layer_height = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 @@ -34,6 +32,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg index 80570c80e5..d1e1397078 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -15,9 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True + layer_height = 0.3 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 @@ -34,6 +33,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg index 210da0b761..293e2ec56d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Draft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] brim_width = 15 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg index 4be250acf4..d9bbacf909 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 15 layer_height = 0.4 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg index fbac1c9bc3..1e57dd5049 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 15 layer_height = 0.3 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 17 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg index 87f4132e21..8242fef441 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 @@ -28,7 +26,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg index e923361d9f..150d58ef48 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width layer_height = 0.4 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 @@ -29,7 +27,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 0e369d9986..fb0aa8c1f2 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width layer_height = 0.3 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 @@ -29,8 +27,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 -support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg index 015a74801f..226522000c 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Fast_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 @@ -29,4 +27,3 @@ speed_slowdown_layers = 15 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg index e59833b89b..81c4bb3394 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -15,9 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True + layer_height = 0.4 -line_width = =machine_nozzle_size * 0.875 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 raft_airgap = 0.5 @@ -29,4 +28,3 @@ speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg index bfa5496c10..d147d2259d 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -15,9 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True + layer_height = 0.3 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 @@ -30,4 +29,3 @@ speed_slowdown_layers = 10 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg index bb6d55e52a..ec58dae719 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Draft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = AA 0.8 [values] brim_width = 7 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg index a470fb8c21..a7a1593a29 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 7 layer_height = 0.4 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg index f7dc76952e..93af43f386 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 7 layer_height = 0.3 -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg index 7607b1d22b..added0b5ad 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Draft_Print.inst.cfg @@ -16,9 +16,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -33,10 +31,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg index d3e3c3c873..0c55551453 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' layer_height = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -35,10 +33,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg index c7682afc46..00bdc6c219 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' layer_height = 0.3 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg index 170475fbce..16093951d2 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Draft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 @@ -33,17 +31,13 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_travel = 300 speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg index a67f09a60c..9a2b73fa91 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 @@ -33,17 +31,13 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_travel = 300 speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg index 5f35962bc9..d08659c036 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' layer_height = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature @@ -33,17 +31,13 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_travel = 300 speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg index dd3b9bc815..1f86a66c38 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -29,9 +27,6 @@ prime_tower_enable = False retract_at_layer_change = False speed_print = 45 support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 6 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 7f06130fe4..1c144290b4 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,8 +32,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 25/ 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x
\ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 44c5aabf19..31f23166f0 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,11 +32,8 @@ speed_topbottom = =math.ceil(speed_print * 20 / 35) speed_wall = =math.ceil(speed_print * 25/ 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg index d38fb444a5..f0bc86da9f 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Draft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 gradual_infill_step_height = =4 * layer_height -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 machine_nozzle_cool_down_speed = 0.5 @@ -38,7 +36,6 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 25 / 30) speed_travel = 300 @@ -46,14 +43,11 @@ speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg index ff544e57c1..73ae3a5564 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 gradual_infill_step_height = =4 * layer_height -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 layer_height = 0.4 @@ -39,7 +37,6 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_travel = 300 @@ -47,14 +44,11 @@ speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg index 5593a38bfe..af1cbe6051 100644 --- a/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 gradual_infill_step_height = =4 * layer_height -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 layer_height = 0.3 @@ -38,7 +36,6 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 23 / 30) speed_travel = 300 @@ -46,14 +43,11 @@ speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg index df05a87b57..27d9387476 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.25 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 @@ -32,6 +31,6 @@ speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + raft_surface_speed = 45 speed_layer_0 = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg index d0f482524c..47119e62bf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PC_Normal_Quality.inst.cfg @@ -13,15 +13,12 @@ variant = AA 0.25 is_experimental = True [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 -infill_line_width = =line_width infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 jerk_enabled = True @@ -51,5 +48,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg index bc9e3f4de2..34fa0d7c84 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PETG_Normal_Quality.inst.cfg @@ -19,5 +19,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 wall_thickness = 0.92 initial_layer_line_width_factor = 100 -infill_before_walls = true + material_print_temperature = =default_material_print_temperature - 5
\ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg index 930539badb..e426ee3efd 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_PP_Normal_Quality.inst.cfg @@ -13,18 +13,14 @@ variant = AA 0.25 is_experimental = True [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 10 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.92 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_final_print_temperature = =material_print_temperature - 10 @@ -42,7 +38,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 13 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_travel_layer_0 = 50 @@ -55,5 +50,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg index 3be4ede280..447d0412aa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -15,10 +15,8 @@ variant = AA 0.25 brim_width = 8 cool_fan_full_at_height = =layer_height_0 cool_min_speed = 7 -infill_line_width = =line_width infill_overlap = =0 if infill_sparse_density > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' -line_width = =machine_nozzle_size * 0.92 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,7 +32,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 -wall_line_width = =line_width -wall_line_width_x= =line_width wall_thickness = 0.7 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg index 5bf8f819b2..9644732c0c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Draft_Print.inst.cfg @@ -26,7 +26,7 @@ speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) wall_thickness = 1 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + speed_infill = =math.ceil(speed_print * 50 / 60) raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg index 586923ce30..81def5bbd8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Print.inst.cfg @@ -25,7 +25,7 @@ speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + speed_infill = =math.ceil(speed_print * 45 / 60) raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg index 0c6d89b567..fe4dd8cd17 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_High_Quality.inst.cfg @@ -24,7 +24,7 @@ speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + speed_infill = =math.ceil(speed_print * 40 / 50) raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg index 015b349dbe..7e46754dde 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -23,7 +23,7 @@ speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + speed_infill = =math.ceil(speed_print * 40 / 55) raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg index 5180905e90..d0e6e36ea3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Draft_Print.inst.cfg @@ -12,11 +12,9 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 80 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) + infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg index ce011d2d24..51f90c6c8f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Fast_Print.inst.cfg @@ -12,11 +12,9 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 80 cool_min_speed = 6 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) + infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg index 3dfc922123..e5241c36c6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_High_Quality.inst.cfg @@ -12,11 +12,9 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 50 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) + infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg index be119e9e55..155001b888 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -12,11 +12,9 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 50 cool_min_speed = 7 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) + infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg index 0b8c33f160..5bc7246093 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Draft_Print.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size + + material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 @@ -33,7 +33,7 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg index 968c92b6f2..614254e9d9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Fast_Print.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size + + material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 @@ -33,7 +33,7 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg index db0d869e02..3a11b6dbe3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_High_Quality.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size + + material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 @@ -32,7 +32,7 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg index 047ce3dfd2..a5abd1bab6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size + + material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 @@ -32,7 +32,7 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg index 840676e4fd..69bbcf001d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Draft_Print.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 90 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 6 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -59,5 +57,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg index 2abc0cc16c..63568363d2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Fast_Print.inst.cfg @@ -12,15 +12,12 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 85 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 7 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 @@ -59,5 +56,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg index 82325e883a..3a317c820e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_High_Quality.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 8 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -60,5 +58,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg index 9bf47a65bb..8b264ad751 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PC_Normal_Quality.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 @@ -58,5 +56,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg index 2513df3784..7ca3b04031 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Draft_Print.inst.cfg @@ -28,7 +28,7 @@ top_bottom_thickness = 0.8 wall_thickness = 0.8 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + infill_sparse_density = 15 layer_height_0 = 0.2 acceleration_wall = 2000 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg index fec0a2e319..38741f40ff 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Print.inst.cfg @@ -27,7 +27,7 @@ top_bottom_thickness = 1 wall_thickness = 1 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg index 9fb28d5ef9..871ab6adc8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_High_Quality.inst.cfg @@ -29,7 +29,7 @@ top_bottom_thickness = 1 wall_thickness = 1 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg index a8bf4c94a7..7c8b71cd68 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Quality.inst.cfg @@ -25,7 +25,7 @@ top_bottom_thickness = 1 wall_thickness = 1 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg index 0e3d4a8079..816eaeda5d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Draft_Print.inst.cfg @@ -12,20 +12,17 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -46,7 +43,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -58,5 +54,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg index 78cd09b5a8..498bdd6bd5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Fast_Print.inst.cfg @@ -12,20 +12,16 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -46,7 +42,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -60,5 +55,5 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1.1 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg index 61f34bc18b..28b1470419 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PP_Normal_Quality.inst.cfg @@ -12,20 +12,18 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -46,7 +44,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -60,5 +57,5 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg index 228b6896e5..522c35cec2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -infill_line_width = =round(line_width * 0.45/0.35,2) jerk_print = 25 jerk_roofing = 1 layer_height_0 = 0.2 @@ -33,5 +32,5 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) top_bottom_thickness = 1.2 -wall_line_width_x = =round(line_width * 0.35/0.35,2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg index 71bbcb765b..b97bdbece7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -infill_line_width = =round(line_width * 1.285, 2) layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -27,5 +26,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 -wall_line_width_x = =round(line_width * 0.35/0.35,2) + wall_thickness = 1.23 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg index 5e30530b3b..262a1593a3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_High_Quality.inst.cfg @@ -31,6 +31,3 @@ wall_thickness = 1.23 layer_height_0 = 0.2 -line_width = =round(machine_nozzle_size * 1.025, 3) -wall_line_width_x = =line_width -infill_line_width = =line_width diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg index 3c3833c401..c438fd2a93 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -infill_line_width = =round(line_width * 1.285, 2) layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg index 3c02550a8c..0a01d45a0c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Draft_Print.inst.cfg @@ -12,21 +12,19 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -46,7 +44,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -59,5 +56,5 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = 0.76 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg index 110fd361be..18c5c014f8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Fast_Print.inst.cfg @@ -12,21 +12,19 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -46,7 +44,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -59,6 +56,6 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = 0.76 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg index 0e8d3c7e70..536f766916 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPU_Normal_Quality.inst.cfg @@ -12,21 +12,19 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -45,7 +43,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -58,6 +55,6 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = 0.76 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg index ac51c40fb8..d38564ef8c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Draft_Print.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.8 [values] -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg index edd811fa38..78593302e3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.8 [values] -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 25 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg index 58d82ffb01..a5495fc113 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.8 [values] -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 22 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg index df3f853a1d..ab0088e44f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Fast_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 @@ -34,6 +34,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg index 41aa2d39d6..edac440f9a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 @@ -34,6 +34,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg index b0f1fdd172..fb6e33aff1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 @@ -34,6 +34,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg index 06cd735575..9e293db418 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Draft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg index 6acf4eabf9..0062aa89f8 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg index 825b569960..86e7b2465e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 17 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg index 7b968b847a..3cb85b22cb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Draft_Print.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 @@ -28,7 +28,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg index 896d56aa91..b1962e3f88 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 @@ -28,7 +28,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg index 2f68b0bdf5..5495eafcb3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 @@ -28,7 +28,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg index 82ca7f5b35..40d148ef75 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Fast_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 + + material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 @@ -29,4 +29,3 @@ speed_slowdown_layers = 15 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg index db1c299c15..4100787241 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Superdraft_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 + + material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 raft_airgap = 0.5 @@ -28,4 +28,3 @@ speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg index 8fc68b4364..5908dd7630 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PC_Verydraft_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 + + material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 @@ -29,4 +29,3 @@ speed_slowdown_layers = 10 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg index 0d02bc2a64..c34d5b281b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Draft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 7 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True @@ -24,4 +24,3 @@ speed_wall = =math.ceil(speed_print * 30 / 40) jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 -infill_before_walls = true
\ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg index 82877db1d8..8940e53e23 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 7 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True @@ -25,4 +25,3 @@ speed_wall_0 = =math.ceil(speed_wall * 30 / 40) jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 -infill_before_walls = true
\ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg index 2043a1ba2d..56d72118c6 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 7 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True @@ -25,4 +25,4 @@ jerk_travel = 50 cool_fan_speed = 20 layer_height_0 = 0.27 initial_layer_line_width_factor = 100 -infill_before_walls = true + diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg index 35e9a62710..279e4f4beb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Draft_Print.inst.cfg @@ -16,8 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -25,13 +23,9 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x - retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg index be96127b8c..9c6ec154fe 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -16,8 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -26,11 +24,8 @@ material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True raft_margin = 10 support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg index 72c0b0a98c..6ef378376d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -16,8 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -25,11 +23,8 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg index f7f965146a..0350a1836f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Draft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 @@ -33,17 +31,12 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg index dedc9b8f30..cfe751f38b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Superdraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 @@ -33,17 +31,12 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg index d52ee60a7d..58a7cea554 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_PP_Verydraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 @@ -32,17 +30,12 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg index 07c7c3544b..91e9ac5632 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Draft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -32,9 +30,6 @@ speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) speed_wall_0 = =round(speed_print * 35 / 45) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 6 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x
\ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg index 9a8662e261..db12dff2f0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,8 +32,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 25/ 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg index 276d6e64da..a97439f98c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -35,9 +33,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 35) speed_wall = =math.ceil(speed_print * 25/ 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg index 3497d5340c..47cb0623eb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Draft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -36,24 +34,18 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 25 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg index e552f7ebaa..1155e46024 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 machine_nozzle_cool_down_speed = 0.5 @@ -37,24 +35,18 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg index 5ec5a2bd67..ab5562474d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 machine_nozzle_cool_down_speed = 0.5 @@ -36,24 +34,18 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 23 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg index 6625cba6c3..b71262e643 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg index 597c93ddc5..053afc04a5 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg index a345e968f3..259e269406 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg index 0b9e9d022a..3233442e50 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg index 8f46012ed5..b4151ee80b 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg index 6f94a48449..becf437583 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg index 528aa4da07..a167732e56 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg index d286cbcb1f..70a6eee76e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg index a7c599f881..c354eea9e3 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg index 5fd28c9a74..a0778a7f88 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_PLA_Fast_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg index 5c5d6453ab..fb60ce93f7 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg index 4948613fc7..9520fde07e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg index 02ffb07f13..12098a1949 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg index c0276dca69..83577034b3 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg index f819110fc2..c78b060dee 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg index 5198080708..031db016b6 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_PLA_Fast_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg index a751c7a58d..a4a5945c91 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_Nylon_Normal_Quality.inst.cfg @@ -14,7 +14,7 @@ variant = AA 0.25 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 @@ -32,4 +32,4 @@ speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg index 9559e510c3..ee3750680f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PC_Normal_Quality.inst.cfg @@ -13,15 +13,12 @@ variant = AA 0.25 is_experimental = True [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 -infill_line_width = =line_width infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 jerk_enabled = True @@ -51,5 +48,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg index 335f1746dc..d81ae5f88e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PETG_Normal_Quality.inst.cfg @@ -19,5 +19,5 @@ speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 wall_thickness = 0.92 initial_layer_line_width_factor = 100 -infill_before_walls = true + material_print_temperature = =default_material_print_temperature - 5
\ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg index 70dadbcd4d..07aa9462e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_PP_Normal_Quality.inst.cfg @@ -13,18 +13,14 @@ variant = AA 0.25 is_experimental = True [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 10 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.92 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_final_print_temperature = =material_print_temperature - 10 @@ -42,7 +38,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 13 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_travel_layer_0 = 50 @@ -55,5 +50,4 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 travel_avoid_distance = 3 wall_0_inset = 0 -wall_line_width_x = =line_width wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg index f767f93e56..e4aa517abb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_TPLA_Normal_Quality.inst.cfg @@ -15,10 +15,8 @@ variant = AA 0.25 brim_width = 8 cool_fan_full_at_height = =layer_height_0 cool_min_speed = 7 -infill_line_width = =line_width infill_overlap = =0 if infill_sparse_density > 80 else 10 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'grid' -line_width = =machine_nozzle_size * 0.92 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,7 +32,5 @@ speed_wall_0 = =math.ceil(speed_print * 20 / 30) top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 -wall_line_width = =line_width -wall_line_width_x= =line_width wall_thickness = 0.7 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg index fe204e4b36..d6ef41abe1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Draft_Print.inst.cfg @@ -25,8 +25,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) wall_thickness = 1 - -infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 50 / 60) - raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg index a3ab1e4454..e5ed77862a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Print.inst.cfg @@ -24,8 +24,5 @@ speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -infill_line_width = =round(line_width * 0.4 / 0.35, 2) speed_infill = =math.ceil(speed_print * 45 / 60) - raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg index 582b6577e9..73d1ad25d4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_High_Quality.inst.cfg @@ -24,7 +24,7 @@ speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + speed_infill = =math.ceil(speed_print * 40 / 50) raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg index 396a6f6046..bb8f9c5bb9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Quality.inst.cfg @@ -23,6 +23,6 @@ speed_layer_0 = 10 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + speed_infill = =math.ceil(speed_print * 40 / 55) raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg index 88a9b174f2..f6927953d1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Draft_Print.inst.cfg @@ -12,11 +12,9 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 80 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) + infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg index 8b080cc8a7..ffb22e619d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Fast_Print.inst.cfg @@ -12,11 +12,9 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 80 cool_min_speed = 6 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) + infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg index feebe6c54b..262e6583a2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_High_Quality.inst.cfg @@ -12,11 +12,9 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 50 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) + infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg index 2ab011d608..a11519fb05 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPEP_Normal_Quality.inst.cfg @@ -12,11 +12,8 @@ material = generic_cpe_plus variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 cool_fan_speed_max = 50 cool_min_speed = 7 -infill_line_width = =round(line_width * 0.35 / 0.35, 2) infill_overlap = 0 infill_wipe_dist = 0 jerk_enabled = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg index d1f0d4faf4..9a02eeede4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Draft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 @@ -33,7 +31,5 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width - jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg index 766829df65..01859d49a1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Fast_Print.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size + + material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 @@ -33,7 +33,7 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg index 24a6d8390b..c25a46ce20 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_High_Quality.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size + + material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 @@ -32,7 +32,7 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg index 80fbfa1a1d..321c369975 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_Nylon_Normal_Quality.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.4 adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 -infill_line_width = =round(line_width * 0.5 / 0.4, 2) -line_width = =machine_nozzle_size + + material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 material_standby_temperature = 100 @@ -32,7 +32,7 @@ speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -wall_line_width_x = =wall_line_width + jerk_travel = 50 raft_surface_speed = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg index fe2d64d58a..2fdc113b3c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Draft_Print.inst.cfg @@ -12,15 +12,12 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 90 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 6 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -59,5 +56,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg index 4e0a2d3e9a..9adceaa9cd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Fast_Print.inst.cfg @@ -12,15 +12,12 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 85 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 7 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 @@ -59,5 +56,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg index 5595008d1e..65364d955a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_High_Quality.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 8 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_overlap_mm = =0 if infill_sparse_density > 80 else 0.05 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' @@ -60,5 +58,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg index 235dd1d577..e6adcfaf22 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PC_Normal_Quality.inst.cfg @@ -12,15 +12,13 @@ material = generic_pc variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 -infill_line_width = =round(line_width * 0.4 / 0.35, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 @@ -58,5 +56,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =round(line_width * 0.4 / 0.35, 2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg index 3869313801..fcc7ce6278 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Draft_Print.inst.cfg @@ -29,7 +29,7 @@ top_bottom_thickness = 0.8 wall_thickness = 0.8 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + infill_sparse_density = 15 layer_height_0 = 0.2 acceleration_wall = 2000 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg index b90ace8ace..27df25d5d5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Print.inst.cfg @@ -27,6 +27,6 @@ top_bottom_thickness = 1 wall_thickness = 1 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg index 4928021740..9df48afa7b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_High_Quality.inst.cfg @@ -29,6 +29,6 @@ top_bottom_thickness = 1 wall_thickness = 1 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg index a06fd6ecca..b3d096ed71 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Quality.inst.cfg @@ -25,6 +25,6 @@ top_bottom_thickness = 1 wall_thickness = 1 jerk_travel = 50 -infill_line_width = =round(line_width * 0.42 / 0.35, 2) + layer_height_0 = 0.2 raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg index 1e5dfad31e..3acfe41222 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Draft_Print.inst.cfg @@ -12,20 +12,18 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -46,7 +44,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -58,5 +55,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg index abdbb57f1e..4f7e5c5860 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Fast_Print.inst.cfg @@ -12,20 +12,18 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -46,7 +44,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -60,5 +57,5 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1.1 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg index 099cdef747..b2b03b494d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PP_Normal_Quality.inst.cfg @@ -12,20 +12,18 @@ material = generic_pp variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 20 cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -46,7 +44,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 retraction_prime_speed = 18 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) @@ -60,5 +57,5 @@ switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 top_bottom_thickness = 1 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg index d5a69fd393..94be77a109 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -infill_line_width = =round(line_width * 0.45/0.35,2) jerk_print = 25 jerk_roofing = 1 layer_height_0 = 0.2 @@ -33,5 +32,5 @@ speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) top_bottom_thickness = 1.2 -wall_line_width_x = =round(line_width * 0.35/0.35,2) + wall_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg index b7df7b81b2..e66b376515 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Print.inst.cfg @@ -14,7 +14,6 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed -infill_line_width = =round(line_width * 1.285, 2) layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 @@ -27,5 +26,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 -wall_line_width_x = =round(line_width * 0.35/0.35,2) + wall_thickness = 1.23 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg index 3301bd2a52..cb9e545007 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_High_Quality.inst.cfg @@ -28,9 +28,4 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) top_bottom_thickness = 1.2 wall_thickness = 1.23 - layer_height_0 = 0.2 - -line_width = =round(machine_nozzle_size * 1.025, 3) -wall_line_width_x = =line_width -infill_line_width = =line_width diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg index ff21b4cc75..405fd35825 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Quality.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 -infill_line_width = =round(line_width * 1.285, 2) layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg index 664f651341..30eb73204b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Draft_Print.inst.cfg @@ -12,21 +12,19 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -46,7 +44,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -59,5 +56,5 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = 0.76 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg index 2edc53b7c4..b63ecbdad8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Fast_Print.inst.cfg @@ -12,21 +12,19 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -46,7 +44,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -59,6 +56,6 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = 0.76 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg index 7804a7cb74..ff25dd69a9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPU_Normal_Quality.inst.cfg @@ -12,21 +12,19 @@ material = generic_tpu variant = AA 0.4 [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 8.75 cool_fan_speed_max = 100 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 4 gradual_infill_step_height = =5 * layer_height -infill_line_width = =round(line_width * 0.38 / 0.38, 2) + infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 jerk_enabled = True jerk_print = 25 -line_width = =machine_nozzle_size * 0.95 + machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -45,7 +43,6 @@ retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 skin_line_width = =round(line_width / 0.8, 2) skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = =math.ceil(speed_print * 18 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 0.8) @@ -58,6 +55,6 @@ switch_extruder_retraction_speeds = 35 top_bottom_thickness = 0.7 travel_avoid_distance = 1.5 wall_0_inset = 0 -wall_line_width_x = =line_width + wall_thickness = 0.76 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg index 5a3b6978d6..01d7e53670 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Draft_Print.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.8 [values] -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg index 1734f808b1..96b7e79ad5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Superdraft_Print.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.8 [values] -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 25 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg index aa4997489a..d7a7a85eeb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_ABS_Verydraft_Print.inst.cfg @@ -12,7 +12,7 @@ material = generic_abs variant = AA 0.8 [values] -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 22 material_standby_temperature = 100 speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg index 77880f2e2a..36145680b5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Fast_Print.inst.cfg @@ -15,8 +15,7 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 @@ -34,6 +33,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg index 2e9ab45f9a..d31ca4ffbe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Superdraft_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 @@ -34,6 +34,5 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg index 801469f563..5770d4057c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPEP_Verydraft_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.9375 + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 @@ -34,6 +34,6 @@ speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.6 / 0.7, 2) + support_z_distance = =layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg index a917cfa5c5..f7dbe85c00 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Draft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 15 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg index 4d5d7a8f7c..07e19b9ca3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Superdraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 20 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg index 35ba606771..350c99833c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_CPE_Verydraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature + 17 material_standby_temperature = 100 prime_tower_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg index b9109fc19e..467eec435c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Draft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 @@ -28,7 +26,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg index 51108615c4..4d307200d4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Superdraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 @@ -28,7 +26,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg index ceae874f6a..de5699b976 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_Nylon_Verydraft_Print.inst.cfg @@ -15,8 +15,8 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -infill_before_walls = True -infill_line_width = =line_width + + machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_standby_temperature = 100 @@ -28,7 +28,6 @@ raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) raft_margin = 10 raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg index 12e7c5bb32..57d0f13aca 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Fast_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 + + material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 @@ -29,4 +29,4 @@ speed_slowdown_layers = 15 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg index de971b9bd5..1ee17fd498 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Superdraft_Print.inst.cfg @@ -15,8 +15,8 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 + + material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 raft_airgap = 0.5 @@ -28,4 +28,4 @@ speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg index eba73f4bae..be23988e50 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PC_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ is_experimental = True [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height -infill_before_walls = True -line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature material_standby_temperature = 100 @@ -29,4 +27,3 @@ speed_slowdown_layers = 10 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -support_line_width = =round(line_width * 0.6 / 0.7, 2) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg index 553ceeebc6..762b2ebca8 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Draft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 7 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True @@ -24,4 +24,3 @@ speed_wall = =math.ceil(speed_print * 30 / 40) jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 -infill_before_walls = true
\ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg index a4fb2106fd..855a5ae292 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Superdraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 7 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True @@ -25,4 +25,4 @@ speed_wall_0 = =math.ceil(speed_wall * 30 / 40) jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 -infill_before_walls = true + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg index 3f143f88bc..8b688debf0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PETG_Verydraft_Print.inst.cfg @@ -13,7 +13,7 @@ variant = AA 0.8 [values] brim_width = 7 -line_width = =machine_nozzle_size * 0.875 + material_print_temperature = =default_material_print_temperature - 5 material_standby_temperature = 100 prime_tower_enable = True @@ -24,4 +24,4 @@ speed_wall = =math.ceil(speed_print * 30 / 40) jerk_travel = 50 cool_fan_speed = 20 initial_layer_line_width_factor = 100 -infill_before_walls = true + diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg index a56d25544c..495f18dc4a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Draft_Print.inst.cfg @@ -16,8 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -25,13 +23,9 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x - retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg index f5ee003217..814c7a2b5e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Superdraft_Print.inst.cfg @@ -16,8 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -26,11 +24,8 @@ material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True raft_margin = 10 support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg index 89d05725e8..bf341d3bf0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PLA_Verydraft_Print.inst.cfg @@ -16,8 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -25,11 +23,8 @@ material_initial_print_temperature = =max(-273.15, material_print_temperature - material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x retract_at_layer_change = False speed_print = 45 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg index 64c94a74bd..2042e29518 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Draft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature - 2 @@ -33,17 +31,12 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg index f40280a355..f0b09c333d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Superdraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature = =default_material_print_temperature + 2 @@ -33,17 +31,12 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg index d2b380fc97..9cb6b43d70 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_PP_Verydraft_Print.inst.cfg @@ -16,8 +16,6 @@ brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 @@ -32,17 +30,12 @@ retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) - speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.8 / 0.8, 2) wall_thickness = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg index c9a856dde8..6f02b91def 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Draft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -32,9 +30,6 @@ speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) speed_wall_0 = =round(speed_print * 35 / 45) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 6 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x
\ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg index 00367c0b28..818e9130e5 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Superdraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,8 +32,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 25/ 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg index 88074eea54..b5d32d020c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPLA_Verydraft_Print.inst.cfg @@ -16,10 +16,8 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.75 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' layer_height_0 = 0.4 -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -35,9 +33,6 @@ speed_topbottom = =math.ceil(speed_print * 20 / 35) speed_wall = =math.ceil(speed_print * 25/ 35) speed_wall_0 = =math.ceil(speed_print * 20 / 35) support_angle = 70 -support_line_width = =line_width * 0.75 support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.75 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg index c7ccc9a2a0..d89919328e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Draft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -36,24 +34,18 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 25 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg index 3d3bc26a5b..a400721d90 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Superdraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 machine_nozzle_cool_down_speed = 0.5 @@ -37,24 +35,18 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg index f6979ef1c7..19842185fe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_TPU_Verydraft_Print.inst.cfg @@ -15,8 +15,6 @@ variant = AA 0.8 brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 top_skin_expand_distance = =line_width * 2 -infill_before_walls = True -infill_line_width = =round(line_width * 0.7 / 0.8, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 machine_nozzle_cool_down_speed = 0.5 @@ -36,24 +34,18 @@ retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 -skin_line_width = =round(line_width * 0.78 / 0.8, 2) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 23 / 30) - speed_wall = =math.ceil(speed_print * 30 / 30) speed_wall_x = =math.ceil(speed_wall * 30 / 30) support_angle = 50 support_bottom_distance = =support_z_distance -support_line_width = =round(line_width * 0.7 / 0.8, 2) support_offset = =line_width switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 travel_avoid_distance = 1.5 -travel_compensate_overlapping_walls_0_enabled = False wall_0_wipe_dist = =line_width * 2 -wall_line_width_x = =round(line_width * 0.6 / 0.8, 2) wall_thickness = 1.3 - jerk_travel = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg index 049fc9c94b..d685b0686e 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg index 9d83f4a959..1d096fdfd2 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFCPE_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg index 7df168e3d2..e55f7b8e62 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg index 3b740c7e74..2aac3f8e40 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_CFFPA_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg index ad819a0251..b84b684382 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg index e6cb3461b6..3244681911 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFCPE_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg index 1b885a0884..6002ab3ac8 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Draft_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg index 7409b2e9d5..eb9a93ef15 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_GFFPA_Fast_Print.inst.cfg @@ -17,9 +17,9 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size + material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +28,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg index 82cfff1037..a9cef5ca36 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg index 0491fd7613..e8a37bb6fc 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_PLA_Fast_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg index 5877bc2929..df034335ef 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,8 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +27,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg index 6d87f91b8a..299ba1eb95 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_CFFPA_Draft_Print.inst.cfg @@ -17,9 +17,8 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +27,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg index b8fa2d70d3..d4a52ed87e 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFCPE_Draft_Print.inst.cfg @@ -17,9 +17,8 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width + initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +27,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg index 87a3c4e2e6..2e7f7b3eb7 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_GFFPA_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 -infill_line_width = =line_width initial_layer_line_width_factor = 130.0 -line_width = =machine_nozzle_size * (0.58/0.6) material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature @@ -28,4 +26,4 @@ skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 -wall_line_width_x = =line_width + diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg index be522d3908..9052dfee7d 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Draft_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg index b2201a159e..fd41d88a76 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_PLA_Fast_Print.inst.cfg @@ -17,9 +17,7 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 cool_min_speed = 2 gradual_infill_step_height = =3 * layer_height -infill_line_width = =round(line_width * 0.65 / 0.75, 2) infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -line_width = =machine_nozzle_size * 0.9375 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) @@ -34,10 +32,7 @@ speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) support_angle = 70 -support_line_width = =line_width * 0.75 support_pattern = ='triangles' support_xy_distance = =wall_line_width_0 * 1.5 top_bottom_thickness = =layer_height * 4 -wall_line_width = =round(line_width * 0.75 / 0.75, 2) -wall_line_width_x = =round(wall_line_width * 0.625 / 0.75, 2) wall_thickness = =wall_line_width_0 + wall_line_width_x diff --git a/resources/quality/volumic/sh65_coarse.inst.cfg b/resources/quality/volumic/sh65_coarse.inst.cfg new file mode 100644 index 0000000000..fce43507b7 --- /dev/null +++ b/resources/quality/volumic/sh65_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Low
+definition = sh65
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = coarse
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.250
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/sh65_draft.inst.cfg b/resources/quality/volumic/sh65_draft.inst.cfg new file mode 100644 index 0000000000..b1b84cbefa --- /dev/null +++ b/resources/quality/volumic/sh65_draft.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Standard
+definition = sh65
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = draft
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.2
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/sh65_extra_coarse.inst.cfg b/resources/quality/volumic/sh65_extra_coarse.inst.cfg new file mode 100644 index 0000000000..bcb19d612f --- /dev/null +++ b/resources/quality/volumic/sh65_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Very low
+definition = sh65
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = extra coarse
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.3
+top_bottom_thickness = 1.1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/sh65_fast.inst.cfg b/resources/quality/volumic/sh65_fast.inst.cfg new file mode 100644 index 0000000000..01bf626ad8 --- /dev/null +++ b/resources/quality/volumic/sh65_fast.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Medium
+definition = sh65
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = fast
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.15
+top_bottom_thickness = 1.05
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/sh65_high.inst.cfg b/resources/quality/volumic/sh65_high.inst.cfg new file mode 100644 index 0000000000..549cfb69a7 --- /dev/null +++ b/resources/quality/volumic/sh65_high.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Very high
+definition = sh65
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = high
+weight = -5
+global_quality = True
+
+[values]
+layer_height = 0.05
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/sh65_normal.inst.cfg b/resources/quality/volumic/sh65_normal.inst.cfg new file mode 100644 index 0000000000..5f60e22c9b --- /dev/null +++ b/resources/quality/volumic/sh65_normal.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = High
+definition = sh65
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = normal
+weight = -4
+global_quality = True
+
+[values]
+layer_height = 0.1
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30mk3_coarse.inst.cfg b/resources/quality/volumic/stream30mk3_coarse.inst.cfg new file mode 100644 index 0000000000..6ce36779bd --- /dev/null +++ b/resources/quality/volumic/stream30mk3_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Low
+definition = stream30mk3
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = coarse
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.250
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30mk3_draft.inst.cfg b/resources/quality/volumic/stream30mk3_draft.inst.cfg new file mode 100644 index 0000000000..67ae9158a3 --- /dev/null +++ b/resources/quality/volumic/stream30mk3_draft.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Standard
+definition = stream30mk3
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = draft
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.2
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30mk3_extra_coarse.inst.cfg b/resources/quality/volumic/stream30mk3_extra_coarse.inst.cfg new file mode 100644 index 0000000000..8f8d8ce76f --- /dev/null +++ b/resources/quality/volumic/stream30mk3_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Very low
+definition = stream30mk3
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = extra coarse
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.3
+top_bottom_thickness = 1.1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30mk3_fast.inst.cfg b/resources/quality/volumic/stream30mk3_fast.inst.cfg new file mode 100644 index 0000000000..48e8e9be5e --- /dev/null +++ b/resources/quality/volumic/stream30mk3_fast.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Medium
+definition = stream30mk3
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = fast
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.15
+top_bottom_thickness = 1.05
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30mk3_high.inst.cfg b/resources/quality/volumic/stream30mk3_high.inst.cfg new file mode 100644 index 0000000000..0520548d1d --- /dev/null +++ b/resources/quality/volumic/stream30mk3_high.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Very high
+definition = stream30mk3
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = high
+weight = -5
+global_quality = True
+
+[values]
+layer_height = 0.05
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30mk3_normal.inst.cfg b/resources/quality/volumic/stream30mk3_normal.inst.cfg new file mode 100644 index 0000000000..cb1a89bf3f --- /dev/null +++ b/resources/quality/volumic/stream30mk3_normal.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = High
+definition = stream30mk3
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = normal
+weight = -4
+global_quality = True
+
+[values]
+layer_height = 0.1
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc2_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc2_coarse.inst.cfg new file mode 100644 index 0000000000..caf13670bb --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc2_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Low
+definition = stream30ultrasc2
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = coarse
+weight = -1
+global_quality = True
+
+[values]
+layer_height = 0.250
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc2_draft.inst.cfg b/resources/quality/volumic/stream30ultrasc2_draft.inst.cfg new file mode 100644 index 0000000000..0f830c37e3 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc2_draft.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Standard
+definition = stream30ultrasc2
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = draft
+weight = -2
+global_quality = True
+
+[values]
+layer_height = 0.2
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc2_extra_coarse.inst.cfg b/resources/quality/volumic/stream30ultrasc2_extra_coarse.inst.cfg new file mode 100644 index 0000000000..2768dd8154 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc2_extra_coarse.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Very low
+definition = stream30ultrasc2
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = extra coarse
+weight = 0
+global_quality = True
+
+[values]
+layer_height = 0.3
+top_bottom_thickness = 1.1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc2_fast.inst.cfg b/resources/quality/volumic/stream30ultrasc2_fast.inst.cfg new file mode 100644 index 0000000000..a0509980ba --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc2_fast.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Medium
+definition = stream30ultrasc2
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = fast
+weight = -3
+global_quality = True
+
+[values]
+layer_height = 0.15
+top_bottom_thickness = 1.05
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc2_high.inst.cfg b/resources/quality/volumic/stream30ultrasc2_high.inst.cfg new file mode 100644 index 0000000000..6716a4edd0 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc2_high.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = Very high
+definition = stream30ultrasc2
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = high
+weight = -5
+global_quality = True
+
+[values]
+layer_height = 0.05
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/quality/volumic/stream30ultrasc2_normal.inst.cfg b/resources/quality/volumic/stream30ultrasc2_normal.inst.cfg new file mode 100644 index 0000000000..1e40ec60b4 --- /dev/null +++ b/resources/quality/volumic/stream30ultrasc2_normal.inst.cfg @@ -0,0 +1,26 @@ +[general]
+version = 4
+name = High
+definition = stream30ultrasc2
+
+[metadata]
+setting_version = 19
+type = quality
+quality_type = normal
+weight = -4
+global_quality = True
+
+[values]
+layer_height = 0.1
+top_bottom_thickness = 1
+wall_thickness = 1.2
+line_width = 0.4
+travel_avoid_distance = 1
+speed_infill = 100
+speed_layer_0 = 40
+speed_print = 100
+speed_topbottom = 80
+speed_travel = 140
+speed_wall = 40
+speed_wall_0 = 40
+speed_wall_x = 60
\ No newline at end of file diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index f4acaca9a0..768dad20a5 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -23,7 +23,6 @@ wall_x_extruder_nr wall_thickness wall_line_count optimize_wall_printing_order -fill_perimeter_gaps xy_offset [top_bottom] diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index ba986c8263..7882dfda15 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -31,12 +31,8 @@ wall_line_count wall_0_wipe_dist wall_0_inset optimize_wall_printing_order -outer_inset_first +inset_direction alternate_extra_perimeter -travel_compensate_overlapping_walls_enabled -travel_compensate_overlapping_walls_0_enabled -travel_compensate_overlapping_walls_x_enabled -fill_perimeter_gaps filter_out_tiny_gaps fill_outline_gaps xy_offset @@ -137,6 +133,7 @@ support_bottom_material_flow prime_tower_flow material_flow_layer_0 material_standby_temperature +material_alternate_walls [speed] speed_print @@ -156,8 +153,7 @@ speed_print_layer_0 speed_travel_layer_0 skirt_brim_speed speed_slowdown_layers -speed_equalize_flow_enabled -speed_equalize_flow_max +speed_equalize_flow_width_factor acceleration_enabled acceleration_print acceleration_infill @@ -317,6 +313,7 @@ raft_speed raft_acceleration raft_jerk raft_fan_speed +raft_is_shrink_plate [dual] prime_tower_enable @@ -338,6 +335,7 @@ meshfix_keep_open_polygons meshfix_maximum_resolution meshfix_maximum_travel_resolution meshfix_maximum_deviation +meshfix_maximum_extrusion_area_deviation multiple_mesh_overlap carve_multiple_volumes alternate_carve_order diff --git a/resources/variants/creality_cr100_0.4.inst.cfg b/resources/variants/creality_cr100_0.4.inst.cfg new file mode 100644 index 0000000000..ee6fc88135 --- /dev/null +++ b/resources/variants/creality_cr100_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = creality_cr100 + +[metadata] +setting_version = 19 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_sermoond1_0.2.inst.cfg b/resources/variants/creality_sermoond1_0.2.inst.cfg new file mode 100644 index 0000000000..63ca5626b7 --- /dev/null +++ b/resources/variants/creality_sermoond1_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general]
+name = 0.2mm Nozzle
+version = 4
+definition = creality_sermoond1
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.2
diff --git a/resources/variants/creality_sermoond1_0.3.inst.cfg b/resources/variants/creality_sermoond1_0.3.inst.cfg new file mode 100644 index 0000000000..0948db45c0 --- /dev/null +++ b/resources/variants/creality_sermoond1_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general]
+name = 0.3mm Nozzle
+version = 4
+definition = creality_sermoond1
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.3
diff --git a/resources/variants/creality_sermoond1_0.4.inst.cfg b/resources/variants/creality_sermoond1_0.4.inst.cfg new file mode 100644 index 0000000000..033e3ce06a --- /dev/null +++ b/resources/variants/creality_sermoond1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general]
+name = 0.4mm Nozzle
+version = 4
+definition = creality_sermoond1
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.4
diff --git a/resources/variants/creality_sermoond1_0.5.inst.cfg b/resources/variants/creality_sermoond1_0.5.inst.cfg new file mode 100644 index 0000000000..c542f814cf --- /dev/null +++ b/resources/variants/creality_sermoond1_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general]
+name = 0.5mm Nozzle
+version = 4
+definition = creality_sermoond1
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.5
diff --git a/resources/variants/creality_sermoond1_0.6.inst.cfg b/resources/variants/creality_sermoond1_0.6.inst.cfg new file mode 100644 index 0000000000..d1964a8ee3 --- /dev/null +++ b/resources/variants/creality_sermoond1_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general]
+name = 0.6mm Nozzle
+version = 4
+definition = creality_sermoond1
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.6
diff --git a/resources/variants/creality_sermoond1_0.8.inst.cfg b/resources/variants/creality_sermoond1_0.8.inst.cfg new file mode 100644 index 0000000000..a50d2d7c2f --- /dev/null +++ b/resources/variants/creality_sermoond1_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general]
+name = 0.8mm Nozzle
+version = 4
+definition = creality_sermoond1
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 0.8
diff --git a/resources/variants/creality_sermoond1_1.0.inst.cfg b/resources/variants/creality_sermoond1_1.0.inst.cfg new file mode 100644 index 0000000000..0e8a7b5137 --- /dev/null +++ b/resources/variants/creality_sermoond1_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general]
+name = 1.0mm Nozzle
+version = 4
+definition = creality_sermoond1
+
+[metadata]
+setting_version = 19
+type = variant
+hardware_type = nozzle
+
+[values]
+machine_nozzle_size = 1.0
diff --git a/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg index 6be85523f1..6be85523f1 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20_vfbe080.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg index bc0e4a290c..bc0e4a290c 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg index 5793a34bb9..5793a34bb9 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg index 945b30da4a..945b30da4a 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_dbe060.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg index 520aa6eb0a..520aa6eb0a 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20dual_vdbe080.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg index 9f25059f8b..9f25059f8b 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg index 385fda1bbf..385fda1bbf 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg index a4d7e0ce0f..a4d7e0ce0f 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc20flux_fbe060.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg index e5218a20cc..e5218a20cc 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg index c6e7356844..c6e7356844 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg index b84f88d92e..b84f88d92e 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_fbe060.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg index e615659329..e615659329 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21_vfbe080.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg index c8ac27f1a1..c8ac27f1a1 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg index 872fd2771b..872fd2771b 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg index a81144e0f5..a81144e0f5 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_dbe060.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg index 21d3210801..21d3210801 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21dual_vdbe080.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg index e491021443..e491021443 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg index 8395b02434..8395b02434 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg index bb5f0e409d..bb5f0e409d 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc21flux_fbe060.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg index 6294afff45..6294afff45 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg index d3e86cab6a..d3e86cab6a 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg index 4715e2b3a0..4715e2b3a0 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_fbe060.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg index bb605c637a..bb605c637a 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30_vfbe080.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg index c07b2bad30..c07b2bad30 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg index 7b33bbf49a..7b33bbf49a 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg index 71c4d59869..71c4d59869 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_dbe060.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg index d26ce6684d..d26ce6684d 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30dual_vdbe080.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg index aaae9664fc..aaae9664fc 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe025.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg index ec9d8ec376..ec9d8ec376 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe040.inst.cfg diff --git a/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg index 78d7d505a7..78d7d505a7 100644..100755 --- a/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg +++ b/resources/variants/deltacomb/deltacomb_dc30flux_fbe060.inst.cfg diff --git a/resources/variants/liquid_vo08.inst.cfg b/resources/variants/liquid_vo08.inst.cfg index b6e1c58c51..7a84aad82c 100644 --- a/resources/variants/liquid_vo08.inst.cfg +++ b/resources/variants/liquid_vo08.inst.cfg @@ -47,7 +47,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = 20 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index afc5d2c90d..e510bac6a8 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -10,9 +10,7 @@ hardware_type = nozzle [values] brim_width = 7 -infill_line_width = 0.23 layer_height_0 = 0.17 -line_width = 0.23 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = AA 0.25 @@ -46,6 +44,5 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 -wall_line_width_x = 0.23 wall_thickness = 1.3 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index 41f3694323..abe079eeb5 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -9,22 +9,17 @@ type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 7 cool_fan_speed = 7 cool_fan_speed_max = 100 cool_min_speed = 5 default_material_print_temperature = 200 -infill_before_walls = False -infill_line_width = =round(line_width * 0.6 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 layer_height = 0.2 -line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -45,7 +40,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = 20 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) @@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 2 diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index 42a547f821..af5daf9f11 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -10,9 +10,8 @@ hardware_type = nozzle [values] acceleration_enabled = True -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) -acceleration_print = 4000 -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) brim_width = 3 @@ -20,15 +19,14 @@ cool_fan_speed = 50 cool_min_speed = 5 gradual_support_infill_step_height = 1.6 gradual_support_infill_steps = 2 -infill_line_width = =round(line_width * 0.8 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) +jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20) +jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20) +jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 @@ -76,7 +74,6 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 1.5 support_pattern = triangles support_use_towers = False @@ -87,6 +84,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 1 diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 76156b5e1e..89c5430af5 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -9,8 +9,8 @@ type = variant hardware_type = nozzle [values] -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) cool_fan_speed_max = =cool_fan_speed @@ -43,7 +43,6 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 3 support_xy_distance = =round(wall_line_width_0 * 0.75, 2) support_xy_distance_overhang = =wall_line_width_0 / 2 diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index 0be8f5b740..c26249a17b 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -10,9 +10,7 @@ hardware_type = nozzle [values] brim_width = 7 -infill_line_width = 0.23 layer_height_0 = 0.17 -line_width = 0.23 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = AA 0.25 @@ -46,6 +44,5 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 -wall_line_width_x = 0.23 wall_thickness = 1.3 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset
\ No newline at end of file diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index 1681abd5ef..0f603036b8 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -9,22 +9,17 @@ type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 7 cool_fan_speed = 7 cool_fan_speed_max = 100 cool_min_speed = 5 default_material_print_temperature = 200 -infill_before_walls = False -infill_line_width = =round(line_width * 0.6 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 layer_height = 0.2 -line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -45,7 +40,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = 20 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) @@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 2 diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 9f124467ee..b73d5c2bc7 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -10,9 +10,8 @@ hardware_type = nozzle [values] acceleration_enabled = True -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) -acceleration_print = 4000 -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) brim_width = 3 @@ -20,15 +19,14 @@ cool_fan_speed = 50 cool_min_speed = 5 gradual_support_infill_step_height = 1.6 gradual_support_infill_steps = 2 -infill_line_width = =round(line_width * 0.8 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) +jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20) +jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20) +jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 @@ -76,7 +74,6 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 1.5 support_pattern = triangles support_use_towers = False @@ -87,6 +84,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 1 diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index df9a1aa062..79a7441256 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -9,8 +9,8 @@ type = variant hardware_type = nozzle [values] -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) cool_fan_speed_max = =cool_fan_speed @@ -43,7 +43,6 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 3 support_xy_distance = =round(wall_line_width_0 * 0.75, 2) support_xy_distance_overhang = =wall_line_width_0 / 2 diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg index 7ed8d6b6b0..9b0714b7bb 100644 --- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg @@ -10,9 +10,7 @@ hardware_type = nozzle [values] brim_width = 7 -infill_line_width = 0.23 layer_height_0 = 0.17 -line_width = 0.23 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = AA 0.25 @@ -46,5 +44,4 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 -wall_line_width_x = 0.23 wall_thickness = 1.3 diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index a2796d4a1b..5b19f224b4 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -9,22 +9,17 @@ type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 7 cool_fan_speed = 7 cool_fan_speed_max = 100 cool_min_speed = 5 default_material_print_temperature = 200 -infill_before_walls = False -infill_line_width = =round(line_width * 0.6 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 layer_height = 0.2 -line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -45,7 +40,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = 20 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) @@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 2 diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index f503cd7499..2affa6d01b 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -9,26 +9,23 @@ type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) brim_width = 3 cool_fan_speed = 50 cool_min_speed = 5 gradual_support_infill_step_height = 1.6 gradual_support_infill_steps = 2 -infill_line_width = =round(line_width * 0.8 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -jerk_support_interface = =math.ceil(jerk_support * 10 / 15) -jerk_support_bottom = =math.ceil(jerk_support_interface * 1 / 10) +jerk_support = =max(math.ceil(jerk_print * 15 / 25), 20) +jerk_support_interface = =max(math.ceil(jerk_support * 10 / 15), 20) +jerk_support_bottom = =max(math.ceil(jerk_support_interface * 1 / 10), 20) layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_heat_up_speed = 1.5 @@ -76,7 +73,6 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 1.5 support_pattern = triangles support_use_towers = False @@ -87,6 +83,4 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 1 diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index a2b8eb1b7e..cd33dbfe1b 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -9,10 +9,10 @@ type = variant hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 jerk_support = =math.ceil(jerk_print * 15 / 25) @@ -43,7 +43,6 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 3 support_xy_distance = =round(wall_line_width_0 * 0.75, 2) support_xy_distance_overhang = =wall_line_width_0 / 2 diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 51a49e3f04..91f05ac857 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -10,9 +10,7 @@ hardware_type = nozzle [values] brim_width = 7 -infill_line_width = 0.23 layer_height_0 = 0.17 -line_width = 0.23 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = AA 0.25 @@ -46,6 +44,5 @@ support_z_distance = =layer_height * 2 switch_extruder_prime_speed = =switch_extruder_retraction_speeds switch_extruder_retraction_amount = =machine_heat_zone_length top_bottom_thickness = 1.2 -wall_line_width_x = 0.23 wall_thickness = 1.3 xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index a3b0e653c7..c36d96066d 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -9,22 +9,17 @@ type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 brim_width = 7 cool_fan_speed = 7 cool_fan_speed_max = 100 cool_min_speed = 5 default_material_print_temperature = 200 -infill_before_walls = False -infill_line_width = =round(line_width * 0.6 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 jerk_enabled = True jerk_print = 25 layer_height = 0.2 -line_width = =machine_nozzle_size machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -45,7 +40,6 @@ retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = =line_width * 2 skin_overlap = 5 -speed_equalize_flow_enabled = True speed_layer_0 = 20 speed_print = 35 speed_topbottom = =math.ceil(speed_print * 25 / 35) @@ -59,6 +53,4 @@ switch_extruder_prime_speed = 20 switch_extruder_retraction_amount = 16.5 top_bottom_thickness = 1.4 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 2 diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index d778da8c84..89aadaae54 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -9,18 +9,15 @@ type = variant hardware_type = nozzle [values] -acceleration_enabled = True -acceleration_print = 4000 -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) brim_width = 3 cool_fan_speed = 50 cool_min_speed = 5 gradual_support_infill_step_height = 1.6 gradual_support_infill_steps = 2 -infill_line_width = =round(line_width * 0.8 / 0.7, 2) infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 @@ -76,17 +73,14 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 1.5 support_pattern = triangles support_use_towers = False -support_xy_distance = =round(wall_line_width_0 * 0.75, 2) +support_xy_distance = =wall_line_width_0 support_xy_distance_overhang = =wall_line_width_0 / 4 support_z_distance = 0 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 12 top_bottom_thickness = 1 wall_0_inset = 0 -wall_line_width_0 = =wall_line_width -wall_line_width_x = =wall_line_width wall_thickness = 1 diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 380e634c93..3a4d937620 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -9,10 +9,10 @@ type = variant hardware_type = nozzle [values] -acceleration_support = =math.ceil(acceleration_print * 2000 / 4000) +acceleration_support = =math.ceil(acceleration_print * 2000 / 3500) acceleration_support_interface = =math.ceil(acceleration_support * 1500 / 2000) acceleration_support_bottom = =math.ceil(acceleration_support_interface * 100 / 1500) -acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 4000) +acceleration_prime_tower = =math.ceil(acceleration_print * 200 / 3500) cool_fan_speed_max = =cool_fan_speed gradual_support_infill_steps = 2 jerk_support = =math.ceil(jerk_print * 15 / 25) @@ -43,7 +43,6 @@ support_interface_enable = True support_interface_height = 0.6 support_interface_skip_height = =layer_height support_join_distance = 3 -support_line_width = =round(line_width * 0.4 / 0.35, 2) support_offset = 3 support_xy_distance = =round(wall_line_width_0 * 0.75, 2) support_xy_distance_overhang = =wall_line_width_0 / 2 diff --git a/tests/TestBuildVolume.py b/tests/TestBuildVolume.py index 293b8e0270..f59d83df5e 100644 --- a/tests/TestBuildVolume.py +++ b/tests/TestBuildVolume.py @@ -57,7 +57,10 @@ class TestCalculateBedAdhesionSize: "machine_depth": {"value": 200}, "skirt_line_count": {"value": 0}, "skirt_gap": {"value": 0}, - "raft_margin": {"value": 0} + "raft_margin": {"value": 0}, + "material_shrinkage_percentage": {"value": 100.0}, + "material_shrinkage_percentage_xy": {"value": 100.0}, + "material_shrinkage_percentage_z": {"value": 100.0}, } def getPropertySideEffect(*args, **kwargs): @@ -109,6 +112,9 @@ class TestComputeDisallowedAreasStatic: setting_property_dict = {"machine_disallowed_areas": {"value": [[[-200, 112.5], [ -82, 112.5], [ -84, 102.5], [-115, 102.5]]]}, "machine_width": {"value": 200}, "machine_depth": {"value": 200}, + "material_shrinkage_percentage": {"value": 100.0}, + "material_shrinkage_percentage_xy": {"value": 100.0}, + "material_shrinkage_percentage_z": {"value": 100.0}, } def getPropertySideEffect(*args, **kwargs): @@ -157,7 +163,11 @@ class TestUpdateRaftThickness: "raft_surface_thickness": {"value": 1}, "raft_airgap": {"value": 1}, "layer_0_z_overlap": {"value": 1}, - "adhesion_type": {"value": "raft"}} + "adhesion_type": {"value": "raft"}, + "material_shrinkage_percentage": {"value": 100.0}, + "material_shrinkage_percentage_xy": {"value": 100.0}, + "material_shrinkage_percentage_z": {"value": 100.0}, + } def getPropertySideEffect(*args, **kwargs): properties = TestUpdateRaftThickness.setting_property_dict.get(args[1]) @@ -208,6 +218,9 @@ class TestComputeDisallowedAreasPrimeBlob: "extruder_prime_pos_x": {"value": 25}, "extruder_prime_pos_y": {"value": 50}, "machine_center_is_zero": {"value": True}, + "material_shrinkage_percentage": {"value": 100.0}, + "material_shrinkage_percentage_xy": {"value": 100.0}, + "material_shrinkage_percentage_z": {"value": 100.0}, } def getPropertySideEffect(*args, **kwargs): @@ -248,7 +261,11 @@ class TestComputeDisallowedAreasPrimeBlob: class TestCalculateExtraZClearance: setting_property_dict = {"retraction_hop": {"value": 12}, - "retraction_hop_enabled": {"value": True}} + "retraction_hop_enabled": {"value": True}, + "material_shrinkage_percentage": {"value": 100.0}, + "material_shrinkage_percentage_xy": {"value": 100.0}, + "material_shrinkage_percentage_z": {"value": 100.0}, + } def getPropertySideEffect(*args, **kwargs): properties = TestCalculateExtraZClearance.setting_property_dict.get(args[1]) @@ -285,6 +302,16 @@ class TestCalculateExtraZClearance: class TestRebuild: + setting_property_dict = { + "material_shrinkage_percentage": {"value": 100.0}, + "material_shrinkage_percentage_xy": {"value": 100.0}, + "material_shrinkage_percentage_z": {"value": 100.0}, + } + def getPropertySideEffect(*args, **kwargs): + properties = TestCalculateExtraZClearance.setting_property_dict.get(args[1]) + if properties: + return properties.get(args[2]) + def test_zeroWidthHeightDepth(self, build_volume: BuildVolume): build_volume.rebuild() assert build_volume.getMeshData() is None @@ -311,6 +338,7 @@ class TestRebuild: build_volume.setDepth(10) mocked_global_stack = MagicMock() + mocked_global_stack.getProperty = MagicMock(side_effect=self.getPropertySideEffect) build_volume._global_container_stack = mocked_global_stack build_volume.getEdgeDisallowedSize = MagicMock(return_value = 0) build_volume.updateNodeBoundaryCheck = MagicMock() @@ -328,7 +356,11 @@ class TestUpdateMachineSizeProperties: setting_property_dict = {"machine_width": {"value": 50}, "machine_depth": {"value": 100}, "machine_height": {"value": 200}, - "machine_shape": {"value": "DERP!"}} + "machine_shape": {"value": "DERP!"}, + "material_shrinkage_percentage": {"value": 100.0}, + "material_shrinkage_percentage_xy": {"value": 100.0}, + "material_shrinkage_percentage_z": {"value": 100.0}, + } def getPropertySideEffect(*args, **kwargs): properties = TestUpdateMachineSizeProperties.setting_property_dict.get(args[1]) |
