diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index ddadfe1781..3ee67835f0 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -53,9 +53,18 @@ jobs: steps: - name: Checkout repo uses: actions/checkout@v3 + if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} with: - ref: ${{ github.head_ref }} fetch-depth: 0 + ref: ${{ github.head_ref }} + + - name: Checkout repo PR + uses: actions/checkout@v3 + if: ${{ github.event.pull_request.head.repo.full_name != github.repository }} + with: + fetch-depth: 0 + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} - name: Setup Python and pip uses: actions/setup-python@v4 @@ -106,13 +115,15 @@ jobs: else: channel = repo.active_branch.name.split("_")[0].replace("-", "_").lower() - if event_name == "pull_request": + if "pull_request" in event_name: channel = f"pr_{issue_number}" # %% Get the actual version latest_branch_version = tools.Version("0.0.0") latest_branch_tag = None for tag in repo.git.tag(merged = True).splitlines(): + if str(tag).startswith("firmware") or str(tag).startswith("master"): + continue # Quick-fix for the versioning scheme name of the embedded team in fdm_materials(_private) repo try: version = tools.Version(tag) except ConanException: @@ -121,36 +132,46 @@ jobs: latest_branch_version = version latest_branch_tag = repo.tag(tag) - # %% Get the actual version - no_commits = 0 - for commit in repo.iter_commits("HEAD"): - if commit == latest_branch_tag.commit: - break - no_commits += 1 - - if no_commits == 0: - # This is a release - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}" - if channel == "stable": - user = "_" - channel = "_" - else: - if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: - # The prerealese did not contain a version number, default it to 1 - latest_branch_version.prerelease += ".1" - if event_name == "pull_request": - actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" + if latest_branch_tag: + # %% Get the actual version + no_commits = 0 + for commit in repo.iter_commits("HEAD"): + if commit == latest_branch_tag.commit: + break + no_commits += 1 + + if no_commits == 0: + # This is a release + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}" + if channel == "stable": + user = "_" + channel = "_" else: - if channel in ("stable", "_", ""): - channel_metadata = f"{no_commits}" - else: + latest_branch_version_prerelease = latest_branch_version.prerelease + if latest_branch_version.prerelease and not "." in latest_branch_version.prerelease: + # The prerealese did not contain a version number, default it to 1 + latest_branch_version_prerelease = f"{latest_branch_version.prerelease}.1" + if event_name == "pull_request": + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version_prerelease.lower()}+{buildmetadata}pr_{issue_number}_{no_commits}" channel_metadata = f"{channel}_{no_commits}" - # FIXME: for when we create a new release branch + else: + if channel in ("stable", "_", ""): + channel_metadata = f"{no_commits}" + else: + channel_metadata = f"{channel}_{no_commits}" if latest_branch_version.prerelease == "": - bump_up_minor = int(latest_branch_version.minor) + 1 - actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{latest_branch_version.patch}-alpha+{buildmetadata}{channel_metadata}" + if is_release_branch: + bump_up_patch = int(latest_branch_version.patch) + 1 + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{bump_up_patch}-alpha+{buildmetadata}{channel_metadata}" + else: + bump_up_minor = int(latest_branch_version.minor) + 1 + reset_patch = 0 + actual_version = f"{latest_branch_version.major}.{bump_up_minor}.{reset_patch}-alpha+{buildmetadata}{channel_metadata}" else: actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{buildmetadata}{channel_metadata}" + else: + # FIXME: for external PR's + actual_version = f"5.2.0-alpha+{buildmetadata}pr_{issue_number}" # %% print to output cmd_name = ["echo", f"::set-output name=name::{project_name}"] diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt index fcc1379cfa..bd19974dd9 100644 --- a/.github/workflows/requirements-conan-package.txt +++ b/.github/workflows/requirements-conan-package.txt @@ -1,2 +1,2 @@ -conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3 +conan!=1.51.0,!=1.51.1,!=1.51.2,!=1.51.3,!=1.52.0 sip diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 20ea83bdb1..eb2edc09d8 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -103,7 +103,18 @@ jobs: - name: Install Linux system requirements if: ${{ runner.os == 'Linux' }} - run: sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y + run: | + sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y + sudo apt update + sudo apt upgrade + sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev pkg-config -y + + - name: Install GCC-12 on ubuntu-22.04 + if: ${{ startsWith(inputs.runs_on, 'ubuntu-22.04') }} + run: | + sudo apt install g++-12 gcc-12 -y + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-12 12 - name: Get Conan configuration run: conan config install https://github.com/Ultimaker/conan-config.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d6e3c709b..61c6d1cf41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,8 @@ # Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. +# NOTE: This is only being used for translation scripts. + # For MSVC flags, will be ignored on non-Windows OS's and this project in general. Only needed for cura-build-environment. cmake_policy(SET CMP0091 NEW) project(cura) @@ -13,47 +15,8 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) set(URANIUM_DIR "${CMAKE_SOURCE_DIR}/../Uranium" CACHE PATH "The location of the Uranium repository") set(URANIUM_SCRIPTS_DIR "${URANIUM_DIR}/scripts" CACHE PATH "The location of the scripts directory of the Uranium repository") -option(CURA_DEBUGMODE "Enable debug dialog and other debug features" OFF) -if(CURA_DEBUGMODE) - set(_cura_debugmode "ON") -endif() - option(GENERATE_TRANSLATIONS "Should the translations be generated?" ON) -set(CURA_APP_NAME "cura" CACHE STRING "Short name of Cura, used for configuration folder") -set(CURA_APP_DISPLAY_NAME "Ultimaker Cura" CACHE STRING "Display name of Cura") -set(CURA_VERSION "master" CACHE STRING "Version name of Cura") -set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'") -set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root") -set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version") -set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version") -set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location") -set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location") - -configure_file(${CMAKE_SOURCE_DIR}/com.ultimaker.cura.desktop.in ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop @ONLY) - -configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY) - -if(NOT DEFINED Python_VERSION) - set(Python_VERSION - 3.10 - CACHE STRING "Python Version" FORCE) - message(STATUS "Setting Python version to ${Python_VERSION}. Set Python_VERSION if you want to compile against an other version.") -endif() -if(APPLE) - set(Python_FIND_FRAMEWORK NEVER) -endif() -find_package(Python ${Python_VERSION} EXACT REQUIRED COMPONENTS Interpreter) -message(STATUS "Linking and building ${project_name} against Python ${Python_VERSION}") -if(NOT DEFINED Python_SITELIB_LOCAL) - set(Python_SITELIB_LOCAL - "${Python_SITELIB}" - CACHE PATH "Local alternative site-package location to install Cura" FORCE) -endif() - -# Tests -include(CuraTests) - if(NOT ${URANIUM_DIR} STREQUAL "") set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${URANIUM_DIR}/cmake") endif() @@ -66,24 +29,4 @@ if(NOT ${URANIUM_SCRIPTS_DIR} STREQUAL "") if(${GENERATE_TRANSLATIONS}) CREATE_TRANSLATION_TARGETS() endif() -endif() - -install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura) - -include(CuraPluginInstall) - -install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -install(DIRECTORY cura DESTINATION "${Python_SITELIB_LOCAL}") -install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION "${Python_SITELIB_LOCAL}/cura/") -if(NOT APPLE AND NOT WIN32) - install(FILES ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop - DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png - DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/) - install(FILES com.ultimaker.cura.appdata.xml - DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) - install(FILES cura.sharedmimeinfo - DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/ - RENAME cura.xml ) -endif() +endif() \ No newline at end of file diff --git a/GitVersion.yml b/GitVersion.yml deleted file mode 100644 index 6f94c14540..0000000000 --- a/GitVersion.yml +++ /dev/null @@ -1,55 +0,0 @@ -mode: ContinuousDelivery -next-version: 5.1 -branches: - main: - regex: ^main$ - mode: ContinuousDelivery - tag: alpha - increment: None - prevent-increment-of-merged-branch-version: true - track-merge-target: false - source-branches: [ ] - tracks-release-branches: false - is-release-branch: false - is-mainline: true - pre-release-weight: 55000 - develop: - regex: ^CURA-.*$ - mode: ContinuousDelivery - tag: alpha - increment: None - prevent-increment-of-merged-branch-version: false - track-merge-target: true - source-branches: [ 'main' ] - tracks-release-branches: true - is-release-branch: false - is-mainline: false - pre-release-weight: 0 - release: - regex: ^[\d]+\.[\d]+$ - mode: ContinuousDelivery - tag: beta - increment: None - prevent-increment-of-merged-branch-version: true - track-merge-target: false - source-branches: [ 'main' ] - tracks-release-branches: false - is-release-branch: true - is-mainline: false - pre-release-weight: 30000 - pull-request-main: - regex: ^(pull|pull\-requests|pr)[/-] - mode: ContinuousDelivery - tag: alpha+ - increment: Inherit - prevent-increment-of-merged-branch-version: true - tag-number-pattern: '[/-](?\d+)[-/]' - track-merge-target: true - source-branches: [ 'main' ] - tracks-release-branches: false - is-release-branch: false - is-mainline: false - pre-release-weight: 30000 -ignore: - sha: [ ] -merge-message-formats: { } diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index a345ebbd05..0000000000 --- a/Jenkinsfile +++ /dev/null @@ -1,74 +0,0 @@ -parallel_nodes(['linux && cura', 'windows && cura']) -{ - timeout(time: 2, unit: "HOURS") - { - - // Prepare building - stage('Prepare') - { - // Ensure we start with a clean build directory. - step([$class: 'WsCleanup']) - - // Checkout whatever sources are linked to this pipeline. - checkout scm - } - - // If any error occurs during building, we want to catch it and continue with the "finale" stage. - catchError - { - // Building and testing should happen in a subdirectory. - dir('build') - { - // Perform the "build". Since Uranium is Python code, this basically only ensures CMake is setup. - stage('Build') - { - def branch = env.BRANCH_NAME - if(!fileExists("${env.CURA_ENVIRONMENT_PATH}/${branch}")) - { - branch = "master" - } - - // Ensure CMake is setup. Note that since this is Python code we do not really "build" it. - def uranium_dir = get_workspace_dir("Ultimaker/Uranium/${branch}") - cmake("..", "-DCMAKE_PREFIX_PATH=\"${env.CURA_ENVIRONMENT_PATH}/${branch}\" -DCMAKE_BUILD_TYPE=Release -DURANIUM_DIR=\"${uranium_dir}\"") - } - - // Try and run the unit tests. If this stage fails, we consider the build to be "unstable". - stage('Unit Test') - { - if (isUnix()) - { - // For Linux - try { - sh 'make CTEST_OUTPUT_ON_FAILURE=TRUE test' - } catch(e) - { - currentBuild.result = "UNSTABLE" - } - } - else - { - // For Windows - try - { - // This also does code style checks. - bat 'ctest -V' - } catch(e) - { - currentBuild.result = "UNSTABLE" - } - } - } - } - } - - // Perform any post-build actions like notification and publishing of unit tests. - stage('Finalize') - { - // Publish the test results to Jenkins. - junit allowEmptyResults: true, testResults: 'build/junit*.xml' - - notify_build_result(env.CURA_EMAIL_RECIPIENTS, '#cura-dev', ['master', '2.']) - } - } -} diff --git a/cmake/CuraPluginInstall.cmake b/cmake/CuraPluginInstall.cmake deleted file mode 100644 index 79b86ebdc6..0000000000 --- a/cmake/CuraPluginInstall.cmake +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright (c) 2022 Ultimaker B.V. -# CuraPluginInstall.cmake is released under the terms of the LGPLv3 or higher. - -# -# This module detects all plugins that need to be installed and adds them using the CMake install() command. -# It detects all plugin folder in the path "plugins/*" where there's a "plugin.json" in it. -# -# Plugins can be configured to NOT BE INSTALLED via the variable "CURA_NO_INSTALL_PLUGINS" as a list of string in the -# form of "a;b;c" or "a,b,c". By default all plugins will be installed. -# - -option(PRINT_PLUGIN_LIST "Should the list of plugins that are installed be printed?" ON) - -# Options or configuration variables -set(CURA_NO_INSTALL_PLUGINS "" CACHE STRING "A list of plugins that should not be installed, separated with ';' or ','.") - -file(GLOB_RECURSE _plugin_json_list ${CMAKE_SOURCE_DIR}/plugins/*/plugin.json) -list(LENGTH _plugin_json_list _plugin_json_list_len) - -# Sort the lists alphabetically so we can handle cases like this: -# - plugins/my_plugin/plugin.json -# - plugins/my_plugin/my_module/plugin.json -# In this case, only "plugins/my_plugin" should be added via install(). -set(_no_install_plugin_list ${CURA_NO_INSTALL_PLUGINS}) -# Sanitize the string so the comparison will be case-insensitive. -string(STRIP "${_no_install_plugin_list}" _no_install_plugin_list) -string(TOLOWER "${_no_install_plugin_list}" _no_install_plugin_list) - -# WORKAROUND counterpart of what's in cura-build. -string(REPLACE "," ";" _no_install_plugin_list "${_no_install_plugin_list}") - -list(LENGTH _no_install_plugin_list _no_install_plugin_list_len) - -if(_no_install_plugin_list_len GREATER 0) - list(SORT _no_install_plugin_list) -endif() -if(_plugin_json_list_len GREATER 0) - list(SORT _plugin_json_list) -endif() - -# Check all plugin directories and add them via install() if needed. -set(_install_plugin_list "") -foreach(_plugin_json_path ${_plugin_json_list}) - get_filename_component(_plugin_dir ${_plugin_json_path} DIRECTORY) - file(RELATIVE_PATH _rel_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_plugin_dir}) - get_filename_component(_plugin_dir_name ${_plugin_dir} NAME) - - # Make plugin name comparison case-insensitive - string(TOLOWER "${_plugin_dir_name}" _plugin_dir_name_lowercase) - - # Check if this plugin needs to be skipped for installation - set(_add_plugin ON) # Indicates if this plugin should be added to the build or not. - set(_is_no_install_plugin OFF) # If this plugin will not be added, this indicates if it's because the plugin is - # specified in the NO_INSTALL_PLUGINS list. - if(_no_install_plugin_list) - if("${_plugin_dir_name_lowercase}" IN_LIST _no_install_plugin_list) - set(_add_plugin OFF) - set(_is_no_install_plugin ON) - endif() - endif() - - # Make sure this is not a subdirectory in a plugin that's already in the install list - if(_add_plugin) - foreach(_known_install_plugin_dir ${_install_plugin_list}) - if(_plugin_dir MATCHES "${_known_install_plugin_dir}.+") - set(_add_plugin OFF) - break() - endif() - endforeach() - endif() - - if(_add_plugin) - if(${PRINT_PLUGIN_LIST}) - message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}") - endif() - get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY) - install(DIRECTORY ${_rel_plugin_dir} - DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir} - PATTERN "__pycache__" EXCLUDE - PATTERN "*.qmlc" EXCLUDE - ) - list(APPEND _install_plugin_list ${_plugin_dir}) - elseif(_is_no_install_plugin) - if(${PRINT_PLUGIN_LIST}) - message(STATUS "[-] PLUGIN TO REMOVE : ${_rel_plugin_dir}") - endif() - execute_process(COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod_bundled_packages_json.py - -d ${CMAKE_CURRENT_SOURCE_DIR}/resources/bundled_packages - ${_plugin_dir_name} - RESULT_VARIABLE _mod_json_result) - endif() -endforeach() diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake deleted file mode 100644 index 09e8dadbab..0000000000 --- a/cmake/CuraTests.cmake +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (c) 2022 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -include(CTest) -include(CMakeParseArguments) - -add_custom_target(test-verbose COMMAND ${CMAKE_CTEST_COMMAND} --verbose) - -function(cura_add_test) - set(_single_args NAME DIRECTORY PYTHONPATH) - cmake_parse_arguments("" "" "${_single_args}" "" ${ARGN}) - - if(NOT _NAME) - message(FATAL_ERROR "cura_add_test requires a test name argument") - endif() - - if(NOT _DIRECTORY) - message(FATAL_ERROR "cura_add_test requires a directory to test") - endif() - - if(NOT _PYTHONPATH) - set(_PYTHONPATH ${_DIRECTORY}) - endif() - - if(WIN32) - string(REPLACE "|" "\\;" _PYTHONPATH ${_PYTHONPATH}) - set(_PYTHONPATH "${_PYTHONPATH}\\;$ENV{PYTHONPATH}") - else() - string(REPLACE "|" ":" _PYTHONPATH ${_PYTHONPATH}) - set(_PYTHONPATH "${_PYTHONPATH}:$ENV{PYTHONPATH}") - endif() - - get_test_property(${_NAME} ENVIRONMENT test_exists) #Find out if the test exists by getting a property from it that always exists (such as ENVIRONMENT because we set that ourselves). - if (NOT ${test_exists}) - add_test( - NAME ${_NAME} - COMMAND ${Python_EXECUTABLE} -m pytest --junitxml=${CMAKE_BINARY_DIR}/junit-${_NAME}.xml ${_DIRECTORY} - ) - set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT LANG=C) - set_tests_properties(${_NAME} PROPERTIES ENVIRONMENT "PYTHONPATH=${_PYTHONPATH}") - else() - message(WARNING "Duplicate test ${_NAME}!") - endif() -endfunction() - - -#Add code style test. -add_test( - NAME "code-style" - COMMAND ${Python_EXECUTABLE} run_mypy.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - -#Add test for import statements which are not compatible with all builds -add_test( - NAME "invalid-imports" - COMMAND ${Python_EXECUTABLE} scripts/check_invalid_imports.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - -cura_add_test(NAME pytest-main DIRECTORY ${CMAKE_SOURCE_DIR}/tests PYTHONPATH "${CMAKE_SOURCE_DIR}|${URANIUM_DIR}") - -file(GLOB_RECURSE _plugins plugins/*/__init__.py) -foreach(_plugin ${_plugins}) - get_filename_component(_plugin_directory ${_plugin} DIRECTORY) - if(EXISTS ${_plugin_directory}/tests) - get_filename_component(_plugin_name ${_plugin_directory} NAME) - cura_add_test(NAME pytest-${_plugin_name} DIRECTORY ${_plugin_directory} PYTHONPATH "${_plugin_directory}|${CMAKE_SOURCE_DIR}|${URANIUM_DIR}") - endif() -endforeach() - -#Add test for whether the shortcut alt-keys are unique in every translation. -add_test( - NAME "shortcut-keys" - COMMAND ${Python_EXECUTABLE} scripts/check_shortcut_keys.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) diff --git a/cmake/mod_bundled_packages_json.py b/cmake/mod_bundled_packages_json.py deleted file mode 100755 index e03261b479..0000000000 --- a/cmake/mod_bundled_packages_json.py +++ /dev/null @@ -1,73 +0,0 @@ -#!/usr/bin/env python3 -# -# This script removes the given package entries in the bundled_packages JSON files. This is used by the PluginInstall -# CMake module. -# - -import argparse -import collections -import json -import os -import sys - - -def find_json_files(work_dir: str) -> list: - """Finds all JSON files in the given directory recursively and returns a list of those files in absolute paths. - - :param work_dir: The directory to look for JSON files recursively. - :return: A list of JSON files in absolute paths that are found in the given directory. - """ - - json_file_list = [] - for root, dir_names, file_names in os.walk(work_dir): - for file_name in file_names: - abs_path = os.path.abspath(os.path.join(root, file_name)) - json_file_list.append(abs_path) - return json_file_list - - -def remove_entries_from_json_file(file_path: str, entries: list) -> None: - """Removes the given entries from the given JSON file. The file will modified in-place. - - :param file_path: The JSON file to modify. - :param entries: A list of strings as entries to remove. - :return: None - """ - - try: - with open(file_path, "r", encoding = "utf-8") as f: - package_dict = json.load(f, object_hook = collections.OrderedDict) - except Exception as e: - msg = "Failed to load '{file_path}' as a JSON file. This file will be ignored Exception: {e}"\ - .format(file_path = file_path, e = e) - sys.stderr.write(msg + os.linesep) - return - - for entry in entries: - if entry in package_dict: - del package_dict[entry] - print("[INFO] Remove entry [{entry}] from [{file_path}]".format(file_path = file_path, entry = entry)) - - try: - with open(file_path, "w", encoding = "utf-8", newline = "\n") as f: - json.dump(package_dict, f, indent = 4) - except Exception as e: - msg = "Failed to write '{file_path}' as a JSON file. Exception: {e}".format(file_path = file_path, e = e) - raise IOError(msg) - - -def main() -> None: - parser = argparse.ArgumentParser("mod_bundled_packages_json") - parser.add_argument("-d", "--dir", dest = "work_dir", - help = "The directory to look for bundled packages JSON files, recursively.") - parser.add_argument("entries", metavar = "ENTRIES", type = str, nargs = "+") - - args = parser.parse_args() - - json_file_list = find_json_files(args.work_dir) - for json_file_path in json_file_list: - remove_entries_from_json_file(json_file_path, args.entries) - - -if __name__ == "__main__": - main() diff --git a/com.ultimaker.cura.appdata.xml b/com.ultimaker.cura.appdata.xml deleted file mode 100644 index 3af0e9c352..0000000000 --- a/com.ultimaker.cura.appdata.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - com.ultimaker.cura.desktop - CC0-1.0 - LGPL-3.0 and CC-BY-SA-4.0 - Cura - The world's most advanced 3d printer software - -

- Cura creates a seamless integration between hardware, software and - materials for the best 3D printing experience around. - Cura supports the 3MF, OBJ and STL file formats and is available on - Windows, Mac and Linux. -

-
    -
  • Novices can start printing right away
    • -
  • Experts are able to customize 300 settings to achieve the best results
    • -
  • Optimized profiles for Ultimaker materials
    • -
  • Supported by a global network of Ultimaker certified service partners
    • -
  • Print multiple objects at once with different settings for each object
    • -
  • Cura supports STL, 3MF and OBJ file formats
    • -
  • Open source and completely free
    • -
- - - - https://raw.githubusercontent.com/Ultimaker/Cura/main/cura-logo.PNG - - - https://ultimaker.com/software/ultimaker-cura?utm_source=cura&utm_medium=software&utm_campaign=cura-update-linux - Cura - - diff --git a/com.ultimaker.cura.desktop.in b/com.ultimaker.cura.desktop.in deleted file mode 100644 index 1e17e30f4e..0000000000 --- a/com.ultimaker.cura.desktop.in +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Name=Ultimaker Cura -Name[de]=Ultimaker Cura -Name[nl]=Ultimaker Cura -GenericName=3D Printing Software -GenericName[de]=3D-Druck-Software -GenericName[nl]=3D-printsoftware -Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great. -Comment[de]=Cura wandelt 3D-Modelle in Pfade für einen 3D-Drucker um. Es bereitet Ihren Druck für maximale Genauigkeit, minimale Druckzeit und guter Zuverlässigkeit mit vielen zusätzlichen Funktionen vor, damit Ihr Druck großartig wird. -Comment[nl]=Cura converteert 3D-modellen naar paden voor een 3D printer. Het bereidt je print voor om zeer precies, snel en betrouwbaar te kunnen printen, met veel extra functionaliteit om je print er goed uit te laten komen. -Exec=@CMAKE_INSTALL_FULL_BINDIR@/cura %F -TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura -Icon=cura-icon -Terminal=false -Type=Application -MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip; -Categories=Graphics; -Keywords=3D;Printing;Slicer; -StartupWMClass=cura.real diff --git a/conandata.yml b/conandata.yml index 4b9d8dd612..83f45a2056 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1,5 +1,5 @@ --- -# Usage: defaults to None +# Usage: defaults to the first entry in this conandata.yml file # If you're on a release branch create an entry for that **version** e.q.: `5.1.0` update the requirements (use pinned versions, not latest) # also create a beta entry for that **version** e.q.: `5.1.0-beta`, update the requirements (use the /(latest)@ultimaker/stable) # @@ -10,111 +10,6 @@ # requirements (use the /(latest)@ultimaker/testing) # # Subject to change in the future! -"None": - requirements: - - "pyarcus/(latest)@ultimaker/testing" - - "curaengine/(latest)@ultimaker/testing" - - "pysavitar/(latest)@ultimaker/testing" - - "pynest2d/(latest)@ultimaker/testing" - - "uranium/(latest)@ultimaker/testing" - - "fdm_materials/(latest)@ultimaker/testing" - - "cura_binary_data/(latest)@ultimaker/testing" - - "cpython/3.10.4" - internal_requirements: - - "fdm_materials_private/(latest)@ultimaker/testing" - - "cura_private_data/(latest)@ultimaker/testing" - runinfo: - entrypoint: "cura_app.py" - pyinstaller: - datas: - cura_plugins: - package: "cura" - src: "plugins" - dst: "share/cura/plugins" - cura_resources: - package: "cura" - src: "resources" - dst: "share/cura/resources" - cura_private_data: - package: "cura_private_data" - src: "resources" - dst: "share/cura/resources" - internal: true - uranium_plugins: - package: "uranium" - src: "plugins" - dst: "share/uranium/plugins" - uranium_resources: - package: "uranium" - src: "resources" - dst: "share/uranium/resources" - uranium_um_qt_qml_um: - package: "uranium" - src: "site-packages/UM/Qt/qml/UM" - dst: "PyQt6/Qt6/qml/UM" - cura_binary_data: - package: "cura_binary_data" - src: "resources/cura/resources" - dst: "share/cura/resources" - uranium_binary_data: - package: "cura_binary_data" - src: "resources/uranium/resources" - dst: "share/uranium/resources" - windows_binary_data: - package: "cura_binary_data" - src: "windows" - dst: "share/windows" - fdm_materials: - package: "fdm_materials" - src: "materials" - dst: "share/cura/resources/materials" - fdm_materials_private: - package: "fdm_materials_private" - src: "resources/materials" - dst: "share/cura/resources/materials" - internal: true - tcl: - package: "tcl" - src: "lib/tcl8.6" - dst: "tcl" - tk: - package: "tk" - src: "lib/tk8.6" - dst: "tk" - binaries: - curaengine: - package: "curaengine" - src: "bin" - dst: "." - binary: "CuraEngine" - hiddenimports: - - "pySavitar" - - "pyArcus" - - "pynest2d" - - "PyQt6" - - "PyQt6.QtNetwork" - - "PyQt6.sip" - - "logging.handlers" - - "zeroconf" - - "fcntl" - - "stl" - - "serial" - collect_all: - - "cura" - - "UM" - - "serial" - - "Charon" - - "sqlite3" - - "trimesh" - - "win32ctypes" - - "PyQt6" - - "PyQt6.QtNetwork" - - "PyQt6.sip" - - "stl" - icon: - Windows: "./icons/Cura.ico" - Macos: "./icons/cura.icns" - Linux: "./icons/cura-128.png" "5.2.0-alpha": requirements: - "pyarcus/(latest)@ultimaker/testing" diff --git a/conanfile.py b/conanfile.py index bcdaeda5d9..17cd0260a6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -3,13 +3,13 @@ from pathlib import Path from jinja2 import Template -from conans import tools from conan import ConanFile -from conan.tools import files +from conan.tools.files import copy, rmdir, save from conan.tools.env import VirtualRunEnv, Environment +from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration -required_conan_version = ">=1.48.0" +required_conan_version = ">=1.50.0" class CuraConan(ConanFile): @@ -26,7 +26,7 @@ class CuraConan(ConanFile): # FIXME: Remove specific branch once merged to main # Extending the conanfile with the UMBaseConanfile https://github.com/Ultimaker/conan-ultimaker-index/tree/CURA-9177_Fix_CI_CD/recipes/umbase - python_requires = "umbase/0.1.5@ultimaker/testing" + python_requires = "umbase/[>=0.1.7]@ultimaker/stable" python_requires_extend = "umbase.UMBaseConanfile" options = { @@ -135,7 +135,7 @@ class CuraConan(ConanFile): def _site_packages(self): if self.settings.os == "Windows": return self._base_dir.joinpath("Lib", "site-packages") - py_version = tools.Version(self.deps_cpp_info["cpython"].version) + py_version = Version(self.deps_cpp_info["cpython"].version) return self._base_dir.joinpath("lib", f"python{py_version.major}.{py_version.minor}", "site-packages") @property @@ -149,9 +149,9 @@ class CuraConan(ConanFile): with open(Path(__file__).parent.joinpath("CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) - cura_version = self.version + cura_version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) if self.options.internal: - version = tools.Version(self.version) + version = Version(cura_version) cura_version = f"{version.major}.{version.minor}.{version.patch}-{version.prerelease.replace('+', '+internal_')}" with open(Path(location, "CuraVersion.py"), "w") as f: @@ -220,7 +220,8 @@ class CuraConan(ConanFile): with open(Path(__file__).parent.joinpath("Ultimaker-Cura.spec.jinja"), "r") as f: pyinstaller = Template(f.read()) - cura_version = tools.Version(self.version) if self.version else tools.Version("0.0.0") + version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) + cura_version = Version(version) with open(Path(location, "Ultimaker-Cura.spec"), "w") as f: f.write(pyinstaller.render( @@ -239,10 +240,14 @@ class CuraConan(ConanFile): strip = False, # This should be possible on Linux and MacOS but, it can also cause issues on some distributions. Safest is to disable it for now target_arch = "'x86_64'" if self.settings.os == "Macos" else "None", # FIXME: Make this dependent on the settings.arch_target macos = self.settings.os == "Macos", - version = f"'{self.version}'", + version = f"'{version}'", short_version = f"'{cura_version.major}.{cura_version.minor}.{cura_version.patch}'", )) + def set_version(self): + if self.version is None: + self.version = self._umdefault_version() + def configure(self): self.options["pyarcus"].shared = True self.options["pysavitar"].shared = True @@ -250,7 +255,8 @@ class CuraConan(ConanFile): self.options["cpython"].shared = True def validate(self): - if self.version and tools.Version(self.version) <= tools.Version("4"): + version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) + if version and Version(version) <= Version("4"): raise ConanInvalidConfiguration("Only versions 5+ are support") def requirements(self): @@ -293,7 +299,7 @@ class CuraConan(ConanFile): self.copy("CuraEngine.exe", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) self.copy("CuraEngine", root_package = "curaengine", src = "@bindirs", dst = "", keep_path = False) - files.rmdir(self, "resources/materials") + rmdir(self, os.path.join(self.source_folder, "resources", "materials")) self.copy("*.fdm_material", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False) self.copy("*.sig", root_package = "fdm_materials", src = "@resdirs", dst = "resources/materials", keep_path = False) @@ -377,7 +383,8 @@ class CuraConan(ConanFile): self.copy("*.txt", src = self.cpp_info.resdirs[-1], dst = self._base_dir.joinpath("pip_requirements")) # Generate the GitHub Action version info Environment - cura_version = tools.Version(self.version) + version = self.conf_info.get("user.cura:version", default = self.version, check_type = str) + cura_version = Version(version) env_prefix = "Env:" if self.settings.os == "Windows" else "" activate_github_actions_version_env = Template(r"""echo "CURA_VERSION_MAJOR={{ cura_version_major }}" >> ${{ env_prefix }}GITHUB_ENV echo "CURA_VERSION_MINOR={{ cura_version_minor }}" >> ${{ env_prefix }}GITHUB_ENV @@ -392,7 +399,7 @@ echo "CURA_VERSION_FULL={{ cura_version_full }}" >> ${{ env_prefix }}GITHUB_ENV env_prefix = env_prefix) ext = ".sh" if self.settings.os != "Windows" else ".ps1" - files.save(self, self._script_dir.joinpath(f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) + save(self, self._script_dir.joinpath(f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) self._generate_cura_version(Path(self._site_packages, "cura")) diff --git a/contributing.md b/contributing.md index 06f9dd472b..180b6b1461 100644 --- a/contributing.md +++ b/contributing.md @@ -16,4 +16,6 @@ Making pull requests -------------------- If you want to propose a change to Cura's source code, please create a pull request in the appropriate repository (being [Cura](https://github.com/Ultimaker/Cura), [Uranium](https://github.com/Ultimaker/Uranium), [CuraEngine](https://github.com/Ultimaker/CuraEngine), [fdm_materials](https://github.com/Ultimaker/fdm_materials), [libArcus](https://github.com/Ultimaker/libArcus), [cura-build](https://github.com/Ultimaker/cura-build), [cura-build-environment](https://github.com/Ultimaker/cura-build-environment), [libSavitar](https://github.com/Ultimaker/libSavitar), [libCharon](https://github.com/Ultimaker/libCharon) or [cura-binary-data](https://github.com/Ultimaker/cura-binary-data)) and if your change requires changes on multiple of these repositories, please link them together so that we know to merge them together. -Some of these repositories will have automated tests running when you create a pull request, indicated by green check marks or red crosses in the Github web page. If you see a red cross, that means that a test has failed. If the test doesn't fail on the Master branch but does fail on your branch, that indicates that you've probably made a mistake and you need to do that. Click on the cross for more details, or run the test locally by running `cmake . && ctest --verbose`. \ No newline at end of file +The style guide for code contributions to Cura and other Ultimaker projects can be found [here](https://github.com/Ultimaker/Meta/blob/master/general/generic_code_conventions.md). + +Some of these repositories will have automated tests running when you create a pull request, indicated by green check marks or red crosses in the Github web page. If you see a red cross, that means that a test has failed. If the test doesn't fail on the Master branch but does fail on your branch, that indicates that you've probably made a mistake and you need to do that. Click on the cross for more details, or run the test locally by running `cmake . && ctest --verbose`. diff --git a/cura/Arranging/ArrangeObjectsJob.py b/cura/Arranging/ArrangeObjectsJob.py index e65a442acb..6ba6717191 100644 --- a/cura/Arranging/ArrangeObjectsJob.py +++ b/cura/Arranging/ArrangeObjectsJob.py @@ -21,6 +21,7 @@ class ArrangeObjectsJob(Job): self._min_offset = min_offset def run(self): + found_solution_for_all = False status_message = Message(i18n_catalog.i18nc("@info:status", "Finding new location for objects"), lifetime = 0, dismissable = False, @@ -28,18 +29,19 @@ class ArrangeObjectsJob(Job): title = i18n_catalog.i18nc("@info:title", "Finding Location")) status_message.show() - found_solution_for_all = None try: found_solution_for_all = arrange(self._nodes, Application.getInstance().getBuildVolume(), self._fixed_nodes) except: # If the thread crashes, the message should still close Logger.logException("e", "Unable to arrange the objects on the buildplate. The arrange algorithm has crashed.") status_message.hide() - if found_solution_for_all is not None and not found_solution_for_all: + + if not found_solution_for_all: no_full_solution_message = Message( i18n_catalog.i18nc("@info:status", "Unable to find a location within the build volume for all objects"), title = i18n_catalog.i18nc("@info:title", "Can't Find Location"), message_type = Message.MessageType.ERROR) no_full_solution_message.show() + self.finished.emit(self) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index f690456913..74811e724f 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -115,6 +115,7 @@ from . import CuraActions from . import PlatformPhysics from . import PrintJobPreviewImageProvider from .AutoSave import AutoSave +from .Machines.Models.CompatibleMachineModel import CompatibleMachineModel from .Machines.Models.MachineListModel import MachineListModel from .Machines.Models.ActiveIntentQualitiesModel import ActiveIntentQualitiesModel from .Machines.Models.IntentSelectionModel import IntentSelectionModel @@ -1191,6 +1192,7 @@ class CuraApplication(QtApplication): qmlRegisterType(ExtrudersModel, "Cura", 1, 0, "ExtrudersModel") qmlRegisterType(GlobalStacksModel, "Cura", 1, 0, "GlobalStacksModel") qmlRegisterType(MachineListModel, "Cura", 1, 0, "MachineListModel") + qmlRegisterType(CompatibleMachineModel, "Cura", 1, 0, "CompatibleMachineModel") self.processEvents() qmlRegisterType(FavoriteMaterialsModel, "Cura", 1, 0, "FavoriteMaterialsModel") @@ -1445,7 +1447,7 @@ class CuraApplication(QtApplication): bounding_box = node.getBoundingBox() if bounding_box is None or bounding_box.width < self._volume.getBoundingBox().width or bounding_box.depth < self._volume.getBoundingBox().depth: # Arrange only the unlocked nodes and keep the locked ones in place - if UM.Util.parseBool(node.getSetting(SceneNodeSettings.LockPosition)): + if node.getSetting(SceneNodeSettings.LockPosition): locked_nodes.append(node) else: nodes_to_arrange.append(node) diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index 2c3b432b1d..103703e594 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -24,9 +24,12 @@ class LayerPolygon: PrimeTowerType = 11 __number_of_types = 12 - __jump_map = numpy.logical_or(numpy.logical_or(numpy.arange(__number_of_types) == NoneType, numpy.arange(__number_of_types) == MoveCombingType), numpy.arange(__number_of_types) == MoveRetractionType) + __jump_map = numpy.logical_or(numpy.logical_or(numpy.arange(__number_of_types) == NoneType, + numpy.arange(__number_of_types) == MoveCombingType), + numpy.arange(__number_of_types) == MoveRetractionType) - def __init__(self, extruder: int, line_types: numpy.ndarray, data: numpy.ndarray, line_widths: numpy.ndarray, line_thicknesses: numpy.ndarray, line_feedrates: numpy.ndarray) -> None: + def __init__(self, extruder: int, line_types: numpy.ndarray, data: numpy.ndarray, + line_widths: numpy.ndarray, line_thicknesses: numpy.ndarray, line_feedrates: numpy.ndarray) -> None: """LayerPolygon, used in ProcessSlicedLayersJob :param extruder: The position of the extruder @@ -39,10 +42,12 @@ class LayerPolygon: self._extruder = extruder self._types = line_types - for i in range(len(self._types)): - if self._types[i] >= self.__number_of_types: # Got faulty line data from the engine. - Logger.log("w", "Found an unknown line type: %s", i) - self._types[i] = self.NoneType + unknown_types = numpy.where(self._types >= self.__number_of_types, self._types, None) + if unknown_types.any(): + # Got faulty line data from the engine. + for idx in unknown_types: + Logger.warning(f"Found an unknown line type at: {idx}") + self._types[idx] = self.NoneType self._data = data self._line_widths = line_widths self._line_thicknesses = line_thicknesses @@ -58,14 +63,16 @@ class LayerPolygon: self._mesh_line_count = len(self._types) - self._jump_count self._vertex_count = self._mesh_line_count + numpy.sum(self._types[1:] == self._types[:-1]) - # Buffering the colors shouldn't be necessary as it is not + # Buffering the colors shouldn't be necessary as it is not # re-used and can save a lot of memory usage. self._color_map = LayerPolygon.getColorMap() self._colors = self._color_map[self._types] # type: numpy.ndarray - # When type is used as index returns true if type == LayerPolygon.InfillType or type == LayerPolygon.SkinType or type == LayerPolygon.SupportInfillType + # When type is used as index returns true if type == LayerPolygon.InfillType + # or type == LayerPolygon.SkinType + # or type == LayerPolygon.SupportInfillType # Should be generated in better way, not hardcoded. - self._is_infill_or_skin_type_map = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype = bool) + self._is_infill_or_skin_type_map = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0], dtype=bool) self._build_cache_line_mesh_mask = None # type: Optional[numpy.ndarray] self._build_cache_needed_points = None # type: Optional[numpy.ndarray] @@ -80,12 +87,14 @@ class LayerPolygon: # Only if the type of line segment changes do we need to add an extra vertex to change colors self._build_cache_needed_points[1:, 0][:, numpy.newaxis] = self._types[1:] != self._types[:-1] # Mark points as unneeded if they are of types we don't want in the line mesh according to the calculated mask - numpy.logical_and(self._build_cache_needed_points, self._build_cache_line_mesh_mask, self._build_cache_needed_points ) + numpy.logical_and(self._build_cache_needed_points, self._build_cache_line_mesh_mask, self._build_cache_needed_points) self._vertex_begin = 0 self._vertex_end = cast(int, numpy.sum(self._build_cache_needed_points)) - def build(self, vertex_offset: int, index_offset: int, vertices: numpy.ndarray, colors: numpy.ndarray, line_dimensions: numpy.ndarray, feedrates: numpy.ndarray, extruders: numpy.ndarray, line_types: numpy.ndarray, indices: numpy.ndarray) -> None: + def build(self, vertex_offset: int, index_offset: int, vertices: numpy.ndarray, + colors: numpy.ndarray, line_dimensions: numpy.ndarray, feedrates: numpy.ndarray, + extruders: numpy.ndarray, line_types: numpy.ndarray, indices: numpy.ndarray) -> None: """Set all the arrays provided by the function caller, representing the LayerPolygon The arrays are either by vertex or by indices. @@ -111,19 +120,20 @@ class LayerPolygon: line_mesh_mask = self._build_cache_line_mesh_mask needed_points_list = self._build_cache_needed_points - # Index to the points we need to represent the line mesh. This is constructed by generating simple - # start and end points for each line. For line segment n these are points n and n+1. Row n reads [n n+1] - # Then then the indices for the points we don't need are thrown away based on the pre-calculated list. - index_list = ( numpy.arange(len(self._types)).reshape((-1, 1)) + numpy.array([[0, 1]]) ).reshape((-1, 1))[needed_points_list.reshape((-1, 1))] + # Index to the points we need to represent the line mesh. + # This is constructed by generating simple start and end points for each line. + # For line segment n, these are points n and n+1. Row n reads [n n+1] + # Then the indices for the points we don't need are thrown away based on the pre-calculated list. + index_list = (numpy.arange(len(self._types)).reshape((-1, 1)) + numpy.array([[0, 1]])).reshape((-1, 1))[needed_points_list.reshape((-1, 1))] # The relative values of begin and end indices have already been set in buildCache, so we only need to offset them to the parents offset. self._vertex_begin += vertex_offset self._vertex_end += vertex_offset - # Points are picked based on the index list to get the vertices needed. + # Points are picked based on the index list to get the vertices needed. vertices[self._vertex_begin:self._vertex_end, :] = self._data[index_list, :] - # Create an array with colors for each vertex and remove the color data for the points that has been thrown away. + # Create an array with colors for each vertex and remove the color data for the points that has been thrown away. colors[self._vertex_begin:self._vertex_end, :] = numpy.tile(self._colors, (1, 2)).reshape((-1, 4))[needed_points_list.ravel()] # Create an array with line widths and thicknesses for each vertex. @@ -138,14 +148,15 @@ class LayerPolygon: # Convert type per vertex to type per line line_types[self._vertex_begin:self._vertex_end] = numpy.tile(self._types, (1, 2)).reshape((-1, 1))[needed_points_list.ravel()][:, 0] - # The relative values of begin and end indices have already been set in buildCache, so we only need to offset them to the parents offset. + # The relative values of begin and end indices have already been set in buildCache, + # so we only need to offset them to the parents offset. self._index_begin += index_offset self._index_end += index_offset - indices[self._index_begin:self._index_end, :] = numpy.arange(self._index_end-self._index_begin, dtype = numpy.int32).reshape((-1, 1)) + indices[self._index_begin:self._index_end, :] = numpy.arange(self._index_end-self._index_begin, dtype=numpy.int32).reshape((-1, 1)) # When the line type changes the index needs to be increased by 2. indices[self._index_begin:self._index_end, :] += numpy.cumsum(needed_points_list[line_mesh_mask.ravel(), 0], dtype = numpy.int32).reshape((-1, 1)) - # Each line segment goes from it's starting point p to p+1, offset by the vertex index. + # Each line segment goes from it's starting point p to p+1, offset by the vertex index. # The -1 is to compensate for the necessarily True value of needed_points_list[0,0] which causes an unwanted +1 in cumsum above. indices[self._index_begin:self._index_end, :] += numpy.array([self._vertex_begin - 1, self._vertex_begin]) @@ -214,13 +225,12 @@ class LayerPolygon: """ normals = numpy.copy(self._data) - normals[:, 1] = 0.0 # We are only interested in 2D normals + normals[:, 1] = 0.0 # We are only interested in 2D normals # Calculate the edges between points. - # The call to numpy.roll shifts the entire array by one so that - # we end up subtracting each next point from the current, wrapping - # around. This gives us the edges from the next point to the current - # point. + # The call to numpy.roll shifts the entire array by one + # so that we end up subtracting each next point from the current, wrapping around. + # This gives us the edges from the next point to the current point. normals = numpy.diff(normals, 1, 0) # Calculate the length of each edge using standard Pythagoras @@ -245,17 +255,17 @@ class LayerPolygon: if cls.__color_map is None: theme = cast(Theme, QtApplication.getInstance().getTheme()) cls.__color_map = numpy.array([ - theme.getColor("layerview_none").getRgbF(), # NoneType - theme.getColor("layerview_inset_0").getRgbF(), # Inset0Type - theme.getColor("layerview_inset_x").getRgbF(), # InsetXType - theme.getColor("layerview_skin").getRgbF(), # SkinType - theme.getColor("layerview_support").getRgbF(), # SupportType - theme.getColor("layerview_skirt").getRgbF(), # SkirtType - theme.getColor("layerview_infill").getRgbF(), # InfillType - theme.getColor("layerview_support_infill").getRgbF(), # SupportInfillType - theme.getColor("layerview_move_combing").getRgbF(), # MoveCombingType - theme.getColor("layerview_move_retraction").getRgbF(), # MoveRetractionType - theme.getColor("layerview_support_interface").getRgbF(), # SupportInterfaceType + theme.getColor("layerview_none").getRgbF(), # NoneType + theme.getColor("layerview_inset_0").getRgbF(), # Inset0Type + theme.getColor("layerview_inset_x").getRgbF(), # InsetXType + theme.getColor("layerview_skin").getRgbF(), # SkinType + theme.getColor("layerview_support").getRgbF(), # SupportType + theme.getColor("layerview_skirt").getRgbF(), # SkirtType + theme.getColor("layerview_infill").getRgbF(), # InfillType + theme.getColor("layerview_support_infill").getRgbF(), # SupportInfillType + theme.getColor("layerview_move_combing").getRgbF(), # MoveCombingType + theme.getColor("layerview_move_retraction").getRgbF(), # MoveRetractionType + theme.getColor("layerview_support_interface").getRgbF(), # SupportInterfaceType theme.getColor("layerview_prime_tower").getRgbF() # PrimeTowerType ]) diff --git a/cura/MachineAction.py b/cura/MachineAction.py index 15d9ab1ca1..c38be5261f 100644 --- a/cura/MachineAction.py +++ b/cura/MachineAction.py @@ -94,7 +94,7 @@ class MachineAction(QObject, PluginObject): plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId()) if plugin_path is None: - Logger.log("e", "Cannot create QML view: cannot find plugin path for plugin [%s]", self.getPluginId()) + Logger.error(f"Cannot create QML view: cannot find plugin path for plugin {self.getPluginId()}") return None path = os.path.join(plugin_path, self._qml_url) @@ -106,7 +106,7 @@ class MachineAction(QObject, PluginObject): def qmlPath(self) -> "QUrl": plugin_path = PluginRegistry.getInstance().getPluginPath(self.getPluginId()) if plugin_path is None: - Logger.log("e", "Cannot create QML view: cannot find plugin path for plugin [%s]", self.getPluginId()) + Logger.error(f"Cannot create QML view: cannot find plugin path for plugin {self.getPluginId()}") return QUrl("") path = os.path.join(plugin_path, self._qml_url) return QUrl.fromLocalFile(path) diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py index b113bd6dd7..cc6560378d 100644 --- a/cura/Machines/MachineErrorChecker.py +++ b/cura/Machines/MachineErrorChecker.py @@ -43,7 +43,7 @@ class MachineErrorChecker(QObject): self._application = cura.CuraApplication.CuraApplication.getInstance() self._machine_manager = self._application.getMachineManager() - self._start_time = 0. # measure checking time + self._check_start_time = time.time() self._setCheckTimer() @@ -160,7 +160,7 @@ class MachineErrorChecker(QObject): self._stacks_and_keys_to_check.append((stack, key)) self._application.callLater(self._checkStack) - self._start_time = time.time() + self._check_start_time = time.time() Logger.log("d", "New error check scheduled.") def _checkStack(self) -> None: @@ -212,12 +212,10 @@ class MachineErrorChecker(QObject): self._has_errors = result self.hasErrorUpdated.emit() self._machine_manager.stacksValidationChanged.emit() - if keys_to_recheck is None: - self._keys_to_check = set() - else: - self._keys_to_check = keys_to_recheck + self._keys_to_check = keys_to_recheck if keys_to_recheck else set() self._need_to_check = False self._check_in_progress = False self.needToWaitForResultChanged.emit() self.errorCheckFinished.emit() - Logger.log("i", "Error check finished, result = %s, time = %0.1fs", result, time.time() - self._start_time) + execution_time = time.time() - self._check_start_time + Logger.info(f"Error check finished, result = {result}, time = {execution_time:.2f}s") diff --git a/cura/Machines/Models/CompatibleMachineModel.py b/cura/Machines/Models/CompatibleMachineModel.py new file mode 100644 index 0000000000..029567cdec --- /dev/null +++ b/cura/Machines/Models/CompatibleMachineModel.py @@ -0,0 +1,76 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + +from typing import Optional + +from PyQt6.QtCore import Qt, QObject, pyqtSlot, pyqtProperty, pyqtSignal + +from UM.Logger import Logger +from UM.Qt.ListModel import ListModel +from UM.i18n import i18nCatalog + + +class CompatibleMachineModel(ListModel): + NameRole = Qt.ItemDataRole.UserRole + 1 + UniqueIdRole = Qt.ItemDataRole.UserRole + 2 + ExtrudersRole = Qt.ItemDataRole.UserRole + 3 + + def __init__(self, parent: Optional[QObject] = None) -> None: + super().__init__(parent) + + self._catalog = i18nCatalog("cura") + + self.addRoleName(self.NameRole, "name") + self.addRoleName(self.UniqueIdRole, "unique_id") + self.addRoleName(self.ExtrudersRole, "extruders") + + self._update() + + from cura.CuraApplication import CuraApplication + machine_manager = CuraApplication.getInstance().getMachineManager() + machine_manager.globalContainerChanged.connect(self._update) + machine_manager.outputDevicesChanged.connect(self._update) + + def _update(self) -> None: + self.clear() + + from cura.CuraApplication import CuraApplication + machine_manager = CuraApplication.getInstance().getMachineManager() + + # Loop over the output-devices, not the stacks; need all applicable configurations, not just the current loaded one. + for output_device in machine_manager.printerOutputDevices: + for printer in output_device.printers: + extruder_configs = dict() + + # initialize & add current active material: + for extruder in printer.extruders: + materials = [{ + "brand": extruder.activeMaterial.brand, + "name": extruder.activeMaterial.name, + "hexcolor": extruder.activeMaterial.color, + }] + extruder_configs[extruder.getPosition()] = { + "position": extruder.getPosition(), + "core": extruder.hotendID, + "materials": materials + } + + # add currently inactive, but possible materials: + for configuration in printer.availableConfigurations: + for extruder in configuration.extruderConfigurations: + if not extruder.position in extruder_configs: + Logger.log("w", f"No active extruder for position {extruder.position}.") + continue + + extruder_configs[extruder.position]["materials"].append({ + "brand": extruder.material.brand, + "name": extruder.material.name, + "hexcolor": extruder.material.color + }) + + if any([len(extruder["materials"]) > 0 for extruder in extruder_configs.values()]): + self.appendItem({ + "name": printer.name, + "unique_id": printer.name, # <- Can assume the cloud doesn't have duplicate names? + "extruders": list(extruder_configs.values()) + }) diff --git a/cura/Machines/Models/GlobalStacksModel.py b/cura/Machines/Models/GlobalStacksModel.py index 8f13d34ccf..69f2ec3822 100644 --- a/cura/Machines/Models/GlobalStacksModel.py +++ b/cura/Machines/Models/GlobalStacksModel.py @@ -44,6 +44,7 @@ class GlobalStacksModel(ListModel): self._filter_connection_type = None # type: Optional[ConnectionType] self._filter_online_only = False self._filter_capabilities: List[str] = [] # Required capabilities that all listed printers must have. + self._filter_abstract_machines: Optional[bool] = None # Listen to changes CuraContainerRegistry.getInstance().containerAdded.connect(self._onContainerChanged) @@ -54,6 +55,7 @@ class GlobalStacksModel(ListModel): filterConnectionTypeChanged = pyqtSignal() filterCapabilitiesChanged = pyqtSignal() filterOnlineOnlyChanged = pyqtSignal() + filterAbstractMachinesChanged = pyqtSignal() def setFilterConnectionType(self, new_filter: Optional[ConnectionType]) -> None: if self._filter_connection_type != new_filter: @@ -98,6 +100,22 @@ class GlobalStacksModel(ListModel): """ return self._filter_capabilities + def setFilterAbstractMachines(self, new_filter: Optional[bool]) -> None: + if self._filter_abstract_machines != new_filter: + self._filter_abstract_machines = new_filter + self.filterAbstractMachinesChanged.emit() + + @pyqtProperty(bool, fset = setFilterAbstractMachines, notify = filterAbstractMachinesChanged) + def filterAbstractMachines(self) -> Optional[bool]: + """ + Weather we include abstract printers, non-abstract printers or both + + if this is set to None both abstract and non-abstract printers will be included in the list + set to True will only include abstract printers + set to False will only inclde non-abstract printers + """ + return self._filter_abstract_machines + def _onContainerChanged(self, container) -> None: """Handler for container added/removed events from registry""" @@ -130,6 +148,10 @@ class GlobalStacksModel(ListModel): if self._filter_online_only and not is_online: continue + is_abstract_machine = parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)) + if self._filter_abstract_machines is not None and self._filter_abstract_machines is not is_abstract_machine: + continue + capabilities = set(container_stack.getMetaDataEntry(META_CAPABILITIES, "").split(",")) if set(self._filter_capabilities) - capabilities: # Not all required capabilities are met. continue diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py index a758060384..4db1082863 100644 --- a/cura/Machines/Models/MachineListModel.py +++ b/cura/Machines/Models/MachineListModel.py @@ -5,12 +5,16 @@ # online cloud connected printers are represented within this ListModel. Additional information such as the number of # connected printers for each printer type is gathered. -from PyQt6.QtCore import Qt, QTimer +from typing import Optional + +from PyQt6.QtCore import Qt, QTimer, QObject, pyqtSlot, pyqtProperty, pyqtSignal from UM.Qt.ListModel import ListModel from UM.Settings.ContainerStack import ContainerStack +from UM.Settings.Interfaces import ContainerInterface from UM.i18n import i18nCatalog from UM.Util import parseBool +from cura.PrinterOutput.PrinterOutputDevice import ConnectionType from cura.Settings.CuraContainerRegistry import CuraContainerRegistry from cura.Settings.GlobalStack import GlobalStack @@ -23,11 +27,14 @@ class MachineListModel(ListModel): MetaDataRole = Qt.ItemDataRole.UserRole + 4 IsOnlineRole = Qt.ItemDataRole.UserRole + 5 MachineCountRole = Qt.ItemDataRole.UserRole + 6 - IsAbstractMachine = Qt.ItemDataRole.UserRole + 7 + IsAbstractMachineRole = Qt.ItemDataRole.UserRole + 7 + ComponentTypeRole = Qt.ItemDataRole.UserRole + 8 - def __init__(self, parent=None) -> None: + def __init__(self, parent: Optional[QObject] = None) -> None: super().__init__(parent) + self._show_cloud_printers = False + self._catalog = i18nCatalog("cura") self.addRoleName(self.NameRole, "name") @@ -36,7 +43,8 @@ class MachineListModel(ListModel): self.addRoleName(self.MetaDataRole, "metadata") self.addRoleName(self.IsOnlineRole, "isOnline") self.addRoleName(self.MachineCountRole, "machineCount") - self.addRoleName(self.IsAbstractMachine, "isAbstractMachine") + self.addRoleName(self.IsAbstractMachineRole, "isAbstractMachine") + self.addRoleName(self.ComponentTypeRole, "componentType") self._change_timer = QTimer() self._change_timer.setInterval(200) @@ -49,7 +57,19 @@ class MachineListModel(ListModel): CuraContainerRegistry.getInstance().containerRemoved.connect(self._onContainerChanged) self._updateDelayed() - def _onContainerChanged(self, container) -> None: + showCloudPrintersChanged = pyqtSignal(bool) + + @pyqtProperty(bool, notify=showCloudPrintersChanged) + def showCloudPrinters(self) -> bool: + return self._show_cloud_printers + + @pyqtSlot(bool) + def setShowCloudPrinters(self, show_cloud_printers: bool) -> None: + self._show_cloud_printers = show_cloud_printers + self._updateDelayed() + self.showCloudPrintersChanged.emit(show_cloud_printers) + + def _onContainerChanged(self, container: ContainerInterface) -> None: """Handler for container added/removed events from registry""" # We only need to update when the added / removed container GlobalStack @@ -60,40 +80,63 @@ class MachineListModel(ListModel): self._change_timer.start() def _update(self) -> None: - self.setItems([]) # Clear items + self.clear() + + from cura.CuraApplication import CuraApplication + machines_manager = CuraApplication.getInstance().getMachineManager() other_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(type="machine") abstract_machine_stacks = CuraContainerRegistry.getInstance().findContainerStacks(is_abstract_machine = "True") abstract_machine_stacks.sort(key = lambda machine: machine.getName(), reverse = True) - for abstract_machine in abstract_machine_stacks: definition_id = abstract_machine.definition.getId() - from cura.CuraApplication import CuraApplication - machines_manager = CuraApplication.getInstance().getMachineManager() online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) - # Create a list item for abstract machine - self.addItem(abstract_machine, len(online_machine_stacks)) + online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks)) + other_machine_stacks.remove(abstract_machine) + if abstract_machine in online_machine_stacks: + online_machine_stacks.remove(abstract_machine) + + # Create a list item for abstract machine + self.addItem(abstract_machine, True, len(online_machine_stacks)) # Create list of machines that are children of the abstract machine for stack in online_machine_stacks: - self.addItem(stack) + if self._show_cloud_printers: + self.addItem(stack, True) # Remove this machine from the other stack list - other_machine_stacks.remove(stack) + if stack in other_machine_stacks: + other_machine_stacks.remove(stack) + + if len(abstract_machine_stacks) > 0: + if self._show_cloud_printers: + self.appendItem({"componentType": "HIDE_BUTTON", + "isOnline": True, + "isAbstractMachine": False, + "machineCount": 0 + }) + else: + self.appendItem({"componentType": "SHOW_BUTTON", + "isOnline": True, + "isAbstractMachine": False, + "machineCount": 0 + }) for stack in other_machine_stacks: - self.addItem(stack) + self.addItem(stack, False) - def addItem(self, container_stack: ContainerStack, machine_count: int = 0) -> None: + def addItem(self, container_stack: ContainerStack, is_online: bool, machine_count: int = 0) -> None: if parseBool(container_stack.getMetaDataEntry("hidden", False)): return - self.appendItem({"name": container_stack.getName(), + self.appendItem({ + "componentType": "MACHINE", + "name": container_stack.getName(), "id": container_stack.getId(), "metadata": container_stack.getMetaData().copy(), - "isOnline": parseBool(container_stack.getMetaDataEntry("is_online", False)), + "isOnline": is_online, "isAbstractMachine": parseBool(container_stack.getMetaDataEntry("is_abstract_machine", False)), "machineCount": machine_count, - }) + }) diff --git a/cura/PlatformPhysics.py b/cura/PlatformPhysics.py index e054528c42..402b9fe250 100755 --- a/cura/PlatformPhysics.py +++ b/cura/PlatformPhysics.py @@ -50,8 +50,13 @@ class PlatformPhysics: if not self._enabled: return + app_instance = Application.getInstance() + app_preferences = app_instance.getPreferences() + app_automatic_drop_down = app_preferences.getValue("physics/automatic_drop_down") + app_automatic_push_free = app_preferences.getValue("physics/automatic_push_free") + root = self._controller.getScene().getRoot() - build_volume = Application.getInstance().getBuildVolume() + build_volume = app_instance.getBuildVolume() build_volume.updateNodeBoundaryCheck() # Keep a list of nodes that are moving. We use this so that we don't move two intersecting objects in the @@ -75,7 +80,7 @@ class PlatformPhysics: # Move it downwards if bottom is above platform move_vector = Vector() - if Application.getInstance().getPreferences().getValue("physics/automatic_drop_down") and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down + if node.getSetting(SceneNodeSettings.AutoDropDown, app_automatic_drop_down) and not (node.getParent() and node.getParent().callDecoration("isGroup") or node.getParent() != root) and node.isEnabled(): #If an object is grouped, don't move it down z_offset = node.callDecoration("getZOffset") if node.getDecorator(ZOffsetDecorator.ZOffsetDecorator) else 0 move_vector = move_vector.set(y = -bbox.bottom + z_offset) @@ -84,7 +89,7 @@ class PlatformPhysics: node.addDecorator(ConvexHullDecorator()) # only push away objects if this node is a printing mesh - if not node.callDecoration("isNonPrintingMesh") and Application.getInstance().getPreferences().getValue("physics/automatic_push_free"): + if not node.callDecoration("isNonPrintingMesh") and app_automatic_push_free: # Do not move locked nodes if node.getSetting(SceneNodeSettings.LockPosition): continue diff --git a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py index 4cc3e81f56..d54092b8c9 100644 --- a/cura/PrinterOutput/Models/ExtruderConfigurationModel.py +++ b/cura/PrinterOutput/Models/ExtruderConfigurationModel.py @@ -13,9 +13,9 @@ class ExtruderConfigurationModel(QObject): def __init__(self, position: int = -1) -> None: super().__init__() - self._position = position # type: int - self._material = None # type: Optional[MaterialOutputModel] - self._hotend_id = None # type: Optional[str] + self._position: int = position + self._material: Optional[MaterialOutputModel] = None + self._hotend_id: Optional[str] = None def setPosition(self, position: int) -> None: self._position = position diff --git a/cura/PrinterOutput/Models/PrinterOutputModel.py b/cura/PrinterOutput/Models/PrinterOutputModel.py index 2f7091e014..5605ce0de9 100644 --- a/cura/PrinterOutput/Models/PrinterOutputModel.py +++ b/cura/PrinterOutput/Models/PrinterOutputModel.py @@ -350,5 +350,6 @@ class PrinterOutputModel(QObject): self.availableConfigurationsChanged.emit() def setAvailableConfigurations(self, new_configurations: List[PrinterConfigurationModel]) -> None: - self._available_printer_configurations = new_configurations - self.availableConfigurationsChanged.emit() + if self._available_printer_configurations != new_configurations: + self._available_printer_configurations = new_configurations + self.availableConfigurationsChanged.emit() diff --git a/cura/PrinterOutput/PrinterOutputDevice.py b/cura/PrinterOutput/PrinterOutputDevice.py index d3a5e252d3..add561fcb1 100644 --- a/cura/PrinterOutput/PrinterOutputDevice.py +++ b/cura/PrinterOutput/PrinterOutputDevice.py @@ -50,13 +50,12 @@ class PrinterOutputDevice(QObject, OutputDevice): The assumption is made the printer is a FDM printer. Note that a number of settings are marked as "final". This is because decorators - are not inherited by children. To fix this we use the private counter part of those + are not inherited by children. To fix this we use the private counterpart of those functions to actually have the implementation. For all other uses it should be used in the same way as a "regular" OutputDevice. """ - printersChanged = pyqtSignal() connectionStateChanged = pyqtSignal(str) acceptsCommandsChanged = pyqtSignal() @@ -183,8 +182,8 @@ class PrinterOutputDevice(QObject, OutputDevice): @pyqtProperty(QObject, constant = True) def monitorItem(self) -> QObject: # Note that we specifically only check if the monitor component is created. - # It could be that it failed to actually create the qml item! If we check if the item was created, it will try to - # create the item (and fail) every time. + # It could be that it failed to actually create the qml item! If we check if the item was created, it will try + # to create the item (and fail) every time. if not self._monitor_component: self._createMonitorViewFromQML() return self._monitor_item @@ -237,9 +236,9 @@ class PrinterOutputDevice(QObject, OutputDevice): self.acceptsCommandsChanged.emit() - # Returns the unique configurations of the printers within this output device @pyqtProperty("QVariantList", notify = uniqueConfigurationsChanged) def uniqueConfigurations(self) -> List["PrinterConfigurationModel"]: + """ Returns the unique configurations of the printers within this output device """ return self._unique_configurations def _updateUniqueConfigurations(self) -> None: @@ -248,7 +247,9 @@ class PrinterOutputDevice(QObject, OutputDevice): if printer.printerConfiguration is not None and printer.printerConfiguration.hasAnyMaterialLoaded(): all_configurations.add(printer.printerConfiguration) all_configurations.update(printer.availableConfigurations) - if None in all_configurations: # Shouldn't happen, but it does. I don't see how it could ever happen. Skip adding that configuration. List could end up empty! + if None in all_configurations: + # Shouldn't happen, but it does. I don't see how it could ever happen. Skip adding that configuration. + # List could end up empty! Logger.log("e", "Found a broken configuration in the synced list!") all_configurations.remove(None) new_configurations = sorted(all_configurations, key = lambda config: config.printerType or "") @@ -256,9 +257,9 @@ class PrinterOutputDevice(QObject, OutputDevice): self._unique_configurations = new_configurations self.uniqueConfigurationsChanged.emit() - # Returns the unique configurations of the printers within this output device @pyqtProperty("QStringList", notify = uniqueConfigurationsChanged) def uniquePrinterTypes(self) -> List[str]: + """ Returns the unique configurations of the printers within this output device """ return list(sorted(set([configuration.printerType or "" for configuration in self._unique_configurations]))) def _onPrintersChanged(self) -> None: diff --git a/cura/Scene/ConvexHullDecorator.py b/cura/Scene/ConvexHullDecorator.py index b15eaf2ae1..06ec247ae4 100644 --- a/cura/Scene/ConvexHullDecorator.py +++ b/cura/Scene/ConvexHullDecorator.py @@ -390,7 +390,7 @@ class ConvexHullDecorator(SceneNodeDecorator): if self._global_stack.getProperty("print_sequence", "value") == "one_at_a_time": # Find the root node that's placed in the scene; the root of the mesh group. ancestor = self.getNode() - while ancestor.getParent() != self._root: + while ancestor.getParent() != self._root and ancestor.getParent() is not None: ancestor = ancestor.getParent() center = ancestor.getBoundingBox().center else: diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index a8a1d780ea..41502f8874 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -49,7 +49,7 @@ class CuraContainerStack(ContainerStack): self._empty_material = cura_empty_instance_containers.empty_material_container #type: InstanceContainer self._empty_variant = cura_empty_instance_containers.empty_variant_container #type: InstanceContainer - self._containers = [self._empty_instance_container for i in range(len(_ContainerIndexes.IndexTypeMap))] #type: List[ContainerInterface] + self._containers: List[ContainerInterface] = [self._empty_instance_container for i in _ContainerIndexes.IndexTypeMap] self._containers[_ContainerIndexes.QualityChanges] = self._empty_quality_changes self._containers[_ContainerIndexes.Quality] = self._empty_quality self._containers[_ContainerIndexes.Material] = self._empty_material diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py index 5a745f8f0a..a25a487c6e 100644 --- a/cura/Settings/CuraStackBuilder.py +++ b/cura/Settings/CuraStackBuilder.py @@ -1,7 +1,9 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. -from typing import Optional +import copy + +from typing import Optional, cast from UM.ConfigurationErrorMessage import ConfigurationErrorMessage from UM.Logger import Logger @@ -275,41 +277,26 @@ class CuraStackBuilder: :return: The new Abstract Machine or None if an error occurred. """ abstract_machine_id = f"{definition_id}_abstract_machine" - from cura.CuraApplication import CuraApplication application = CuraApplication.getInstance() registry = application.getContainerRegistry() - container_tree = ContainerTree.getInstance() - if registry.findContainerStacks(is_abstract_machine = "True", id = abstract_machine_id): - # This abstract machine already exists + abstract_machines = registry.findContainerStacks(id = abstract_machine_id) + if abstract_machines: + return cast(GlobalStack, abstract_machines[0]) + definitions = registry.findDefinitionContainers(id=definition_id) + + name = "" + + if definitions: + name = definitions[0].getName() + stack = cls.createMachine(abstract_machine_id, definition_id, show_warning_message=False) + if not stack: return None - match registry.findDefinitionContainers(type = "machine", id = definition_id): - case []: - # It should not be possible for the definition to be missing since an abstract machine will only - # be created as a result of a machine with definition_id being created. - Logger.error(f"Definition {definition_id} was not found!") - return None - case [machine_definition, *_definitions]: - machine_node = container_tree.machines[machine_definition.getId()] - name = machine_definition.getName() + stack.setName(name) - stack = GlobalStack(abstract_machine_id) - stack.setMetaDataEntry("is_abstract_machine", True) - stack.setMetaDataEntry("is_online", True) - stack.setDefinition(machine_definition) - cls.createUserContainer( - name, - machine_definition, - stack, - application.empty_variant_container, - application.empty_material_container, - machine_node.preferredGlobalQuality().container, - ) + stack.setMetaDataEntry("is_abstract_machine", True) + stack.setMetaDataEntry("is_online", True) - stack.setName(name) - - registry.addContainer(stack) - - return stack + return stack \ No newline at end of file diff --git a/cura/Settings/GlobalStack.py b/cura/Settings/GlobalStack.py index 3c13f236ab..041bd19d3a 100755 --- a/cura/Settings/GlobalStack.py +++ b/cura/Settings/GlobalStack.py @@ -90,7 +90,6 @@ class GlobalStack(CuraContainerStack): @pyqtProperty("QVariantList", notify=configuredConnectionTypesChanged) def configuredConnectionTypes(self) -> List[int]: """The configured connection types can be used to find out if the global - stack is configured to be connected with a printer, without having to know all the details as to how this is exactly done (and without actually setting the stack to be active). @@ -292,7 +291,6 @@ class GlobalStack(CuraContainerStack): for extruder_train in extruder_trains: extruder_position = extruder_train.getMetaDataEntry("position") extruder_check_position.add(extruder_position) - for check_position in range(machine_extruder_count): if str(check_position) not in extruder_check_position: return False @@ -349,6 +347,12 @@ class GlobalStack(CuraContainerStack): nameChanged = pyqtSignal() name = pyqtProperty(str, fget=getName, fset=setName, notify=nameChanged) + def hasNetworkedConnection(self) -> bool: + has_connection = False + for connection_type in [ConnectionType.NetworkConnection.value, ConnectionType.CloudConnection.value]: + has_connection |= connection_type in self.configuredConnectionTypes + return has_connection + ## private: global_stack_mime = MimeType( name = "application/x-cura-globalstack", diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 389c5ded75..2051ce1b99 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1,4 +1,4 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import time @@ -99,7 +99,7 @@ class MachineManager(QObject): self._application.getPreferences().addPreference("cura/active_machine", "") - self._printer_output_devices = [] # type: List[PrinterOutputDevice] + self._printer_output_devices: List[PrinterOutputDevice] = [] self._application.getOutputDeviceManager().outputDevicesChanged.connect(self._onOutputDevicesChanged) # There might already be some output devices by the time the signal is connected self._onOutputDevicesChanged() @@ -112,7 +112,7 @@ class MachineManager(QObject): self._application.callLater(self.setInitialActiveMachine) - containers = CuraContainerRegistry.getInstance().findInstanceContainers(id = self.activeMaterialId) # type: List[InstanceContainer] + containers: List[InstanceContainer] = CuraContainerRegistry.getInstance().findInstanceContainers(id = self.activeMaterialId) if containers: containers[0].nameChanged.connect(self._onMaterialNameChanged) @@ -359,6 +359,7 @@ class MachineManager(QObject): extruder_manager = ExtruderManager.getInstance() extruder_manager.fixSingleExtrusionMachineExtruderDefinition(global_stack) if not global_stack.isValid(): + Logger.warning("Global stack isn't valid, adding it to faulty container list") # Mark global stack as invalid ConfigurationErrorMessage.getInstance().addFaultyContainers(global_stack.getId()) return # We're done here @@ -530,6 +531,10 @@ class MachineManager(QObject): def printerConnected(self) -> bool: return bool(self._printer_output_devices) + @pyqtProperty(bool, notify = globalContainerChanged) + def activeMachineIsAbstractCloudPrinter(self) -> bool: + return len(self._printer_output_devices) == 1 and self._printer_output_devices[0].__class__.__name__ == "AbstractCloudOutputDevice" + @pyqtProperty(bool, notify = printerConnectedStatusChanged) def activeMachineIsGroup(self) -> bool: if self.activeMachine is None: @@ -899,7 +904,7 @@ class MachineManager(QObject): if self._global_container_stack is None \ or self._global_container_stack.getProperty(setting_key, "value") == new_value \ - or self.numberExtrudersEnabled < 2: + or self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") < 2: return user_changes_container = self._global_container_stack.userChanges @@ -1004,7 +1009,7 @@ class MachineManager(QObject): for position, extruder in enumerate(self._global_container_stack.extruderList): if extruder.isEnabled and int(position) < machine_extruder_count: extruder_count += 1 - if self.numberExtrudersEnabled != extruder_count: + if self._global_container_stack.definitionChanges.getProperty("extruders_enabled_count", "value") != extruder_count: definition_changes_container.setProperty("extruders_enabled_count", "value", extruder_count) self.numberExtrudersEnabledChanged.emit() diff --git a/cura/UI/PrintInformation.py b/cura/UI/PrintInformation.py index 2b8e13b09f..936e646946 100644 --- a/cura/UI/PrintInformation.py +++ b/cura/UI/PrintInformation.py @@ -23,9 +23,9 @@ catalog = i18nCatalog("cura") class PrintInformation(QObject): - """A class for processing and the print times per build plate as well as managing the job name + """A class for processing the print times per build plate and managing the job name - This class also mangles the current machine name and the filename of the first loaded mesh into a job name. + This class also combines the current machine name and the filename of the first loaded mesh into a job name. This job name is requested by the JobSpecs qml file. """ @@ -186,7 +186,7 @@ class PrintInformation(QObject): if time != time: # Check for NaN. Engine can sometimes give us weird values. duration.setDuration(0) - Logger.log("w", "Received NaN for print duration message") + Logger.warning("Received NaN for print duration message") continue total_estimated_time += time @@ -368,7 +368,7 @@ class PrintInformation(QObject): mime_type = MimeTypeDatabase.getMimeTypeForFile(name) data = mime_type.stripExtension(name) except MimeTypeNotFoundError: - Logger.log("w", "Unsupported Mime Type Database file extension %s", name) + Logger.warning(f"Unsupported Mime Type Database file extension {name}") if data is not None and check_name is not None: self._base_name = data @@ -392,7 +392,7 @@ class PrintInformation(QObject): return self._base_name def _defineAbbreviatedMachineName(self) -> None: - """Created an acronym-like abbreviated machine name from the currently active machine name. + """Creates an abbreviated machine name from the currently active machine name. Called each time the global stack is switched. """ @@ -446,7 +446,7 @@ class PrintInformation(QObject): self.setToZeroPrintInformation(self._active_build_plate) def _onOutputStart(self, output_device: OutputDevice) -> None: - """If this is the sort of output 'device' (like local or online file storage, rather than a printer), + """If this is a sort of output 'device' (like local or online file storage, rather than a printer), the user could have altered the file-name, and thus the project name should be altered as well.""" if isinstance(output_device, ProjectOutputDevice): new_name = output_device.getLastOutputName() diff --git a/cura/UI/WhatsNewPagesModel.py b/cura/UI/WhatsNewPagesModel.py index 4fb7802924..1faf9572c7 100644 --- a/cura/UI/WhatsNewPagesModel.py +++ b/cura/UI/WhatsNewPagesModel.py @@ -62,15 +62,21 @@ class WhatsNewPagesModel(WelcomePagesModel): def initialize(self) -> None: self._pages = [] - self._pages.append({"id": "whats_new", - "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"), - "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"), - "next_page_id": "changelog" - }) - self._pages.append({"id": "changelog", - "page_url": self._getBuiltinWelcomePagePath("ChangelogContent.qml"), - "next_page_button_text": self._catalog.i18nc("@action:button", "Close"), - }) + try: + self._pages.append({"id": "whats_new", + "page_url": self._getBuiltinWelcomePagePath("WhatsNewContent.qml"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Skip"), + "next_page_id": "changelog" + }) + except FileNotFoundError: + Logger.warning("Unable to find what's new page") + try: + self._pages.append({"id": "changelog", + "page_url": self._getBuiltinWelcomePagePath("ChangelogContent.qml"), + "next_page_button_text": self._catalog.i18nc("@action:button", "Close"), + }) + except FileNotFoundError: + Logger.warning("Unable to find changelog page") self.setItems(self._pages) images, max_image = WhatsNewPagesModel._collectOrdinalFiles(Resources.Images, WhatsNewPagesModel.image_formats) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index c8f7bc8abd..86be2f0380 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -664,10 +664,22 @@ class ThreeMFWorkspaceReader(WorkspaceReader): cura_file_names = [name for name in archive.namelist() if name.startswith("Cura/")] - # Create a shadow copy of the preferences (we don't want all of the preferences, but we do want to re-use its + # Create a shadow copy of the preferences (We don't want all of the preferences, but we do want to re-use its # parsing code. temp_preferences = Preferences() - serialized = archive.open("Cura/preferences.cfg").read().decode("utf-8") + try: + serialized = archive.open("Cura/preferences.cfg").read().decode("utf-8") + except KeyError: + # If there is no preferences file, it's not a workspace, so notify user of failure. + Logger.log("w", "File %s is not a valid workspace.", file_name) + message = Message(i18n_catalog.i18nc("@info:error Don't translate the XML tags or !", + "Project file {0} is corrupt: {1}.", + file_name, str(e)), + title=i18n_catalog.i18nc("@info:title", "Can't Open Project File"), + message_type=Message.MessageType.ERROR) + message.show() + self.setWorkspaceName("") + return [], {} temp_preferences.deserialize(serialized) # Copy a number of settings from the temp preferences to the global diff --git a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py index d6cc6ea159..1bc1432b67 100644 --- a/plugins/3MFWriter/ThreeMFWorkspaceWriter.py +++ b/plugins/3MFWriter/ThreeMFWorkspaceWriter.py @@ -156,6 +156,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter): "connection_type", "capabilities", "octoprint_api_key", + "is_online", } serialized_data = container.serialize(ignored_metadata_keys = ignore_keys) diff --git a/plugins/GCodeWriter/GCodeWriter.py b/plugins/GCodeWriter/GCodeWriter.py index 7323ffd35c..667e064d90 100644 --- a/plugins/GCodeWriter/GCodeWriter.py +++ b/plugins/GCodeWriter/GCodeWriter.py @@ -1,9 +1,8 @@ -# Copyright (c) 2019 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import re # For escaping characters in the settings. import json -import copy from UM.Mesh.MeshWriter import MeshWriter from UM.Logger import Logger @@ -12,6 +11,8 @@ from UM.Settings.InstanceContainer import InstanceContainer from cura.Machines.ContainerTree import ContainerTree from UM.i18n import i18nCatalog +from cura.Settings.CuraStackBuilder import CuraStackBuilder + catalog = i18nCatalog("cura") @@ -96,25 +97,6 @@ class GCodeWriter(MeshWriter): self.setInformation(catalog.i18nc("@warning:status", "Please prepare G-code before exporting.")) return False - def _createFlattenedContainerInstance(self, instance_container1, instance_container2): - """Create a new container with container 2 as base and container 1 written over it.""" - - flat_container = InstanceContainer(instance_container2.getName()) - - # The metadata includes id, name and definition - flat_container.setMetaData(copy.deepcopy(instance_container2.getMetaData())) - - if instance_container1.getDefinition(): - flat_container.setDefinition(instance_container1.getDefinition().getId()) - - for key in instance_container2.getAllKeys(): - flat_container.setProperty(key, "value", instance_container2.getProperty(key, "value")) - - for key in instance_container1.getAllKeys(): - flat_container.setProperty(key, "value", instance_container1.getProperty(key, "value")) - - return flat_container - def _serialiseSettings(self, stack): """Serialises a container stack to prepare it for writing at the end of the g-code. @@ -145,22 +127,22 @@ class GCodeWriter(MeshWriter): container_with_profile.setDefinition(machine_definition_id_for_quality) container_with_profile.setMetaDataEntry("setting_version", stack.quality.getMetaDataEntry("setting_version")) - flat_global_container = self._createFlattenedContainerInstance(stack.userChanges, container_with_profile) + merged_global_instance_container = InstanceContainer.createMergedInstanceContainer(stack.userChanges, container_with_profile) # If the quality changes is not set, we need to set type manually - if flat_global_container.getMetaDataEntry("type", None) is None: - flat_global_container.setMetaDataEntry("type", "quality_changes") + if merged_global_instance_container.getMetaDataEntry("type", None) is None: + merged_global_instance_container.setMetaDataEntry("type", "quality_changes") # Ensure that quality_type is set. (Can happen if we have empty quality changes). - if flat_global_container.getMetaDataEntry("quality_type", None) is None: - flat_global_container.setMetaDataEntry("quality_type", stack.quality.getMetaDataEntry("quality_type", "normal")) + if merged_global_instance_container.getMetaDataEntry("quality_type", None) is None: + merged_global_instance_container.setMetaDataEntry("quality_type", stack.quality.getMetaDataEntry("quality_type", "normal")) # Get the machine definition ID for quality profiles - flat_global_container.setMetaDataEntry("definition", machine_definition_id_for_quality) + merged_global_instance_container.setMetaDataEntry("definition", machine_definition_id_for_quality) - serialized = flat_global_container.serialize() + serialized = merged_global_instance_container.serialize() data = {"global_quality": serialized} - all_setting_keys = flat_global_container.getAllKeys() + all_setting_keys = merged_global_instance_container.getAllKeys() for extruder in stack.extruderList: extruder_quality = extruder.qualityChanges if extruder_quality.getId() == "empty_quality_changes": @@ -174,7 +156,7 @@ class GCodeWriter(MeshWriter): extruder_quality.setDefinition(machine_definition_id_for_quality) extruder_quality.setMetaDataEntry("setting_version", stack.quality.getMetaDataEntry("setting_version")) - flat_extruder_quality = self._createFlattenedContainerInstance(extruder.userChanges, extruder_quality) + flat_extruder_quality = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder_quality) # If the quality changes is not set, we need to set type manually if flat_extruder_quality.getMetaDataEntry("type", None) is None: flat_extruder_quality.setMetaDataEntry("type", "quality_changes") diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml index 5d63ac5b83..a89938530c 100644 --- a/plugins/MonitorStage/MonitorMain.qml +++ b/plugins/MonitorStage/MonitorMain.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2018 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. import QtQuick 2.10 @@ -114,6 +114,7 @@ Rectangle font: UM.Theme.getFont("medium") width: contentWidth } + Item { anchors diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py index 52dab1efc7..49751e1a2a 100644 --- a/plugins/UFPWriter/UFPWriter.py +++ b/plugins/UFPWriter/UFPWriter.py @@ -1,6 +1,6 @@ -# Copyright (c) 2021 Ultimaker B.V. +# Copyright (c) 2022 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. - +import json from typing import cast, List, Dict from Charon.VirtualFile import VirtualFile # To open UFP files. @@ -10,6 +10,7 @@ from io import StringIO # For converting g-code to bytes. from PyQt6.QtCore import QBuffer +from UM.Application import Application from UM.Logger import Logger from UM.Mesh.MeshWriter import MeshWriter # The writer we need to implement. from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType @@ -17,12 +18,16 @@ from UM.PluginRegistry import PluginRegistry # To get the g-code writer. from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.SceneNode import SceneNode +from UM.Settings.InstanceContainer import InstanceContainer from cura.CuraApplication import CuraApplication +from cura.Settings.CuraStackBuilder import CuraStackBuilder +from cura.Settings.GlobalStack import GlobalStack from cura.Utils.Threading import call_on_qt_thread from UM.i18n import i18nCatalog METADATA_OBJECTS_PATH = "metadata/objects" +SLICE_METADATA_PATH = "Cura/slicemetadata.json" catalog = i18nCatalog("cura") @@ -67,7 +72,21 @@ class UFPWriter(MeshWriter): try: gcode = archive.getStream("/3D/model.gcode") gcode.write(gcode_textio.getvalue().encode("UTF-8")) - archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode") + archive.addRelation(virtual_path = "/3D/model.gcode", + relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode") + except EnvironmentError as e: + error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e) + self.setInformation(error_msg) + Logger.error(error_msg) + return False + + # Write settings + try: + archive.addContentType(extension="json", mime_type="application/json") + setting_textio = StringIO() + json.dump(self._getSliceMetadata(), setting_textio, separators=(", ", ": "), indent=4) + steam = archive.getStream(SLICE_METADATA_PATH) + steam.write(setting_textio.getvalue().encode("UTF-8")) except EnvironmentError as e: error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e) self.setInformation(error_msg) @@ -190,3 +209,47 @@ class UFPWriter(MeshWriter): return [{"name": item.getName()} for item in DepthFirstIterator(node) if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")] + + def _getSliceMetadata(self) -> Dict[str, Dict[str, Dict[str, str]]]: + """Get all changed settings and all settings. For each extruder and the global stack""" + print_information = CuraApplication.getInstance().getPrintInformation() + settings = { + "material": { + "length": print_information.materialLengths, + "weight": print_information.materialWeights, + "cost": print_information.materialCosts, + }, + "global": { + "changes": {}, + "all_settings": {}, + } + } + + global_stack = cast(GlobalStack, Application.getInstance().getGlobalContainerStack()) + + # Add global user or quality changes + global_flattened_changes = InstanceContainer.createMergedInstanceContainer(global_stack.userChanges, global_stack.qualityChanges) + for setting in global_flattened_changes.getAllKeys(): + settings["global"]["changes"][setting] = global_flattened_changes.getProperty(setting, "value") + + # Get global all settings values without user or quality changes + for setting in global_stack.getAllKeys(): + settings["global"]["all_settings"][setting] = global_stack.getProperty(setting, "value") + + for i, extruder in enumerate(global_stack.extruderList): + # Add extruder fields to settings dictionary + settings[f"extruder_{i}"] = { + "changes": {}, + "all_settings": {}, + } + + # Add extruder user or quality changes + extruder_flattened_changes = InstanceContainer.createMergedInstanceContainer(extruder.userChanges, extruder.qualityChanges) + for setting in extruder_flattened_changes.getAllKeys(): + settings[f"extruder_{i}"]["changes"][setting] = extruder_flattened_changes.getProperty(setting, "value") + + # Get extruder all settings values without user or quality changes + for setting in extruder.getAllKeys(): + settings[f"extruder_{i}"]["all_settings"][setting] = extruder.getProperty(setting, "value") + + return settings diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml index 64aa4e7a9c..1b62d6b203 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrintJobCard.qml @@ -153,7 +153,7 @@ Item MonitorPrinterPill { - text: printJob.configuration.printerType + text: printJob ? printJob.configuration.printerType : "" } } } @@ -172,8 +172,15 @@ Item { id: printerConfiguration anchors.verticalCenter: parent.verticalCenter - buildplate: catalog.i18nc("@label", "Glass") - configurations: base.printJob.configuration.extruderConfigurations + buildplate: { + switch (printJob.assignedPrinter.buildplate) { + case "glass": + return catalog.i18nc("@label", "Glass"); + default: + return null + } + } + configurations: base.printJob ? base.printJob.configuration.extruderConfigurations : null height: Math.round(72 * screenScaleFactor) // TODO: Theme! } diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml index 67f308a64e..9d6ffba17b 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorPrinterCard.qml @@ -175,7 +175,14 @@ Item { id: printerConfiguration anchors.verticalCenter: parent.verticalCenter - buildplate: printer ? catalog.i18nc("@label", "Glass") : null // 'Glass' as a default + buildplate: { + switch (printer.buildplate) { + case "glass": + return catalog.i18nc("@label", "Glass"); + default: + return null + } + } configurations: { var configs = [] diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml index 6e8f6b4ebd..e508f70cbb 100644 --- a/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml +++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml @@ -1,8 +1,8 @@ -// Copyright (c) 2019 Ultimaker B.V. +// Copyright (c) 2022 Ultimaker B.V. // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.2 -import UM 1.3 as UM +import QtQuick 2.15 +import UM 1.5 as UM import Cura 1.0 as Cura // This is the root component for the monitor stage. @@ -37,6 +37,7 @@ Component Item { id: printers + visible: !Cura.MachineManager.activeMachineIsAbstractCloudPrinter anchors { top: parent.top @@ -69,14 +70,66 @@ Component top: printers.bottom topMargin: 48 * screenScaleFactor // TODO: Theme! } - visible: OutputDevice.supportsPrintJobQueue && OutputDevice.canReadPrintJobs + visible: OutputDevice.supportsPrintJobQueue && OutputDevice.canReadPrintJobs && !Cura.MachineManager.activeMachineIsAbstractCloudPrinter } PrinterVideoStream { anchors.fill: parent cameraUrl: OutputDevice.activeCameraUrl - visible: OutputDevice.activeCameraUrl != "" + visible: OutputDevice.activeCameraUrl != "" && !Cura.MachineManager.activeMachineIsAbstractCloudPrinter + } + + Rectangle + { + id: sendToFactoryCard + + visible: Cura.MachineManager.activeMachineIsAbstractCloudPrinter + + color: UM.Theme.getColor("monitor_stage_background") + height: childrenRect.height + UM.Theme.getSize("default_margin").height * 2 + width: childrenRect.width + UM.Theme.getSize("wide_margin").width * 2 + anchors + { + horizontalCenter: parent.horizontalCenter + top: parent.top + topMargin: UM.Theme.getSize("wide_margin").height * screenScaleFactor * 2 + } + + Column + { + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + spacing: UM.Theme.getSize("wide_margin").height + padding: UM.Theme.getSize("default_margin").width + topPadding: 0 + + Image + { + id: sendToFactoryImage + anchors.horizontalCenter: parent.horizontalCenter + source: UM.Theme.getImage("cura_connected_printers") + } + + UM.Label + { + anchors.horizontalCenter: parent.horizontalCenter + text: catalog.i18nc("@info", "Monitor your printers from everywhere using Ultimaker Digital Factory") + font: UM.Theme.getFont("medium") + width: sendToFactoryImage.width + wrapMode: Text.WordWrap + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + } + + Cura.PrimaryButton + { + id: sendToFactoryButton + anchors.horizontalCenter: parent.horizontalCenter + text: catalog.i18nc("@button", "View printers in Digital Factory") + onClicked: Qt.openUrlExternally("https://digitalfactory.ultimaker.com/app/print-jobs?utm_source=cura&utm_medium=software&utm_campaign=monitor-view-cloud-printer-type") + } + } } } } diff --git a/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py new file mode 100644 index 0000000000..4ee74550a4 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py @@ -0,0 +1,122 @@ +from time import time +from typing import Callable, List, Optional + +from PyQt6.QtCore import QObject, pyqtSlot +from PyQt6.QtNetwork import QNetworkReply + +from UM import i18nCatalog +from UM.Logger import Logger +from UM.FileHandler.FileHandler import FileHandler +from UM.Resources import Resources +from UM.Scene.SceneNode import SceneNode + +from cura.CuraApplication import CuraApplication +from cura.PrinterOutput.NetworkedPrinterOutputDevice import AuthState +from cura.PrinterOutput.PrinterOutputDevice import ConnectionType +from .CloudApiClient import CloudApiClient +from ..Models.Http.CloudClusterWithConfigResponse import CloudClusterWithConfigResponse +from ..UltimakerNetworkedPrinterOutputDevice import UltimakerNetworkedPrinterOutputDevice + +I18N_CATALOG = i18nCatalog("cura") + + +class AbstractCloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): + API_CHECK_INTERVAL = 10.0 # seconds + + def __init__(self, api_client: CloudApiClient, printer_type: str, request_write_callback: Callable, refresh_callback: Callable, parent: QObject = None) -> None: + + self._api = api_client + properties = {b"printer_type": printer_type.encode()} + super().__init__( + device_id=f"ABSTRACT_{printer_type}", + address="", + connection_type=ConnectionType.CloudConnection, + properties=properties, + parent=parent + ) + + self._on_print_dialog: Optional[QObject] = None + self._nodes: List[SceneNode] = None + self._request_write_callback = request_write_callback + self._refresh_callback = refresh_callback + + self._setInterfaceElements() + + def connect(self) -> None: + """Connects this device.""" + + if self.isConnected(): + return + Logger.log("i", "Attempting to connect AbstractCloudOutputDevice %s", self.key) + super().connect() + + self._update() + + def disconnect(self) -> None: + """Disconnects the device""" + + if not self.isConnected(): + return + super().disconnect() + + def _update(self) -> None: + """Called when the network data should be updated.""" + + super()._update() + if time() - self._time_of_last_request < self.API_CHECK_INTERVAL: + return # avoid calling the cloud too often + self._time_of_last_request = time() + if self._api.account.isLoggedIn: + self.setAuthenticationState(AuthState.Authenticated) + self._last_request_time = time() + self._api.getClustersByMachineType(self.printerType, self._onCompleted, self._onError) + else: + self.setAuthenticationState(AuthState.NotAuthenticated) + + def _setInterfaceElements(self) -> None: + """Set all the interface elements and texts for this output device.""" + + self.setPriority(2) # Make sure we end up below the local networking and above 'save to file'. + self.setShortDescription(I18N_CATALOG.i18nc("@action:button", "Print via cloud")) + self.setDescription(I18N_CATALOG.i18nc("@properties:tooltip", "Print via cloud")) + self.setConnectionText(I18N_CATALOG.i18nc("@info:status", "Connected via cloud")) + + def _onCompleted(self, clusters: List[CloudClusterWithConfigResponse]) -> None: + self._responseReceived() + + all_configurations = [] + for resp in clusters: + if resp.configuration is not None: + # Usually when the printer is offline, it doesn't have a configuration... + all_configurations.append(resp.configuration) + self._updatePrinters(all_configurations) + + def _onError(self, reply: QNetworkReply, error: QNetworkReply.NetworkError) -> None: + Logger.log("w", f"Failed to get clusters by machine type: {str(error)}.") + + @pyqtSlot(str) + def printerSelected(self, unique_id: str): + self._request_write_callback(unique_id, self._nodes) + if self._on_print_dialog: + self._on_print_dialog.close() + + @pyqtSlot() + def refresh(self): + self._refresh_callback() + self._update() + + def _openChoosePrinterDialog(self) -> None: + if self._on_print_dialog is None: + qml_path = Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "Dialogs", "ChoosePrinterDialog.qml") + self._on_print_dialog = CuraApplication.getInstance().createQmlComponent(qml_path, {}) + if self._on_print_dialog is None: # Failed to load QML file. + return + self._on_print_dialog.setProperty("manager", self) + self._on_print_dialog.show() + + def requestWrite(self, nodes: List[SceneNode], file_name: Optional[str] = None, limit_mimetypes: bool = False, file_handler: Optional[FileHandler] = None, **kwargs) -> None: + if not nodes or len(nodes) < 1: + Logger.log("w", "Nothing to print.") + return + self._nodes = nodes + self._openChoosePrinterDialog() diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py index 470e57947e..318fceeb40 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py @@ -1,6 +1,7 @@ # Copyright (c) 2019 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import json +import urllib.parse from json import JSONDecodeError from time import time from typing import Callable, List, Type, TypeVar, Union, Optional, Tuple, Dict, Any, cast @@ -17,6 +18,7 @@ from cura.UltimakerCloud import UltimakerCloudConstants from cura.UltimakerCloud.UltimakerCloudScope import UltimakerCloudScope from .ToolPathUploader import ToolPathUploader from ..Models.BaseModel import BaseModel +from ..Models.Http.CloudClusterWithConfigResponse import CloudClusterWithConfigResponse from ..Models.Http.CloudClusterResponse import CloudClusterResponse from ..Models.Http.CloudClusterStatus import CloudClusterStatus from ..Models.Http.CloudError import CloudError @@ -48,7 +50,6 @@ class CloudApiClient: """Initializes a new cloud API client. :param app: - :param account: The user's account object :param on_error: The callback to be called whenever we receive errors from the server. """ super().__init__() @@ -57,12 +58,11 @@ class CloudApiClient: self._scope = JsonDecoratorScope(UltimakerCloudScope(app)) self._http = HttpRequestManager.getInstance() self._on_error = on_error - self._upload = None # type: Optional[ToolPathUploader] + self._upload: Optional[ToolPathUploader] = None @property def account(self) -> Account: """Gets the account used for the API.""" - return self._account def getClusters(self, on_finished: Callable[[List[CloudClusterResponse]], Any], failed: Callable) -> None: @@ -71,13 +71,31 @@ class CloudApiClient: :param on_finished: The function to be called after the result is parsed. """ - url = "{}/clusters?status=active".format(self.CLUSTER_API_ROOT) + url = f"{self.CLUSTER_API_ROOT}/clusters?status=active" self._http.get(url, scope = self._scope, callback = self._parseCallback(on_finished, CloudClusterResponse, failed), error_callback = failed, timeout = self.DEFAULT_REQUEST_TIMEOUT) + def getClustersByMachineType(self, machine_type, on_finished: Callable[[List[CloudClusterWithConfigResponse]], Any], failed: Callable) -> None: + # HACK: There is something weird going on with the API, as it reports printer types in formats like + # "ultimaker_s3", but wants "Ultimaker S3" when using the machine_variant filter query. So we need to do some + # conversion! + + machine_type = machine_type.replace("_plus", "+") + machine_type = machine_type.replace("_", " ") + machine_type = machine_type.replace("ultimaker", "ultimaker ") + machine_type = machine_type.replace(" ", " ") + machine_type = machine_type.title() + machine_type = urllib.parse.quote_plus(machine_type) + url = f"{self.CLUSTER_API_ROOT}/clusters?machine_variant={machine_type}" + self._http.get(url, + scope=self._scope, + callback=self._parseCallback(on_finished, CloudClusterWithConfigResponse, failed), + error_callback=failed, + timeout=self.DEFAULT_REQUEST_TIMEOUT) + def getClusterStatus(self, cluster_id: str, on_finished: Callable[[CloudClusterStatus], Any]) -> None: """Retrieves the status of the given cluster. @@ -85,7 +103,7 @@ class CloudApiClient: :param on_finished: The function to be called after the result is parsed. """ - url = "{}/clusters/{}/status".format(self.CLUSTER_API_ROOT, cluster_id) + url = f"{self.CLUSTER_API_ROOT}/clusters/{cluster_id}/status" self._http.get(url, scope = self._scope, callback = self._parseCallback(on_finished, CloudClusterStatus), @@ -100,7 +118,7 @@ class CloudApiClient: :param on_finished: The function to be called after the result is parsed. """ - url = "{}/jobs/upload".format(self.CURA_API_ROOT) + url = f"{self.CURA_API_ROOT}/jobs/upload" data = json.dumps({"data": request.toDict()}).encode() self._http.put(url, @@ -131,7 +149,7 @@ class CloudApiClient: # specific to sending print jobs) such as lost connection, unparsable responses, etc. are not returned here, but # handled in a generic way by the CloudApiClient. def requestPrint(self, cluster_id: str, job_id: str, on_finished: Callable[[CloudPrintResponse], Any], on_error) -> None: - url = "{}/clusters/{}/print/{}".format(self.CLUSTER_API_ROOT, cluster_id, job_id) + url = f"{self.CLUSTER_API_ROOT}/clusters/{cluster_id}/print/{job_id}" self._http.post(url, scope = self._scope, data = b"", @@ -150,7 +168,7 @@ class CloudApiClient: """ body = json.dumps({"data": data}).encode() if data else b"" - url = "{}/clusters/{}/print_jobs/{}/action/{}".format(self.CLUSTER_API_ROOT, cluster_id, cluster_job_id, action) + url = f"{self.CLUSTER_API_ROOT}/clusters/{cluster_id}/print_jobs/{cluster_job_id}/action/{action}" self._http.post(url, scope = self._scope, data = body, @@ -159,7 +177,7 @@ class CloudApiClient: def _createEmptyRequest(self, path: str, content_type: Optional[str] = "application/json") -> QNetworkRequest: """We override _createEmptyRequest in order to add the user credentials. - :param url: The URL to request + :param path: The URL to request :param content_type: The type of the body contents. """ @@ -168,7 +186,7 @@ class CloudApiClient: request.setHeader(QNetworkRequest.KnownHeaders.ContentTypeHeader, content_type) access_token = self._account.accessToken if access_token: - request.setRawHeader(b"Authorization", "Bearer {}".format(access_token).encode()) + request.setRawHeader(b"Authorization", f"Bearer {access_token}".encode()) return request @staticmethod @@ -189,9 +207,9 @@ class CloudApiClient: Logger.logException("e", "Could not parse the stardust response: %s", error.toDict()) return status_code, {"errors": [error.toDict()]} - def _parseModels(self, response: Dict[str, Any], on_finished: Union[Callable[[CloudApiClientModel], Any], - Callable[[List[CloudApiClientModel]], Any]], model_class: Type[CloudApiClientModel]) -> None: - """Parses the given models and calls the correct callback depending on the result. + def _parseResponse(self, response: Dict[str, Any], on_finished: Union[Callable[[CloudApiClientModel], Any], + Callable[[List[CloudApiClientModel]], Any]], model_class: Type[CloudApiClientModel]) -> None: + """Parses the given response and calls the correct callback depending on the result. :param response: The response from the server, after being converted to a dict. :param on_finished: The callback in case the response is successful. @@ -200,7 +218,10 @@ class CloudApiClient: if "data" in response: data = response["data"] - if isinstance(data, list): + if "status" in data and data["status"] == "wait_approval": + on_finished_empty = cast(Callable[[List], Any], on_finished) + on_finished_empty([]) + elif isinstance(data, list): results = [model_class(**c) for c in data] # type: List[CloudApiClientModel] on_finished_list = cast(Callable[[List[CloudApiClientModel]], Any], on_finished) on_finished_list(results) @@ -242,7 +263,7 @@ class CloudApiClient: if status_code >= 300 and on_error is not None: on_error() else: - self._parseModels(response, on_finished, model) + self._parseResponse(response, on_finished, model) self._anti_gc_callbacks.append(parse) return parse diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 6431d09b7b..4c58c82350 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -3,7 +3,7 @@ from time import time import os -from typing import cast, List, Optional, TYPE_CHECKING +from typing import cast, List, Optional from PyQt6.QtCore import QObject, QUrl, pyqtProperty, pyqtSignal, pyqtSlot from PyQt6.QtGui import QDesktopServices @@ -21,6 +21,7 @@ from cura.PrinterOutput.PrinterOutputDevice import ConnectionType from .CloudApiClient import CloudApiClient from ..ExportFileJob import ExportFileJob +from ..Messages.PrintJobAwaitingApprovalMessage import PrintJobPendingApprovalMessage from ..UltimakerNetworkedPrinterOutputDevice import UltimakerNetworkedPrinterOutputDevice from ..Messages.PrintJobUploadBlockedMessage import PrintJobUploadBlockedMessage from ..Messages.PrintJobUploadErrorMessage import PrintJobUploadErrorMessage @@ -41,7 +42,7 @@ I18N_CATALOG = i18nCatalog("cura") class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """The cloud output device is a network output device that works remotely but has limited functionality. - Currently it only supports viewing the printer and print job status and adding a new job to the queue. + Currently, it only supports viewing the printer and print job status and adding a new job to the queue. As such, those methods have been implemented here. Note that this device represents a single remote cluster, not a list of multiple clusters. """ @@ -58,7 +59,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): PRINT_JOB_ACTIONS_MIN_VERSION = Version("5.2.12") # Notify can only use signals that are defined by the class that they are in, not inherited ones. - # Therefore we create a private signal used to trigger the printersChanged signal. + # Therefore, we create a private signal used to trigger the printersChanged signal. _cloudClusterPrintersChanged = pyqtSignal() def __init__(self, api_client: CloudApiClient, cluster: CloudClusterResponse, parent: QObject = None) -> None: @@ -202,7 +203,8 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): # Note that self.writeFinished is called in _onPrintUploadCompleted as well. if self._uploaded_print_job: Logger.log("i", "Current mesh is already attached to a print-job, immediately request reprint.") - self._api.requestPrint(self.key, self._uploaded_print_job.job_id, self._onPrintUploadCompleted, self._onPrintUploadSpecificError) + self._api.requestPrint(self.key, self._uploaded_print_job.job_id, self._onPrintUploadCompleted, + self._onPrintUploadSpecificError) return # Export the scene to the correct file type. @@ -230,6 +232,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): :param job_response: The response received from the cloud API. """ + if not self._tool_path: return self._onUploadError() self._pre_upload_print_job = job_response # store the last uploaded job to prevent re-upload of the same file @@ -244,12 +247,15 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): self._progress.update(100) print_job = cast(CloudPrintJobResponse, self._pre_upload_print_job) - if not print_job: # It's possible that another print job is requested in the meanwhile, which then fails to upload with an error, which sets self._pre_uploaded_print_job to `None`. + if not print_job: + # It's possible that another print job is requested in the meanwhile, which then fails to upload with an + # error, which sets self._pre_uploaded_print_job to `None`. self._pre_upload_print_job = None self._uploaded_print_job = None Logger.log("w", "Interference from another job uploaded at roughly the same time, not uploading print!") return # Prevent a crash. - self._api.requestPrint(self.key, print_job.job_id, self._onPrintUploadCompleted, self._onPrintUploadSpecificError) + self._api.requestPrint(self.key, print_job.job_id, self._onPrintUploadCompleted, + self._onPrintUploadSpecificError) def _onPrintUploadCompleted(self, response: CloudPrintResponse) -> None: """Shows a message when the upload has succeeded @@ -258,16 +264,21 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """ self._uploaded_print_job = self._pre_upload_print_job self._progress.hide() - message = PrintJobUploadSuccessMessage() - message.addAction("monitor print", - name=I18N_CATALOG.i18nc("@action:button", "Monitor print"), - icon="", - description=I18N_CATALOG.i18nc("@action:tooltip", "Track the print in Ultimaker Digital Factory"), - button_align=message.ActionButtonAlignment.ALIGN_RIGHT) - df_url = f"https://digitalfactory.ultimaker.com/app/jobs/{self._cluster.cluster_id}?utm_source=cura&utm_medium=software&utm_campaign=message-printjob-sent" - message.pyQtActionTriggered.connect(lambda message, action: (QDesktopServices.openUrl(QUrl(df_url)), message.hide())) - message.show() + if response: + message = PrintJobUploadSuccessMessage() + message.addAction("monitor print", + name=I18N_CATALOG.i18nc("@action:button", "Monitor print"), + icon="", + description=I18N_CATALOG.i18nc("@action:tooltip", "Track the print in Ultimaker Digital Factory"), + button_align=message.ActionButtonAlignment.ALIGN_RIGHT) + df_url = f"https://digitalfactory.ultimaker.com/app/jobs/{self._cluster.cluster_id}?utm_source=cura&utm_medium=software&utm_campaign=message-printjob-sent" + message.pyQtActionTriggered.connect(lambda message, action: (QDesktopServices.openUrl(QUrl(df_url)), message.hide())) + + message.show() + else: + PrintJobPendingApprovalMessage(self._cluster.cluster_id).show() + self.writeFinished.emit() def _onPrintUploadSpecificError(self, reply: "QNetworkReply", _: "QNetworkReply.NetworkError"): @@ -278,7 +289,9 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): if error_code == 409: PrintJobUploadQueueFullMessage().show() else: - PrintJobUploadErrorMessage(I18N_CATALOG.i18nc("@error:send", "Unknown error code when uploading print job: {0}", error_code)).show() + PrintJobUploadErrorMessage(I18N_CATALOG.i18nc("@error:send", + "Unknown error code when uploading print job: {0}", + error_code)).show() Logger.log("w", "Upload of print job failed specifically with error code {}".format(error_code)) @@ -336,11 +349,13 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): @pyqtSlot(name="openPrintJobControlPanel") def openPrintJobControlPanel(self) -> None: - QDesktopServices.openUrl(QUrl(self.clusterCloudUrl + "?utm_source=cura&utm_medium=software&utm_campaign=monitor-manage-browser")) + QDesktopServices.openUrl(QUrl(f"{self.clusterCloudUrl}?utm_source=cura&utm_medium=software&" + f"utm_campaign=monitor-manage-browser")) @pyqtSlot(name="openPrinterControlPanel") def openPrinterControlPanel(self) -> None: - QDesktopServices.openUrl(QUrl(self.clusterCloudUrl + "?utm_source=cura&utm_medium=software&utm_campaign=monitor-manage-printer")) + QDesktopServices.openUrl(QUrl(f"{self.clusterCloudUrl}?utm_source=cura&utm_medium=software" + f"&utm_campaign=monitor-manage-printer")) permissionsChanged = pyqtSignal() @@ -362,7 +377,7 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): @pyqtProperty(bool, notify = permissionsChanged) def canWriteOwnPrintJobs(self) -> bool: """ - Whether this user can change things about print jobs made by themself. + Whether this user can change things about print jobs made by them. """ return "digital-factory.print-job.write.own" in self._account.permissions @@ -390,4 +405,4 @@ class CloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): """Gets the URL on which to monitor the cluster via the cloud.""" root_url_prefix = "-staging" if self._account.is_staging else "" - return "https://digitalfactory{}.ultimaker.com/app/jobs/{}".format(root_url_prefix, self.clusterData.cluster_id) + return f"https://digitalfactory{root_url_prefix}.ultimaker.com/app/jobs/{self.clusterData.cluster_id}" diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py index 30bbf68f6c..abfe863749 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py @@ -9,7 +9,6 @@ from PyQt6.QtWidgets import QMessageBox from UM import i18nCatalog from UM.Logger import Logger # To log errors talking to the API. -from UM.Message import Message from UM.Settings.Interfaces import ContainerInterface from UM.Signal import Signal from UM.Util import parseBool @@ -20,16 +19,19 @@ from cura.Settings.CuraContainerRegistry import CuraContainerRegistry # To upda from cura.Settings.CuraStackBuilder import CuraStackBuilder from cura.Settings.GlobalStack import GlobalStack from cura.UltimakerCloud.UltimakerCloudConstants import META_CAPABILITIES, META_UM_LINKED_TO_ACCOUNT +from .AbstractCloudOutputDevice import AbstractCloudOutputDevice from .CloudApiClient import CloudApiClient from .CloudOutputDevice import CloudOutputDevice +from ..Messages.RemovedPrintersMessage import RemovedPrintersMessage from ..Models.Http.CloudClusterResponse import CloudClusterResponse +from ..Messages.NewPrinterDetectedMessage import NewPrinterDetectedMessage class CloudOutputDeviceManager: """The cloud output device manager is responsible for using the Ultimaker Cloud APIs to manage remote clusters. Keeping all cloud related logic in this class instead of the UM3OutputDevicePlugin results in more readable code. - API spec is available on https://api.ultimaker.com/docs/connect/spec/. + API spec is available on https://docs.api.ultimaker.com/connect/index.html. """ META_CLUSTER_ID = "um_cloud_cluster_id" @@ -46,21 +48,22 @@ class CloudOutputDeviceManager: def __init__(self) -> None: # Persistent dict containing the remote clusters for the authenticated user. - self._remote_clusters = {} # type: Dict[str, CloudOutputDevice] + self._remote_clusters: Dict[str, CloudOutputDevice] = {} + + self._abstract_clusters: Dict[str, AbstractCloudOutputDevice] = {} # Dictionary containing all the cloud printers loaded in Cura - self._um_cloud_printers = {} # type: Dict[str, GlobalStack] + self._um_cloud_printers: Dict[str, GlobalStack] = {} - self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account + self._account: Account = CuraApplication.getInstance().getCuraAPI().account self._api = CloudApiClient(CuraApplication.getInstance(), on_error = lambda error: Logger.log("e", str(error))) self._account.loginStateChanged.connect(self._onLoginStateChanged) - self._removed_printers_message = None # type: Optional[Message] + self._removed_printers_message: Optional[RemovedPrintersMessage] = None # Ensure we don't start twice. self._running = False self._syncing = False - CuraApplication.getInstance().getContainerRegistry().containerRemoved.connect(self._printerRemoved) def start(self): @@ -113,8 +116,8 @@ class CloudOutputDeviceManager: CuraApplication.getInstance().getContainerRegistry().findContainerStacks( type = "machine") if m.getMetaDataEntry(self.META_CLUSTER_ID, None)} new_clusters = [] - all_clusters = {c.cluster_id: c for c in clusters} # type: Dict[str, CloudClusterResponse] - online_clusters = {c.cluster_id: c for c in clusters if c.is_online} # type: Dict[str, CloudClusterResponse] + all_clusters: Dict[str, CloudClusterResponse] = {c.cluster_id: c for c in clusters} + online_clusters: Dict[str, CloudClusterResponse] = {c.cluster_id: c for c in clusters if c.is_online} # Add the new printers in Cura. for device_id, cluster_data in all_clusters.items(): @@ -130,8 +133,11 @@ class CloudOutputDeviceManager: self._um_cloud_printers[device_id].setMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, True) if not self._um_cloud_printers[device_id].getMetaDataEntry(META_CAPABILITIES, None): self._um_cloud_printers[device_id].setMetaDataEntry(META_CAPABILITIES, ",".join(cluster_data.capabilities)) - self._onDevicesDiscovered(new_clusters) + # We want a machine stack per remote printer that we discovered. Create them now! + self._createMachineStacksForDiscoveredClusters(new_clusters) + + # Update the online vs offline status for all found devices self._updateOnlinePrinters(all_clusters) # Hide the current removed_printers_message, if there is any @@ -152,6 +158,7 @@ class CloudOutputDeviceManager: if new_clusters or offline_device_keys or removed_device_keys: self.discoveredDevicesChanged.emit() + if offline_device_keys: # If the removed device was active we should connect to the new active device self._connectToActiveMachine() @@ -165,54 +172,72 @@ class CloudOutputDeviceManager: self._syncing = False self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.ERROR) - def _onDevicesDiscovered(self, clusters: List[CloudClusterResponse]) -> None: + def _requestWrite(self, unique_id: str, nodes: List["SceneNode"]): + for remote in self._remote_clusters.values(): + if unique_id == remote.name: # No other id-type would match. Assume cloud doesn't have duplicate names. + remote.requestWrite(nodes) + return + Logger.log("e", f"Failed writing to specific cloud printer: {unique_id} not in remote clusters.") + + def _createMachineStacksForDiscoveredClusters(self, discovered_clusters: List[CloudClusterResponse]) -> None: """**Synchronously** create machines for discovered devices Any new machines are made available to the user. - May take a long time to complete. As this code needs access to the Application - and blocks the GIL, creating a Job for this would not make sense. - Shows a Message informing the user of progress. + May take a long time to complete. This currently forcefully calls the "processEvents", which isn't + the nicest solution out there. We might need to consider moving this into a job later! """ - new_devices = [] + new_output_devices: List[CloudOutputDevice] = [] remote_clusters_added = False - host_guid_map = {machine.getMetaDataEntry(self.META_HOST_GUID): device_cluster_id - for device_cluster_id, machine in self._um_cloud_printers.items() - if machine.getMetaDataEntry(self.META_HOST_GUID)} + + # Create a map that maps the HOST_GUID to the DEVICE_CLUSTER_ID + host_guid_map: Dict[str, str] = {machine.getMetaDataEntry(self.META_HOST_GUID): device_cluster_id + for device_cluster_id, machine in self._um_cloud_printers.items() + if machine.getMetaDataEntry(self.META_HOST_GUID)} + machine_manager = CuraApplication.getInstance().getMachineManager() - for cluster_data in clusters: - device = CloudOutputDevice(self._api, cluster_data) + for cluster_data in discovered_clusters: + output_device = CloudOutputDevice(self._api, cluster_data) + + if cluster_data.printer_type not in self._abstract_clusters: + self._abstract_clusters[cluster_data.printer_type] = AbstractCloudOutputDevice(self._api, cluster_data.printer_type, self._requestWrite, self.refreshConnections) + # Ensure that the abstract machine is added (either because it was never added, or it somehow got + # removed) + _abstract_machine = CuraStackBuilder.createAbstractMachine(cluster_data.printer_type) + # If the machine already existed before, it will be present in the host_guid_map if cluster_data.host_guid in host_guid_map: - machine = machine_manager.getMachine(device.printerType, {self.META_HOST_GUID: cluster_data.host_guid}) - if machine and machine.getMetaDataEntry(self.META_CLUSTER_ID) != device.key: + machine = machine_manager.getMachine(output_device.printerType, {self.META_HOST_GUID: cluster_data.host_guid}) + if machine and machine.getMetaDataEntry(self.META_CLUSTER_ID) != output_device.key: # If the retrieved device has a different cluster_id than the existing machine, bring the existing # machine up-to-date. - self._updateOutdatedMachine(outdated_machine = machine, new_cloud_output_device = device) + self._updateOutdatedMachine(outdated_machine = machine, new_cloud_output_device = output_device) # Create a machine if we don't already have it. Do not make it the active machine. # We only need to add it if it wasn't already added by "local" network or by cloud. - if machine_manager.getMachine(device.printerType, {self.META_CLUSTER_ID: device.key}) is None \ - and machine_manager.getMachine(device.printerType, {self.META_NETWORK_KEY: cluster_data.host_name + "*"}) is None: # The host name is part of the network key. - new_devices.append(device) - elif device.getId() not in self._remote_clusters: - self._remote_clusters[device.getId()] = device + if machine_manager.getMachine(output_device.printerType, {self.META_CLUSTER_ID: output_device.key}) is None \ + and machine_manager.getMachine(output_device.printerType, {self.META_NETWORK_KEY: cluster_data.host_name + "*"}) is None: # The host name is part of the network key. + new_output_devices.append(output_device) + elif output_device.getId() not in self._remote_clusters: + self._remote_clusters[output_device.getId()] = output_device remote_clusters_added = True # If a printer that was removed from the account is re-added, change its metadata to mark it not removed # from the account - elif not parseBool(self._um_cloud_printers[device.key].getMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, "true")): - self._um_cloud_printers[device.key].setMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, True) + elif not parseBool(self._um_cloud_printers[output_device.key].getMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, "true")): + self._um_cloud_printers[output_device.key].setMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, True) + # As adding a lot of machines might take some time, ensure that the GUI (and progress message) is updated + CuraApplication.getInstance().processEvents() # Inform the Cloud printers model about new devices. new_devices_list_of_dicts = [{ "key": d.getId(), "name": d.name, "machine_type": d.printerTypeName, - "firmware_version": d.firmwareVersion} for d in new_devices] + "firmware_version": d.firmwareVersion} for d in new_output_devices] discovered_cloud_printers_model = CuraApplication.getInstance().getDiscoveredCloudPrintersModel() discovered_cloud_printers_model.addDiscoveredCloudPrinters(new_devices_list_of_dicts) - if not new_devices: + if not new_output_devices: if remote_clusters_added: self._connectToActiveMachine() return @@ -220,55 +245,29 @@ class CloudOutputDeviceManager: # Sort new_devices on online status first, alphabetical second. # Since the first device might be activated in case there is no active printer yet, # it would be nice to prioritize online devices - online_cluster_names = {c.friendly_name.lower() for c in clusters if c.is_online and not c.friendly_name is None} - new_devices.sort(key = lambda x: ("a{}" if x.name.lower() in online_cluster_names else "b{}").format(x.name.lower())) + online_cluster_names = {c.friendly_name.lower() for c in discovered_clusters if c.is_online and not c.friendly_name is None} + new_output_devices.sort(key = lambda x: ("a{}" if x.name.lower() in online_cluster_names else "b{}").format(x.name.lower())) - message = Message( - title = self.i18n_catalog.i18ncp( - "info:status", - "New printer detected from your Ultimaker account", - "New printers detected from your Ultimaker account", - len(new_devices) - ), - progress = 0, - lifetime = 0, - message_type = Message.MessageType.POSITIVE - ) + message = NewPrinterDetectedMessage(num_printers_found = len(new_output_devices)) message.show() new_devices_added = [] - for idx, device in enumerate(new_devices): - message_text = self.i18n_catalog.i18nc("info:status Filled in with printer name and printer model.", "Adding printer {name} ({model}) from your account").format(name = device.name, model = device.printerTypeName) - message.setText(message_text) - if len(new_devices) > 1: - message.setProgress((idx / len(new_devices)) * 100) - CuraApplication.getInstance().processEvents() - self._remote_clusters[device.getId()] = device + for idx, output_device in enumerate(new_output_devices): + message.updateProgressText(output_device) + + self._remote_clusters[output_device.getId()] = output_device # If there is no active machine, activate the first available cloud printer activate = not CuraApplication.getInstance().getMachineManager().activeMachine - if self._createMachineFromDiscoveredDevice(device.getId(), activate = activate): - new_devices_added.append(device) + if self._createMachineFromDiscoveredDevice(output_device.getId(), activate = activate): + new_devices_added.append(output_device) - message.setProgress(None) + message.finalize(new_devices_added, new_output_devices) - max_disp_devices = 3 - if len(new_devices_added) > max_disp_devices: - num_hidden = len(new_devices_added) - max_disp_devices - device_name_list = ["
  • {} ({})
    • ".format(device.name, device.printerTypeName) for device in new_devices[0:max_disp_devices]] - device_name_list.append("
  • " + self.i18n_catalog.i18ncp("info:{0} gets replaced by a number of printers", "... and {0} other", "... and {0} others", num_hidden) + "
    • ") - device_names = "".join(device_name_list) - else: - device_names = "".join(["
  • {} ({})
    • ".format(device.name, device.printerTypeName) for device in new_devices_added]) - if new_devices_added: - message_text = self.i18n_catalog.i18nc("info:status", "Printers added from Digital Factory:") + "
      " + device_names + "
    " - message.setText(message_text) - else: - message.hide() - - def _updateOnlinePrinters(self, printer_responses: Dict[str, CloudClusterResponse]) -> None: + @staticmethod + def _updateOnlinePrinters(printer_responses: Dict[str, CloudClusterResponse]) -> None: """ Update the metadata of the printers to store whether they are online or not. :param printer_responses: The responses received from the API about the printer statuses. @@ -291,7 +290,8 @@ class CloudOutputDeviceManager: old_cluster_id = outdated_machine.getMetaDataEntry(self.META_CLUSTER_ID) outdated_machine.setMetaDataEntry(self.META_CLUSTER_ID, new_cloud_output_device.key) outdated_machine.setMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, True) - # Cleanup the remainings of the old CloudOutputDevice(old_cluster_id) + + # Cleanup the remains of the old CloudOutputDevice(old_cluster_id) self._um_cloud_printers[new_cloud_output_device.key] = self._um_cloud_printers.pop(old_cluster_id) output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() if old_cluster_id in output_device_manager.getOutputDeviceIds(): @@ -321,56 +321,19 @@ class CloudOutputDeviceManager: for device_id in removed_device_ids: if not parseBool(self._um_cloud_printers[device_id].getMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, "true")): ignored_device_ids.add(device_id) + # Keep the reported_device_ids list in a class variable, so that the message button actions can access it and # take the necessary steps to fulfill their purpose. self.reported_device_ids = removed_device_ids - ignored_device_ids if not self.reported_device_ids: return - # Generate message - self._removed_printers_message = Message( - title = self.i18n_catalog.i18ncp( - "info:status", - "A cloud connection is not available for a printer", - "A cloud connection is not available for some printers", - len(self.reported_device_ids) - ), - message_type = Message.MessageType.WARNING - ) - device_names = "".join(["
  • {} ({})
    • ".format(self._um_cloud_printers[device].name, self._um_cloud_printers[device].definition.name) for device in self.reported_device_ids]) - message_text = self.i18n_catalog.i18ncp( - "info:status", - "This printer is not linked to the Digital Factory:", - "These printers are not linked to the Digital Factory:", - len(self.reported_device_ids) - ) - message_text += "
      {}

    ".format(device_names) - digital_factory_string = self.i18n_catalog.i18nc("info:name", "Ultimaker Digital Factory") - - message_text += self.i18n_catalog.i18nc( - "info:status", - "To establish a connection, please visit the {website_link}".format(website_link = "{}.".format(digital_factory_string)) - ) - self._removed_printers_message.setText(message_text) - self._removed_printers_message.addAction("keep_printer_configurations_action", - name = self.i18n_catalog.i18nc("@action:button", "Keep printer configurations"), - icon = "", - description = "Keep cloud printers in Ultimaker Cura when not connected to your account.", - button_align = Message.ActionButtonAlignment.ALIGN_RIGHT) - self._removed_printers_message.addAction("remove_printers_action", - name = self.i18n_catalog.i18nc("@action:button", "Remove printers"), - icon = "", - description = "Remove cloud printer(s) which aren't linked to your account.", - button_style = Message.ActionButtonStyle.SECONDARY, - button_align = Message.ActionButtonAlignment.ALIGN_LEFT) - self._removed_printers_message.actionTriggered.connect(self._onRemovedPrintersMessageActionTriggered) - output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() # Remove the output device from the printers for device_id in removed_device_ids: - device = self._um_cloud_printers.get(device_id, None) # type: Optional[GlobalStack] - if not device: + global_stack: Optional[GlobalStack] = self._um_cloud_printers.get(device_id, None) + if not global_stack: continue if device_id in output_device_manager.getOutputDeviceIds(): output_device_manager.removeOutputDevice(device_id) @@ -378,12 +341,19 @@ class CloudOutputDeviceManager: del self._remote_clusters[device_id] # Update the printer's metadata to mark it as not linked to the account - device.setMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, False) + global_stack.setMetaDataEntry(META_UM_LINKED_TO_ACCOUNT, False) + # Generate message to show + device_names = "".join(["
  • {} ({})
    • ".format(self._um_cloud_printers[device].name, + self._um_cloud_printers[device].definition.name) for device in + self.reported_device_ids]) + self._removed_printers_message = RemovedPrintersMessage(self.reported_device_ids, device_names) + self._removed_printers_message.actionTriggered.connect(self._onRemovedPrintersMessageActionTriggered) self._removed_printers_message.show() def _onDiscoveredDeviceRemoved(self, device_id: str) -> None: - device = self._remote_clusters.pop(device_id, None) # type: Optional[CloudOutputDevice] + """ Remove the CloudOutputDevices for printers that are offline""" + device: Optional[CloudOutputDevice] = self._remote_clusters.pop(device_id, None) if not device: return device.close() @@ -392,12 +362,12 @@ class CloudOutputDeviceManager: output_device_manager.removeOutputDevice(device.key) def _createMachineFromDiscoveredDevice(self, key: str, activate: bool = True) -> bool: - device = self._remote_clusters[key] + device = self._remote_clusters.get(key) if not device: return False # Create a new machine. - # We do not use use MachineManager.addMachine here because we need to set the cluster ID before activating it. + # We do not use MachineManager.addMachine here because we need to set the cluster ID before activating it. new_machine = CuraStackBuilder.createMachine(device.name, device.printerType, show_warning_message=False) if not new_machine: Logger.error(f"Failed creating a new machine for {device.name}") @@ -405,8 +375,6 @@ class CloudOutputDeviceManager: self._setOutputDeviceMetadata(device, new_machine) - _abstract_machine = CuraStackBuilder.createAbstractMachine(device.printerType) - if activate: CuraApplication.getInstance().getMachineManager().setActiveMachine(new_machine.getId()) @@ -414,15 +382,19 @@ class CloudOutputDeviceManager: def _connectToActiveMachine(self) -> None: """Callback for when the active machine was changed by the user""" - active_machine = CuraApplication.getInstance().getGlobalContainerStack() if not active_machine: return + # Check if we should directly connect with a "normal" CloudOutputDevice or that we should connect to an + # 'abstract' one output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() stored_cluster_id = active_machine.getMetaDataEntry(self.META_CLUSTER_ID) local_network_key = active_machine.getMetaDataEntry(self.META_NETWORK_KEY) - for device in list(self._remote_clusters.values()): # Make a copy of the remote devices list, to prevent modifying the list while iterating, if a device gets added asynchronously. + + # Copy of the device list, to prevent modifying the list while iterating, if a device gets added asynchronously. + remote_cluster_copy: List[CloudOutputDevice] = list(self._remote_clusters.values()) + for device in remote_cluster_copy: if device.key == stored_cluster_id: # Connect to it if the stored ID matches. self._connectToOutputDevice(device, active_machine) @@ -433,6 +405,14 @@ class CloudOutputDeviceManager: # Remove device if it is not meant for the active machine. output_device_manager.removeOutputDevice(device.key) + # Update state of all abstract output devices + remote_abstract_cluster_copy: List[CloudOutputDevice] = list(self._abstract_clusters.values()) + for device in remote_abstract_cluster_copy: + if device.printerType == active_machine.definition.getId() and parseBool(active_machine.getMetaDataEntry("is_abstract_machine", False)): + self._connectToAbstractOutputDevice(device, active_machine) + elif device.key in output_device_manager.getOutputDeviceIds(): + output_device_manager.removeOutputDevice(device.key) + def _setOutputDeviceMetadata(self, device: CloudOutputDevice, machine: GlobalStack): machine.setName(device.name) machine.setMetaDataEntry(self.META_CLUSTER_ID, device.key) @@ -440,13 +420,24 @@ class CloudOutputDeviceManager: machine.setMetaDataEntry("group_name", device.name) machine.setMetaDataEntry("group_size", device.clusterSize) digital_factory_string = self.i18n_catalog.i18nc("info:name", "Ultimaker Digital Factory") - digital_factory_link = "{digital_factory_string}".format(digital_factory_string = digital_factory_string) + digital_factory_link = f"{digital_factory_string}" removal_warning_string = self.i18n_catalog.i18nc("@message {printer_name} is replaced with the name of the printer", "{printer_name} will be removed until the next account sync.").format(printer_name = device.name) \ + "
    " + self.i18n_catalog.i18nc("@message {printer_name} is replaced with the name of the printer", "To remove {printer_name} permanently, visit {digital_factory_link}").format(printer_name = device.name, digital_factory_link = digital_factory_link) \ + "

    " + self.i18n_catalog.i18nc("@message {printer_name} is replaced with the name of the printer", "Are you sure you want to remove {printer_name} temporarily?").format(printer_name = device.name) machine.setMetaDataEntry("removal_warning", removal_warning_string) machine.addConfiguredConnectionType(device.connectionType.value) + def _connectToAbstractOutputDevice(self, device: AbstractCloudOutputDevice, machine: GlobalStack) -> None: + Logger.debug(f"Attempting to connect to abstract machine {machine.id}") + if not device.isConnected(): + device.connect() + machine.addConfiguredConnectionType(device.connectionType.value) + + output_device_manager = CuraApplication.getInstance().getOutputDeviceManager() + if device.key not in output_device_manager.getOutputDeviceIds(): + output_device_manager.addOutputDevice(device) + def _connectToOutputDevice(self, device: CloudOutputDevice, machine: GlobalStack) -> None: """Connects to an output device and makes sure it is registered in the output device manager.""" @@ -472,7 +463,7 @@ class CloudOutputDeviceManager: if container_cluster_id in self._remote_clusters.keys(): del self._remote_clusters[container_cluster_id] - def _onRemovedPrintersMessageActionTriggered(self, removed_printers_message: Message, action: str) -> None: + def _onRemovedPrintersMessageActionTriggered(self, removed_printers_message: RemovedPrintersMessage, action: str) -> None: if action == "keep_printer_configurations_action": removed_printers_message.hide() elif action == "remove_printers_action": @@ -483,12 +474,16 @@ class CloudOutputDeviceManager: question_title = self.i18n_catalog.i18nc("@title:window", "Remove printers?") question_content = self.i18n_catalog.i18ncp( "@label", - "You are about to remove {0} printer from Cura. This action cannot be undone.\nAre you sure you want to continue?", - "You are about to remove {0} printers from Cura. This action cannot be undone.\nAre you sure you want to continue?", + "You are about to remove {0} printer from Cura. This action cannot be undone.\n" + "Are you sure you want to continue?", + "You are about to remove {0} printers from Cura. This action cannot be undone.\n" + "Are you sure you want to continue?", len(remove_printers_ids) ) if remove_printers_ids == all_ids: - question_content = self.i18n_catalog.i18nc("@label", "You are about to remove all printers from Cura. This action cannot be undone.\nAre you sure you want to continue?") + question_content = self.i18n_catalog.i18nc("@label", "You are about to remove all printers from Cura. " + "This action cannot be undone.\n" + "Are you sure you want to continue?") result = QMessageBox.question(None, question_title, question_content) if result == QMessageBox.StandardButton.No: return diff --git a/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py b/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py new file mode 100644 index 0000000000..d85ade9dce --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/NewPrinterDetectedMessage.py @@ -0,0 +1,60 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from UM import i18nCatalog +from UM.Message import Message +from cura.CuraApplication import CuraApplication + + +class NewPrinterDetectedMessage(Message): + i18n_catalog = i18nCatalog("cura") + + def __init__(self, num_printers_found: int) -> None: + super().__init__(title = self.i18n_catalog.i18ncp("info:status", + "New printer detected from your Ultimaker account", + "New printers detected from your Ultimaker account", + num_printers_found), + progress = 0, + lifetime = 0, + message_type = Message.MessageType.POSITIVE) + self._printers_added = 0 + self._num_printers_found = num_printers_found + + def updateProgressText(self, output_device): + """ + While the progress of adding printers is running, update the text displayed. + :param output_device: The output device that is being added. + :return: + """ + message_text = self.i18n_catalog.i18nc("info:status Filled in with printer name and printer model.", + "Adding printer {name} ({model}) from your account").format( + name=output_device.name, model=output_device.printerTypeName) + self.setText(message_text) + if self._num_printers_found > 1: + self.setProgress((self._printers_added / self._num_printers_found) * 100) + self._printers_added += 1 + + CuraApplication.getInstance().processEvents() + + def finalize(self, new_devices_added, new_output_devices): + self.setProgress(None) + num_devices_added = len(new_devices_added) + max_disp_devices = 3 + + if num_devices_added > max_disp_devices: + num_hidden = num_devices_added - max_disp_devices + device_name_list = ["
  • {} ({})
    • ".format(device.name, device.printerTypeName) for device in + new_output_devices[0: max_disp_devices]] + device_name_list.append( + "
  • " + self.i18n_catalog.i18ncp("info:{0} gets replaced by a number of printers", "... and {0} other", + "... and {0} others", num_hidden) + "
    • ") + device_names = "".join(device_name_list) + else: + device_names = "".join( + ["
  • {} ({})
    • ".format(device.name, device.printerTypeName) for device in new_devices_added]) + + if new_devices_added: + message_text = self.i18n_catalog.i18nc("info:status", + "Printers added from Digital Factory:") + f"
      {device_names}
    " + self.setText(message_text) + else: + self.hide() diff --git a/plugins/UM3NetworkPrinting/src/Messages/PrintJobAwaitingApprovalMessage.py b/plugins/UM3NetworkPrinting/src/Messages/PrintJobAwaitingApprovalMessage.py new file mode 100644 index 0000000000..c60d596da9 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/PrintJobAwaitingApprovalMessage.py @@ -0,0 +1,38 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from PyQt6.QtCore import QUrl +from PyQt6.QtGui import QDesktopServices + +from UM import i18nCatalog +from UM.Message import Message + + +I18N_CATALOG = i18nCatalog("cura") + + +class PrintJobPendingApprovalMessage(Message): + """Message shown when waiting for approval on an uploaded print job.""" + + def __init__(self, cluster_id: str) -> None: + super().__init__( + text = I18N_CATALOG.i18nc("@info:status", "You will receive a confirmation via email when the print job is approved"), + title=I18N_CATALOG.i18nc("@info:title", "The print job was successfully submitted"), + message_type=Message.MessageType.POSITIVE + ) + self.addAction("manage_print_jobs", I18N_CATALOG.i18nc("@action", "Manage print jobs"), "", "") + + self.addAction("learn_more", I18N_CATALOG.i18nc("@action", "Learn more"), "", "", + button_style = Message.ActionButtonStyle.LINK, + button_align = Message.ActionButtonAlignment.ALIGN_LEFT) + + self.actionTriggered.connect(self._onActionTriggered) + + self.cluster_id = cluster_id + + def _onActionTriggered(self, message: Message, action: str) -> None: + """ Callback function for the "Manage print jobs" button on the pending approval notification. """ + match action: + case "manage_print_jobs": + QDesktopServices.openUrl(QUrl(f"https://digitalfactory.ultimaker.com/app/jobs/{self._cluster.cluster_id}?utm_source=cura&utm_medium=software&utm_campaign=message-printjob-sent")) + case "learn_more": + QDesktopServices.openUrl(QUrl("https://support.ultimaker.com/hc/en-us/articles/5329940078620?utm_source=cura&utm_medium=software&utm_campaign=message-printjob-sent")) diff --git a/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py b/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py new file mode 100644 index 0000000000..caed6ddf91 --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Messages/RemovedPrintersMessage.py @@ -0,0 +1,52 @@ +# Copyright (c) 2022 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from UM import i18nCatalog +from UM.Message import Message +from cura.CuraApplication import CuraApplication + + +class RemovedPrintersMessage(Message): + i18n_catalog = i18nCatalog("cura") + + def __init__(self, removed_devices, device_names) -> None: + self._removed_devices = removed_devices + + message_text = self.i18n_catalog.i18ncp( + "info:status", + "This printer is not linked to the Digital Factory:", + "These printers are not linked to the Digital Factory:", + len(self._removed_devices) + ) + message_text += "
      {}

    ".format(device_names) + + digital_factory_string = self.i18n_catalog.i18nc("info:name", "Ultimaker Digital Factory") + website_link = f"{digital_factory_string}." + + message_text += self.i18n_catalog.i18nc( + "info:status", + f"To establish a connection, please visit the {website_link}" + ) + + super().__init__(title=self.i18n_catalog.i18ncp("info:status", + "A cloud connection is not available for a printer", + "A cloud connection is not available for some printers", + len(self._removed_devices)), + message_type=Message.MessageType.WARNING, + text = message_text) + + self.addAction("keep_printer_configurations_action", + name=self.i18n_catalog.i18nc("@action:button", + "Keep printer configurations"), + icon="", + description="Keep cloud printers in Ultimaker Cura when not connected to your account.", + button_align=Message.ActionButtonAlignment.ALIGN_RIGHT) + self.addAction("remove_printers_action", + name=self.i18n_catalog.i18nc("@action:button", "Remove printers"), + icon="", + description="Remove cloud printer(s) which aren't linked to your account.", + button_style=Message.ActionButtonStyle.SECONDARY, + button_align=Message.ActionButtonAlignment.ALIGN_LEFT) + + + diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py index ce6dd1de4d..c8f3be282e 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterResponse.py @@ -8,7 +8,6 @@ from ..BaseModel import BaseModel class CloudClusterResponse(BaseModel): """Class representing a cloud connected cluster.""" - def __init__(self, cluster_id: str, host_guid: str, host_name: str, is_online: bool, status: str, host_internal_ip: Optional[str] = None, host_version: Optional[str] = None, friendly_name: Optional[str] = None, printer_type: str = "ultimaker3", printer_count: int = 1, diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterWithConfigResponse.py b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterWithConfigResponse.py new file mode 100644 index 0000000000..eb6389910c --- /dev/null +++ b/plugins/UM3NetworkPrinting/src/Models/Http/CloudClusterWithConfigResponse.py @@ -0,0 +1,14 @@ +# Copyright (c) 2019 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. +from typing import Optional, List + +from .CloudClusterResponse import CloudClusterResponse +from .ClusterPrinterStatus import ClusterPrinterStatus + + +class CloudClusterWithConfigResponse(CloudClusterResponse): + """Class representing a cloud connected cluster.""" + + def __init__(self, **kwargs) -> None: + self.configuration = self.parseModel(ClusterPrinterStatus, kwargs.get("host_printer")) + super().__init__(**kwargs) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py index 16b4b6d656..925b4844c1 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterStatus.py @@ -20,7 +20,6 @@ from ..BaseModel import BaseModel class ClusterPrinterStatus(BaseModel): """Class representing a cluster printer""" - def __init__(self, enabled: bool, firmware_version: str, friendly_name: str, ip_address: str, machine_variant: str, status: str, unique_name: str, uuid: str, configuration: List[Union[Dict[str, Any], ClusterPrintCoreConfiguration]], @@ -28,9 +27,9 @@ class ClusterPrinterStatus(BaseModel): firmware_update_status: Optional[str] = None, latest_available_firmware: Optional[str] = None, build_plate: Union[Dict[str, Any], ClusterBuildPlate] = None, material_station: Union[Dict[str, Any], ClusterPrinterMaterialStation] = None, **kwargs) -> None: - """Creates a new cluster printer status - - :param enabled: A printer can be disabled if it should not receive new jobs. By default every printer is enabled. + """ + Creates a new cluster printer status + :param enabled: A printer can be disabled if it should not receive new jobs. By default, every printer is enabled. :param firmware_version: Firmware version installed on the printer. Can differ for each printer in a cluster. :param friendly_name: Human readable name of the printer. Can be used for identification purposes. :param ip_address: The IP address of the printer in the local network. diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py index f5afb0b14e..466f7debde 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py @@ -3,6 +3,8 @@ import os from typing import Optional, Dict, List, Callable, Any +from time import time + from PyQt6.QtGui import QDesktopServices from PyQt6.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject from PyQt6.QtNetwork import QNetworkReply @@ -32,6 +34,8 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): activeCameraUrlChanged = pyqtSignal() + CHECK_CLUSTER_INTERVAL = 10.0 # seconds + def __init__(self, device_id: str, address: str, properties: Dict[bytes, bytes], parent=None) -> None: super().__init__( @@ -107,6 +111,8 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice): def _update(self) -> None: super()._update() + if time() - self._time_of_last_request < self.CHECK_CLUSTER_INTERVAL: + return # avoid calling the cluster too often self._getApiClient().getPrinters(self._updatePrinters) self._getApiClient().getPrintJobs(self._updatePrintJobs) self._updatePrintJobPreviewImages() diff --git a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py index bddd383b23..d35e409086 100644 --- a/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py +++ b/plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py @@ -221,7 +221,7 @@ class LocalClusterOutputDeviceManager: return # Create a new machine and activate it. - # We do not use use MachineManager.addMachine here because we need to set the network key before activating it. + # We do not use MachineManager.addMachine here because we need to set the network key before activating it. # If we do not do this the auto-pairing with the cloud-equivalent device will not work. new_machine = CuraStackBuilder.createMachine(device.name, device.printerType) if not new_machine: @@ -234,7 +234,6 @@ class LocalClusterOutputDeviceManager: _abstract_machine = CuraStackBuilder.createAbstractMachine(device.printerType) - def _storeManualAddress(self, address: str) -> None: """Add an address to the stored preferences.""" diff --git a/plugins/USBPrinting/USBPrinterOutputDevice.py b/plugins/USBPrinting/USBPrinterOutputDevice.py index d91be99f46..1155420b60 100644 --- a/plugins/USBPrinting/USBPrinterOutputDevice.py +++ b/plugins/USBPrinting/USBPrinterOutputDevice.py @@ -398,7 +398,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): line = line[:line.find(";")] line = line.strip() - + # Don't send empty lines. But we do have to send something, so send M105 instead. # Don't send the M0 or M1 to the machine, as M0 and M1 are handled as an LCD menu pause. if line == "" or line == "M0" or line == "M1": @@ -429,7 +429,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice): print_job.updateTimeElapsed(elapsed_time) estimated_time = self._print_estimated_time if progress > .1: - estimated_time = self._print_estimated_time * (1 - progress) + elapsed_time + estimated_time = int(self._print_estimated_time * (1 - progress) + elapsed_time) print_job.updateTimeTotal(estimated_time) self._gcode_position += 1 diff --git a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py index ded892d137..2c3a0939a8 100644 --- a/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py +++ b/plugins/VersionUpgrade/VersionUpgrade22to24/VersionUpgrade.py @@ -64,7 +64,7 @@ class VersionUpgrade22to24(VersionUpgrade): config.remove_option("general", "containers") - for idx in range(len(container_list)): + for idx, _ in enumerate(container_list): config.set("containers", str(idx), container_list[idx]) output = io.StringIO() diff --git a/plugins/X3DReader/X3DReader.py b/plugins/X3DReader/X3DReader.py index 0b41578a05..57105b66a1 100644 --- a/plugins/X3DReader/X3DReader.py +++ b/plugins/X3DReader/X3DReader.py @@ -866,13 +866,13 @@ def readIndex(node, attr): v = readIntArray(node, attr, []) chunks = [] chunk = [] - for i in range(len(v)): - if v[i] == -1: + for i in v: + if i == -1: if chunk: chunks.append(chunk) chunk = [] else: - chunk.append(v[i]) + chunk.append(i) if chunk: chunks.append(chunk) return chunks diff --git a/requirements.txt b/requirements.txt index c8bb861814..60dcb77bea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -228,6 +228,9 @@ SecretStorage==3.3.1 \ keyring==23.0.1 \ --hash=sha256:045703609dd3fccfcdb27da201684278823b72af515aedec1a8515719a038cb8 \ --hash=sha256:8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 +networkx==2.6.2 \ + --hash=sha256:2306f1950ce772c5a59a57f5486d59bb9cab98497c45fc49cbc45ac0dec119bb \ + --hash=sha256:5fcb7004be69e8fbdf07dcb502efa5c77cadcaad6982164134eeb9721f826c2e pywin32==303; \ sys_platform=="win32" \ --hash=sha256:51cb52c5ec6709f96c3f26e7795b0bf169ee0d8395b2c1d7eb2c029a5008ed51 diff --git a/resources/definitions/Mark2_for_Ultimaker2.def.json b/resources/definitions/Mark2_for_Ultimaker2.def.json index 68498db423..2418445a26 100644 --- a/resources/definitions/Mark2_for_Ultimaker2.def.json +++ b/resources/definitions/Mark2_for_Ultimaker2.def.json @@ -63,9 +63,6 @@ "machine_heated_bed": { "default_value": true }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall_x": { "value": "speed_wall" }, diff --git a/resources/definitions/SV01.def.json b/resources/definitions/SV01.def.json index 439ced7d38..bd7773de6f 100644 --- a/resources/definitions/SV01.def.json +++ b/resources/definitions/SV01.def.json @@ -45,16 +45,12 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - "infill_sparse_density": { "value": "20" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, "infill_pattern": { "value": "'lines'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, diff --git a/resources/definitions/SV02.def.json b/resources/definitions/SV02.def.json index 352cd23394..ab2ad8439e 100644 --- a/resources/definitions/SV02.def.json +++ b/resources/definitions/SV02.def.json @@ -28,8 +28,7 @@ "retraction_speed": { "default_value": 50}, "gantry_height": { "value": "30" }, "speed_print": { "default_value": 50 }, - "material_print_temperature": { "value": 195 }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "default_material_print_temperature": { "value": 195 }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": 195 }, "machine_max_feedrate_x": { "value": 500 }, @@ -41,11 +40,9 @@ "machine_max_acceleration_z": { "value": 100 }, "machine_max_acceleration_e": { "value": 500 }, "machine_acceleration": { "value": 500 }, - "machine_max_jerk_xy": { "value": 8 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 }, + "material_diameter": { "default_value": 1.75 }, - "infill_overlap": { "default_value": 15 }, + "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, diff --git a/resources/definitions/SV03.def.json b/resources/definitions/SV03.def.json index 5968a82c0d..9a550c1960 100644 --- a/resources/definitions/SV03.def.json +++ b/resources/definitions/SV03.def.json @@ -45,16 +45,12 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, - "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - "infill_sparse_density": { "value": "20" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, "infill_pattern": { "value": "'lines'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, diff --git a/resources/definitions/abax_pri3.def.json b/resources/definitions/abax_pri3.def.json index 914dc4d3e0..7f73bea678 100644 --- a/resources/definitions/abax_pri3.def.json +++ b/resources/definitions/abax_pri3.def.json @@ -7,6 +7,7 @@ "author": "Abax 3D Technologies", "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", + "has_machine_quality": "true", "machine_extruder_trains": { "0": "abax_pri3_extruder_0" diff --git a/resources/definitions/abax_pri5.def.json b/resources/definitions/abax_pri5.def.json index cb6566e08c..e97994bd61 100644 --- a/resources/definitions/abax_pri5.def.json +++ b/resources/definitions/abax_pri5.def.json @@ -7,6 +7,7 @@ "author": "Abax 3D Technologies", "manufacturer": "Abax 3D Technologies", "file_formats": "text/x-gcode", + "has_machine_quality": "true", "machine_extruder_trains": { "0": "abax_pri5_extruder_0" diff --git a/resources/definitions/alya3dp.def.json b/resources/definitions/alya3dp.def.json index f335285cfb..4b800226cf 100644 --- a/resources/definitions/alya3dp.def.json +++ b/resources/definitions/alya3dp.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "alya_platform.3mf", "platform_offset": [-60, -45, 75 ], - "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], + "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], "preferred_material": "generic_pla", "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/alyanx3dp.def.json b/resources/definitions/alyanx3dp.def.json index 76ce87445b..509f252488 100644 --- a/resources/definitions/alyanx3dp.def.json +++ b/resources/definitions/alyanx3dp.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "alya_nx_platform.3mf", "platform_offset": [-104, 0, 93 ], - "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], + "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], "preferred_material": "generic_pla", "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/anet3d.def.json b/resources/definitions/anet3d.def.json index 59ad93416c..1946b81bc0 100644 --- a/resources/definitions/anet3d.def.json +++ b/resources/definitions/anet3d.def.json @@ -51,14 +51,11 @@ "speed_print": { "value": 50.0 } , "speed_infill": { "value": "speed_print * 2" }, - "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_layer_0": { "value": "speed_print / 2" }, - "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_print" }, "speed_support": { "value": "speed_print" }, @@ -67,18 +64,14 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, - "optimize_wall_printing_order": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": true }, "infill_overlap": { "value": 30.0 }, @@ -88,34 +81,34 @@ "fill_outline_gaps": { "value": false }, - "retraction_speed": { + "retraction_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_retract_speed": { + "retraction_retract_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_prime_speed": { + "retraction_prime_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 1 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adaptive_layer_height_variation": { "value": 0.04 }, @@ -133,16 +126,12 @@ "extruder_prime_pos_y":{"minimum_value": "0","maximum_value": "machine_depth"}, "extruder_prime_pos_x":{"minimum_value": "0","maximum_value": "machine_width"}, - "relative_extrusion":{"value": false,"enabled": false}, + "relative_extrusion":{"value": false, "enabled": false}, "machine_use_extruder_offset_to_offset_coords": {"default_value": true}, "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, - "machine_center_is_zero": { - "default_value": false - }, - "gantry_height": { - "value": "0" - } + "machine_center_is_zero": { "default_value": false }, + "gantry_height": { "value": "0"} } } diff --git a/resources/definitions/anycubic_4max.def.json b/resources/definitions/anycubic_4max.def.json index 6d6c20e8f5..bb27619175 100644 --- a/resources/definitions/anycubic_4max.def.json +++ b/resources/definitions/anycubic_4max.def.json @@ -37,7 +37,7 @@ "machine_max_jerk_xy": { "default_value": 11.0 }, "machine_max_jerk_z": { "default_value": 0.4 }, "machine_max_jerk_e": { "default_value": 11.0 }, - + "acceleration_enabled": { "value": true }, "jerk_enabled": { "value": "True" }, "jerk_layer_0": { "value": "jerk_topbottom" }, "jerk_prime_tower": { "value": "math.ceil(jerk_print * 15 / 25)" }, @@ -51,7 +51,6 @@ "gantry_height": { "value": "25.0" }, "skin_overlap": { "value": "10" }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "900" }, diff --git a/resources/definitions/anycubic_i3_mega_s.def.json b/resources/definitions/anycubic_i3_mega_s.def.json index 2e972c78b6..54fa459946 100644 --- a/resources/definitions/anycubic_i3_mega_s.def.json +++ b/resources/definitions/anycubic_i3_mega_s.def.json @@ -53,8 +53,6 @@ "material_bed_temperature": { "maximum_value_warning": 110 }, "material_bed_temperature_layer_0": { "maximum_value_warning": 110 }, - "material_flow": { "value": 100 }, - "top_bottom_thickness": { "value": "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" }, "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" }, @@ -70,15 +68,11 @@ "jerk_enabled": { "value": true }, "speed_print": { "value": 50.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": 100.0, "maximum_value_warning": 150.0, "maximum_value": 200.0 }, "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "speed_travel" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -101,7 +95,7 @@ "retraction_hop": { "value": 0.075 }, "retraction_hop_only_when_collides": { "value": true }, "retraction_amount": { "value": 6 }, - "retraction_enable": { "value": true }, + "retraction_min_travel": { "value": 1.5 }, "retraction_combing": { "value": "'off'" }, "retraction_combing_max_distance": { "value": 30 }, @@ -114,7 +108,6 @@ "cool_fan_speed": { "value": 100 }, "cool_fan_speed_0": { "value": 30 }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, diff --git a/resources/definitions/anycubic_mega_zero.def.json b/resources/definitions/anycubic_mega_zero.def.json index 5f71d243ab..30bf702aa4 100644 --- a/resources/definitions/anycubic_mega_zero.def.json +++ b/resources/definitions/anycubic_mega_zero.def.json @@ -76,8 +76,8 @@ "acceleration_enabled": { "value": false }, "machine_max_jerk_xy": { "value": 10 }, - "machine_max_jerk_z": { "value": 0.4 }, - "machine_max_jerk_e": { "value": 5 }, + "machine_max_jerk_z": { "value": 0.3 }, + "machine_max_jerk_e": { "value": 15 }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, "jerk_travel_layer_0": { "value": "jerk_travel" }, @@ -99,7 +99,6 @@ "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "retraction_speed": { "value": 30 }, "retraction_amount": { "value": 7 }, "retraction_count_max": { "value": 100 }, diff --git a/resources/definitions/artillery_base.def.json b/resources/definitions/artillery_base.def.json index eabe97ba03..171ac4a524 100644 --- a/resources/definitions/artillery_base.def.json +++ b/resources/definitions/artillery_base.def.json @@ -64,55 +64,6 @@ "tizyx_abs", "tizyx_pla", "tizyx_pla_bois", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla" @@ -155,35 +106,25 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 60.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_layer_0": { "value": 20.0 }, - "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" }, "speed_z_hop": { "value": 5 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size * 1.1" }, - "optimize_wall_printing_order": { "value": "True" }, + "optimize_wall_printing_order": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -193,15 +134,18 @@ "fill_outline_gaps": { "value": false }, - "retraction_speed": { + "retraction_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_retract_speed": { + "retraction_retract_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_prime_speed": { + "retraction_prime_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, @@ -215,13 +159,12 @@ "travel_retract_before_outer_wall": { "value": true }, "retraction_amount": { "value": 2 }, - "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, @@ -236,14 +179,13 @@ "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, "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" }, "support_use_towers": { "value": false }, "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": { "value": "'xy_overrides_z'" }, - "support_wall_count": { "value": 1 }, "support_brim_enable": { "value": true }, "support_brim_width": { "value": 4 }, @@ -256,7 +198,6 @@ "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/atmat_signal_pro_base.def.json b/resources/definitions/atmat_signal_pro_base.def.json index 0d1c5a75c2..d92ea5c468 100644 --- a/resources/definitions/atmat_signal_pro_base.def.json +++ b/resources/definitions/atmat_signal_pro_base.def.json @@ -23,55 +23,6 @@ "supports_usb_connection": false, "supports_network_connection": false, "exclude_materials": [ - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", @@ -128,55 +79,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", diff --git a/resources/definitions/atom3.def.json b/resources/definitions/atom3.def.json index 2483b81155..62d6c23577 100644 --- a/resources/definitions/atom3.def.json +++ b/resources/definitions/atom3.def.json @@ -2,7 +2,8 @@ "version": 2, "name": "Atom 3", "inherits": "fdmprinter", - "metadata": { + "metadata": + { "visible": true, "author": "Daniel Kurth", "manufacturer": "Layer One", @@ -22,10 +23,8 @@ }, - - - "overrides": { - + "overrides": + { "machine_name": { "default_value": "Atom 3" }, "machine_show_variants": { "default_value": true}, "machine_shape": { "default_value": "elliptic" }, @@ -48,45 +47,36 @@ "machine_gcode_flavor": { "RepRap (Marlin/Sprinter)": "Marlin" }, "machine_heated_bed": { "default_value": true }, "material_diameter": { "default_value": 1.75}, - "machine_start_gcode": { + "machine_start_gcode": + { "default_value": ";MACHINE START CODE\nG21 ;metric values\nG90 ;absolute positioning\nG28 ;home\nG1 Z5 F9000\n;MACHINE START CODE" }, - "machine_end_gcode": { + "machine_end_gcode": + { "default_value": ";MACHINE END CODE\nG91 ;relative positioning\nG1 E-1 F300 ;retract filament release pressure\nG1 Z+1.0 E-5 F9000 ;move up a and retract more\nG90 ;absolute positioning\nG28; home\nM84 ;steppers off\n;MACHINE END CODE" }, - - - "layer_height": {"default_value": 0.2 }, - "layer_height_0": { + "layer_height_0": + { "default_value": 0.2, "value": "layer_height" }, "line_width": { "value": "machine_nozzle_size"}, - "infill_line_width": { "value":"line_width"}, + "initial_layer_line_width_factor": { "default_value": 100}, - - - "top_bottom_thickness": { "default_value": 1.0}, - - - "infill_sparse_density": { "default_value": 17}, "infill_before_walls": { "value": false}, "zig_zaggify_infill": { "value": true}, - - - "default_material_print_temperature": { "default_value": 200 }, - "material_print_temperature_layer_0": { "value": "material_print_temperature + 0"}, "material_initial_print_temperature": { "value": "material_print_temperature_layer_0"}, "material_final_print_temperature": { "value": "material_print_temperature"}, - "default_material_bed_temperature": { + "default_material_bed_temperature": + { "default_value": 60, "minimum_value": "0", "minimum_value_warning": "build_volume_temperature", @@ -95,16 +85,13 @@ }, "material_bed_temperature": { - "value": "round(default_material_bed_temperature-((-0.202*default_material_bed_temperature)+7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature", + "value": "round(default_material_bed_temperature-(-0.202 * default_material_bed_temperature + 7.16)) if default_material_bed_temperature > 40 else default_material_bed_temperature", "minimum_value": "0", "minimum_value_warning": "build_volume_temperature", "maximum_value_warning": "115", "maximum_value": "120" }, - - - "speed_print": { "default_value": 40}, "speed_wall": { "value": "speed_print * 0.75"}, "speed_wall_0": { "value": "speed_print * 0.5"}, @@ -112,48 +99,42 @@ "speed_layer_0": { "value": "20"}, "speed_slowdown_layers": { "default_value": 1}, - - - - "retraction_amount": { + "retraction_amount": + { "default_value": 7, - "maximum_value_warning": 9 }, - "retraction_speed": { + "maximum_value_warning": 9 + }, + "retraction_speed": + { "default_value": 70, "maximum_value_warning": 80 }, "retraction_hop_enabled": { "default_value": true}, "retraction_hop": { "default_value": 0.5}, - - - "cool_min_layer_time": { "default_value": 5}, "cool_min_speed": { "default_value": 10}, "cool_lift_head": { "default_value": false}, - - - "support_type": { "default_value": "everywhere"}, "support_angle": { "default_value": 60}, "support_z_distance": { "value": "layer_height"}, "support_xy_distance_overhang":{"value": "machine_nozzle_size"}, - - "adhesion_type": { "default_value": "skirt"}, - "skirt_brim_minimal_length": { + "skirt_brim_minimal_length": + { "default_value": 750, - "value": "60/(layer_height_0*line_width)", + "value": "60 / (layer_height_0 * line_width)", "minimum_value": "0", "minimum_value_warning": "25", "maximum_value_warning": "4000" }, - "skirt_gap": { - "default_value": "1`", - "value": "3*wall_line_width_0" + "skirt_gap": + { + "default_value": 1, + "value": "3 * wall_line_width_0" } } } \ No newline at end of file diff --git a/resources/definitions/biqu_base.def.json b/resources/definitions/biqu_base.def.json index 82ee71dd7a..44a582e545 100755 --- a/resources/definitions/biqu_base.def.json +++ b/resources/definitions/biqu_base.def.json @@ -59,15 +59,11 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 50.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_layer_0": { "value": 20.0 }, - "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" }, @@ -76,19 +72,16 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" }, "infill_line_width": { "value": "line_width * 1.2" }, - "infill_sparse_density": { "value": "20" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -111,7 +104,6 @@ "maximum_value": 200 }, - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, @@ -119,13 +111,11 @@ "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, diff --git a/resources/definitions/blv_mgn_cube_base.def.json b/resources/definitions/blv_mgn_cube_base.def.json index 2c73b80cfc..84c585e016 100644 --- a/resources/definitions/blv_mgn_cube_base.def.json +++ b/resources/definitions/blv_mgn_cube_base.def.json @@ -165,9 +165,6 @@ "skin_overlap": { "value": 10.0 }, - "speed_infill": { - "value": "speed_print" - }, "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)" }, diff --git a/resources/definitions/builder_premium_large.def.json b/resources/definitions/builder_premium_large.def.json index f0e64921e7..9a8c8dc6f1 100644 --- a/resources/definitions/builder_premium_large.def.json +++ b/resources/definitions/builder_premium_large.def.json @@ -35,7 +35,7 @@ "switch_extruder_retraction_speeds": {"default_value": 15 }, "switch_extruder_retraction_amount": {"value": 1 }, - + "acceleration_enabled": { "value": true }, "speed_travel": { "value": "100" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, @@ -54,7 +54,6 @@ "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, diff --git a/resources/definitions/builder_premium_medium.def.json b/resources/definitions/builder_premium_medium.def.json index e85c654fa2..fcc87ae125 100644 --- a/resources/definitions/builder_premium_medium.def.json +++ b/resources/definitions/builder_premium_medium.def.json @@ -28,7 +28,7 @@ "infill_pattern": {"value": "'triangles'" }, "infill_before_walls": {"value": false }, - + "acceleration_enabled": { "value": true }, "default_material_print_temperature": { "value": "215" }, "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "material_standby_temperature": { "value": "material_print_temperature" }, @@ -54,7 +54,6 @@ "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, diff --git a/resources/definitions/builder_premium_small.def.json b/resources/definitions/builder_premium_small.def.json index c89b01566b..03f4600f4c 100644 --- a/resources/definitions/builder_premium_small.def.json +++ b/resources/definitions/builder_premium_small.def.json @@ -34,7 +34,7 @@ "switch_extruder_retraction_speeds": {"default_value": 15 }, "switch_extruder_retraction_amount": {"value": 1 }, - + "acceleration_enabled": { "value": true }, "speed_travel": { "value": "100" }, "speed_layer_0": { "value": "20" }, "speed_prime_tower": { "value": "speed_topbottom" }, @@ -53,7 +53,6 @@ "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "3000" }, diff --git a/resources/definitions/cartesio.def.json b/resources/definitions/cartesio.def.json index 631f947324..996e03ef0a 100644 --- a/resources/definitions/cartesio.def.json +++ b/resources/definitions/cartesio.def.json @@ -41,7 +41,6 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "material_print_temp_wait": { "default_value": false }, "material_bed_temp_wait": { "default_value": false }, - "prime_tower_enable": { "default_value": false }, "prime_tower_min_volume": { "value": "0.7" }, "prime_tower_size": { "value": 24.0 }, "prime_tower_position_x": { "value": "125" }, diff --git a/resources/definitions/crazy3dprint_cz_300.def.json b/resources/definitions/crazy3dprint_cz_300.def.json index 56d3d69757..2748b39b53 100644 --- a/resources/definitions/crazy3dprint_cz_300.def.json +++ b/resources/definitions/crazy3dprint_cz_300.def.json @@ -36,9 +36,8 @@ "min_infill_area": { "default_value": 2.0 }, "retract_at_layer_change": { "default_value": true }, "default_material_print_temperature": { "default_value": 210 }, - "material_print_temperature": { "value": 210 }, "material_final_print_temperature": { "value": 210 }, - "material_bed_temperature": { "value": 70 }, + "default_material_bed_temperature": { "value": 70 }, "material_bed_temperature_layer_0": { "value": 70 }, "material_flow_layer_0": {"value": 140}, "retraction_amount": { "default_value": 10 }, diff --git a/resources/definitions/creality_base.def.json b/resources/definitions/creality_base.def.json index 4d2391f959..a947369de7 100644 --- a/resources/definitions/creality_base.def.json +++ b/resources/definitions/creality_base.def.json @@ -68,61 +68,13 @@ "tizyx_abs", "tizyx_pla", "tizyx_pla_bois", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla" ] }, - "overrides": { + "overrides": + { "machine_name": { "default_value": "Creawsome Base Printer" }, "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\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\nG1 X0 Y{machine_depth} ;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" }, @@ -158,36 +110,25 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_print": { "value": 50.0 }, "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_layer_0": { "value": 20.0 }, - "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" }, "speed_z_hop": { "value": 5 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - - "line_width": { "value": "machine_nozzle_size" }, - "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -197,34 +138,33 @@ "fill_outline_gaps": { "value": false }, - "retraction_speed": { + "retraction_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_retract_speed": { + "retraction_retract_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - "retraction_prime_speed": { + "retraction_prime_speed": + { "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, @@ -238,7 +178,7 @@ "meshfix_maximum_resolution": { "value": "0.25" }, "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, - "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, + "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" }, "support_use_towers": { "value": false }, diff --git a/resources/definitions/creality_ender6.def.json b/resources/definitions/creality_ender6.def.json index 56ceab88b2..599d3beb86 100644 --- a/resources/definitions/creality_ender6.def.json +++ b/resources/definitions/creality_ender6.def.json @@ -9,17 +9,6 @@ "machine_width": { "default_value": 260 }, "machine_depth": { "default_value": 260 }, "machine_height": { "default_value": 400 }, - "z_seam_type": { "value": "'sharpest_corner'"}, - "z_seam_corner": { "value": "'z_seam_corner_inner'"}, - "infill_sparse_density": { "value": "10"}, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'"}, - "infill_overlap":{"value": 10}, - "material_print_temperature":{"value": 220}, - "material_bed_temperature":{"value": 50}, - "retraction_amount":{"value": 10}, - "speed_travel": { "value": 80.0 }, - "coasting_enable": { "value": true}, - "coasting_min_volume": { "value": 0.5}, "machine_head_with_fans_polygon": { "default_value": [ [-26, 34], [-26, -32], @@ -30,9 +19,8 @@ "gantry_height": { "value": 25 }, - "speed_print": { "value": 50.0 }, - "speed_wall": { "value": 30.0 } - + "speed_print": { "value": 80.0 } + }, "metadata": { "quality_definition": "creality_base", diff --git a/resources/definitions/cremaker_common.def.json b/resources/definitions/cremaker_common.def.json index 6fd339f58f..acabcac92a 100644 --- a/resources/definitions/cremaker_common.def.json +++ b/resources/definitions/cremaker_common.def.json @@ -24,7 +24,7 @@ "xy_offset": { "value": 0.1 }, "xy_offset_layer_0": { "value": -0.1 }, "hole_xy_offset": { "value": 0.15 }, - "material_print_temperature": { "value": 200 }, + "material_print_temperature_layer_0": { "value": "default_material_bed_temperature + 15" }, "speed_travel": { "value": 100 }, "speed_layer_0": { "value": 25 }, "acceleration_enabled": { "value": true }, diff --git a/resources/definitions/cremaker_m_v2.def.json b/resources/definitions/cremaker_m_v2.def.json index 2d6c4d1a7f..2d760b2aaa 100644 --- a/resources/definitions/cremaker_m_v2.def.json +++ b/resources/definitions/cremaker_m_v2.def.json @@ -30,9 +30,6 @@ }, "cool_fan_speed": { "value": 50 }, - "coasting_enable": { "value": true }, - "coasting_volume": { "value": 0.05 }, - "coasting_min_volume": { "value": 1.0 }, "jerk_enabled": { "value": false } } } diff --git a/resources/definitions/dagoma_pro_430_bowden.def.json b/resources/definitions/dagoma_pro_430_bowden.def.json index 7ed1adb0b7..cb7d4126cb 100644 --- a/resources/definitions/dagoma_pro_430_bowden.def.json +++ b/resources/definitions/dagoma_pro_430_bowden.def.json @@ -25,7 +25,7 @@ "machine_max_jerk_e": { "value": 5 }, "machine_max_feedrate_e": { "default_value": 200 }, "machine_steps_per_mm_e": { "default_value": 139.5 }, - "acceleration_enabled": { "value": "True" }, + "acceleration_enabled": { "value": true }, "acceleration_print": { "value": "1250", "maximum_value": 1500 }, "acceleration_layer_0": { "value": "acceleration_topbottom", "maximum_value": 1500 }, "acceleration_topbottom": { "value": "math.ceil(acceleration_print * 1000 / 1250)", "maximum_value": 1500 }, diff --git a/resources/definitions/deltacomb_dc20flux.def.json b/resources/definitions/deltacomb_dc20flux.def.json index fa6fdb0ca7..f907649312 100644 --- a/resources/definitions/deltacomb_dc20flux.def.json +++ b/resources/definitions/deltacomb_dc20flux.def.json @@ -25,7 +25,7 @@ "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" }, "switch_extruder_retraction_amount": { "value": "0" }, "prime_tower_min_volume": { "value": "50" }, - "prime_tower_enable": { "value": "1" }, + "prime_tower_enable": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" } diff --git a/resources/definitions/deltacomb_dc21flux.def.json b/resources/definitions/deltacomb_dc21flux.def.json index f2b7941518..42e1851ab0 100644 --- a/resources/definitions/deltacomb_dc21flux.def.json +++ b/resources/definitions/deltacomb_dc21flux.def.json @@ -25,7 +25,7 @@ "machine_end_gcode": { "default_value": ";---------------------------------------\n;Deltacomb end script\n;---------------------------------------\nG91 ;relative positioning\nG1 X8.0 E-10 F6000 ;wipe filament+material retraction\nG1 Z2 E9 ;Lift and start filament shaping\nG1 E-9\nG1 E8\nG1 E-8\nG1 E-10 F110\nG1 E-40 F5000 ; move to park position\nG28 ;home all axes (max endstops)\nM84 ;steppers off" }, "switch_extruder_retraction_amount": { "value": "0" }, "prime_tower_min_volume": { "value": "50" }, - "prime_tower_enable": { "value": "1" }, + "prime_tower_enable": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" } diff --git a/resources/definitions/dxu.def.json b/resources/definitions/dxu.def.json index 4d7c3eb446..e810506fea 100644 --- a/resources/definitions/dxu.def.json +++ b/resources/definitions/dxu.def.json @@ -70,9 +70,6 @@ "machine_heated_bed": { "default_value": true }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall_x": { "value": "speed_wall" }, diff --git a/resources/definitions/eryone_er20.def.json b/resources/definitions/eryone_er20.def.json index 2f5f02d7db..f9fe209151 100644 --- a/resources/definitions/eryone_er20.def.json +++ b/resources/definitions/eryone_er20.def.json @@ -53,7 +53,7 @@ "machine_end_gcode": { "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": { + "default_material_print_temperature": { "value": 205 }, "material_print_temperature_layer_0": { @@ -103,7 +103,7 @@ "infill_before_walls": { "value": false }, - "material_bed_temperature": { + "default_material_bed_temperature": { "value": 60 }, "material_bed_temperature_layer_0": { @@ -156,9 +156,6 @@ "skirt_line_count": { "value": 3 }, - "speed_infill": { - "value": "speed_print" - }, "speed_topbottom": { "value": "math.ceil(speed_print * 20 / 50)" }, diff --git a/resources/definitions/eryone_thinker.def.json b/resources/definitions/eryone_thinker.def.json index 33c96f45ca..648de5cd03 100644 --- a/resources/definitions/eryone_thinker.def.json +++ b/resources/definitions/eryone_thinker.def.json @@ -138,15 +138,11 @@ "value": "material_print_temperature" }, "material_bed_temperature": { - "value": "default_material_bed_temperature", "maximum_value_warning": 100 }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall": { "value": "speed_print" }, @@ -253,9 +249,6 @@ }, "smooth_spiralized_contours": { "value": false - }, - "roofing_monotonic": { - "value": true } } } \ No newline at end of file diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4a40d1855a..7c3dbc63b3 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -426,9 +426,7 @@ "label": "Disallowed Areas", "description": "A list of polygons with areas the print head is not allowed to enter.", "type": "polygons", - "default_value": - [ - ], + "default_value": [], "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -438,9 +436,7 @@ "label": "Nozzle Disallowed Areas", "description": "A list of polygons with areas the nozzle is not allowed to enter.", "type": "polygons", - "default_value": - [ - ], + "default_value": [], "settable_per_mesh": false, "settable_per_extruder": false, "settable_per_meshgroup": false @@ -452,22 +448,10 @@ "type": "polygon", "default_value": [ - [ - -20, - 10 - ], - [ - 10, - 10 - ], - [ - 10, - -10 - ], - [ - -20, - -10 - ] + [ -20, 10 ], + [ 10, 10 ], + [ 10, -10 ], + [ -20, -10 ] ], "settable_per_mesh": false, "settable_per_extruder": false, @@ -1027,7 +1011,8 @@ "settable_per_meshgroup": true, "settable_globally": true, "enabled": "extruders_enabled_count > 1", - "children": { + "children": + { "wall_0_extruder_nr": { "label": "Outer Wall Extruder", @@ -1184,9 +1169,10 @@ "inset_direction": { "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.", + "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. When there is an uneven amount of total innner walls, the 'center last line' is always printed last.", "type": "enum", - "options": { + "options": + { "inside_out": "Inside To Outside", "outside_in": "Outside To Inside" }, @@ -1241,7 +1227,8 @@ } } }, - "fill_outline_gaps": { + "fill_outline_gaps": + { "label": "Print Thin Walls", "description": "Print pieces of the model which are horizontally thinner than the nozzle size.", "type": "bool", @@ -1443,7 +1430,63 @@ "value": "0", "limit_to_extruder": "roofing_extruder_nr", "settable_per_mesh": true, - "enabled": "top_layers > 0" + "enabled": "top_layers > 0", + "children": + { + "roofing_line_width": + { + "label": "Top Surface Skin Line Width", + "description": "Width of a single line of the areas at the top of the print.", + "unit": "mm", + "minimum_value": "0.001", + "minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size", + "maximum_value_warning": "2 * machine_nozzle_size", + "default_value": 0.4, + "type": "float", + "value": "skin_line_width", + "limit_to_extruder": "roofing_extruder_nr", + "settable_per_mesh": true, + "enabled": "roofing_layer_count > 0 and top_layers > 0" + }, + "roofing_pattern": + { + "label": "Top Surface Skin Pattern", + "description": "The pattern of the top most layers.", + "type": "enum", + "options": + { + "lines": "Lines", + "concentric": "Concentric", + "zigzag": "Zig Zag" + }, + "default_value": "lines", + "value": "top_bottom_pattern", + "limit_to_extruder": "roofing_extruder_nr", + "settable_per_mesh": true, + "enabled": "roofing_layer_count > 0 and top_layers > 0" + }, + "roofing_monotonic": + { + "label": "Monotonic Top Surface Order", + "description": "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.", + "type": "bool", + "value": true, + "enabled": "roofing_layer_count > 0 and top_layers > 0 and roofing_pattern != 'concentric'", + "limit_to_extruder": "roofing_extruder_nr", + "settable_per_mesh": true + }, + "roofing_angles": + { + "label": "Top Surface Skin Line Directions", + "description": "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", + "type": "[int]", + "default_value": "[ ]", + "value": "skin_angles", + "enabled": "roofing_pattern != 'concentric' and roofing_layer_count > 0 and top_layers > 0", + "limit_to_extruder": "roofing_extruder_nr", + "settable_per_mesh": true + } + } }, "top_bottom_extruder_nr": { @@ -2943,6 +2986,49 @@ "maximum_value_warning": "150", "settable_per_mesh": true }, + "wall_x_material_flow_layer_0": + { + "label": "Initial Layer Inner Wall Flow", + "description": "Flow compensation on the outermost wall line of the first layer.", + "unit": "%", + "type": "float", + "default_value": 100, + "value": "material_flow_layer_0", + "minimum_value": "0.0001", + "minimum_value_warning": "50", + "maximum_value_warning": "150", + "limit_to_extruder": "wall_x_extruder_nr", + "settable_per_mesh": true + }, + "wall_0_material_flow_layer_0": + { + "label": "Initial Layer Outer Wall Flow", + "description": "Flow compensation on the outermost wall line of the first layer.", + "unit": "%", + "type": "float", + "default_value": 100, + "value": "material_flow_layer_0", + "minimum_value": "0.0001", + "minimum_value_warning": "50", + "maximum_value_warning": "150", + "limit_to_extruder": "wall_0_extruder_nr", + "settable_per_mesh": true + }, + "skin_material_flow_layer_0": + { + "label": "Initial Layer Bottom Flow", + "description": "Flow compensation on bottom lines of the first layer", + "unit": "%", + "type": "float", + "default_value": 100, + "value": "material_flow_layer_0", + "minimum_value": "0.0001", + "minimum_value_warning": "50", + "maximum_value_warning": "150", + "enabled": "bottom_layers > 0", + "limit_to_extruder": "top_bottom_extruder_nr", + "settable_per_mesh": true + }, "material_standby_temperature": { "label": "Standby Temperature", @@ -4362,7 +4448,8 @@ "enabled": "(support_enable or support_meshes_present) and extruders_enabled_count > 1", "settable_per_mesh": false, "settable_per_extruder": false, - "children": { + "children": + { "support_infill_extruder_nr": { "label": "Support Infill Extruder", @@ -4482,6 +4569,20 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "support_tree_max_diameter": + { + "label": "Tree Support Trunk Diameter", + "description": "The diameter of the widest branches of tree support. A thicker trunk is more sturdy; a thinner trunk takes up less space on the build plate.", + "unit": "mm", + "type": "float", + "minimum_value": "support_tree_branch_diameter", + "minimum_value_warning": "support_line_width * 5", + "default_value": 15, + "limit_to_extruder": "support_infill_extruder_nr", + "enabled": "support_enable and support_structure=='tree'", + "settable_per_mesh": false, + "settable_per_extruder": true + }, "support_tree_branch_diameter_angle": { "label": "Tree Support Branch Diameter Angle", @@ -4513,6 +4614,42 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "support_conical_enabled": { + "label": "Enable Conical Support", + "description": "Make support areas smaller at the bottom than at the overhang.", + "type": "bool", + "default_value": false, + "enabled": "support_enable and support_structure != 'tree'", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": true + }, + "support_conical_angle": { + "label": "Conical Support Angle", + "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", + "unit": "°", + "type": "float", + "minimum_value": "-90", + "minimum_value_warning": "-45", + "maximum_value_warning": "45", + "maximum_value": "90", + "default_value": 30, + "enabled": "support_conical_enabled and support_enable and support_structure != 'tree'", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": true + }, + "support_conical_min_width": { + "label": "Conical Support Minimum Width", + "description": "Minimum width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.", + "unit": "mm", + "default_value": 5.0, + "minimum_value": "0", + "minimum_value_warning": "machine_nozzle_size * 3", + "maximum_value_warning": "100.0", + "type": "float", + "enabled": "support_conical_enabled and support_enable and support_structure != 'tree' and support_conical_angle > 0", + "limit_to_extruder": "support_infill_extruder_nr", + "settable_per_mesh": true + }, "support_type": { "label": "Support Placement", @@ -6335,6 +6472,7 @@ "description": "Remove the holes in each layer and keep only the outside shape. This will ignore any invisible internal geometry. However, it also ignores layer holes which can be viewed from above or below.", "type": "bool", "default_value": false, + "value": "magic_spiralize", "settable_per_mesh": true }, "meshfix_extensive_stitching": @@ -6645,60 +6783,6 @@ "default_value": "middle", "settable_per_mesh": true }, - "roofing_line_width": - { - "label": "Top Surface Skin Line Width", - "description": "Width of a single line of the areas at the top of the print.", - "unit": "mm", - "minimum_value": "0.001", - "minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size", - "maximum_value_warning": "2 * machine_nozzle_size", - "default_value": 0.4, - "type": "float", - "value": "skin_line_width", - "limit_to_extruder": "roofing_extruder_nr", - "settable_per_mesh": true, - "enabled": "roofing_layer_count > 0 and top_layers > 0" - }, - "roofing_pattern": - { - "label": "Top Surface Skin Pattern", - "description": "The pattern of the top most layers.", - "type": "enum", - "options": - { - "lines": "Lines", - "concentric": "Concentric", - "zigzag": "Zig Zag" - }, - "default_value": "lines", - "value": "top_bottom_pattern", - "limit_to_extruder": "roofing_extruder_nr", - "settable_per_mesh": true, - "enabled": "roofing_layer_count > 0 and top_layers > 0" - }, - "roofing_monotonic": - { - "label": "Monotonic Top Surface Order", - "description": "Print top surface lines in an ordering that causes them to always overlap with adjacent lines in a single direction. This takes slightly more time to print, but makes flat surfaces look more consistent.", - "type": "bool", - "default_value": false, - "value": "skin_monotonic", - "enabled": "roofing_layer_count > 0 and top_layers > 0 and roofing_pattern != 'concentric'", - "limit_to_extruder": "roofing_extruder_nr", - "settable_per_mesh": true - }, - "roofing_angles": - { - "label": "Top Surface Skin Line Directions", - "description": "A list of integer line directions to use when the top surface skin layers use the lines or zig zag pattern. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees).", - "type": "[int]", - "default_value": "[ ]", - "value": "skin_angles", - "enabled": "roofing_pattern != 'concentric' and roofing_layer_count > 0 and top_layers > 0", - "limit_to_extruder": "roofing_extruder_nr", - "settable_per_mesh": true - }, "infill_enable_travel_optimization": { "label": "Infill Travel Optimization", @@ -6950,45 +7034,6 @@ "settable_per_mesh": false, "settable_per_extruder": true }, - "support_conical_enabled": - { - "label": "Enable Conical Support", - "description": "Make support areas smaller at the bottom than at the overhang.", - "type": "bool", - "default_value": false, - "enabled": "support_enable and support_structure != 'tree'", - "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": true - }, - "support_conical_angle": - { - "label": "Conical Support Angle", - "description": "The angle of the tilt of conical support. With 0 degrees being vertical, and 90 degrees being horizontal. Smaller angles cause the support to be more sturdy, but consist of more material. Negative angles cause the base of the support to be wider than the top.", - "unit": "°", - "type": "float", - "minimum_value": "-90", - "minimum_value_warning": "-45", - "maximum_value_warning": "45", - "maximum_value": "90", - "default_value": 30, - "enabled": "support_conical_enabled and support_enable and support_structure != 'tree'", - "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": true - }, - "support_conical_min_width": - { - "label": "Conical Support Minimum Width", - "description": "Minimum width to which the base of the conical support area is reduced. Small widths can lead to unstable support structures.", - "unit": "mm", - "default_value": 5.0, - "minimum_value": "0", - "minimum_value_warning": "machine_nozzle_size * 3", - "maximum_value_warning": "100.0", - "type": "float", - "enabled": "support_conical_enabled and support_enable and support_structure != 'tree' and support_conical_angle > 0", - "limit_to_extruder": "support_infill_extruder_nr", - "settable_per_mesh": true - }, "magic_fuzzy_skin_enabled": { "label": "Fuzzy Skin", @@ -7524,6 +7569,7 @@ "type": "float", "minimum_value": "0", "default_value": 5, + "value": "line_width + support_xy_distance + 1.0", "enabled": "bridge_settings_enabled", "settable_per_mesh": true, "settable_per_extruder": false @@ -8048,7 +8094,8 @@ "description": "Settings which are only used if CuraEngine isn't called from the Cura frontend.", "type": "category", "enabled": false, - "children": { + "children": + { "center_object": { "description": "Whether to center the object on the middle of the build platform (0,0), instead of using the coordinate system in which the object was saved.", diff --git a/resources/definitions/flsun_sr.def.json b/resources/definitions/flsun_sr.def.json index 643e8f64de..37487412ab 100644 --- a/resources/definitions/flsun_sr.def.json +++ b/resources/definitions/flsun_sr.def.json @@ -65,7 +65,7 @@ "default_value": 15 }, "machine_start_gcode": { - "default_value": "G21 ; millimeter units\nG90 ; absolute coordinates\nM82 ; E absolute\nM140 S{material_bed_temperature}\nM104 S{material_print_temperature}\nM190 S{material_bed_temperature}\nM109 S{material_print_temperature}\nG28 ; home axis\nM420 S1 ; enable mesh leveling\n; Lower nozzle and move to start position\nG1 Z150\nG1 X-130 Y0 Z0.4 F3000\n; Extrude about 40 mm by printing a 90 degree arc\nG3 X0 Y-130 I130 Z0.3 E40 F2700\n; Retract and move nozzle up\nG92 E0\nG1 E-1.5 F1800\nG0 Z0.5\nG1 E0 F300\n" + "default_value": "G21 ; millimeter units\nG90 ; absolute coordinates\nM82 ; E absolute\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_initial_print_temperature}\nG28 ; home axis\nM420 S1 ; enable mesh leveling\n; Lower nozzle and move to start position\nG1 Z150\nG1 X-130 Y0 Z0.4 F3000\n; Extrude about 40 mm by printing a 90 degree arc\nG3 X0 Y-130 I130 Z0.3 E40 F2700\n; Retract and move nozzle up\nG92 E0\nG1 E-1.5 F1800\nG0 Z0.5\nG1 E0 F300\n" }, "machine_end_gcode": { "default_value": "G91 ; relative coordinates\nG1 E-1 F300 ; retract filament a bit before lifting\nG1 Z+5 E-5 F6000 ; raise platform from current position\nG28 X0 Y0 ; home axis\nG90 ; absolute coordinates\nG92 E0 ; reset extruder\nM104 S0 ; turn off hotend\nM140 S0 ; turn off heat bed\nM107 ; turn off fans\nM84 ; disable motors\n" @@ -74,4 +74,4 @@ "default_value": "Marlin" } } -} \ No newline at end of file +} diff --git a/resources/definitions/flyingbear_base.def.json b/resources/definitions/flyingbear_base.def.json index 89da5ecf70..68c709a630 100644 --- a/resources/definitions/flyingbear_base.def.json +++ b/resources/definitions/flyingbear_base.def.json @@ -88,55 +88,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", @@ -165,7 +116,6 @@ "material_diameter": { "default_value": 1.75 }, "layer_height_0": { "value": 0.2 }, - "line_width": { "value": "machine_nozzle_size" }, "skin_line_width": { "value": "machine_nozzle_size" }, "infill_line_width": { "value": "line_width + 0.1" }, "skirt_brim_line_width": { "value": "line_width + 0.1" }, @@ -189,25 +139,19 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, - "retraction_enable": { "value": true }, "retraction_min_travel": { "value": 1.5 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "speed_print": { "value": 60 } , "speed_infill": { "value": "speed_print * 1.5" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_print" }, "speed_roofing": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_support": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_prime_tower": { "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_layer_0": { "value": "speed_print / 2" }, - "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" }, "skirt_brim_speed": { "value": "speed_layer_0" }, "speed_z_hop": { "value": 5 }, @@ -220,7 +164,6 @@ "retraction_hop_enabled": { "value": false }, "retraction_hop": { "value": 0.2 }, - "cool_fan_enabled": { "value": true }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, "cool_min_layer_time": { "value": 10 }, diff --git a/resources/definitions/geeetech_Mizar_S.def.json b/resources/definitions/geeetech_Mizar_S.def.json new file mode 100644 index 0000000000..7cd7e42e68 --- /dev/null +++ b/resources/definitions/geeetech_Mizar_S.def.json @@ -0,0 +1,59 @@ +{ + "version": 2, + "name": "Geeetech Mizar_S", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Amit L", + "manufacturer": "Geeetech", + "file_formats": "text/x-gcode", + "has_materials": true, + "machine_extruder_trains": + { + "0": "geeetech_Mizar_S_1" + } + + }, + + "overrides": { + "machine_name": { "default_value": "Geeetech Mizar_S" }, + "machine_width": { + "default_value": 255 + }, + "machine_height": { + "default_value": 260 + }, + "machine_depth": { + "default_value": 255 + }, + "machine_center_is_zero": { + "default_value": false + }, + "layer_height": { "default_value": 0.1 }, + "layer_height_0": { "default_value": 0.15 }, + "retraction_amount": { "default_value": 0.8 }, + "retraction_speed": { "default_value": 35 }, + "adhesion_type": { "default_value": "skirt" }, + "machine_head_with_fans_polygon": { "default_value": [[-31,31],[34,31],[34,-40],[-31,-40]] }, + "gantry_height": { "value": "28" }, + "machine_max_feedrate_z": { "default_value": 12 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 10 }, + "machine_max_jerk_z": { "default_value": 0.2 }, + "machine_max_jerk_e": { "default_value": 2.5 }, + "machine_heated_bed": { "default_value": true }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_start_gcode": { + "default_value": "G28 ; Auto home\nG1 Z15 F300 ;Move up slightly\nM107 ;Off fans\nG90 ;Switch to absolute positioning\nM82 ;Extruder absolute mode\nG92 E0 ;Set position of extruder to 0\nG0 X10 Y20 F1500 ;Move to X10 Y20 at 1500mms\nG1 Z0.8 ;Move Z to 0.8\nG1 F300 X180 E40 ;Extrude a line of filament\nG1 F1200 Z2 ;Raise Z\nG92 E0 ;Set extruder position to zero\nG28 ;Auto home" + }, + "machine_end_gcode": { + "default_value": "G91 ;Switch to relative positioning\nG1 E-1 ;Retract filament to lower pressure\nG0 X0 Y200 ;Move hotend to left and bed forward\nM104 S0 ;Cooldown hotend\nG90 ;Switch to absolute mode\nG92 E0 ;Set extruder to zero\nM140 S0 ;Cooldown bed\nM84 ; Disable steppers" + }, + "machine_extruder_count": { + "default_value": 1 + } + + } +} diff --git a/resources/definitions/goofoo_base.def.json b/resources/definitions/goofoo_base.def.json index 05f34bf8fe..13865bdb56 100644 --- a/resources/definitions/goofoo_base.def.json +++ b/resources/definitions/goofoo_base.def.json @@ -59,16 +59,13 @@ "acceleration_enabled": { "value": false }, "jerk_enabled": { "value": false }, - "speed_print": { "value": 40.0 } , - "speed_infill": { "value": "speed_print" }, + "speed_print": { "value": 40.0 }, "speed_wall": { "value": "speed_print" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, "speed_topbottom": { "value": "speed_print" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "80" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "60" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -77,18 +74,21 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_final_print_temperature": { "value": "material_print_temperature" }, + + "material_print_temperature": { "maximum_value_warning": "421", "maximum_value": "500" }, + "material_print_temperature_layer_0": { "maximum_value_warning": "421", "maximum_value": "500" }, + "material_standby_temperature": { "maximum_value_warning": "421", "maximum_value": "500" }, + "material_initial_print_temperature": { "value": "material_print_temperature", "maximum_value_warning": "421", "maximum_value": "500" }, + "material_final_print_temperature": { "value": "material_print_temperature", "maximum_value_warning": "421", "maximum_value": "500" }, "material_flow": { "value": 100 }, + "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -110,26 +110,20 @@ "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "3 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - - - "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, "wall_thickness": {"value": "line_width * 2" } diff --git a/resources/definitions/hctech_hc300-m1&m1h.def.json b/resources/definitions/hctech_hc300-m1&m1h.def.json index 188ed3e7e7..7a311975e6 100644 --- a/resources/definitions/hctech_hc300-m1&m1h.def.json +++ b/resources/definitions/hctech_hc300-m1&m1h.def.json @@ -36,7 +36,6 @@ "retraction_speed": { "default_value": 35}, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "gantry_height": { "value": "55" }, "speed_print": { "default_value": 60.0 } , @@ -48,8 +47,6 @@ "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 P1;clean nozzle\nG1 X5 Y300 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" }, "cool_fan_speed": { "value": 75 }, - "cool_fan_enabled": { "value": true }, - "line_width": { "value": 0.38 }, "travel_avoid_distance": { "value": 1 }, "infill_before_walls": { "value": false } diff --git a/resources/definitions/hctech_hc300-m2h.def.json b/resources/definitions/hctech_hc300-m2h.def.json index d08258c7c6..651af04ec6 100644 --- a/resources/definitions/hctech_hc300-m2h.def.json +++ b/resources/definitions/hctech_hc300-m2h.def.json @@ -37,7 +37,6 @@ "retraction_speed": { "default_value": 35}, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "gantry_height": { "value": "55" }, "speed_print": { "default_value": 60.0 } , @@ -49,7 +48,6 @@ "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-1 F2700 ;Retract a bit\nG1 Z1 E-1 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG12 ;clean nozzle\nG1 X5 Y319 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z\nM81 ;turn-off power" }, "cool_fan_speed": { "value": 75 }, - "cool_fan_enabled": { "value": true }, "line_width": { "value": 0.38 }, "travel_avoid_distance": { "value": 1 }, diff --git a/resources/definitions/hctech_hc300-m3.def.json b/resources/definitions/hctech_hc300-m3.def.json index cbbae35cfa..10fea4272b 100644 --- a/resources/definitions/hctech_hc300-m3.def.json +++ b/resources/definitions/hctech_hc300-m3.def.json @@ -38,7 +38,6 @@ "retraction_speed": { "default_value": 35}, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, "gantry_height": { "value": "55" }, "speed_print": { "default_value": 60.0 } , @@ -49,7 +48,6 @@ "machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 Z1 E-2 F2400 ;Retract and raise Z\nG1 Z2 ;Raise Z\nG90 ;Absolute positioning\nG1 X5 Y290 ;Return to Start Point\nM106 S0 ;Switch off part cooling fan\nM104 S0 ;turn off temperature\nM140 S0 ;turn off Heated Bed\nM84 X Y E ;Disable all steppers but Z" }, "cool_fan_speed": { "value": 75 }, - "cool_fan_enabled": { "value": true }, "line_width": { "value": 0.38 }, "travel_avoid_distance": { "value": 1 }, diff --git a/resources/definitions/hms434.def.json b/resources/definitions/hms434.def.json index 80466d45bd..9f9183c99e 100644 --- a/resources/definitions/hms434.def.json +++ b/resources/definitions/hms434.def.json @@ -108,12 +108,10 @@ "default_material_print_temperature": {"maximum_value": "401" }, "material_print_temperature": {"maximum_value": "401" }, - "material_print_temperature_layer_0": {"value": "material_print_temperature", - "maximum_value": "401" }, + "material_print_temperature_layer_0": {"maximum_value": "401" }, "material_initial_print_temperature": {"value": "material_print_temperature", "maximum_value_warning": "material_print_temperature + 15", "maximum_value": "401" }, - "material_initial_print_temperature": {"maximum_value": "401" }, "material_final_print_temperature": {"value": "material_print_temperature", "maximum_value": "401" }, "material_break_preparation_temperature": {"maximum_value": "401" }, @@ -126,10 +124,9 @@ "switch_extruder_prime_speed": {"value": "(retraction_prime_speed)"}, "speed_print": {"value": "50"}, - "speed_infill": {"value": "speed_print"}, - "speed_wall": {"value": "(speed_print/5*3) if speed_print > 45 else speed_print"}, + "speed_wall": {"value": "(speed_print/ 5 * 3) if speed_print > 45 else speed_print"}, "speed_wall_x": {"value": "speed_wall"}, - "speed_layer_0": {"value": "(speed_print/5*4) if speed_print > 45 else speed_print"}, + "speed_layer_0": {"value": "(speed_print / 5 * 4) if speed_print > 45 else speed_print"}, "speed_topbottom": {"value": "speed_layer_0"}, "speed_travel": {"value": "250"}, "speed_travel_layer_0": {"value": "speed_travel"}, @@ -167,7 +164,6 @@ "skirt_gap": {"value": 1}, "skirt_brim_minimal_length": {"value": 50}, - "prime_tower_enable": {"value": false }, "prime_tower_size": {"value": 20.6 }, "prime_tower_position_x": {"value": 125 }, "prime_tower_position_y": {"value": 70 }, diff --git a/resources/definitions/imade3d_jellybox_root.def.json b/resources/definitions/imade3d_jellybox_root.def.json index 5de6d9dae1..6d5025d56a 100644 --- a/resources/definitions/imade3d_jellybox_root.def.json +++ b/resources/definitions/imade3d_jellybox_root.def.json @@ -53,55 +53,6 @@ "tizyx_abs", "tizyx_pla_bois", "tizyx_pla", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", diff --git a/resources/definitions/inat_base.def.json b/resources/definitions/inat_base.def.json index 61a543c9cc..42a71ee149 100644 --- a/resources/definitions/inat_base.def.json +++ b/resources/definitions/inat_base.def.json @@ -151,43 +151,32 @@ "value": "4" }, "default_material_print_temperature": { - "maximum_value_warning": "470", "maximum_value": "470" }, "material_print_temperature": { - "maximum_value_warning": "470", "maximum_value": "470" }, "material_print_temperature_layer_0": { "value": "material_print_temperature", - "maximum_value_warning": "470", "maximum_value": "470" }, "material_initial_print_temperature": { "value": "material_print_temperature", - "maximum_value_warning": "470", "maximum_value": "470" }, "material_final_print_temperature": { "value": "material_print_temperature", - "maximum_value_warning": "470", "maximum_value": "470" }, "default_material_bed_temperature": { - "maximum_value_warning": "150", "maximum_value": "150" }, "material_bed_temperature": { - "maximum_value_warning": "150", "maximum_value": "150" }, "material_bed_temperature_layer_0": { - "maximum_value_warning": "150", "maximum_value": "150" }, - "speed_infill": { - "value": "speed_print" - }, "speed_wall": { "value": "speed_print" }, diff --git a/resources/definitions/kingroon_base.def.json b/resources/definitions/kingroon_base.def.json index a8dd8725e2..c78f1fc31a 100644 --- a/resources/definitions/kingroon_base.def.json +++ b/resources/definitions/kingroon_base.def.json @@ -129,7 +129,7 @@ "overrides": { "machine_name": { "default_value": "Kingroon Base Printer" }, "machine_start_gcode": { "default_value": "G28 ; home all axes\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y175.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y175.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, - "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y200 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y300 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" }, + "machine_end_gcode": { "default_value": "G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n G1 X0 Y175 F1000 ; prepare for part removal\n M84 ; disable motors\n M106 S0 ; turn off fan" }, "machine_width": { "default_value": 180 }, "machine_depth": { "default_value": 180 }, @@ -170,15 +170,11 @@ "default_material_bed_temperature": { "maximum_value": "150" }, "speed_print": { "value": 60.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_layer_0": { "value": 20.0 }, - "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" }, @@ -193,7 +189,6 @@ "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, @@ -230,13 +225,11 @@ "travel_retract_before_outer_wall": { "value": true }, "retraction_amount": { "value": 2 }, - "retraction_enable": { "value": true }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 2 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, diff --git a/resources/definitions/koonovo_base.def.json b/resources/definitions/koonovo_base.def.json index bb984d6650..868129109e 100644 --- a/resources/definitions/koonovo_base.def.json +++ b/resources/definitions/koonovo_base.def.json @@ -49,7 +49,6 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, - "line_width": { "value": "machine_nozzle_size" }, "wall_thickness": {"value": "line_width * 2" }, @@ -58,39 +57,28 @@ "infill_sparse_density": { "value": "15" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, - "material_print_temperature": { "value": "195" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "default_material_print_temperature": { "value": "195" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature": { "value": "55" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "material_flow": { "value": 100 }, "material_standby_temperature": { "value": "material_print_temperature" }, - "speed_print": { "value": 50.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_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, "speed_layer_0": { "value": 25.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 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_z_hop": { "value": 5 }, - - "retraction_enable": { "value": true }, "retraction_amount": { "value": 2.5 }, "retraction_speed": { "value": 40 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - "support_brim_enable": { "value": true }, "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, diff --git a/resources/definitions/koonovo_kn3.def.json b/resources/definitions/koonovo_kn3.def.json index dc0c40837d..2f8ba71ecf 100644 --- a/resources/definitions/koonovo_kn3.def.json +++ b/resources/definitions/koonovo_kn3.def.json @@ -66,7 +66,6 @@ "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, - "line_width": { "value": "machine_nozzle_size" }, "wall_thickness": {"value": "line_width * 2" }, @@ -75,36 +74,25 @@ "infill_sparse_density": { "value": "15" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, - "material_print_temperature": { "value": "195" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "default_material_print_temperature": { "value": "195" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_bed_temperature": { "value": "55" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "material_flow": { "value": 100 }, + "default_material_bed_temperature": { "value": "55" }, "material_standby_temperature": { "value": "material_print_temperature" }, - "speed_print": { "value": 50.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_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, "speed_layer_0": { "value": 25.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 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_z_hop": { "value": 5 }, - "retraction_enable": { "value": true }, "retraction_amount": { "value": 2.5 }, "retraction_speed": { "value": 40 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, diff --git a/resources/definitions/koonovo_kn5.def.json b/resources/definitions/koonovo_kn5.def.json index 9870c85eb6..e770579487 100644 --- a/resources/definitions/koonovo_kn5.def.json +++ b/resources/definitions/koonovo_kn5.def.json @@ -23,8 +23,8 @@ "preferred_material": "generic_pla" }, - - "overrides": { + "overrides": + { "machine_name": { "default_value": "Koonovo KN5" }, "machine_width": { "default_value": 420 }, "machine_depth": { "default_value": 420 }, @@ -39,7 +39,6 @@ "gantry_height": { "value": 0 }, - "machine_extruder_count": { "default_value": 2 }, "machine_start_gcode": { @@ -64,11 +63,8 @@ "material_diameter": { "default_value": 1.75 }, - "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, - - "line_width": { "value": "machine_nozzle_size" }, "wall_thickness": {"value": "line_width * 2" }, @@ -77,38 +73,27 @@ "infill_sparse_density": { "value": "15" }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, - "material_print_temperature": { "value": "195" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, + "default_material_print_temperature": { "value": "195" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_standby_temperature": { "value": "material_print_temperature" }, - "material_bed_temperature": { "value": "45" }, - "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "material_flow": { "value": 100 }, + "default_material_bed_temperature": { "value": "45" }, "speed_print": { "value": 50.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_travel": { "value": "120.0 if speed_print < 60 else 180.0 if speed_print > 100 else speed_print * 2.2" }, "speed_layer_0": { "value": 25.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 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_z_hop": { "value": 5 }, - "retraction_enable": { "value": true }, "retraction_amount": { "value": 2.5 }, "retraction_speed": { "value": 40 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - "support_brim_enable": { "value": true }, "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width/2.0/layer_height)))" }, "support_pattern": { "value": "'zigzag'" }, diff --git a/resources/definitions/kupido.def.json b/resources/definitions/kupido.def.json index 717c85f93b..667f25a1c4 100644 --- a/resources/definitions/kupido.def.json +++ b/resources/definitions/kupido.def.json @@ -9,7 +9,7 @@ "manufacturer": "Kati Hal ARGE", "file_formats": "text/x-gcode", "platform_offset": [ 0, 0, 0], - "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], + "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla","tizyx_pla","tizyx_abs","tizyx_pla_bois" ], "preferred_material": "generic_pla", "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/liquid.def.json b/resources/definitions/liquid.def.json index 0fc0f3c9ca..e9617ab141 100644 --- a/resources/definitions/liquid.def.json +++ b/resources/definitions/liquid.def.json @@ -87,8 +87,7 @@ "value": true, "enabled": true }, - - "acceleration_enabled": { "value": "True" }, + "acceleration_enabled": { "value": true }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "4000" }, diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json index 2a2e6f5867..435b3000ab 100644 --- a/resources/definitions/longer_base.def.json +++ b/resources/definitions/longer_base.def.json @@ -60,15 +60,10 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 50.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_layer_0": { "value": 20.0 }, - "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" }, @@ -77,18 +72,15 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -112,8 +104,7 @@ "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')", "maximum_value": 200 }, - - "retraction_hop_enabled": { "value": "False" }, + "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "retraction_combing_max_distance": { "value": 30 }, @@ -121,13 +112,12 @@ "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - "retraction_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'raft'" }, diff --git a/resources/definitions/lotmaxx_sc10.def.json b/resources/definitions/lotmaxx_sc10.def.json index b94c63533c..6700521b53 100644 --- a/resources/definitions/lotmaxx_sc10.def.json +++ b/resources/definitions/lotmaxx_sc10.def.json @@ -14,7 +14,8 @@ "0": "lotmaxx_sc10_extruder_0" } }, - "overrides": { + "overrides": + { "machine_name": { "default_value": "Lotmaxx SC-10" }, "machine_width": { "default_value": 235 }, "machine_depth": { "default_value": 235 }, @@ -23,42 +24,39 @@ "gantry_height": { "value": 40 }, "machine_start_gcode": { "default_value": "; SC-10 Custom Start G-code\nG28 ; Home all axes\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End of custom start GCode" }, "machine_end_gcode": { "default_value": "; SC-10 Custom End G-code\nG4 ; Wait\nM220 S100 ; Reset Speed factor override percentage to default (100%)\nM221 S100 ; Reset Extrude factor override percentage to default (100%)\nG91 ; Set coordinates to relative\nG1 F1800 E-3 ; Retract filament 3 mm to prevent oozing\nG1 F3000 Z20 ; Move Z Axis up 20 mm to allow filament ooze freely\nG90 ; Set coordinates to absolute\nG1 X0 Y{machine_depth} F1000 ; Move Heat Bed to the front for easy print removal\nM84 ; Disable stepper motors\n; End of custom end GCode" }, - "machine_max_jerk_xy":{ "value":10 }, - "machine_max_jerk_z":{ "value":0.4 }, - "machine_max_jerk_e":{ "value":5 }, - "machine_heated_bed":{ "default_value":true }, - "material_diameter":{ "default_value":1.75 }, - "jerk_print":{ "value":8 }, - "jerk_travel":{ "value":"jerk_print" }, - "jerk_travel_layer_0":{ "value":"jerk_travel" }, - "acceleration_enabled":{ "value":false }, - "jerk_enabled":{ "value":false }, - "speed_print":{ "value":60.0 }, - "speed_infill":{ "value":"speed_print * 2" }, - "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_layer_0":{ "value":20.0 }, - "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" }, - "skirt_brim_speed":{ "value":"speed_layer_0" }, - "retraction_enable":{ "value":true }, - "retraction_count_max":{ "value":100 }, - "retraction_extrusion_window":{ "value":10 }, - "retraction_min_travel":{ "value":1.5 }, - "cool_fan_full_at_height":{ "value":"layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled":{ "value":true }, - "cool_min_layer_time":{ "value":10 }, - "meshfix_maximum_resolution":{ "value":"0.25" }, - "meshfix_maximum_travel_resolution":{ "value":"meshfix_maximum_resolution" }, + "machine_max_jerk_xy":{ "value": 10 }, + "machine_max_jerk_z":{ "value": 0.4 }, + "machine_max_jerk_e":{ "value": 5 }, + "machine_heated_bed":{ "default_value": true }, + "material_diameter":{ "default_value": 1.75 }, + "jerk_print":{ "value": 8 }, + "jerk_travel":{ "value": "jerk_print" }, + "jerk_travel_layer_0":{ "value":" jerk_travel" }, + "acceleration_enabled":{ "value": false }, + "jerk_enabled":{ "value": false }, + "speed_print":{ "value": 60.0 }, + "speed_infill":{ "value": "speed_print * 2" }, + "speed_wall_0":{ "value": "speed_wall" }, + "speed_wall_x":{ "value": "speed_wall" }, + "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_layer_0":{ "value": 20.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" }, + "skirt_brim_speed":{ "value": "speed_layer_0" }, + "retraction_enable":{ "value": true }, + "retraction_count_max":{ "value": 100 }, + "retraction_extrusion_window":{ "value": 10 }, + "retraction_min_travel":{ "value": 1.5 }, + "cool_fan_full_at_height":{ "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled":{ "value": true }, + "cool_min_layer_time":{ "value": 10 }, + "meshfix_maximum_resolution":{ "value": "0.25" }, + "meshfix_maximum_travel_resolution":{ "value": "meshfix_maximum_resolution" }, "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, - "skirt_gap":{ "value":5.0 }, - "skirt_line_count":{ "value":4 } + "skirt_gap":{ "value": 5.0 }, + "skirt_line_count":{ "value": 4 } } } diff --git a/resources/definitions/lotmaxx_sc20.def.json b/resources/definitions/lotmaxx_sc20.def.json index f96cb0839a..1aa982430d 100644 --- a/resources/definitions/lotmaxx_sc20.def.json +++ b/resources/definitions/lotmaxx_sc20.def.json @@ -35,14 +35,11 @@ "jerk_enabled":{ "value":false }, "speed_print":{ "value":60.0 }, "speed_infill":{ "value":"speed_print * 2" }, - "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_layer_0":{ "value":20.0 }, - "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" }, diff --git a/resources/definitions/maker_made_300x.def.json b/resources/definitions/maker_made_300x.def.json index 70479856e3..0be2112bed 100644 --- a/resources/definitions/maker_made_300x.def.json +++ b/resources/definitions/maker_made_300x.def.json @@ -68,7 +68,6 @@ "infill_support_enabled": {"value": false }, "max_skin_angle_for_expansion": {"value": 90}, "default_material_print_temperature": {"value": 220}, - "material_print_temperature": {"value": 220}, "material_print_temperature_layer_0": {"value": 220}, "material_initial_print_temperature": {"value": 220}, "material_final_print_temperature": {"value": 220}, diff --git a/resources/definitions/malyan_m200.def.json b/resources/definitions/malyan_m200.def.json index c8eb4eb654..2eeef96cbd 100644 --- a/resources/definitions/malyan_m200.def.json +++ b/resources/definitions/malyan_m200.def.json @@ -28,7 +28,6 @@ "speed_wall_x": { "value": "speed_print" }, "speed_support": { "value": "speed_wall_0" }, "speed_layer_0": { "value": "round(speed_print / 2.0, 2)" }, - "speed_infill": { "value": "speed_print" }, "speed_topbottom": {"value": "speed_print / 2"}, "layer_height": @@ -80,7 +79,6 @@ "retraction_amount" : { "default_value": 4.5}, "retraction_speed" : { "default_value": 40}, "coasting_enable": { "default_value": true }, - "prime_tower_enable": { "default_value": false}, "speed_z_hop": {"default_value": 1.5} } } diff --git a/resources/definitions/mingda_1000pro.def.json b/resources/definitions/mingda_1000pro.def.json new file mode 100644 index 0000000000..57c125a9b1 --- /dev/null +++ b/resources/definitions/mingda_1000pro.def.json @@ -0,0 +1,24 @@ +{ + "name": "Mingda 1000Pro", + "version": 2, + "inherits": "mingda_base", + "overrides": + { + "machine_name": { "default_value": "Mingda 1000Pro" }, + + "machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\n G1 X4 Y20 Z0.3 F3000.0 ; move to start-line position\n G1 X4 Y380.0 Z0.3 F1500.0 E30 ; draw 1st line\n G1 X4 Y380.0 Z0.4 F3000.0 ; move to side a little\n G1 X4 Y20 Z0.4 F1500.0 E60 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F1500 ; move z up little to prevent scratching of surface"}, + + "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" }, + + "machine_width": { "default_value": 1000 }, + "machine_depth": { "default_value": 1000 }, + "machine_height": { "default_value": 1000 }, + "gantry_height": { "value": 25 } + + }, + "metadata": + { + "quality_definition": "mingda_base", + "visible": true + } +} diff --git a/resources/definitions/mingda_4h.def.json b/resources/definitions/mingda_4h.def.json new file mode 100644 index 0000000000..8a977aedda --- /dev/null +++ b/resources/definitions/mingda_4h.def.json @@ -0,0 +1,19 @@ +{ + "name": "Mingda 4H", + "version": 2, + "inherits": "mingda_base", + "overrides": + { + "machine_name": { "default_value": "Mingda 4H" }, + + "machine_width": { "default_value": 300 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 200 }, + "gantry_height": { "value": 25 } + }, + "metadata": + { + "quality_definition": "mingda_base", + "visible": true + } +} diff --git a/resources/definitions/mingda_600pro.def.json b/resources/definitions/mingda_600pro.def.json new file mode 100644 index 0000000000..c1cd812ab4 --- /dev/null +++ b/resources/definitions/mingda_600pro.def.json @@ -0,0 +1,24 @@ +{ + "name": "Mingda 600Pro", + "version": 2, + "inherits": "mingda_base", + "overrides": + { + "machine_name": { "default_value": "Mingda 600Pro" }, + + "machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F1200 ; move z up little to prevent scratching of surface\n G1 X4 Y20 Z0.3 F3000.0 ; move to start-line position\n G1 X4 Y380.0 Z0.3 F1500.0 E30 ; draw 1st line\n G1 X4 Y380.0 Z0.4 F3000.0 ; move to side a little\n G1 X4 Y20 Z0.4 F1500.0 E60 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F1500 ; move z up little to prevent scratching of surface"}, + + "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" }, + + "machine_width": { "default_value": 600 }, + "machine_depth": { "default_value": 600 }, + "machine_height": { "default_value": 600 }, + "gantry_height": { "value": 25 } + + }, + "metadata": + { + "quality_definition": "mingda_base", + "visible": true + } +} diff --git a/resources/definitions/mingda_6h.def.json b/resources/definitions/mingda_6h.def.json new file mode 100644 index 0000000000..f306a8f2c4 --- /dev/null +++ b/resources/definitions/mingda_6h.def.json @@ -0,0 +1,19 @@ +{ + "name": "Mingda 6H", + "version": 2, + "inherits": "mingda_base", + "overrides": + { + "machine_name": { "default_value": "Mingda 6H" }, + + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 500 }, + "gantry_height": { "value": 25 } + }, + "metadata": + { + "quality_definition": "mingda_base", + "visible": true + } +} diff --git a/resources/definitions/mingda_base.def.json b/resources/definitions/mingda_base.def.json index f59a26fc1a..9205be8e4e 100644 --- a/resources/definitions/mingda_base.def.json +++ b/resources/definitions/mingda_base.def.json @@ -64,55 +64,6 @@ "tizyx_abs", "tizyx_pla", "tizyx_pla_bois", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "zyyx_pro_flex", "zyyx_pro_pla" @@ -121,9 +72,9 @@ "overrides": { "machine_name": { "default_value": "MINGDA Base Printer" }, - "machine_start_gcode": { "default_value": " G28 ; home all axes\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, + "machine_start_gcode": { "default_value": " G28 ; home all axes\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, - "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" }, + "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M106 S0 ; turn off fan" }, "machine_max_feedrate_x": { "value": 500 }, "machine_max_feedrate_y": { "value": 500 }, @@ -157,16 +108,12 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 60.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_travel": { "value": "80.0 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 1.5" }, "speed_layer_0": { "value": 20.0 }, "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_travel_layer_0": { "value": "60 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 1.5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, @@ -174,24 +121,24 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size * 1.1" }, + "line_width": { "value": "machine_nozzle_size * 1" }, "optimize_wall_printing_order": { "value": true }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_type": { "value": "'back'" }, "z_seam_corner": { "value": "'z_seam_corner_none'" }, "infill_sparse_density": { "value": "15" }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'grid'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, "skin_overlap": { "value": 10.0 }, "infill_wipe_dist": { "value": 0.0 }, "wall_0_wipe_dist": { "value": 0.0 }, + "wall_0_material_flow": { "value": "0.95 * material_flow"}, "fill_outline_gaps": { "value": false }, @@ -219,14 +166,13 @@ "retraction_amount": { "value": 2 }, "retraction_enable": { "value": true }, "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 10 }, + "retraction_extrusion_window": { "value": 3 }, "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, - "adhesion_type": { "value": "'none' if support_enable else 'skirt'" }, + "adhesion_type": { "value": "'none' if support_enable else 'raft'" }, "brim_replaces_support": { "value": false }, "skirt_gap": { "value": 10.0 }, "skirt_line_count": { "value": 4 }, @@ -237,8 +183,8 @@ "meshfix_maximum_resolution": { "value": "0.05" }, "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, - "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" }, - "support_pattern": { "value": "'zigzag'" }, + "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" }, "support_use_towers": { "value": false }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, @@ -258,6 +204,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/mingda_d2.def.json b/resources/definitions/mingda_d2.def.json index d6278705ad..56ac284156 100644 --- a/resources/definitions/mingda_d2.def.json +++ b/resources/definitions/mingda_d2.def.json @@ -2,15 +2,16 @@ "name": "Mingda D2", "version": 2, "inherits": "mingda_base", - "overrides": { + "overrides": + { "machine_name": { "default_value": "MINGDA D2" }, "machine_width": { "default_value": 230 }, "machine_depth": { "default_value": 230 }, "machine_height": { "default_value": 260 }, "gantry_height": { "value": 25 } - }, - "metadata": { + "metadata": + { "quality_definition": "mingda_base", "visible": true, "platform": "mingda_d2_base.stl", diff --git a/resources/definitions/mingda_d3pro.def.json b/resources/definitions/mingda_d3pro.def.json index 682cd88d88..230e59e4e0 100644 --- a/resources/definitions/mingda_d3pro.def.json +++ b/resources/definitions/mingda_d3pro.def.json @@ -2,20 +2,19 @@ "name": "Mingda D3/Pro", "version": 2, "inherits": "mingda_base", - "overrides": { + "overrides": + { "machine_name": { "default_value": "MINGDA D3/Pro" }, "machine_width": { "default_value": 320 }, "machine_depth": { "default_value": 320 }, "machine_height": { "default_value": 400 }, "gantry_height": { "value": 25 } - - - }, - "metadata": { + "metadata": + { "quality_definition": "mingda_base", "visible": true, - "platform": "mingda_rock3_base.stl", + "platform": "mingda_rock3_base.stl", "platform_offset": [ -179, -108, 150] } } diff --git a/resources/definitions/mingda_d4pro.def.json b/resources/definitions/mingda_d4pro.def.json index 00d316c925..283fda8165 100644 --- a/resources/definitions/mingda_d4pro.def.json +++ b/resources/definitions/mingda_d4pro.def.json @@ -2,16 +2,17 @@ "name": "Mingda D4 Pro", "version": 2, "inherits": "mingda_base", - "overrides": { + "overrides": + { "machine_name": { "default_value": "MINGDA D4 Pro" }, "machine_start_gcode": { "default_value": "G28 ; home all axes\n G29; ABL\n M117 Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, "machine_width": { "default_value": 420 }, "machine_depth": { "default_value": 420 }, "machine_height": { "default_value": 400 }, "gantry_height": { "value": 25 } - }, - "metadata": { + "metadata": + { "quality_definition": "mingda_base", "visible": true, "platform": "mingda_d4pro_base.stl", diff --git a/resources/definitions/mingda_magician_max.def.json b/resources/definitions/mingda_magician_max.def.json index 444457ab4e..825a63f4ee 100644 --- a/resources/definitions/mingda_magician_max.def.json +++ b/resources/definitions/mingda_magician_max.def.json @@ -4,6 +4,11 @@ "inherits": "mingda_base", "overrides": { "machine_name": { "default_value": "Mingda Magician Max" }, + + "machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, + + "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M420 S0\n M106 S0 ; turn off fan" }, + "machine_width": { "default_value": 320 }, "machine_depth": { "default_value": 320 }, "machine_height": { "default_value": 400 }, @@ -13,7 +18,7 @@ "metadata": { "quality_definition": "mingda_base", "visible": true, - "platform": "mingda_rock3_base.stl", - "platform_offset": [ -179, -108, 150] + "platform": "mingda_magician_max_base.stl", + "platform_offset": [ 0, 0, 4] } } diff --git a/resources/definitions/mingda_magician_pro.def.json b/resources/definitions/mingda_magician_pro.def.json index b38e168c65..c261f986e5 100644 --- a/resources/definitions/mingda_magician_pro.def.json +++ b/resources/definitions/mingda_magician_pro.def.json @@ -4,9 +4,11 @@ "inherits": "mingda_base", "overrides": { "machine_name": { "default_value": "Mingda Magician Pro" }, - "machine_start_gcode": { - "default_value":" G28 ; home all axes\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface" - }, + + "machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, + + "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M420 S0\n M106 S0 ; turn off fan" }, + "machine_width": { "default_value": 400 }, "machine_depth": { "default_value": 400 }, "machine_height": { "default_value": 400 }, @@ -16,7 +18,7 @@ "metadata": { "quality_definition": "mingda_base", "visible": true, - "platform": "mingda_d4pro_base.stl", - "platform_offset": [ -177, -140, 170] + "platform": "mingda_magician_pro_base.stl", + "platform_offset": [ 0, 0, -4] } } diff --git a/resources/definitions/mingda_magician_x.def.json b/resources/definitions/mingda_magician_x.def.json index 2dd3e5cd82..60b11e8a83 100644 --- a/resources/definitions/mingda_magician_x.def.json +++ b/resources/definitions/mingda_magician_x.def.json @@ -4,6 +4,11 @@ "inherits": "mingda_base", "overrides": { "machine_name": { "default_value": "Mingda Magician X" }, + + "machine_start_gcode": { "default_value": " G28 ; home all axes\n M420 S1\n M117 ; Purge extruder\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface\n G1 X2 Y20 Z0.3 F5000.0 ; move to start-line position\n G1 X2 Y200.0 Z0.3 F1500.0 E15 ; draw 1st line\n G1 X2 Y200.0 Z0.4 F5000.0 ; move to side a little\n G1 X2 Y20 Z0.4 F1500.0 E30 ; draw 2nd line\n G92 E0 ; reset extruder\n G1 Z1.0 F3000 ; move z up little to prevent scratching of surface"}, + + "machine_end_gcode": { "default_value": " G91; relative positioning\n G1 Z1.0 F3000 ; move z up little to prevent scratching of print\n G90; absolute positioning\n G1 X0 Y0 F1000 ; prepare for part removal\n M104 S0; turn off extruder\n M140 S0 ; turn off bed\n M84 ; disable motors\n M420 S0\n M106 S0 ; turn off fan" }, + "machine_width": { "default_value": 230 }, "machine_depth": { "default_value": 230 }, "machine_height": { "default_value": 260 }, @@ -13,7 +18,7 @@ "metadata": { "quality_definition": "mingda_base", "visible": true, - "platform": "mingda_d2_base.stl", - "platform_offset": [ -205, -77, 65] + "platform": "mingda_magician_x_base.stl", + "platform_offset": [ 0, 0, 0] } } diff --git a/resources/definitions/mixware_hyper_s.def.json b/resources/definitions/mixware_hyper_s.def.json index 12e55444cf..b467f8e98c 100644 --- a/resources/definitions/mixware_hyper_s.def.json +++ b/resources/definitions/mixware_hyper_s.def.json @@ -241,12 +241,6 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "speed_infill": { - "value": "speed_print" - }, - "speed_wall": { - "value": "speed_print / 2" - }, "speed_wall_0": { "value": "speed_wall" }, @@ -262,9 +256,6 @@ "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" }, diff --git a/resources/definitions/mp_mini_delta.def.json b/resources/definitions/mp_mini_delta.def.json index eda45bb413..b003bb3853 100644 --- a/resources/definitions/mp_mini_delta.def.json +++ b/resources/definitions/mp_mini_delta.def.json @@ -48,7 +48,6 @@ }, "material_bed_temperature": { "value": 40 }, "line_width": { "value": "round(machine_nozzle_size, 2)" }, - "material_print_temperature_layer_0": { "value": "material_print_temperature" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_max_feedrate_x": { "default_value": 150 }, diff --git a/resources/definitions/nps.def.json b/resources/definitions/nps.def.json new file mode 100644 index 0000000000..b6f0bfffe8 --- /dev/null +++ b/resources/definitions/nps.def.json @@ -0,0 +1,54 @@ +{ + "version": 2, + "name": "nps", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Naxe", + "manufacturer": "Naxe", + "platform": "npscura.stl", + "platform_offset": [ -212, -83, 215], + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "nps_extruder_0" + }, + "has_machine_quality": true, + "has_materials": true + }, + + "overrides": { + "machine_name": { "default_value": "NAXE NP-S" }, + "machine_heated_bed": { "default_value": true }, + "machine_width": { "default_value": 300 }, + "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.2 }, + "retraction_amount": { "default_value": 0.2 }, + "retraction_speed": { "default_value": 45 }, + "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": 20 }, + "machine_max_feedrate_e": { "default_value": 60 }, + "machine_max_acceleration_z": { "default_value": 500 }, + "machine_acceleration": { "default_value": 1000 }, + "machine_max_jerk_xy": { "default_value": 12 }, + "machine_max_jerk_z": { "default_value": 0.5 }, + "machine_max_jerk_e": { "default_value": 5 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_extruder_count": {"default_value": 1}, + "machine_start_gcode": { + "default_value": "G28 X Y\nG1 Y10\nM104 S{print_temperature}\nM190 S{print_bed_temperature}\nG28\nG4 S5\nG34\nG29 E0\nG21\nG90\nM83\nG1 X6 Y20 F7200\nG1 Z0.2\nM109 S{print_temperature}\nG1 X10 Y20 Z0.2 F5000.0\nG1 X10 Y200.0 Z0.2 F900.0 E10\nG92 E0.0\nM82\nM117 Printing\n" + }, + "machine_end_gcode": { + "default_value": "M104 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\n" + } + } +} diff --git a/resources/definitions/renkforce_cubeone.def.json b/resources/definitions/renkforce_cubeone.def.json new file mode 100644 index 0000000000..76f7263c3b --- /dev/null +++ b/resources/definitions/renkforce_cubeone.def.json @@ -0,0 +1,30 @@ +{ + "name": "Renkforce Cube One", + "version": 2, + "inherits": "goofoo_small", + "overrides": { + + "machine_name": { "default_value": "Renkforce Cube One" }, + "machine_width": { "default_value": 80 }, + "machine_depth": { "default_value": 80 }, + "machine_height": { "default_value": 80 }, + "machine_heated_bed": { "default_value": false }, + "raft_margin": { "default_value": 5 }, + "layer_height":{"default_value": 0.4}, + "layer_height_0": {"default_value": 0.5}, + "speed_print": {"value": 10}, + "speed_travel": {"value": 10}, + "speed_layer_0":{"value": 10}, + "speed_print_layer_0":{"value": 10}, + "speed_travel_layer_0":{"value": 10}, + + "retraction_speed": {"default_value": 60}, + "retraction_prime_speed":{"value": 80}, + "adhesion_type": {"default_value": "skirt"} + }, + "metadata": { + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/renkforce_pro6plus.def.json b/resources/definitions/renkforce_pro6plus.def.json new file mode 100644 index 0000000000..09cb29719d --- /dev/null +++ b/resources/definitions/renkforce_pro6plus.def.json @@ -0,0 +1,17 @@ +{ + "name": "Renkforce Pro 6+", + "version": 2, + "inherits": "goofoo_near", + "overrides": { + "machine_name": { "default_value": "Renkforce Pro 6+" }, + "machine_width": { "default_value": 280 }, + "machine_depth": { "default_value": 280 }, + "machine_height": { "default_value": 300 } + + }, + "metadata": { + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/renkforce_pro7dual.def.json b/resources/definitions/renkforce_pro7dual.def.json new file mode 100755 index 0000000000..c6322046a9 --- /dev/null +++ b/resources/definitions/renkforce_pro7dual.def.json @@ -0,0 +1,24 @@ +{ + "name": "Renkforce Pro7 Dual", + "version": 2, + "inherits": "goofoo_far", + "overrides": { + "machine_name": { "default_value": "Renkforce Pro7 Dual" }, + "machine_width": { "default_value": 360 }, + "machine_depth": { "default_value": 250 }, + "machine_height": { "default_value": 200 }, + "machine_head_with_fans_polygon":{"default_value":[[0, 0], [0, 0], [0, 0], [0, 0]]}, + "machine_extruder_count": { + "default_value": 2 + } + }, + "metadata": { + "machine_extruder_trains": { + "0": "renkforce_pro7dual_1st", + "1": "renkforce_pro7dual_2nd" + }, + "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", + "manufacturer": "Renkforce", + "visible": true + } +} \ No newline at end of file diff --git a/resources/definitions/renkforce_rf100.def.json b/resources/definitions/renkforce_rf100.def.json index 7ad092ce8f..f241df9a44 100644 --- a/resources/definitions/renkforce_rf100.def.json +++ b/resources/definitions/renkforce_rf100.def.json @@ -104,7 +104,7 @@ "material_flow": { "value": "110" }, - "material_print_temperature": { + "default_material_print_temperature": { "value": "210.0" }, "ooze_shield_enabled": { diff --git a/resources/definitions/renkforce_rf100_v2.def.json b/resources/definitions/renkforce_rf100_v2.def.json index 05907a1c20..881b5c94ca 100644 --- a/resources/definitions/renkforce_rf100_v2.def.json +++ b/resources/definitions/renkforce_rf100_v2.def.json @@ -104,9 +104,6 @@ "material_flow": { "value": "110" }, - "material_print_temperature": { - "value": "210.0" - }, "ooze_shield_enabled": { "value": "True" }, diff --git a/resources/definitions/renkforce_rf100_xl.def.json b/resources/definitions/renkforce_rf100_xl.def.json index f0e8644ae4..02172dd317 100644 --- a/resources/definitions/renkforce_rf100_xl.def.json +++ b/resources/definitions/renkforce_rf100_xl.def.json @@ -18,55 +18,55 @@ "default_value": "skirt" }, "bottom_thickness": { - "value": "0.6" + "value": 0.6 }, "brim_width": { - "value": "3.0" + "value": 3.0 }, "cool_fan_enabled": { - "value": "True" + "value": true }, "cool_fan_full_at_height": { - "value": "0.5" + "value": 0.5 }, "cool_fan_speed_max": { - "value": "100.0" + "value": 100.0 }, "cool_fan_speed_min": { - "value": "100.0" + "value": 100.0 }, "cool_lift_head": { - "value": "True" + "value": true }, "cool_min_layer_time": { - "value": "1.0" + "value": 1.0 }, "cool_min_speed": { - "value": "5.0" + "value": 5.0 }, "infill_before_walls": { - "value": "True" + "value": true }, "infill_line_width": { - "value": "0.6" + "value": 0.6 }, "infill_overlap": { - "value": "15.0" + "value": 15.0 }, "infill_sparse_density": { - "value": "26.0" + "value": 26.0 }, "ironing_enabled": { - "value": "True" + "value": true }, "layer_0_z_overlap": { - "value": "0.11" + "value": 0.11 }, "layer_height_0": { - "value": "0.3" + "value": 0.3 }, "machine_depth": { - "value": "200" + "value": 200 }, "machine_end_gcode": { "default_value": ";End GCode\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-4 F300 ;move Z up a bit and retract filament even more\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off (if you have it)\nG0 Z{machine_height} F1800 ;move the platform all the way down\nG28 X0 Y0 F1800 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning\nM117 Done" @@ -75,10 +75,10 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { - "default_value": "true" + "default_value": true }, "machine_height": { - "value": "200" + "value": 200 }, "machine_name": { "default_value": "Renkforce RF100 XL" @@ -87,112 +87,109 @@ "default_value": ";Sliced at: {day} {date} {time}\nG21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG1 Z5.0 F1800 ;move Z to 5mm\nG28 X0 Y0 F1800 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstop\nG92 E0 ;zero the extruded length\nG1 F200 E6.0 ;extrude 6.0mm of feed stock to build pressure\nG1 Z5.0 F300 ;move the platform down 5mm\nG92 E0 ;zero the extruded length again\nG1 F1800\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_width": { - "value": "200" + "value": 200 }, "material_bed_temperature": { - "value": "70" - }, - "material_print_temperature": { - "value": "210.0" + "value": 70 }, "ooze_shield_enabled": { - "value": "True" + "value": true }, "raft_airgap": { - "value": "0.33" + "value": 0.33 }, "raft_base_line_spacing": { - "value": "3.0" + "value": 3.0 }, "raft_base_line_width": { - "value": "1.0" + "value": 1.0 }, "raft_base_thickness": { - "value": "0.3" + "value": 0.3 }, "raft_interface_line_spacing": { - "value": "3.0" + "value": 3.0 }, "raft_interface_line_width": { - "value": "0.4" + "value": 0.4 }, "raft_interface_thickness": { - "value": "0.27" + "value": 0.27 }, "raft_margin": { - "value": "6.0" + "value": 6.0 }, "raft_speed": { - "value": "20.0" + "value": 20.0 }, "raft_surface_layers": { - "value": "2" + "value": 2 }, "raft_surface_line_spacing": { - "value": "0.4" + "value": 0.4 }, "raft_surface_line_width": { - "value": "0.4" + "value": 0.4 }, "raft_surface_thickness": { - "value": "0.1" + "value": 0.1 }, "retraction_amount": { - "value": "5.0" + "value": 5.0 }, "retraction_combing": { - "value": "'all'" + "value": "all" }, "retraction_enable": { - "value": "True" + "value": true }, "retraction_min_travel": { - "value": "1.5" + "value": 1.5 }, "skin_overlap": { - "value": "15.0" + "value": 15.0 }, "skirt_brim_minimal_length": { - "value": "150.0" + "value": 150.0 }, "skirt_gap": { - "value": "3.0" + "value": 3.0 }, "skirt_line_count": { - "value": "3" + "value": 3 }, "speed_infill": { - "value": "50.0" + "value": 50.0 }, "speed_layer_0": { - "value": "15.0" + "value": 15.0 }, "speed_print": { - "value": "50.0" + "value": 50.0 }, "speed_topbottom": { - "value": "30.0" + "value": 30.0 }, "speed_travel": { - "value": "50.0" + "value": 50.0 }, "speed_wall_0": { - "value": "25.0" + "value": 25.0 }, "speed_wall_x": { - "value": "35.0" + "value": 35.0 }, "support_angle": { - "value": "60.0" + "value": 60.0 }, "support_enable": { - "value": "False" + "value": false }, "support_infill_rate": { "value": "15 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 15" }, "support_line_width": { - "value": "0.6" + "value": 0.6 }, "support_pattern": { "default_value": "lines" @@ -201,16 +198,16 @@ "default_value": "everywhere" }, "support_xy_distance": { - "value": "0.7" + "value": 0.7 }, "support_z_distance": { - "value": "0.35" + "value": 0.35 }, "top_bottom_thickness": { - "value": "0.8" + "value": 0.8 }, "wall_thickness": { - "value": "0.8" + "value": 0.8 } } } diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 19cb322f69..9bc65b912b 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -16,63 +16,7 @@ "first_start_actions": ["MachineSettingsAction"], "supported_actions": ["MachineSettingsAction"], - "preferred_material": "generic_pla_175", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", "bestfilament_petg_orange", "bestfilament_pla_green", - "chromatik_pla", - "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", "emotiontech_bvoh", "emotiontech_asax", - "emotiontech_bvoh", "emotiontech_copa", "emotiontech_hips", "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", "emotiontech_nylon_1070","emotiontech_pc", "emotiontech_petg", - "emotiontech_pla", "emotiontech_pla_hr_870", "emotiontech_pva-m", "emotiontech_pva-oks", - "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_pekk", - "eryone_petg", "eryone_pla", "eryone_pla_glow", "eryone_pla_matte", "eryone_pla_wood", - "eSUN_PETG_Black", "eSUN_PETG_Grey", "eSUN_PETG_Purple", "eSUN_PLA_PRO_Black", "eSUN_PLA_PRO_Grey", "eSUN_PLA_PRO_Purple", "eSUN_PLA_PRO_White", - "Extrudr_GreenTECPro_Anthracite_175", "Extrudr_GreenTECPro_Black_175", "Extrudr_GreenTECPro_Blue_175", "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", - "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", - "fdplast_pla_olive", "fdplast_abs_tomato", "fdplast_petg_gray", - "fiberlogy_hd_pla", - "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", - "generic_abs", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", "generic_cpe_plus", - "generic_gffcpe", "generic_gffpa", "generic_hips", "generic_nylon", "generic_pc", "generic_petg", - "generic_pla", "generic_pp", "generic_pva", "generic_tough_pla", "generic_tpu", - "goofoo_abs", "goofoo_asa", "goofoo_bronze_pla", "goofoo_emarble_pla", "goofoo_esilk_pla", "goofoo_hips", "goofoo_pa", "goofoo_pa_cf", "goofoo_pc", - "goofoo_peek", "goofoo_petg", "goofoo_pla", "goofoo_pva", "goofoo_tpe_83a", "goofoo_tpu_87a", "goofoo_tpu_95a", "goofoo_wood_pla", - "imade3d_petg_175", "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_white_pla", "layer_one_black_pla", "layer_one_dark_gray_pla", - "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", - "redd_abs", "redd_asa", "redd_hips", "redd_nylon", "redd_petg", "redd_pla", "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", "tizyx_flex", "tizyx_petg", "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", - "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", - "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", - "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", - "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", - "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", - "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", - "ultimaker_tpu_red", "ultimaker_tpu_white", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU", - "volumic_support_ultra", "volumic_abs_ultra", "volumic_arma_ultra", "volumic_asa_ultra", "volumic_br80_ultra", - "volumic_bumper_ultra", "volumic_cu80_ultra", "volumic_flex93_ultra", "volumic_medical_ultra", - "volumic_nylon_ultra", "volumic_pekk_carbone", "volumic_petg_ultra", "volumic_petgcarbone_ultra", - "volumic_pla_ultra", "volumic_pp_ultra", "volumic_strong_ultra", - "xyzprinting_abs", "xyzprinting_antibact_pla", "xyzprinting_carbon_fiber", "xyzprinting_colorinkjet_pla", "xyzprinting_flexible", "xyzprinting_metallic_pla", - "xyzprinting_nylon", "xyzprinting_petg", "xyzprinting_pla", "xyzprinting_tough_pla", "xyzprinting_tpu", - "zyyx_pro_flex", "zyyx_pro_pla" - ] + "preferred_material": "generic_pla_175" }, "overrides": { "machine_name": { "default_value": "Rigid3D Base Printer" }, diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index 9e62173f1e..19a65f7e1a 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -72,55 +72,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json index 45255579eb..ad0d4c7463 100644 --- a/resources/definitions/rigid3d_mucit.def.json +++ b/resources/definitions/rigid3d_mucit.def.json @@ -74,55 +74,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 678f4bc80c..d4db4f1281 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -72,55 +72,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", diff --git a/resources/definitions/skriware_2.def.json b/resources/definitions/skriware_2.def.json index dbcf140585..7bb6968865 100644 --- a/resources/definitions/skriware_2.def.json +++ b/resources/definitions/skriware_2.def.json @@ -30,8 +30,11 @@ "support_skip_zag_per_mm": { "default_value": 10 }, + "default_material_bed_temperature": + { + "value": "50" + }, "material_bed_temperature": { - "value": "50", "minimum_value_warning": "30", "resolve": "extruderValues('material_bed_temperature')[adhesion_extruder_nr] if resolveOrValue('adhesion_type') == 'raft' else max(extruderValues('material_bed_temperature'))" }, @@ -366,9 +369,6 @@ "z_seam_x": { "value": "115" }, - "material_print_temperature": { - "value": "195" - }, "material_bed_temperature_layer_0": { "value": "50", "minimum_value_warning": "30", diff --git a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json index 6f04cdd93c..6b280a6c7b 100644 --- a/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json +++ b/resources/definitions/structur3d_discov3ry1_complete_um2plus.def.json @@ -28,9 +28,6 @@ "overrides": { "machine_name": { "default_value": "Discov3ry Complete (Ultimaker 2+)" }, - "speed_infill": { - "value": "speed_print" - }, "infill_sparse_density": { "value": 100 }, diff --git a/resources/definitions/tank_m3.def.json b/resources/definitions/tank_m3.def.json new file mode 100644 index 0000000000..9a65397a64 --- /dev/null +++ b/resources/definitions/tank_m3.def.json @@ -0,0 +1,25 @@ +{ + "name": "Tank M3", + "version": 2, + "inherits": "tank_m_base", + "overrides": { + "machine_name": { "default_value": "Tank M3" }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 250 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 0 } + + }, + "metadata": { + "quality_definition": "tank_m_base", + "visible": true + } +} diff --git a/resources/definitions/tank_m3_max.def.json b/resources/definitions/tank_m3_max.def.json new file mode 100644 index 0000000000..ef271dc2f5 --- /dev/null +++ b/resources/definitions/tank_m3_max.def.json @@ -0,0 +1,24 @@ +{ + "name": "Tank M3 Max", + "version": 2, + "inherits": "tank_m_base", + "overrides": { + "machine_name": { "default_value": "Tank M3 Max" }, + "machine_width": { "default_value": 310 }, + "machine_depth": { "default_value": 310 }, + "machine_height": { "default_value": 400 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 0 } + }, + "metadata": { + "quality_definition": "tank_m_base", + "visible": true + } +} diff --git a/resources/definitions/tank_m_base.def.json b/resources/definitions/tank_m_base.def.json new file mode 100644 index 0000000000..b3e0bcfb86 --- /dev/null +++ b/resources/definitions/tank_m_base.def.json @@ -0,0 +1,112 @@ +{ + "name": "tank_m Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "tank_m", + "manufacturer": "tank_m", + "file_formats": "text/x-gcode", + "platform": "tank_m.obj", + "platform_texture": "tank_m.png", + + "first_start_actions": [ "MachineSettingsAction" ], + "machine_extruder_trains": {"0": "tank_m_base_extruder_0"}, + + "has_materials": true, + "has_machine_quality": true, + + + "preferred_quality_type": "standard", + "preferred_material": "generic_pla" + }, + + + "overrides": { + "machine_start_gcode": { + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 ;Move to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nM117 Printing..." + }, + "machine_end_gcode": { + "default_value": "M104 T0 S0 ;1st extruder heater off\nM104 T1 S0 ;2nd 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 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" + }, + + "machine_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 50 }, + "machine_max_feedrate_e": { "value": 500 }, + + "machine_max_acceleration_x": { "value": 2500 }, + "machine_max_acceleration_y": { "value": 2500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 2000 }, + "machine_acceleration": { "value": 2500 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + + "acceleration_print": { "value": 2500 }, + "acceleration_travel": { "value": 2500 }, + + + "wall_thickness": {"value": "line_width * 2" }, + + "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, + + "infill_sparse_density": { "value": "15" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + + "material_print_temperature": { "value": "195" }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_bed_temperature": { "value": "55" }, + "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, + "material_standby_temperature": { "value": "material_print_temperature" }, + + "speed_print": { "value": 50.0 } , + "speed_wall_x": { "value": "speed_wall" }, + "speed_travel": { "value": "120.0 if speed_print < 60 else 300.0 if speed_print > 100 else speed_print * 2.2" }, + "speed_layer_0": { "value": 25.0 }, + "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 25 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_z_hop": { "value": 5 }, + + "retraction_amount": { "value": 1.0 }, + "retraction_speed": { "value": 40 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_min_layer_time": { "value": 10 }, + + "support_brim_enable": { "value": true }, + "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" }, + "support_use_towers": { "value": false }, + "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": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_width": { "value": 4 }, + + "support_enable": { "value": true }, + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 2 }, + "minimum_interface_area": { "value": 10 }, + + "fill_outline_gaps": { "value": false }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 6.0 }, + "skirt_line_count": { "value": 3 } + + + } +} diff --git a/resources/definitions/tizyx_evy.def.json b/resources/definitions/tizyx_evy.def.json index 5032ee16d7..5cbdba0de5 100644 --- a/resources/definitions/tizyx_evy.def.json +++ b/resources/definitions/tizyx_evy.def.json @@ -15,7 +15,7 @@ "preferred_variant_name": "0.4mm", "preferred_material": "tizyx_pla", "preferred_quality_type": "normal", - "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175","generic_pp", "generic_pva", "generic_pva_175", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ], + "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175","generic_pp", "generic_pva", "generic_pva_175", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ], "machine_extruder_trains": { diff --git a/resources/definitions/tizyx_k25.def.json b/resources/definitions/tizyx_k25.def.json index 9f65d67313..14a9d3e410 100644 --- a/resources/definitions/tizyx_k25.def.json +++ b/resources/definitions/tizyx_k25.def.json @@ -10,7 +10,7 @@ "file_formats": "text/x-gcode", "platform": "tizyx_k25_platform.3mf", "platform_offset": [0, -4, 0], - "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ], + "exclude_materials": ["chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_abs_175", "generic_bam", "generic_cpe", "generic_cpe_175", "generic_cpe_plus", "generic_hips", "generic_hips_175", "generic_nylon", "generic_nylon_175", "generic_pc", "generic_pc_175", "generic_petg", "generic_petg_175", "generic_pla", "generic_pla_175", "generic_pp", "generic_pva", "generic_pva_175", "generic_tough_pla", "generic_tpu", "generic_tpu_175", "imade3d_petg_green", "imade3d_petg_pink", "imade3d_pla_green", "imade3d_pla_pink", "innofill_innoflex60_175", "octofiber_pla", "polyflex_pla", "polymax_pla", "polyplus_pla", "polywood_pla", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", "Vertex_Delta_PLA", "Vertex_Delta_TPU", "zyyx_pro_flex", "zyyx_pro_pla" ], "preferred_material": "tizyx_pla", "has_machine_quality": true, "has_materials": true, diff --git a/resources/definitions/trimaker_cosmosII.def.json b/resources/definitions/trimaker_cosmosII.def.json index 45072df1b1..0866582f18 100644 --- a/resources/definitions/trimaker_cosmosII.def.json +++ b/resources/definitions/trimaker_cosmosII.def.json @@ -89,55 +89,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", diff --git a/resources/definitions/trimaker_nebula.def.json b/resources/definitions/trimaker_nebula.def.json index dd8e3a565c..2e789b97dd 100644 --- a/resources/definitions/trimaker_nebula.def.json +++ b/resources/definitions/trimaker_nebula.def.json @@ -89,55 +89,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", @@ -158,7 +109,7 @@ "machine_width": {"default_value": 230}, "machine_depth": {"default_value": 230}, "machine_height": {"default_value": 260}, - + "acceleration_enabled": { "value": true }, "layer_height": {"default_value": 0.2}, "material_flow": {"value": 100}, "xy_offset": {"default_value": 0}, diff --git a/resources/definitions/trimaker_nebula_plus.def.json b/resources/definitions/trimaker_nebula_plus.def.json index 71fb729c0f..0a2983e67e 100644 --- a/resources/definitions/trimaker_nebula_plus.def.json +++ b/resources/definitions/trimaker_nebula_plus.def.json @@ -32,7 +32,6 @@ "machine_acceleration": { "default_value": 3000 }, "machine_extruder_count": { "default_value": 1 }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_print": { "value": "4000" }, "acceleration_support": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, diff --git a/resources/definitions/tronxy_x.def.json b/resources/definitions/tronxy_x.def.json index 9665ca0f4f..69525e5f27 100644 --- a/resources/definitions/tronxy_x.def.json +++ b/resources/definitions/tronxy_x.def.json @@ -46,15 +46,12 @@ "jerk_enabled": { "value": false }, "speed_print": { "value": 60.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print *0.75" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_wall": { "value": "speed_print * 0.75" }, "speed_wall_x": { "value": "speed_wall" }, "speed_topbottom": { "value": "speed_print * 0.5" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_travel": { "value": "60.0 if speed_print < 50 else 120.0 if speed_print > 80 else speed_print * 1.25" }, "speed_layer_0": { "value": 30.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": "45 if speed_layer_0 < 20 else 60 if speed_layer_0 > 30 else speed_layer_0 * 1.5" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, @@ -63,7 +60,6 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, @@ -74,8 +70,7 @@ "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 56 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -105,8 +100,7 @@ "travel_avoid_other_parts": { "value": false }, "travel_avoid_supports": { "value": true }, "travel_retract_before_outer_wall": { "value": true }, - - "retraction_enable": { "value": true }, + "retract_at_layer_change": { "value": true }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 5 }, @@ -114,7 +108,6 @@ "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, @@ -140,8 +133,6 @@ "support_wall_count": { "value": 0 }, "support_brim_enable": { "value": true }, "support_brim_width": { "value": 4 }, - - "support_interface_enable": { "value": false }, "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, diff --git a/resources/definitions/two_trees_base.def.json b/resources/definitions/two_trees_base.def.json index b672a2f4cd..f6918c6121 100644 --- a/resources/definitions/two_trees_base.def.json +++ b/resources/definitions/two_trees_base.def.json @@ -32,15 +32,10 @@ "material_diameter": { "default_value": 1.75 }, - "speed_print": { "value": 50.0 } , - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, + "speed_print": { "value": 50.0 }, "speed_wall_x": { "value": "speed_print / 1.5" }, - "speed_topbottom": { "value": "speed_print / 2" }, "speed_roofing": { "value": "speed_topbottom" }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, @@ -48,14 +43,12 @@ "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size" }, "optimize_wall_printing_order": { "value": "True" }, "z_seam_type": { "value": "'sharpest_corner'" }, "z_seam_corner": { "value": "'z_seam_corner_inner'" }, - - "infill_sparse_density": { "value": "20" }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_before_walls": { "value": false }, "infill_overlap": { "value": 30.0 }, @@ -65,24 +58,20 @@ "fill_outline_gaps": { "value": false }, - "retraction_hop_enabled": { "value": "False" }, "retraction_hop": { "value": 0.2 }, "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, "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_enable": { "value": true }, + "retraction_speed": { "default_value" : 40 }, "retraction_amount": { "default_value" : 7 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_min_travel": { "value": 1.5 }, - "cool_fan_full_layer": { "value": "2" }, - "cool_fan_enabled": { "value": true }, "cool_min_layer_time": { "value": 10 }, "adhesion_type": { "value": "'skirt'" }, @@ -108,7 +97,6 @@ "support_brim_enable": { "value": true }, "support_brim_width": { "value": 5 }, - "support_interface_enable": { "value": false }, "support_interface_height": { "value": "layer_height * 4" }, "support_interface_density": { "value": 33.333 }, "support_interface_pattern": { "value": "'grid'" }, diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index f9f686c69b..aab796e0a8 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -24,6 +24,7 @@ "maximum_value_warning": "125" }, "material_standby_temperature": { + "value": "material_print_temperature - 100", "minimum_value": "0" }, "extruder_prime_pos_y": @@ -78,7 +79,7 @@ "value": "skin_material_flow" }, "skin_monotonic" : { - "value": true + "value": "roofing_layer_count == 0" }, "speed_equalize_flow_width_factor": { "value": "110.0" @@ -111,10 +112,7 @@ "value": "4 * layer_height if infill_sparse_density < 30 else 0" }, "bridge_settings_enabled": { - "value": false - }, - "bridge_wall_min_length": { - "value": 0 + "value": true }, "bridge_skin_support_threshold": { "value": 50 @@ -126,7 +124,7 @@ "value": 0 }, "bridge_wall_speed": { - "value": "speed_wall" + "value": "bridge_skin_speed" }, "bridge_wall_material_flow": { "value": "wall_material_flow" @@ -236,10 +234,37 @@ "value": "2 if support_interface_enable else 0" }, "gradual_support_infill_step_height": { - "value": "4*layer_height" + "value": "4 * layer_height" + }, + "raft_base_speed": { + "value": "raft_speed" + }, + "raft_base_thickness": { + "value": "min(machine_nozzle_size * 0.75, 0.3)" + }, + "raft_interface_fan_speed": { + "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" + }, + "raft_interface_line_width": { + "value": "(raft_base_line_width + raft_surface_line_width) / 2" + }, + "raft_interface_speed": { + "value": "(raft_surface_speed + raft_base_speed) / 2" + }, + "raft_interface_thickness": { + "value": "(raft_base_thickness + raft_surface_thickness) / 2" + }, + "raft_speed": { + "value": 15 + }, + "raft_surface_fan_speed": { + "value": "cool_fan_speed" + }, + "raft_surface_speed": { + "value": "speed_topbottom" }, "support_interface_height": { - "value": "2*layer_height" + "value": "2 * layer_height" }, "support_offset": { "value": "support_xy_distance if support_interface_enable else 0" @@ -267,6 +292,15 @@ }, "support_z_distance": { "value": "0" + }, + "support_conical_enabled": { + "value": true + }, + "support_conical_min_width": { + "value": 10 + }, + "top_bottom_pattern": { + "value": "'zigzag'" } } } diff --git a/resources/definitions/ultimaker2_plus_connect.def.json b/resources/definitions/ultimaker2_plus_connect.def.json index 8ccbd7f380..6a69bb8ff4 100644 --- a/resources/definitions/ultimaker2_plus_connect.def.json +++ b/resources/definitions/ultimaker2_plus_connect.def.json @@ -57,8 +57,6 @@ "infill_wipe_dist": { "value": "0" }, "infill_overlap": { "value": "0" }, "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'grid'" }, - "speed_infill": { "value": "speed_print" }, - "speed_wall_x": { "value": "speed_wall" }, "layer_height_0": { "value": "round(machine_nozzle_size / 1.5, 2)" }, "optimize_wall_printing_order": { "value": "True" }, "zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }, @@ -85,6 +83,7 @@ "meshfix_maximum_travel_resolution": { "value": 0.5 }, "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, "retraction_prime_speed": { "value": "15" }, - "retraction_speed": {"value": "45" } + "retraction_speed": {"value": "45" }, + "speed_wall_x": { "value": "speed_wall" } } } diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 38428b89ca..fad1eaf2ea 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -81,8 +81,7 @@ "prime_tower_wipe_enabled": { "default_value": false }, "prime_blob_enable": { "enabled": true, "default_value": true, "value": "resolveOrValue('print_sequence') != 'one_at_a_time'" }, - - "acceleration_enabled": { "value": "True" }, + "acceleration_enabled": { "value": true }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -109,18 +108,9 @@ "material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }, "material_bed_temperature": { "maximum_value": "115" }, "material_bed_temperature_layer_0": { "maximum_value": "115" }, - "material_standby_temperature": { "value": "100" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "default_value": true }, - "raft_airgap": { "value": "0" }, - "raft_base_thickness": { "value": "0.3" }, - "raft_interface_line_spacing": { "value": "0.5" }, - "raft_interface_line_width": { "value": "0.5" }, - "raft_interface_thickness": { "value": "0.2" }, - "raft_jerk": { "value": "jerk_layer_0" }, - "raft_margin": { "value": "10" }, - "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 743ab7f478..78986133a7 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -35,7 +35,7 @@ "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" }, "bom_numbers": [ - 213482 + 213482, 213483 ] }, @@ -68,14 +68,13 @@ "machine_start_gcode": { "default_value": "" }, "machine_end_gcode": { "default_value": "" }, "prime_blob_enable": { "enabled": true, "default_value": false }, - + "acceleration_enabled": { "value": true }, "speed_travel": { "maximum_value": "150", "value": "150" }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -98,21 +97,9 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, - "material_standby_temperature": { "value": "100" }, "multiple_mesh_overlap": { "value": "0" }, "optimize_wall_printing_order": { "value": "True" }, "prime_tower_enable": { "value": "True" }, - "raft_airgap": { "value": "0" }, - "raft_base_speed": { "value": "20" }, - "raft_base_thickness": { "value": "0.3" }, - "raft_interface_line_spacing": { "value": "0.5" }, - "raft_interface_line_width": { "value": "0.5" }, - "raft_interface_speed": { "value": "20" }, - "raft_interface_thickness": { "value": "0.2" }, - "raft_jerk": { "value": "jerk_layer_0" }, - "raft_margin": { "value": "10" }, - "raft_speed": { "value": "25" }, - "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, "retraction_hop": { "value": "2" }, "retraction_hop_enabled": { "value": "extruders_enabled_count > 1" }, @@ -134,7 +121,6 @@ "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_thickness": { "value": "1" }, - "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" }, "initial_layer_line_width_factor": { "value": "120" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index da0367f571..33b3f926e5 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -36,7 +36,7 @@ "update_url": "https://ultimaker.com/firmware?utm_source=cura&utm_medium=software&utm_campaign=fw-update" }, "bom_numbers": [ - 9051, 214475 + 9051, 214475, 214476 ] }, @@ -76,8 +76,7 @@ "maximum_value": "150", "value": "150" }, - - "acceleration_enabled": { "value": "True" }, + "acceleration_enabled": { "value": true }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 3500)" }, "acceleration_print": { "value": "3500" }, @@ -100,20 +99,8 @@ "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, - "material_standby_temperature": { "value": "100" }, "multiple_mesh_overlap": { "value": "0" }, "prime_tower_enable": { "value": "True" }, - "raft_airgap": { "value": "0" }, - "raft_base_speed": { "value": "20" }, - "raft_base_thickness": { "value": "0.3" }, - "raft_interface_line_spacing": { "value": "0.5" }, - "raft_interface_line_width": { "value": "0.5" }, - "raft_interface_speed": { "value": "20" }, - "raft_interface_thickness": { "value": "0.2" }, - "raft_jerk": { "value": "jerk_layer_0" }, - "raft_margin": { "value": "10" }, - "raft_speed": { "value": "25" }, - "raft_surface_layers": { "value": "1" }, "retraction_amount": { "value": "6.5" }, "retraction_combing": { "value": "'no_outer_surfaces'"}, "retraction_hop": { "value": "2" }, @@ -136,7 +123,6 @@ "switch_extruder_prime_speed": { "value": "15" }, "switch_extruder_retraction_amount": { "value": "8" }, "top_bottom_thickness": { "value": "1" }, - "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" }, "optimize_wall_printing_order": { "value": "True" }, diff --git a/resources/definitions/uni_base.def.json b/resources/definitions/uni_base.def.json index 82b05f3366..1eadbc015f 100644 --- a/resources/definitions/uni_base.def.json +++ b/resources/definitions/uni_base.def.json @@ -65,55 +65,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", diff --git a/resources/definitions/vivedino_base.def.json b/resources/definitions/vivedino_base.def.json new file mode 100644 index 0000000000..0a024c7792 --- /dev/null +++ b/resources/definitions/vivedino_base.def.json @@ -0,0 +1,153 @@ +{ + "name": "Vivedino/FormBot Base Printer", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": false, + "author": "bitflipper11", + "manufacturer": "Vivedino, Formbot", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + + "machine_extruder_trains": { + "0": "trex_base_extruder_0" + }, + + "has_materials": true, + "has_variants": true, + "has_machine_quality": true, + "variants_name": "Nozzle Size", + + "preferred_variant_name": "0.4mm Nozzle", + "preferred_quality_type": "standard", + "preferred_material": "generic_pla" + }, + "overrides": { + "machine_name": { "default_value": "Vivedino Base Printer" }, + "machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\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\nG1 X0 Y{machine_depth} ;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_max_feedrate_x": { "value": 500 }, + "machine_max_feedrate_y": { "value": 500 }, + "machine_max_feedrate_z": { "value": 10 }, + "machine_max_feedrate_e": { "value": 50 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 5000 }, + "machine_acceleration": { "value": 500 }, + + "machine_max_jerk_xy": { "value": 10 }, + "machine_max_jerk_z": { "value": 0.4 }, + "machine_max_jerk_e": { "value": 5 }, + + "machine_heated_bed": { "default_value": true }, + + "material_diameter": { "default_value": 1.75 }, + + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, + "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_roofing": { "enabled": "acceleration_enabled and roofing_layer_count > 0 and top_layers > 0" }, + + "jerk_print": { "value": 8 }, + "jerk_travel": { "value": "jerk_print" }, + "jerk_travel_layer_0": { "value": "jerk_travel" }, + + "speed_print": { "value": 50.0 } , + "speed_wall_x": { "value": "speed_wall" }, + "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_layer_0": { "value": 20.0 }, + "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" }, + "speed_z_hop": { "value": 5 }, + + "skirt_brim_speed": { "value": "speed_layer_0" }, + + "line_width": { "value": "machine_nozzle_size * 0.95" }, + + "optimize_wall_printing_order": { "value": true }, + + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "value": 100 }, + + "z_seam_type": { "value": "'back'" }, + "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, + + "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, + "infill_before_walls": { "value": false }, + "infill_overlap": { "value": 30.0 }, + "skin_overlap": { "value": 10.0 }, + "infill_wipe_dist": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + + "fill_outline_gaps": { "value": false }, + + "retraction_speed": { + "maximum_value": 200 + }, + "retraction_retract_speed": { + "maximum_value": 200 + }, + "retraction_prime_speed": { + "maximum_value": 200 + }, + + "retraction_hop_enabled": { "value": false }, + "retraction_hop": { "value": 0.2 }, + "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" }, + "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_enable": { "value": true }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 10 }, + "retraction_min_travel": { "value": 1.5 }, + + "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, + "cool_fan_enabled": { "value": true }, + "cool_min_layer_time": { "value": 10 }, + + "adhesion_type": { "value": "'skirt'" }, + "brim_replaces_support": { "value": false }, + "skirt_gap": { "value": 10.0 }, + "skirt_line_count": { "value": 3 }, + + "adaptive_layer_height_variation": { "value": 0.04 }, + "adaptive_layer_height_variation_step": { "value": 0.04 }, + + "meshfix_maximum_resolution": { "value": 0.25 }, + "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" }, + + "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" }, + "support_use_towers": { "value": false }, + "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": { "value": "'xy_overrides_z'" }, + "support_wall_count": { "value": 1 }, + "support_brim_enable": { "value": true }, + "support_brim_width": { "value": 4 }, + + "support_interface_enable": { "value": true }, + "support_interface_height": { "value": "layer_height * 4" }, + "support_interface_density": { "value": 33.333 }, + "support_interface_pattern": { "value": "'grid'" }, + "support_interface_skip_height": { "value": 0.2 }, + "minimum_support_area": { "value": 10 }, + "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/vivedino_trex2plus.def.json b/resources/definitions/vivedino_trex2plus.def.json new file mode 100644 index 0000000000..51e5fafaed --- /dev/null +++ b/resources/definitions/vivedino_trex2plus.def.json @@ -0,0 +1,34 @@ +{ + "name": "Vivedino T-REX 2+", + "version": 2, + "inherits": "vivedino_base", + "overrides": { + "retraction_amount": { "value": "2" }, + "machine_heat_zone_length": {"value": "10"}, + "machine_extruder_count": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "T0\nG28 ; home all axes\nM420 S1\nG1 X-42 F8000\nG92 E0\nG1 E5 F500\nG1 X0 F5000\nG1 X-40\nG1 X0\nG1 X-40\nG1 X0\nG1 X-40\nG1 X200\nG1 Y200 F5000" }, + "machine_end_gcode": { "default_value": "G28 X0 Y0\nM104 S0 T1 ; turn off extruder\nM104 S0 T0\nM140 S0 ; turn off bed\nG28 X0\nM106 P0 S0\nM106 P1 S0\nM84 S0\nM84 XYE; disable motors except Z"}, + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 500 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-30, 34], + [-30, -32], + [30, -32], + [30, 34] + ] + }, + + "gantry_height": { "value": 30 } + + }, + "metadata": { + "visible": true, + "quality_definition": "vivedino_trex2plus", + "platform": "vivedino_trex.stl", + "machine_extruder_trains": { + "0": "trex2_extruder_0", + "1": "trex2_extruder_1" + } + } +} \ No newline at end of file diff --git a/resources/definitions/vivedino_trex3.def.json b/resources/definitions/vivedino_trex3.def.json new file mode 100644 index 0000000000..0195b94b54 --- /dev/null +++ b/resources/definitions/vivedino_trex3.def.json @@ -0,0 +1,34 @@ +{ + "name": "Vivedino T-REX 3", + "version": 2, + "inherits": "vivedino_base", + "overrides": { + "retraction_amount": { "value": "2" }, + "machine_heat_zone_length": {"value": "10"}, + "machine_extruder_count": { "default_value": 2 }, + "machine_start_gcode": { "default_value": "M605 S1 ; Set dual carriage mode S0 slicer full control | S1 AutoPark inactive head | S2 duplicate\nT0\nM106 P0 S[fan_speed_pwm]\nM106 P1 S[fan_speed_pwm]\nG28 ; home all axes\nM420 S1 ; Enable bed leveling compensation using current grid/mesh\nG1 X-42 F8000\nG92 E0\nG1 E5 F500\nG1 X0 F5000\nG1 X-40\nG1 X0\nG1 X-40\nG1 X0\nG1 X-40\nG1 X200\nG1 Y200 F5000\nT1\nG1 X440 F8000 ; park T0 head at X=440\nG92 E0 ; Zero extruder count" }, + "machine_end_gcode": { "default_value": "G28 X0 Y0\nM104 S0 T1 ; turn off extruder\nM104 S0 T0\nM140 S0 ; turn off bed\nG28 X0\nM106 P0 S0\nM106 P1 S0\nM84 S0\nM84 XYE; disable motors except Z"}, + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 500 }, + "machine_head_with_fans_polygon": { "default_value": [ + [-30, 34], + [-30, -32], + [30, -32], + [30, 34] + ] + }, + + "gantry_height": { "value": 30 } + + }, + "metadata": { + "visible": true, + "quality_definition": "vivedino_trex3", + "platform": "vivedino_trex.stl", + "machine_extruder_trains": { + "0": "trex_extruder_0", + "1": "trex_extruder_1" + } + } +} diff --git a/resources/definitions/voron2_base.def.json b/resources/definitions/voron2_base.def.json index 850a75ef28..e735a6290f 100644 --- a/resources/definitions/voron2_base.def.json +++ b/resources/definitions/voron2_base.def.json @@ -17,57 +17,7 @@ "preferred_variant_name": "V6 0.40mm", "machine_extruder_trains": { "0": "voron2_extruder_0" }, "preferred_material": "generic_abs", - "exclude_materials": [ - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white" - ] + "exclude_materials": [] }, "overrides": { diff --git a/resources/definitions/vzbot_235.def.json b/resources/definitions/vzbot_235.def.json new file mode 100644 index 0000000000..2752cb4241 --- /dev/null +++ b/resources/definitions/vzbot_235.def.json @@ -0,0 +1,18 @@ +{ + "name": "VzBot 235", + "version": 2, + "inherits": "vzbot_base", + "metadata": + { + "visible": true, + "platform": "vzbot_235_bed.stl", + "quality_definition": "vzbot_base" + }, + "overrides": + { + "machine_name": { "default_value": "VzBot 235" }, + "machine_width": { "default_value": 235 }, + "machine_depth": { "default_value": 235 }, + "machine_height": { "default_value": 240 } + } +} \ No newline at end of file diff --git a/resources/definitions/vzbot_330.def.json b/resources/definitions/vzbot_330.def.json new file mode 100644 index 0000000000..74e65ea289 --- /dev/null +++ b/resources/definitions/vzbot_330.def.json @@ -0,0 +1,18 @@ +{ + "name": "VzBot 330", + "version": 2, + "inherits": "vzbot_base", + "metadata": + { + "visible": true, + "platform": "vzbot_330_bed.stl", + "quality_definition": "vzbot_base" + }, + "overrides": + { + "machine_name": { "default_value": "VzBot 330" }, + "machine_width": { "default_value": 330 }, + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 400 } + } +} \ No newline at end of file diff --git a/resources/definitions/vzbot_base.def.json b/resources/definitions/vzbot_base.def.json new file mode 100644 index 0000000000..a3802664d4 --- /dev/null +++ b/resources/definitions/vzbot_base.def.json @@ -0,0 +1,112 @@ +{ + "name": "VzBot Base", + "version": 2, + "inherits": "fdmprinter", + "metadata": + { + "visible": false, + "author": "Chris, ckvsoft.at", + "manufacturer": "VzBot", + "file_formats": "text/x-gcode", + "first_start_actions": ["MachineSettingsAction"], + "machine_extruder_trains": { "0": "vzbot_extruder_0" }, + + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "variants_name": "Nozzle Size", + "preferred_quality_type": "standard", + "preferred_variant_name": "0.4mm Nozzle", + "preferred_material": "generic_abs" + }, + "overrides": + { + "machine_name": { "default_value": "VzBot" }, + "machine_width": { "default_value": 330 }, + "machine_depth": { "default_value": 330 }, + "machine_height": { "default_value": 400 }, + "gantry_height": { "value": 34 }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_x": { "default_value": 15000 }, + "machine_max_acceleration_y": { "default_value": 15000 }, + "machine_max_acceleration_z": { "default_value": 2000 }, + "machine_acceleration": { "default_value": 15000 }, + "machine_max_jerk_xy": { "default_value": 20 }, + "machine_max_jerk_z": { "default_value": 1 }, + "machine_max_jerk_e": { "default_value": 60 }, + "machine_steps_per_mm_x": { "default_value": 80 }, + "machine_steps_per_mm_y": { "default_value": 80 }, + "machine_steps_per_mm_z": { "default_value": 400 }, + "machine_endstop_positive_direction_x": { "default_value": true }, + "machine_endstop_positive_direction_y": { "default_value": true }, + "machine_endstop_positive_direction_z": { "default_value": false }, + "machine_feeder_wheel_diameter": { "default_value": 7.5 }, + "machine_head_with_fans_polygon": { "default_value": [ [-35, 65], [-35, -50], [35, -50], [35, 65] ] }, + "machine_max_feedrate_z": { "default_value": 40 }, + "machine_max_feedrate_e": { "default_value": 120 }, + "machine_gcode_flavor": { "default_value": "Marlin" }, + "machine_start_gcode": { "default_value": "start_print B={material_bed_temperature_layer_0} H={material_print_temperature_layer_0} C={build_volume_temperature}" }, + "machine_end_gcode": { "default_value": "end_print" }, + "adhesion_type": { "default_value": "skirt" }, + "retraction_amount": { "default_value": 0.65 }, + "skirt_brim_minimal_length": { "default_value": 550 }, + "retraction_speed": { "default_value": 30, "maximum_value_warning": 130 }, + "retraction_retract_speed": { "maximum_value_warning": 130 }, + "retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 }, + "retraction_hop_enabled": { "default_value": true }, + "retraction_hop": { "default_value": 0.2 }, + "retraction_combing": { "value": "'noskin'" }, + "retraction_combing_max_distance": { "default_value": 10 }, + "travel_avoid_other_parts": { "default_value": false }, + "speed_print": { "value": 300, "maximum_value_warning": 1001 }, + "speed_infill": { "maximum_value_warning": 1001 }, + "speed_travel": { "value": 300, "maximum_value_warning": 1001 }, + "speed_travel_layer_0": { "value": "math.ceil(speed_travel * 0.4)", "maximum_value_warning": 1001 }, + "speed_layer_0": { "value": "math.ceil(speed_print * 0.25)", "maximum_value_warning": 1001 }, + "speed_wall": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, + "speed_wall_0": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, + "speed_wall_x": { "value": "math.ceil(speed_print)", "maximum_value_warning": 1001 }, + "speed_topbottom": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, + "speed_roofing": { "value": "math.ceil(speed_print * 0.5)", "maximum_value_warning": 1001 }, + "speed_slowdown_layers": { "default_value": 4 }, + "roofing_layer_count": { "value": 1 }, + "optimize_wall_printing_order": { "default_value": true }, + "infill_enable_travel_optimization": { "default_value": true }, + "minimum_polygon_circumference": { "default_value": 0.2 }, + "wall_overhang_angle": { "default_value": 75 }, + "wall_overhang_speed_factor": { "default_value": 50 }, + "bridge_settings_enabled": { "default_value": true }, + "bridge_wall_coast": { "default_value": 10 }, + "bridge_fan_speed": { "default_value": 100 }, + "bridge_fan_speed_2": { "resolve": "max(cool_fan_speed, 50)" }, + "bridge_fan_speed_3": { "resolve": "max(cool_fan_speed, 20)" }, + "alternate_extra_perimeter": { "default_value": true }, + "cool_min_layer_time_fan_speed_max": { "default_value": 20 }, + "cool_min_layer_time": { "default_value": 15 }, + "cool_fan_speed_min": { "value": "cool_fan_speed" }, + "cool_fan_full_at_height": { "value": "resolveOrValue('layer_height_0') + resolveOrValue('layer_height') * max(1, cool_fan_full_layer - 1)" }, + "cool_fan_full_layer": { "value": 4 }, + "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_outline_gaps": { "default_value": true }, + "meshfix_maximum_resolution": { "default_value": 0.01 }, + "infill_before_walls": { "default_value": false }, + "zig_zaggify_infill": { "value": true }, + "min_infill_area": { "default_value": 5.0 }, + "acceleration_enabled": { "default_value": false }, + "acceleration_print": { "default_value": 15000, "maximum_value_warning": 50000 }, + "acceleration_wall_0": { "value": 15000, "maximum_value_warning": 50000 }, + "acceleration_wall_x": { "value": 15000, "maximum_value_warning": 50000 }, + "acceleration_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, + "acceleration_travel_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, + "acceleration_roofing": { "value": 15000, "maximum_value_warning": 50000 }, + "acceleration_topbottom": { "value": 15000, "maximum_value_warning": 50000 }, + "acceleration_travel": { "value": 20000, "maximum_value_warning": 50000 }, + "acceleration_skirt_brim": { "value": 15000, "maximum_value_warning": 50000 }, + "acceleration_print_layer_0": { "value": 15000, "maximum_value_warning": 50000 }, + "jerk_enabled": { "default_value": false }, + "jerk_wall_0": { "value": 10 }, + "jerk_roofing": { "value": 10 } + } +} diff --git a/resources/definitions/vzbot_custom.def.json b/resources/definitions/vzbot_custom.def.json new file mode 100644 index 0000000000..537b6c089c --- /dev/null +++ b/resources/definitions/vzbot_custom.def.json @@ -0,0 +1,17 @@ +{ + "name": "VzBot Custom", + "version": 2, + "inherits": "vzbot_base", + "metadata": + { + "visible": true, + "quality_definition": "vzbot_base" + }, + "overrides": + { + "machine_name": { "default_value": "VzBot Custom" }, + "machine_width": { "default_value": 400 }, + "machine_depth": { "default_value": 400 }, + "machine_height": { "default_value": 400 } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_x40.def.json b/resources/definitions/weedo_x40.def.json index 9fb5cad2d8..305dd8b765 100644 --- a/resources/definitions/weedo_x40.def.json +++ b/resources/definitions/weedo_x40.def.json @@ -215,7 +215,6 @@ "infill_overlap": { "value": 30.0 }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" }, "infill_wipe_dist": { "value": 0.0 }, - "infill_sparse_density": { "value": "20" }, "infill_before_walls": { "value": false }, "jerk_enabled": { "value": false }, "jerk_print": { "value": 11 }, @@ -223,41 +222,32 @@ "jerk_wall": { "value": "jerk_print - 2" }, "jerk_travel": { "value": 18 }, "jerk_travel_layer_0": { "value": "jerk_travel" }, - "layer_height_0": { "value": "round(layer_height * 1.5, 2)" }, - "line_width": { "value": "machine_nozzle_size" }, + "layer_height_0": { "value": "round(layer_height * 1.5, 2)" }, "machine_min_cool_heat_time_window": { "default_value": 360 }, "machine_max_jerk_xy": { "value": 10 }, "machine_max_jerk_z": { "value": 0.4 }, "machine_max_jerk_e": { "value": 5 }, "machine_center_is_zero": { "default_value": false }, "material_diameter": { "default_value": 1.75 }, - "material_flow": { "value": 100 }, "material_standby_temperature": { "value": "100" }, - "material_print_temp_prepend": { "default_value":false }, - "prime_tower_enable": { "default_value": false }, + "material_print_temp_prepend": { "default_value": false }, "raft_airgap": { "default_value": 0.22 }, "raft_base_speed":{ "value": 20 }, "raft_interface_speed": { "value": 33 }, "raft_margin": { "default_value": 8 }, - "retraction_enable": { "value": true }, + "retraction_amount": { "default_value": 4.5 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 8 }, "retraction_hop": { "value": 0.5 }, - "retraction_hop_enabled": { "value": "False" }, "retraction_min_travel": { "value": 1.5 }, "skin_overlap": { "value": 10.0 }, "speed_layer_0": { "value": "round(speed_print / 2.5, 2)" }, "speed_print": { "value": 50.0 }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_print" }, - "speed_topbottom": { "value": "speed_print / 2" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_infill": { "value": "speed_print" }, "speed_support_infill": { "value": 58.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, "speed_travel_layer_0": { "value": 60 }, "speed_support_roof": { "value": 39.0 }, "speed_support_bottom": { "value": 39.0 }, diff --git a/resources/definitions/winbo_dragonl4.def.json b/resources/definitions/winbo_dragonl4.def.json index 746b9ce2fe..86bac9f4e3 100644 --- a/resources/definitions/winbo_dragonl4.def.json +++ b/resources/definitions/winbo_dragonl4.def.json @@ -34,13 +34,13 @@ "machine_max_feedrate_x": { "default_value": 300 }, "machine_max_feedrate_y": { "default_value": 300 }, "machine_max_feedrate_z": { "default_value": 40 }, + "acceleration_enabled": { "value": true }, "machine_acceleration": { "default_value": 2000 }, "gantry_height": { "value": "80" }, "machine_extruder_count": { "default_value": 1 }, "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nM9998\nG28 X0 Y0\nG28 Z0\nG1 F6000 Z0.3\nG92 E0\nG1 F800 X585 E12\nG92 E0" }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "1800" }, @@ -69,11 +69,11 @@ "jerk_wall": { "value": "math.ceil(jerk_print * 10 / 25)" }, "jerk_wall_0": { "value": "math.ceil(jerk_wall * 5 / 10)" }, "wall_thickness": { "value": "2.4"}, - "line_width": { "value": "extruderValue(-1,'machine_nozzle_size')" }, + "line_width": { "value": "extruderValue(-1, 'machine_nozzle_size')" }, "wall_0_inset": { "value": "0.05" }, "wall_line_width_x": { "value": "line_width" }, "wall_line_width_0": { "value": "line_width-0.05" }, - "support_line_width": { "value": "max(min(line_width,0.4),line_width/2)" }, + "support_line_width": { "value": "max(min(line_width, 0.4),line_width / 2)" }, "support_interface_line_width": { "value": "support_line_width" }, "machine_min_cool_heat_time_window": { "value": "15" }, "default_material_print_temperature": { "value": "200" }, @@ -99,33 +99,32 @@ "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "25" }, "speed_print": { "value": "70" }, - "speed_support": { "value": "speed_print*line_width/support_line_width" }, - "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" }, - "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" }, + "speed_support": { "value": "speed_print * line_width / support_line_width" }, + "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" }, + "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" }, "speed_travel": { "value": "100" }, - "speed_infill": { "value": "speed_print*line_width/infill_line_width" }, - "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, + "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" }, "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)" }, - "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" }, - "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, + "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)" }, + "support_bottom_distance": { "value": "max(support_z_distance, layer_height * int(0.45 / layer_height))" }, + "top_bottom_thickness": { "value": "max(1.2, layer_height * 6)" }, "travel_avoid_distance": { "value": "3" }, "gradual_support_infill_step_height": { "value": "0.2" }, "gradual_support_infill_steps": { "value": "1" }, - "infill_sparse_density": { "value": "20" }, "gradual_infill_step_height": { "value": "1" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_travel": { "value": "25" }, "support_bottom_enable": { "value": "True" }, - "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, + "support_bottom_height": { "value": "max((0.15 if(0.15 % layer_height == 0) else layer_height * int((0.15 + layer_height) / layer_height)), layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, "support_connect_zigzags": { "value": "False" }, "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, - "support_interface_enable": { "value": "True" }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, "z_seam_type": { "value": "'shortest'" } diff --git a/resources/definitions/winbo_mini2.def.json b/resources/definitions/winbo_mini2.def.json index 903142010b..4c517a375e 100644 --- a/resources/definitions/winbo_mini2.def.json +++ b/resources/definitions/winbo_mini2.def.json @@ -30,6 +30,7 @@ [ -52, 30 ],[ -52, -40 ],[ 13, -40 ],[ 13, 30 ] ] }, + "acceleration_enabled": { "value": true }, "machine_gcode_flavor": { "default_value": "Marlin" }, "machine_max_feedrate_x": { "default_value": 250 }, "machine_max_feedrate_y": { "default_value": 200 }, @@ -40,7 +41,6 @@ "machine_start_gcode": { "default_value": "G21\nG90\nM82\nM107\nG28 X0 Y0\nG28 Z0\nG1 F1000 Z3\nG1 F4000 X0\nG1 F4000 Y0\nG1 F1000 Z0.2\nG92 E0\nG1 F1000 X30 E8\nG92 E0\nM117 Printing." }, "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\nG92 E2\nG1 E0 F200\nG28 X0 Y0\nM84 X Y E" }, "prime_blob_enable": { "enabled": true }, - "acceleration_enabled": { "value": "True" }, "acceleration_layer_0": { "value": "acceleration_topbottom" }, "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" }, "acceleration_print": { "value": "2000" }, @@ -99,23 +99,22 @@ "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_print": { "value": "50" }, - "speed_support": { "value": "speed_print*line_width/support_line_width" }, - "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" }, - "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" }, + "speed_support": { "value": "speed_print * line_width / support_line_width" }, + "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" }, + "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" }, "speed_travel": { "value": "90" }, - "speed_infill": { "value": "speed_print*line_width/infill_line_width" }, - "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, + "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" }, "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)" }, + "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)" }, "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" }, "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, "travel_avoid_distance": { "value": "3" }, "gradual_support_infill_step_height": { "value": "0.2" }, "gradual_support_infill_steps": { "value": "1" }, - "infill_sparse_density": { "value": "20" }, "gradual_infill_step_height": { "value": "1" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_travel": { "value": "25" }, @@ -125,7 +124,7 @@ "support_connect_zigzags": { "value": "False" }, "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, - "support_interface_enable": { "value": "True" }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, "z_seam_type": { "value": "'shortest'" } diff --git a/resources/definitions/winbo_superhelper105.def.json b/resources/definitions/winbo_superhelper105.def.json index 055967f8ab..5fa6fe7eb6 100644 --- a/resources/definitions/winbo_superhelper105.def.json +++ b/resources/definitions/winbo_superhelper105.def.json @@ -88,33 +88,32 @@ "skin_overlap": { "value": "10" }, "speed_layer_0": { "value": "20" }, "speed_print": { "value": "52" }, - "speed_support": { "value": "speed_print*line_width/support_line_width" }, - "speed_support_interface": { "value": "speed_print*line_width/support_interface_line_width" }, - "speed_topbottom": { "value": "speed_print*line_width/skin_line_width" }, + "speed_support": { "value": "speed_print * line_width / support_line_width" }, + "speed_support_interface": { "value": "speed_print * line_width / support_interface_line_width" }, + "speed_topbottom": { "value": "speed_print * line_width / skin_line_width" }, "speed_travel": { "value": "80" }, - "speed_infill": { "value": "speed_print*line_width/infill_line_width" }, - "speed_wall": { "value": "speed_print*wall_line_width_0/line_width" }, + "speed_infill": { "value": "speed_print * line_width / infill_line_width" }, + "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" }, "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)" }, - "support_bottom_distance": { "value": "max(support_z_distance,layer_height*int(0.45/layer_height))" }, + "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)" }, + "support_bottom_distance": { "value": "max(support_z_distance,layer_height * int(0.45 / layer_height))" }, "top_bottom_thickness": { "value": "max(1.2,layer_height*6)" }, "travel_avoid_distance": { "value": "3" }, "gradual_support_infill_step_height": { "value": "0.2" }, "gradual_support_infill_steps": { "value": "1" }, - "infill_sparse_density": { "value": "20" }, "gradual_infill_step_height": { "value": "1" }, "initial_layer_line_width_factor": { "value": "120" }, "jerk_travel": { "value": "25" }, - "support_bottom_enable": { "value": "True" }, + "support_bottom_enable": { "value": true }, "support_bottom_height": { "value": "max((0.15 if(0.15%layer_height==0) else layer_height*int((0.15+layer_height)/layer_height)),layer_height)" }, "support_bottom_pattern": { "value": "'zigzag'" }, - "support_connect_zigzags": { "value": "False" }, + "support_connect_zigzags": { "value": false }, "support_infill_rate": { "value": "8 if support_enable and support_structure == 'normal' else 0 if support_enable and support_structure == 'tree' else 8" }, "support_interface_density": { "value": "80" }, - "support_interface_enable": { "value": "True" }, + "support_interface_enable": { "value": true }, "support_interface_height": { "value": "0.5" }, "support_roof_pattern": { "value": "'concentric'" }, "z_seam_type": { "value": "'shortest'" } diff --git a/resources/definitions/zav_base.def.json b/resources/definitions/zav_base.def.json index 9f73419d46..5e20b849f5 100644 --- a/resources/definitions/zav_base.def.json +++ b/resources/definitions/zav_base.def.json @@ -74,55 +74,6 @@ "tizyx_pla", "tizyx_pla_bois", "tizyx_pva", - "ultimaker_abs_black", - "ultimaker_abs_blue", - "ultimaker_abs_green", - "ultimaker_abs_grey", - "ultimaker_abs_orange", - "ultimaker_abs_pearl-gold", - "ultimaker_abs_red", - "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", - "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", - "ultimaker_cpe_blue", - "ultimaker_cpe_dark-grey", - "ultimaker_cpe_green", - "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", - "ultimaker_cpe_plus_transparent", - "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", - "ultimaker_cpe_transparent", - "ultimaker_cpe_white", - "ultimaker_cpe_yellow", - "ultimaker_nylon_black", - "ultimaker_nylon_transparent", - "ultimaker_pc_black", - "ultimaker_pc_transparent", - "ultimaker_pc_white", - "ultimaker_pla_black", - "ultimaker_pla_blue", - "ultimaker_pla_green", - "ultimaker_pla_magenta", - "ultimaker_pla_orange", - "ultimaker_pla_pearl-white", - "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", - "ultimaker_pla_transparent", - "ultimaker_pla_white", - "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", - "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", - "ultimaker_tough_pla_white", - "ultimaker_tpu_black", - "ultimaker_tpu_blue", - "ultimaker_tpu_red", - "ultimaker_tpu_white", "verbatim_bvoh_175", "Vertex_Delta_ABS", "Vertex_Delta_PET", @@ -150,10 +101,10 @@ "machine_center_is_zero": {"default_value": false}, "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"}, "machine_head_with_fans_polygon": {"default_value": [ - [-26,41], - [-26,-21], - [36,-21], - [36,41] + [-26, 41], + [-26, -21], + [36, -21], + [36, 41] ] }, "gantry_height": {"value": 999999}, diff --git a/resources/extruders/geeetech_Mizar_S_1.def.json b/resources/extruders/geeetech_Mizar_S_1.def.json new file mode 100644 index 0000000000..da4440cd87 --- /dev/null +++ b/resources/extruders/geeetech_Mizar_S_1.def.json @@ -0,0 +1,17 @@ +{ + + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "geeetech_Mizar_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/nps_extruder_0.def.json b/resources/extruders/nps_extruder_0.def.json new file mode 100644 index 0000000000..48865b1a2e --- /dev/null +++ b/resources/extruders/nps_extruder_0.def.json @@ -0,0 +1,15 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "nps", + "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/renkforce_pro7dual_1st.def.json b/resources/extruders/renkforce_pro7dual_1st.def.json new file mode 100755 index 0000000000..23659aa672 --- /dev/null +++ b/resources/extruders/renkforce_pro7dual_1st.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "renkforce_pro7dual", + "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/renkforce_pro7dual_2nd.def.json b/resources/extruders/renkforce_pro7dual_2nd.def.json new file mode 100755 index 0000000000..7b7a6a1743 --- /dev/null +++ b/resources/extruders/renkforce_pro7dual_2nd.def.json @@ -0,0 +1,19 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "renkforce_pro7dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/tank_m_base_extruder_0.def.json b/resources/extruders/tank_m_base_extruder_0.def.json new file mode 100644 index 0000000000..64bafe97d2 --- /dev/null +++ b/resources/extruders/tank_m_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 0", + "inherits": "fdmextruder", + "metadata": { + "machine": "tank_m_base", + "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/trex2_extruder_0.def.json b/resources/extruders/trex2_extruder_0.def.json new file mode 100644 index 0000000000..cd5e61530f --- /dev/null +++ b/resources/extruders/trex2_extruder_0.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "vivedino_trex2plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "G0 X-40" + }, + "machine_extruder_end_code": { + "default_value": "" + } + } +} \ No newline at end of file diff --git a/resources/extruders/trex2_extruder_1.def.json b/resources/extruders/trex2_extruder_1.def.json new file mode 100644 index 0000000000..73ffd7cada --- /dev/null +++ b/resources/extruders/trex2_extruder_1.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "vivedino_trex2plus", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "G0 X438.2" + }, + "machine_extruder_end_code": { + "default_value": "" + } + } +} \ No newline at end of file diff --git a/resources/extruders/trex_base_extruder_0.def.json b/resources/extruders/trex_base_extruder_0.def.json new file mode 100644 index 0000000000..93feda7fa8 --- /dev/null +++ b/resources/extruders/trex_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "vivedino_base", + "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/trex_extruder_0.def.json b/resources/extruders/trex_extruder_0.def.json new file mode 100644 index 0000000000..7a3b5bfbdc --- /dev/null +++ b/resources/extruders/trex_extruder_0.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "vivedino_trex3", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "M106 P0 S[fan_speed_pwm]" + }, + "machine_extruder_end_code": { + "default_value": "M106 P0 S0" + } + } +} \ No newline at end of file diff --git a/resources/extruders/trex_extruder_1.def.json b/resources/extruders/trex_extruder_1.def.json new file mode 100644 index 0000000000..e0500e98bf --- /dev/null +++ b/resources/extruders/trex_extruder_1.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "vivedino_trex3", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "3" + }, + "machine_nozzle_offset_x": { "default_value": 0.0 }, + "machine_nozzle_offset_y": { "default_value": 0.0 }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_start_code": { + "default_value": "M106 P1 S[fan_speed_pwm]" + }, + "machine_extruder_end_code": { + "default_value": "M106 P1 S0" + } + } +} \ No newline at end of file diff --git a/resources/extruders/vzbot_extruder_0.def.json b/resources/extruders/vzbot_extruder_0.def.json new file mode 100644 index 0000000000..8b1f9abc74 --- /dev/null +++ b/resources/extruders/vzbot_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "vzbot_base", + "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/images/tank_m.png b/resources/images/tank_m.png new file mode 100644 index 0000000000..b5c93afc5a Binary files /dev/null and b/resources/images/tank_m.png differ 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 f2095ba055..1a82100882 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 @@ -12,16 +12,12 @@ material = generic_abs variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - 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 ed17a36b8a..468528e62c 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,22 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg index 694f4f1591..21b37abac1 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg index 3874bc0cce..898c8e3112 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_abs variant = AA 0.4 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 4ec7a841a5..48dee963d1 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,22 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg index bf3dcdc208..fd4cda4565 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_ABS_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_abs variant = AA 0.4 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 b74cd522ac..5ece30afd9 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,17 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 1caacdf72f..4afeb44758 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,17 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 de109c9810..85a2b0f773 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,23 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 315b26a3b1..88843e549e 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,17 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 d4a999d8eb..e0d70d45f2 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,17 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 aa371be6f3..e60b654426 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,17 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 abd125f483..944362e745 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,17 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 c8cf2a3bd4..006b3cac4c 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,17 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 b4bbdddff7..2686ff7e34 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,17 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 19418812af..d0f84a8755 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,17 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 - 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 3186c6be4e..8ca43ef884 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 @@ -12,21 +12,12 @@ material = generic_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - - 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 36ea7c975e..565387bed6 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,16 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg index 2c9b008765..e465f40ed2 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg index 64a25cd046..c50fa33475 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_pla variant = AA 0.4 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 88691ef1d6..d84c7c3a1a 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,16 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg index 5b9177f803..15f4d17fad 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_PLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_pla variant = AA 0.4 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 b59ed875b4..3b6a5b6486 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 @@ -11,22 +11,17 @@ quality_type = verydraft material = generic_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 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 1ca1775990..b2557b3f5e 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 @@ -12,21 +12,12 @@ material = generic_tough_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - - 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 924edf577d..3b43a028b4 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,16 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg index d9c514676d..3afd626d8e 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg index 05b6b33857..2ef6dc756a 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_tough_pla variant = AA 0.4 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 b92e07a877..c8a0053010 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,16 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 diff --git a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg index a7e1e2f83e..fd0e3499e5 100644 --- a/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s3/um_s3_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s3 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_tough_pla variant = AA 0.4 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 21cd1059f0..48fe33a990 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 @@ -11,28 +11,17 @@ quality_type = verydraft material = generic_tough_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 -jerk_infill = =jerk_print -jerk_topbottom = =jerk_print -jerk_wall = =jerk_print -jerk_wall_0 = =jerk_wall -jerk_wall_x = =jerk_wall -jerk_layer_0 = 5 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 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 98ad3af40b..994699e382 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 @@ -12,16 +12,12 @@ material = generic_abs variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - 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 8939d670b1..592ca35859 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,17 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg index e6d8d67c8b..dec4e9a252 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_abs variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg index 4d7510de6d..9df38c762d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_abs variant = AA 0.4 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 44f76d561f..6143b0d78d 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,17 +12,13 @@ material = generic_abs variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg index a0778dcb25..a9578315ff 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_ABS_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_abs variant = AA 0.4 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 7bf1fc834a..6d729bcea9 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,18 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 a95862c35a..86e7cc0505 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,18 +12,13 @@ material = generic_cpe_plus variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 bfdd35017c..12902a388c 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,18 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 022fb2b50d..642a8e2b3c 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,18 +12,13 @@ material = generic_cpe variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 3637040c4c..1725da9733 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,18 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 6cce98ca60..0bba4ccb0f 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,18 +12,13 @@ material = generic_nylon variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 32e0463447..f3a372c8b2 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,18 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 0b7ffb4154..cca4d4af10 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,18 +12,13 @@ material = generic_pc variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 186281c17c..6b06cb6164 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,18 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 545a8b5654..345dc02a8c 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,18 +12,13 @@ material = generic_petg variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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 76d9191fc1..2baf1418a4 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 @@ -12,16 +12,12 @@ material = generic_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - 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 ca098b5bfa..aa880fba07 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,17 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg index 35bb47e546..db38a543f4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg index 5d5d433d9a..e0e9dab04d 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_pla variant = AA 0.4 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 472c0b4359..65b3df86d6 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,17 +12,13 @@ material = generic_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg index ad280d6142..1874a846e4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_PLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_pla variant = AA 0.4 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 51cfaebe34..97d631d300 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 @@ -11,22 +11,17 @@ quality_type = verydraft material = generic_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 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 7851ecd793..5c603860e5 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 @@ -12,16 +12,12 @@ material = generic_tough_pla variant = AA 0.4 [values] +infill_sparse_density = 15 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 top_bottom_thickness = 0.8 -infill_sparse_density = 15 - -jerk_print = 30 - - - 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 2b1b769595..69f421288c 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,17 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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_Fast_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg index 2c0ca34f03..31a8fa8ef7 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Fast_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = fast intent_category = visual +quality_type = fast material = generic_tough_pla variant = AA 0.4 diff --git a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg index 84ab765c21..99b390a03a 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_High_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = high intent_category = visual +quality_type = high material = generic_tough_pla variant = AA 0.4 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 daa327a2f5..079403efb2 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,17 +12,13 @@ material = generic_tough_pla variant = AA 0.4 [values] - jerk_print = 30 - -speed_print = 30 speed_infill = =speed_print speed_layer_0 = 20 +speed_print = 30 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall top_bottom_thickness = =wall_thickness - wall_thickness = =line_width * 3 -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_Visual.inst.cfg b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg index a3740c80c3..e5022cfad4 100644 --- a/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg +++ b/resources/intent/ultimaker_s5/um_s5_aa0.4_TPLA_Normal_Visual.inst.cfg @@ -6,8 +6,8 @@ definition = ultimaker_s5 [metadata] setting_version = 20 type = intent -quality_type = normal intent_category = visual +quality_type = normal material = generic_tough_pla variant = AA 0.4 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 ec93cc5599..0b2666bf23 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 @@ -11,22 +11,17 @@ quality_type = verydraft material = generic_tough_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 10 - -jerk_print = 30 - acceleration_print = 4000 acceleration_wall = 2000 acceleration_wall_0 = 2000 - -speed_print = 50 +infill_sparse_density = 10 +jerk_print = 30 speed_infill = =speed_print +speed_layer_0 = 20 +speed_print = 50 speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -speed_layer_0 = 20 - -top_bottom_thickness = 0.8 \ No newline at end of file +top_bottom_thickness = 0.8 diff --git a/resources/meshes/mingda_magician_max_base.stl b/resources/meshes/mingda_magician_max_base.stl new file mode 100644 index 0000000000..84bdca2349 Binary files /dev/null and b/resources/meshes/mingda_magician_max_base.stl differ diff --git a/resources/meshes/mingda_magician_pro_base.stl b/resources/meshes/mingda_magician_pro_base.stl new file mode 100644 index 0000000000..0fc883bc2b Binary files /dev/null and b/resources/meshes/mingda_magician_pro_base.stl differ diff --git a/resources/meshes/mingda_magician_x_base.stl b/resources/meshes/mingda_magician_x_base.stl new file mode 100644 index 0000000000..b47f0f30fc Binary files /dev/null and b/resources/meshes/mingda_magician_x_base.stl differ diff --git a/resources/meshes/npscura.stl b/resources/meshes/npscura.stl new file mode 100644 index 0000000000..95a6432fd1 Binary files /dev/null and b/resources/meshes/npscura.stl differ diff --git a/resources/meshes/tank_m.obj b/resources/meshes/tank_m.obj new file mode 100644 index 0000000000..c84c1e3efa --- /dev/null +++ b/resources/meshes/tank_m.obj @@ -0,0 +1,60 @@ +v 200 200 0 +v 200 -200 0 +v 200 -200 -4 +v 200 200 -4 +v -200 200 0 +v -200 200 -4 +v -200 -200 0 +v -200 -200 -4 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 1 +vt 0 0 +vt 1 0 +vt 0 1 +vt 1 1 +vt 0 0 +vt 1 0 +vt 0 1 +vt 1 1 +f 1/1 2/2 4/3 +f 4/3 2/2 3/4 +f 5/5 1/6 6/7 +f 6/7 1/6 4/8 +f 7/9 5/10 8/11 +f 8/11 5/10 6/12 +f 2/13 7/14 3/15 +f 3/15 7/14 8/16 +f 6/21 4/22 3/24 8/23 +v -50 270.7 70.7 +v 50 270.7 70.7 +v 50 200 0 +v -50 200 0 +v -50 270.7 66.7 +v 50 270.7 66.7 +v 50 200 -4 +v -50 200 -4 +vt 0 1 +vt 0 0 +vt 1 0 +vt 1 1 +vt 0 1 +f 10/1 11/2 15/3 14/4 +f 9/4 10/8 14/7 13/8 +f 12/9 9/10 13/11 16/12 +f 11/13 12/14 16/15 15/16 +f 12/26 11/27 10/28 9/25 +f 13/13 14/14 15/15 16/16 \ No newline at end of file diff --git a/resources/meshes/vivedino_trex.stl b/resources/meshes/vivedino_trex.stl new file mode 100644 index 0000000000..d3948fb741 Binary files /dev/null and b/resources/meshes/vivedino_trex.stl differ diff --git a/resources/meshes/vzbot_235_bed.stl b/resources/meshes/vzbot_235_bed.stl new file mode 100644 index 0000000000..e1c67491d0 Binary files /dev/null and b/resources/meshes/vzbot_235_bed.stl differ diff --git a/resources/meshes/vzbot_330_bed.stl b/resources/meshes/vzbot_330_bed.stl new file mode 100644 index 0000000000..bc92a35751 Binary files /dev/null and b/resources/meshes/vzbot_330_bed.stl differ diff --git a/resources/qml/Dialogs/ChoosePrinterDialog.qml b/resources/qml/Dialogs/ChoosePrinterDialog.qml new file mode 100644 index 0000000000..b7079fcabd --- /dev/null +++ b/resources/qml/Dialogs/ChoosePrinterDialog.qml @@ -0,0 +1,94 @@ +// Copyright (c) 2022 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 2.9 +import QtQuick.Layouts 2.10 + +import UM 1.5 as UM +import Cura 1.0 as Cura + +UM.Dialog +{ + property var manager + + id: base + + title: catalog.i18nc("@title:window", "Select Printer") + + backgroundColor: UM.Theme.getColor("background_2") + + width: minimumWidth + minimumWidth: 550 * screenScaleFactor + height: minimumHeight + minimumHeight: 550 * screenScaleFactor + + modality: Qt.ApplicationModal + + ScrollView + { + // Workaround for Windowing bugs in Qt: + width: 550 * screenScaleFactor - 3 * UM.Theme.getSize("default_margin").width + height: 550 * screenScaleFactor - 3 * UM.Theme.getSize("default_margin").height + + UM.I18nCatalog + { + id: catalog + name: "cura" + } + + anchors.fill: parent + Column + { + anchors.fill: parent + spacing: UM.Theme.getSize("default_margin").height + + Item + { + width: parent.width + height: childrenRect.height + + UM.Label + { + anchors.left: parent.left + text: catalog.i18nc("@title:label", "Compatible Printers") + font: UM.Theme.getFont("large") + } + + UM.SimpleButton + { + anchors.right: parent.right + + width: UM.Theme.getSize("small_button").width + height: UM.Theme.getSize("small_button").height + iconSource: UM.Theme.getIcon("ArrowDoubleCircleRight") + color: UM.Theme.getColor("text_link") + hoverColor: UM.Theme.getColor("text_scene_hover") + + onClicked: manager.refresh() + } + } + + Repeater + { + id: contents + + model: Cura.CompatibleMachineModel {} + + delegate: Cura.PrintSelectorCard + { + name: model.name + unique_id: model.unique_id + extruders: model.extruders + manager: base.manager + } + } + + UM.Label + { + visible: contents.count < 1 + text: catalog.i18nc("@description", "No compatible printers, that are currently online, where found.") + } + } + } +} diff --git a/resources/qml/ExtruderIcon.qml b/resources/qml/ExtruderIcon.qml index fb3269ca78..718f1bcd87 100644 --- a/resources/qml/ExtruderIcon.qml +++ b/resources/qml/ExtruderIcon.qml @@ -8,16 +8,16 @@ Item { id: extruderIconItem - implicitWidth: UM.Theme.getSize("extruder_icon").width - implicitHeight: UM.Theme.getSize("extruder_icon").height - property bool checked: true property color materialColor property alias textColor: extruderNumberText.color property bool extruderEnabled: true - property var iconSize + property var iconSize: UM.Theme.getSize("extruder_icon").width property string iconVariant: "medium" + implicitWidth: iconSize + implicitHeight: iconSize + Item { opacity: extruderEnabled ? 1 : UM.Theme.getColor("extruder_disabled").a @@ -27,8 +27,8 @@ Item UM.ColorImage { anchors.fill: parent - width: mainIcon.width - height: mainIcon.height + width: iconSize + height: iconSize source: UM.Theme.getIcon("ExtruderColor", iconVariant) color: materialColor @@ -37,8 +37,8 @@ Item { id: mainIcon anchors.fill: parent - width: UM.Theme.getSize("extruder_icon").width - height: UM.Theme.getSize("extruder_icon").height + width: iconSize + height: iconSize source: UM.Theme.getIcon("Extruder", iconVariant) color: extruderNumberText.color diff --git a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml index e8917517dd..bcbb6d7679 100644 --- a/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml +++ b/resources/qml/Menus/ConfigurationMenu/ConfigurationItem.qml @@ -221,10 +221,7 @@ Button } } - Component.onCompleted: - { - configurationItem.checked = Cura.MachineManager.matchesConfiguration(configuration) - } + Component.onCompleted: configurationItem.checked = Cura.MachineManager.matchesConfiguration(configuration) onClicked: { diff --git a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml index c24c031e83..f0d09516b9 100644 --- a/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml +++ b/resources/qml/Menus/ConfigurationMenu/CustomConfiguration.qml @@ -37,50 +37,6 @@ Item } } - // Printer type selector. - Item - { - id: printerTypeSelectorRow - visible: - { - return Cura.MachineManager.printerOutputDevices.length >= 1 //If connected... - && Cura.MachineManager.printerOutputDevices[0].connectedPrintersTypeCount != null //...and we have configuration information... - && Cura.MachineManager.printerOutputDevices[0].connectedPrintersTypeCount.length > 1; //...and there is more than one type of printer in the configuration list. - } - height: visible ? childrenRect.height : 0 - - anchors - { - left: parent.left - right: parent.right - top: header.bottom - topMargin: visible ? UM.Theme.getSize("default_margin").height : 0 - } - - UM.Label - { - text: catalog.i18nc("@label", "Printer") - width: Math.round(parent.width * 0.3) - UM.Theme.getSize("default_margin").width - height: contentHeight - anchors.verticalCenter: printerTypeSelector.verticalCenter - anchors.left: parent.left - } - - Button - { - id: printerTypeSelector - text: Cura.MachineManager.activeMachine !== null ? Cura.MachineManager.activeMachine.definition.name: "" - - height: UM.Theme.getSize("print_setup_big_item").height - width: Math.round(parent.width * 0.7) + UM.Theme.getSize("default_margin").width - anchors.right: parent.right - onClicked: menu.open() - //style: UM.Theme.styles.print_setup_header_button - - Cura.PrinterTypeMenu { id: menu} - } - } - UM.TabRow { id: tabBar diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 2934edf508..f285bc0c75 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -73,6 +73,9 @@ UM.PreferencesPage var defaultTheme = UM.Preferences.getValue("general/theme") setDefaultTheme(defaultTheme) + UM.Preferences.resetPreference("general/use_tray_icon") + trayIconCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/use_tray_icon")) + UM.Preferences.resetPreference("cura/single_instance") singleInstanceCheckbox.checked = boolCheck(UM.Preferences.getValue("cura/single_instance")) UM.Preferences.resetPreference("cura/single_instance_clear_before_load") @@ -329,6 +332,23 @@ UM.PreferencesPage } } + UM.TooltipArea + { + width: childrenRect.width; + height: childrenRect.height; + + text: catalog.i18nc("@info:tooltip", "Show an icon and notifications in the system notification area.") + + UM.CheckBox + { + id: trayIconCheckbox + checked: boolCheck(UM.Preferences.getValue("general/use_tray_icon")) + onClicked: UM.Preferences.setValue("general/use_tray_icon", checked) + + text: catalog.i18nc("@option:check", "Add icon to system tray *"); + } + } + UM.Label { id: languageCaption @@ -337,6 +357,7 @@ UM.PreferencesPage text: catalog.i18nc("@label", "*You will need to restart the application for these changes to have effect.") wrapMode: Text.WordWrap font.italic: true + } Item diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index c77545bc03..4984087883 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -17,7 +17,7 @@ UM.ManagementPage title: catalog.i18nc("@title:tab", "Printers") detailsPlaneCaption: base.currentItem && base.currentItem.name ? base.currentItem.name : "" - model: Cura.GlobalStacksModel { } + model: Cura.GlobalStacksModel { filterAbstractMachines: false } sectionRole: "discoverySource" @@ -93,6 +93,13 @@ UM.ManagementPage maximumWidth: minimumWidth * 3 maximumHeight: minimumHeight * 3 backgroundColor: UM.Theme.getColor("main_background") + onVisibleChanged: + { + if(!visible) + { + actionDialog.loader.item.focus = true + } + } } UM.ConfirmRemoveDialog diff --git a/resources/qml/PrinterSelector/MachineListButton.qml b/resources/qml/PrinterSelector/MachineListButton.qml index 55ae5497d9..70e7564aa9 100644 --- a/resources/qml/PrinterSelector/MachineListButton.qml +++ b/resources/qml/PrinterSelector/MachineListButton.qml @@ -7,81 +7,133 @@ import QtQuick.Controls 2.3 import UM 1.5 as UM import Cura 1.0 as Cura - -Button -{ - id: machineListButton - +Loader { + id: loader width: parent.width - height: UM.Theme.getSize("large_button").height - leftPadding: UM.Theme.getSize("default_margin").width - rightPadding: UM.Theme.getSize("default_margin").width - checkable: true - hoverEnabled: true + sourceComponent: { + switch (model.componentType) { + case "HIDE_BUTTON": + hideButtonComponent + break; + case "SHOW_BUTTON": + showButtonComponent + break; + case "MACHINE": + machineListButtonComponent + break; + default: + } + } + property var onClicked - contentItem: Item + Component { - width: machineListButton.width - machineListButton.leftPadding - machineListButton.rightPadding - height: UM.Theme.getSize("action_button").height - - UM.ColorImage + id: hideButtonComponent + Cura.TertiaryButton { - id: printerIcon - height: UM.Theme.getSize("medium_button").height - width: UM.Theme.getSize("medium_button").width - color: UM.Theme.getColor("machine_selector_printer_icon") - visible: model.isAbstractMachine || !model.isOnline - source: model.isAbstractMachine ? UM.Theme.getIcon("PrinterTriple", "medium") : UM.Theme.getIcon("Printer", "medium") - - anchors - { - left: parent.left - verticalCenter: parent.verticalCenter - } - } - - UM.Label - { - id: buttonText - anchors - { - left: printerIcon.right - right: printerCount.left - verticalCenter: parent.verticalCenter - leftMargin: UM.Theme.getSize("default_margin").width - } - text: machineListButton.text - font: model.isAbstractMachine ? UM.Theme.getFont("medium_bold") : UM.Theme.getFont("medium") - visible: text != "" - elide: Text.ElideRight - } - - Rectangle - { - id: printerCount - color: UM.Theme.getColor("background_2") - radius: height - width: height - anchors - { - right: parent.right - top: buttonText.top - bottom: buttonText.bottom - } - visible: model.isAbstractMachine - - UM.Label - { - text: model.machineCount - anchors.centerIn: parent - font: UM.Theme.getFont("default_bold") - } + text: catalog.i18nc("@label", "Hide all connected printers") + height: UM.Theme.getSize("large_button").height + onClicked: if (loader.onClicked) loader.onClicked() + iconSource: UM.Theme.getIcon("ChevronSingleUp") + width: parent.width } } - background: Rectangle + Component { - id: backgroundRect - color: machineListButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" + id: showButtonComponent + Cura.TertiaryButton + { + text: catalog.i18nc("@label", "Show all connected printers") + height: UM.Theme.getSize("large_button").height + onClicked: if (loader.onClicked) loader.onClicked() + iconSource: UM.Theme.getIcon("ChevronSingleDown") + width: parent.width + } + } + + Component + { + id: machineListButtonComponent + + Button + { + id: machineListButton + + onClicked: if (loader.onClicked) loader.onClicked() + + width: parent.width + height: UM.Theme.getSize("large_button").height + leftPadding: UM.Theme.getSize("default_margin").width + rightPadding: UM.Theme.getSize("default_margin").width + checkable: true + hoverEnabled: true + + contentItem: Item + { + width: machineListButton.width - machineListButton.leftPadding - machineListButton.rightPadding + height: UM.Theme.getSize("action_button").height + + UM.ColorImage + { + id: printerIcon + height: UM.Theme.getSize("medium_button").height + width: UM.Theme.getSize("medium_button").width + color: UM.Theme.getColor("machine_selector_printer_icon") + visible: model.isAbstractMachine || !model.isOnline + source: model.isAbstractMachine ? UM.Theme.getIcon("PrinterTriple", "medium") : UM.Theme.getIcon("Printer", "medium") + + anchors + { + left: parent.left + verticalCenter: parent.verticalCenter + } + } + + UM.Label + { + id: buttonText + anchors + { + left: printerIcon.right + right: printerCount.left + verticalCenter: parent.verticalCenter + leftMargin: UM.Theme.getSize("default_margin").width + } + text: model.name ? model.name : "" + font: model.isAbstractMachine ? UM.Theme.getFont("medium_bold") : UM.Theme.getFont("medium") + visible: text != "" + elide: Text.ElideRight + } + + Rectangle + { + id: printerCount + color: UM.Theme.getColor("background_2") + radius: height + width: height + anchors + { + right: parent.right + top: buttonText.top + bottom: buttonText.bottom + } + visible: model.isAbstractMachine ? model.isAbstractMachine : false + + UM.Label + { + text: model.machineCount ? model.machineCount : "" + anchors.centerIn: parent + font: UM.Theme.getFont("default_bold") + } + } + } + + background: Rectangle + { + id: backgroundRect + color: machineListButton.hovered ? UM.Theme.getColor("action_button_hovered") : "transparent" + } + } } } diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml index 869d536a00..0008529408 100644 --- a/resources/qml/PrinterSelector/MachineSelector.qml +++ b/resources/qml/PrinterSelector/MachineSelector.qml @@ -223,7 +223,6 @@ Cura.ExpandablePopup id: buttonRow anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter anchors.left: parent.left anchors.right: parent.right diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml index 06c2fdb40c..a328ae69d9 100644 --- a/resources/qml/PrinterSelector/MachineSelectorList.qml +++ b/resources/qml/PrinterSelector/MachineSelectorList.qml @@ -22,8 +22,8 @@ ListView section.delegate: UM.Label { text: section == "true" ? catalog.i18nc("@label", "Connected printers") : catalog.i18nc("@label", "Other printers") - width: parent.width - scrollBar.width height: UM.Theme.getSize("action_button").height + width: parent.width - scrollBar.width leftPadding: UM.Theme.getSize("default_margin").width font: UM.Theme.getFont("medium") color: UM.Theme.getColor("text_medium") @@ -31,13 +31,23 @@ ListView delegate: MachineListButton { - text: model.name ? model.name : "" width: listView.width - scrollBar.width - onClicked: + onClicked: function() { - toggleContent() - Cura.MachineManager.setActiveMachine(model.id) + switch (model.componentType) { + case "HIDE_BUTTON": + listView.model.setShowCloudPrinters(false); + break; + case "SHOW_BUTTON": + listView.model.setShowCloudPrinters(true); + break; + case "MACHINE": + toggleContent() + Cura.MachineManager.setActiveMachine(model.id) + break; + default: + } } } } diff --git a/resources/qml/PrinterSelector/PrintSelectorCard.qml b/resources/qml/PrinterSelector/PrintSelectorCard.qml new file mode 100644 index 0000000000..517a0e164a --- /dev/null +++ b/resources/qml/PrinterSelector/PrintSelectorCard.qml @@ -0,0 +1,143 @@ +// Copyright (c) 2022 Ultimaker B.V. +// Cura is released under the terms of the LGPLv3 or higher. + +import QtQuick 2.2 +import QtQuick.Controls 2.9 +import QtQuick.Layouts 2.10 + +import UM 1.5 as UM +import Cura 1.0 as Cura + +Rectangle +{ + property alias name: printerTitle.text + property string unique_id + property var extruders + property var manager + + width: parent.width + height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height + + color: UM.Theme.getColor("background_1") + border.color: UM.Theme.getColor("border_main") + border.width: UM.Theme.getSize("default_lining").width + + RowLayout + { + anchors.left: parent.left + anchors.right: parent.right + anchors.top: parent.top + anchors.margins: UM.Theme.getSize("default_margin").width + + Cura.IconWithText + { + id: printerTitle + + Layout.preferredWidth: parent.width / 3 + Layout.fillWidth: true + Layout.alignment: Qt.AlignTop + Layout.fillHeight: false + + source: UM.Theme.getIcon("Printer") + spacing: UM.Theme.getSize("thin_margin").width + iconSize: UM.Theme.getSize("medium_button_icon").width + font: UM.Theme.getFont("medium_bold") + } + + ColumnLayout + { + id: extruderInformation + Layout.fillWidth: true + Layout.preferredWidth: parent.width / 2 + Layout.alignment: Qt.AlignTop + spacing: UM.Theme.getSize("default_margin").width + + Repeater + { + model: extruders + + Item + { + height: childrenRect.height + + Cura.ExtruderIcon + { + id: extruderIcon + anchors.top: parent.top + anchors.left: parent.left + materialColor: modelData.materials.length == 1 ? modelData.materials[0].hexcolor : "white" + iconSize: UM.Theme.getSize("medium_button_icon").width + } + + UM.Label + { + id: extruderCore + anchors.verticalCenter: extruderIcon.verticalCenter + anchors.left: extruderIcon.right + anchors.leftMargin: UM.Theme.getSize("default_margin").width + text: modelData.core + font: UM.Theme.getFont("default_bold") + } + + UM.Label + { + id: singleMaterialText + anchors.left: extruderCore.right + anchors.verticalCenter: extruderCore.verticalCenter + anchors.leftMargin: UM.Theme.getSize("default_margin").width + text: modelData.materials.length == 1 ? `${modelData.materials[0].brand} ${modelData.materials[0].name}` : "" + visible: modelData.materials.length == 1 + } + + ColumnLayout + { + id: multiMaterialText + anchors.top: extruderCore.bottom + anchors.left: extruderCore.left + anchors.topMargin: UM.Theme.getSize("narrow_margin").height + visible: modelData.materials.length > 1 + Repeater + { + model: modelData.materials + UM.Label + { + text: `${modelData.brand} ${modelData.name}` + } + } + } + } + } + } + + Button + { + id: printButton + + implicitWidth: UM.Theme.getSize("medium_button").width + implicitHeight: implicitWidth + Layout.alignment: Qt.AlignTop + padding: 0 + + background: Rectangle + { + border.width: UM.Theme.getSize("default_lining").width + border.color: UM.Theme.getColor("border_accent_1") + color: printButton.hovered ? UM.Theme.getColor("toolbar_button_hover"): UM.Theme.getColor("background_1") + } + + contentItem: Item + { + UM.ColorImage + { + anchors.centerIn: parent + source: UM.Theme.getIcon("Printer") + color: UM.Theme.getColor("border_accent_1") + width: UM.Theme.getSize("small_button_icon").width + height: width + } + } + + onClicked: manager.printerSelected(unique_id) + } + } +} diff --git a/resources/qml/qmldir b/resources/qml/qmldir index 6ec3ca91c8..d5184f1d8c 100644 --- a/resources/qml/qmldir +++ b/resources/qml/qmldir @@ -17,6 +17,7 @@ PrinterTypeLabel 1.0 PrinterTypeLabel.qml ViewsSelector 1.0 ViewsSelector.qml SettingView 1.0 SettingView.qml ProfileMenu 1.0 ProfileMenu.qml +PrintSelectorCard 1.0 PrintSelectorCard.qml # Cura/WelcomePages diff --git a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg index 58141d7ac9..3e8e09032d 100644 --- a/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = generic_pla [values] -layer_height = 0.2 wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 diff --git a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg index 4051885819..808ec25a37 100644 --- a/resources/quality/abax_pri3/apri3_pla_high.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_high.inst.cfg @@ -11,7 +11,6 @@ weight = 1 material = generic_pla [values] -layer_height = 0.1 wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 diff --git a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg index d76eac4014..526493b90b 100644 --- a/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg +++ b/resources/quality/abax_pri3/apri3_pla_normal.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = generic_pla [values] -layer_height = 0.2 wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 diff --git a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg index ef6ec00ede..f582449a8e 100644 --- a/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = generic_pla [values] -layer_height = 0.2 wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 diff --git a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg index 00c5a67cf9..08d86375c9 100644 --- a/resources/quality/abax_pri5/apri5_pla_high.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_high.inst.cfg @@ -11,7 +11,6 @@ weight = 1 material = generic_pla [values] -layer_height = 0.1 wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 diff --git a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg index 1934b4af25..6bb5667a30 100644 --- a/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg +++ b/resources/quality/abax_pri5/apri5_pla_normal.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = generic_pla [values] -layer_height = 0.2 wall_thickness = 1.05 top_bottom_thickness = 0.8 infill_sparse_density = 20 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg index 63f9920bf3..1073729905 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = -2 material = chromatik_pla [values] -layer_height = 0.2 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg index c9828cca5a..e3a5c6eac9 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_fine.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = chromatik_pla [values] -layer_height = 0.1 line_width = =machine_nozzle_size * 0.875 speed_print = 35 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg index 1ac89bfcb6..e1f8934019 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_bicolor_pla_standard.inst.cfg @@ -11,7 +11,6 @@ weight = -1 material = chromatik_pla [values] -layer_height = 0.15 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index f739b02303..f8635d2cc7 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = -2 material = chromatik_pla [values] -layer_height = 0.2 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 3b25824cbc..6c0597409c 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = chromatik_pla [values] -layer_height = 0.1 line_width = =machine_nozzle_size * 0.875 speed_print = 35 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 913af36eb3..5254504da5 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -11,7 +11,6 @@ weight = -1 material = chromatik_pla [values] -layer_height = 0.15 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg index 87c089438f..5e4467e5ed 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = -2 material = chromatik_pla [values] -layer_height = 0.2 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg index e927d2addf..d5d21af6e2 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_fine.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = chromatik_pla [values] -layer_height = 0.1 line_width = =machine_nozzle_size * 0.875 speed_print = 35 diff --git a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg index ccbaa8f506..4163399ccc 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_bicolor_pla_standard.inst.cfg @@ -11,7 +11,6 @@ weight = -1 material = chromatik_pla [values] -layer_height = 0.15 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg index 290d4be38d..90336926f8 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = -2 material = chromatik_pla [values] -layer_height = 0.2 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg index 3c0d4a70ca..4b70708d41 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_fine.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = chromatik_pla [values] -layer_height = 0.1 line_width = =machine_nozzle_size * 0.875 speed_print = 35 diff --git a/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg index d7c8fa3360..61b8bb8d2d 100644 --- a/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoultimate_pla_standard.inst.cfg @@ -11,7 +11,6 @@ weight = -1 material = chromatik_pla [values] -layer_height = 0.15 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg index be852a2446..3fc2e53381 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = -2 material = chromatik_pla [values] -layer_height = 0.2 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg index cf7f6f6545..ee7fec9712 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_fine.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = chromatik_pla [values] -layer_height = 0.1 line_width = =machine_nozzle_size * 0.875 speed_print = 30 diff --git a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg index 0ad63679ec..6d5890a74c 100644 --- a/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_magis_pla_standard.inst.cfg @@ -11,7 +11,6 @@ weight = -1 material = chromatik_pla [values] -layer_height = 0.15 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 6d08b2a27e..d1b723fe0a 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -11,7 +11,6 @@ weight = -2 material = chromatik_pla [values] -layer_height = 0.2 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index 96d0a51d95..a57a833f5c 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -11,7 +11,6 @@ weight = 0 material = chromatik_pla [values] -layer_height = 0.1 line_width = =machine_nozzle_size * 0.875 speed_print = 30 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index f24ae61f71..c63ec93a63 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -11,7 +11,6 @@ weight = -1 material = chromatik_pla [values] -layer_height = 0.15 line_width = =machine_nozzle_size * 0.875 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg index aa36a94cbd..641a52be30 100644 --- a/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_fast.inst.cfg @@ -14,8 +14,6 @@ variant = Lite 0.4 mm [values] adhesion_type = raft speed_print = 80 -layer_height = 0.2 -layer_height_0 = 0.2 cool_fan_enabled = False cool_fan_full_at_height = 0.4 cool_fan_speed = 50 diff --git a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg index 8afdd25424..a4e802f37a 100644 --- a/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_high.inst.cfg @@ -14,8 +14,6 @@ variant = Lite 0.4 mm [values] adhesion_type = raft speed_print = 45 -layer_height = 0.1 -layer_height_0 = 0.1 cool_fan_enabled = False cool_fan_full_at_height = 0.2 cool_fan_speed = 50 diff --git a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg index 5b4501657f..99f8ec4e56 100644 --- a/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_abs_normal.inst.cfg @@ -14,8 +14,6 @@ variant = Lite 0.4 mm [values] adhesion_type = raft speed_print = 60 -layer_height = 0.15 -layer_height_0 = 0.15 cool_fan_enabled = False cool_fan_full_at_height = 0.3 cool_fan_speed = 50 diff --git a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg index a2f97e6fdc..9a61677c9d 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_fast.inst.cfg @@ -23,8 +23,6 @@ cool_min_layer_time = 5 cool_min_speed = 0 infill_overlap = 15 infill_sparse_density = 24 -layer_height = 0.20 -layer_height_0 = 0.15 line_width = =machine_nozzle_size material_flow = 100 raft_airgap = 0.22 diff --git a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg index 6d8ebac406..1d1eedf3f4 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_high.inst.cfg @@ -23,8 +23,6 @@ cool_min_layer_time = 5 cool_min_speed = 0 infill_overlap = 15 infill_sparse_density = 24 -layer_height = 0.10 -layer_height_0 = 0.10 line_width = =machine_nozzle_size material_flow = 100 raft_airgap = 0.22 diff --git a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg index b29dd370f5..4920f1750f 100644 --- a/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_nylon_normal.inst.cfg @@ -23,8 +23,6 @@ cool_min_layer_time = 5 cool_min_speed = 0 infill_overlap = 15 infill_sparse_density = 24 -layer_height = 0.15 -layer_height_0 = 0.10 line_width = =machine_nozzle_size material_flow = 100 raft_airgap = 0.22 diff --git a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg index 0df61d9b21..5247ca4719 100644 --- a/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_fast.inst.cfg @@ -14,8 +14,6 @@ variant = Lite 0.4 mm [values] adhesion_type = skirt speed_print = 80 -layer_height = 0.2 -layer_height_0 = 0.2 cool_fan_enabled = True cool_fan_full_at_height = 0.4 cool_fan_speed = 100 diff --git a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg index e20a86e503..20a2340870 100644 --- a/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_high.inst.cfg @@ -14,8 +14,6 @@ variant = Lite 0.4 mm [values] adhesion_type = skirt speed_print = 45 -layer_height = 0.1 -layer_height_0 = 0.1 cool_fan_enabled = True cool_fan_full_at_height = 0.2 cool_fan_speed = 100 diff --git a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg index 70cb0d7f67..ea267e88ac 100644 --- a/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_pla_normal.inst.cfg @@ -14,8 +14,6 @@ variant = Lite 0.4 mm [values] adhesion_type = skirt speed_print = 60 -layer_height = 0.15 -layer_height_0 = 0.15 cool_fan_enabled = True cool_fan_full_at_height = 0.3 cool_fan_speed = 100 diff --git a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg index cdd814e02d..ddad87e2d1 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_fast.inst.cfg @@ -14,8 +14,6 @@ weight = -1 [values] adhesion_type = skirt speed_print = 80 -layer_height = 0.2 -layer_height_0 = 0.2 cool_fan_enabled = True cool_fan_full_at_height = 0.4 cool_fan_speed = 100 diff --git a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg index 1f287605ee..5db8f1172e 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_high.inst.cfg @@ -13,8 +13,6 @@ weight = 1 [values] adhesion_type = skirt -layer_height = 0.1 -layer_height_0 = 0.1 cool_fan_enabled = True cool_fan_full_at_height = 0.2 cool_fan_speed = 100 diff --git a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg index f146a41ef2..3f09c8ea16 100644 --- a/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg +++ b/resources/quality/fabtotum/fabtotum_tpu_normal.inst.cfg @@ -14,8 +14,6 @@ weight = 0 [values] adhesion_type = skirt speed_print = 80 -layer_height = 0.15 -layer_height_0 = 0.15 cool_fan_enabled = True cool_fan_full_at_height = 0.3 cool_fan_speed = 100 diff --git a/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg b/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg index b944d37e6d..cf71e68d00 100644 --- a/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg +++ b/resources/quality/fabxpro/fabxpro_abs_draft.inst.cfg @@ -11,7 +11,6 @@ weight = -2 material = redd_abs global_quality = True - [values] layer_height = 0.3 layer_height_0 = 0.35 diff --git a/resources/quality/mingda/ABS/mingda_0.2_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.2_ABS_super.inst.cfg index f1f6748183..a290d894e0 100644 --- a/resources/quality/mingda/ABS/mingda_0.2_ABS_super.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.2_ABS_super.inst.cfg @@ -12,3 +12,5 @@ variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.2_ABS_ultra.inst.cfg b/resources/quality/mingda/ABS/mingda_0.2_ABS_ultra.inst.cfg index e86ddc6a3c..7b4f45bbb9 100644 --- a/resources/quality/mingda/ABS/mingda_0.2_ABS_ultra.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.2_ABS_ultra.inst.cfg @@ -12,3 +12,5 @@ variant = 0.2mm Nozzle [values] wall_thickness = =line_width*8 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_adaptive.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_adaptive.inst.cfg index 98d763841f..aea32319cd 100644 --- a/resources/quality/mingda/ABS/mingda_0.3_ABS_adaptive.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_adaptive.inst.cfg @@ -12,3 +12,5 @@ variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_low.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_low.inst.cfg index 5386760786..dcc0c48812 100644 --- a/resources/quality/mingda/ABS/mingda_0.3_ABS_low.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_low.inst.cfg @@ -12,3 +12,7 @@ variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 +raft_interface_thickness = 0.2 +raft_surface_thickness = 0.2 diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_standard.inst.cfg index b9d05ce302..687a605422 100644 --- a/resources/quality/mingda/ABS/mingda_0.3_ABS_standard.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_standard.inst.cfg @@ -12,3 +12,6 @@ variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 +raft_interface_thickness = =round(layer_height, 2) diff --git a/resources/quality/mingda/ABS/mingda_0.3_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.3_ABS_super.inst.cfg index 1473d22be8..c67c5e9ea6 100644 --- a/resources/quality/mingda/ABS/mingda_0.3_ABS_super.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.3_ABS_super.inst.cfg @@ -12,3 +12,5 @@ variant = 0.3mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_adaptive.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_adaptive.inst.cfg index ace730f1dc..cd3ba80866 100644 --- a/resources/quality/mingda/ABS/mingda_0.4_ABS_adaptive.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_adaptive.inst.cfg @@ -12,3 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_low.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_low.inst.cfg index 424825d1b4..2f335102fe 100644 --- a/resources/quality/mingda/ABS/mingda_0.4_ABS_low.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_low.inst.cfg @@ -12,3 +12,6 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 +raft_interface_thickness = 0.3 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_standard.inst.cfg index 69bc7a850e..fcf26711f7 100644 --- a/resources/quality/mingda/ABS/mingda_0.4_ABS_standard.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_standard.inst.cfg @@ -12,3 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.4_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.4_ABS_super.inst.cfg index 102f30a9a2..f18e33b7bd 100644 --- a/resources/quality/mingda/ABS/mingda_0.4_ABS_super.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.4_ABS_super.inst.cfg @@ -12,3 +12,5 @@ variant = 0.4mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_adaptive.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_adaptive.inst.cfg index 361cc1b51d..71f24f53dd 100644 --- a/resources/quality/mingda/ABS/mingda_0.5_ABS_adaptive.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_adaptive.inst.cfg @@ -12,3 +12,5 @@ variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_low.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_low.inst.cfg index d56abbea8a..8a7f59c5d3 100644 --- a/resources/quality/mingda/ABS/mingda_0.5_ABS_low.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_low.inst.cfg @@ -12,3 +12,5 @@ variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_standard.inst.cfg index 89c414d44f..7a9bc4b647 100644 --- a/resources/quality/mingda/ABS/mingda_0.5_ABS_standard.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_standard.inst.cfg @@ -12,3 +12,5 @@ variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.5_ABS_super.inst.cfg b/resources/quality/mingda/ABS/mingda_0.5_ABS_super.inst.cfg index c66b2bda76..4604328d8c 100644 --- a/resources/quality/mingda/ABS/mingda_0.5_ABS_super.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.5_ABS_super.inst.cfg @@ -12,3 +12,5 @@ variant = 0.5mm Nozzle [values] wall_thickness = =line_width*4 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.6_ABS_standard.inst.cfg b/resources/quality/mingda/ABS/mingda_0.6_ABS_standard.inst.cfg index 74f22e5a69..6dad91e842 100644 --- a/resources/quality/mingda/ABS/mingda_0.6_ABS_standard.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.6_ABS_standard.inst.cfg @@ -12,3 +12,5 @@ variant = 0.6mm Nozzle [values] wall_thickness = =line_width*3 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_0.8_ABS_draft.inst.cfg b/resources/quality/mingda/ABS/mingda_0.8_ABS_draft.inst.cfg index 27a89a4b0b..4c2df1ef24 100644 --- a/resources/quality/mingda/ABS/mingda_0.8_ABS_draft.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_0.8_ABS_draft.inst.cfg @@ -12,3 +12,5 @@ variant = 0.8mm Nozzle [values] wall_thickness = =line_width*3 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/ABS/mingda_1.0_ABS_draft.inst.cfg b/resources/quality/mingda/ABS/mingda_1.0_ABS_draft.inst.cfg index cefd94a01d..5c38398af0 100644 --- a/resources/quality/mingda/ABS/mingda_1.0_ABS_draft.inst.cfg +++ b/resources/quality/mingda/ABS/mingda_1.0_ABS_draft.inst.cfg @@ -12,3 +12,5 @@ variant = 1.0mm Nozzle [values] wall_thickness = =line_width*3 + +raft_airgap = 0.1 diff --git a/resources/quality/mingda/PETG/mingda_0.3_PETG_low.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_low.inst.cfg index 9936912b26..a6f2784f8d 100644 --- a/resources/quality/mingda/PETG/mingda_0.3_PETG_low.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_low.inst.cfg @@ -13,3 +13,6 @@ variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + +raft_interface_thickness = 0.2 +raft_surface_thickness = 0.2 diff --git a/resources/quality/mingda/PETG/mingda_0.3_PETG_standard.inst.cfg b/resources/quality/mingda/PETG/mingda_0.3_PETG_standard.inst.cfg index e7731f6eb2..f57e3db198 100644 --- a/resources/quality/mingda/PETG/mingda_0.3_PETG_standard.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.3_PETG_standard.inst.cfg @@ -13,3 +13,5 @@ variant = 0.3mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + +raft_interface_thickness = =round(layer_height, 2) diff --git a/resources/quality/mingda/PETG/mingda_0.4_PETG_low.inst.cfg b/resources/quality/mingda/PETG/mingda_0.4_PETG_low.inst.cfg index b5410324bc..e2b1d88690 100644 --- a/resources/quality/mingda/PETG/mingda_0.4_PETG_low.inst.cfg +++ b/resources/quality/mingda/PETG/mingda_0.4_PETG_low.inst.cfg @@ -13,3 +13,5 @@ variant = 0.4mm Nozzle [values] speed_layer_0 = 15 wall_thickness = =line_width*4 + +raft_interface_thickness = 0.3 diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_low.inst.cfg index 80d5b97081..73143d9c9d 100644 --- a/resources/quality/mingda/PLA/mingda_0.3_PLA_low.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_low.inst.cfg @@ -11,3 +11,5 @@ material = generic_pla variant = 0.3mm Nozzle [values] +raft_interface_thickness = 0.2 +raft_surface_thickness = 0.2 diff --git a/resources/quality/mingda/PLA/mingda_0.3_PLA_standard.inst.cfg b/resources/quality/mingda/PLA/mingda_0.3_PLA_standard.inst.cfg index 03fffbabf0..0da6cf8201 100644 --- a/resources/quality/mingda/PLA/mingda_0.3_PLA_standard.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.3_PLA_standard.inst.cfg @@ -11,3 +11,4 @@ material = generic_pla variant = 0.3mm Nozzle [values] +raft_interface_thickness = =round(layer_height, 2) diff --git a/resources/quality/mingda/PLA/mingda_0.4_PLA_low.inst.cfg b/resources/quality/mingda/PLA/mingda_0.4_PLA_low.inst.cfg index 4405c5ae6c..c8970c8d0c 100644 --- a/resources/quality/mingda/PLA/mingda_0.4_PLA_low.inst.cfg +++ b/resources/quality/mingda/PLA/mingda_0.4_PLA_low.inst.cfg @@ -11,3 +11,4 @@ material = generic_pla variant = 0.4mm Nozzle [values] +raft_interface_thickness = 0.3 diff --git a/resources/quality/mingda/TPU/mingda_0.3_TPU_standard.inst.cfg b/resources/quality/mingda/TPU/mingda_0.3_TPU_standard.inst.cfg index 64f66a9fca..b2a607705f 100644 --- a/resources/quality/mingda/TPU/mingda_0.3_TPU_standard.inst.cfg +++ b/resources/quality/mingda/TPU/mingda_0.3_TPU_standard.inst.cfg @@ -11,3 +11,4 @@ material = generic_tpu variant = 0.3mm Nozzle [values] +raft_interface_thickness = =round(layer_height, 2) diff --git a/resources/quality/mingda/mingda_global_adaptive.inst.cfg b/resources/quality/mingda/mingda_global_adaptive.inst.cfg index a900091816..7fcfaa3c96 100644 --- a/resources/quality/mingda/mingda_global_adaptive.inst.cfg +++ b/resources/quality/mingda/mingda_global_adaptive.inst.cfg @@ -17,3 +17,17 @@ top_bottom_thickness = =layer_height_0+layer_height*4 wall_thickness = =line_width*3 support_interface_height = =layer_height*6 adaptive_layer_height_enabled = true + +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +infill_sparse_density = 20 + +speed_print = 60 +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) + +jerk_travel = 50 +raft_airgap = 0.18 +raft_base_thickness = =round(layer_height*1.5, 2) +raft_interface_thickness = =round(layer_height*1.2, 2) diff --git a/resources/quality/mingda/mingda_global_draft.inst.cfg b/resources/quality/mingda/mingda_global_draft.inst.cfg index 4af8021880..bb6ae41101 100644 --- a/resources/quality/mingda/mingda_global_draft.inst.cfg +++ b/resources/quality/mingda/mingda_global_draft.inst.cfg @@ -16,3 +16,21 @@ layer_height_0 = 0.32 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 support_interface_height = =layer_height*4 + +jerk_travel = 20 +acceleration_print = 2000 +acceleration_wall = 1500 +acceleration_wall_0 = 1000 +acceleration_topbottom = 1000 +acceleration_travel = 2000 + +infill_sparse_density = 10 +infill_line_width = =line_width*1 + +speed_print = 50 +speed_wall = 50 + +raft_airgap = 0.18 +raft_base_thickness = =round(layer_height*1.5, 2) +raft_interface_thickness = =round(layer_height*1.2, 2) + diff --git a/resources/quality/mingda/mingda_global_low.inst.cfg b/resources/quality/mingda/mingda_global_low.inst.cfg index f6483ef64f..080e5da12b 100644 --- a/resources/quality/mingda/mingda_global_low.inst.cfg +++ b/resources/quality/mingda/mingda_global_low.inst.cfg @@ -16,3 +16,20 @@ layer_height_0 = 0.28 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*2 support_interface_height = =layer_height*4 + +jerk_travel = 20 +acceleration_print = 2000 +acceleration_wall = 1500 +acceleration_wall_0 = 1000 +acceleration_topbottom = 1000 +acceleration_travel = 2000 + +infill_sparse_density = 10 +infill_line_width = =line_width*1 + +speed_print = 50 +speed_wall = 50 + +raft_airgap = 0.18 +raft_base_thickness = =round(layer_height*1.5, 2) +raft_interface_thickness = =round(layer_height*1.2, 2) diff --git a/resources/quality/mingda/mingda_global_standard.inst.cfg b/resources/quality/mingda/mingda_global_standard.inst.cfg index f80d7f4c37..e59e66882d 100644 --- a/resources/quality/mingda/mingda_global_standard.inst.cfg +++ b/resources/quality/mingda/mingda_global_standard.inst.cfg @@ -16,3 +16,20 @@ layer_height_0 = 0.2 top_bottom_thickness = =layer_height_0+layer_height*3 wall_thickness = =line_width*3 support_interface_height = =layer_height*5 + +infill_line_width = =round(line_width * 0.4 / 0.35, 2) +infill_sparse_density = 20 + +speed_print = 60 +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) + +acceleration_wall = 2000 +acceleration_wall_0 = 2000 +jerk_travel = 50 + +raft_airgap = 0.18 +raft_base_thickness = =round(layer_height*1.5, 2) +raft_interface_thickness = =round(layer_height*1.2, 2) diff --git a/resources/quality/mingda/mingda_global_super.inst.cfg b/resources/quality/mingda/mingda_global_super.inst.cfg index 6abe36ffd2..ce20114662 100644 --- a/resources/quality/mingda/mingda_global_super.inst.cfg +++ b/resources/quality/mingda/mingda_global_super.inst.cfg @@ -16,3 +16,11 @@ layer_height_0 = 0.12 top_bottom_thickness = =layer_height_0+layer_height*6 wall_thickness = =line_width*3 support_interface_height = =layer_height*8 + +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +infill_sparse_density = 20 + +jerk_travel = 50 +raft_airgap = 0.18 +raft_base_thickness = =round(layer_height*1.5, 2) +raft_interface_thickness = =round(layer_height*1.2, 2) diff --git a/resources/quality/mingda/mingda_global_ultra.inst.cfg b/resources/quality/mingda/mingda_global_ultra.inst.cfg index b383c4c799..c2b616cb1a 100644 --- a/resources/quality/mingda/mingda_global_ultra.inst.cfg +++ b/resources/quality/mingda/mingda_global_ultra.inst.cfg @@ -16,3 +16,16 @@ layer_height_0 = 0.12 top_bottom_thickness = =layer_height_0+layer_height*10 wall_thickness = =line_width*3 support_interface_height = =layer_height*12 + +skin_overlap = 10 +speed_print = 50 +speed_layer_0 = 10 +speed_topbottom = =math.ceil(speed_print * 35 / 50) +speed_wall = =math.ceil(speed_print * 35 / 50) +top_bottom_thickness = 1 + +infill_line_width = =round(line_width * 0.42 / 0.35, 2) +jerk_travel = 50 +raft_airgap = 0.18 +raft_base_thickness = =round(layer_height*1.5, 2) +raft_interface_thickness = =round(layer_height*1.2, 2) diff --git a/resources/quality/nps/nps_ABS_A.inst.cfg b/resources/quality/nps/nps_ABS_A.inst.cfg new file mode 100644 index 0000000000..e920d95be1 --- /dev/null +++ b/resources/quality/nps/nps_ABS_A.inst.cfg @@ -0,0 +1,46 @@ +[general] +version = 4 +name = A +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = a +weight = 1 +material = generic_abs + +[values] +layer_height_0 = =round(0.5*machine_nozzle_size, 2) +line_width = =machine_nozzle_size/machine_nozzle_size*0.4 +wall_line_width = =machine_nozzle_size/machine_nozzle_size*0.35 +wall_line_width_x = =machine_nozzle_size/machine_nozzle_size*0.3 +wall_0_wipe_dist = =machine_nozzle_size/2 +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 19 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =240 +material_bed_temperature = 100 +material_flow = 100 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/nps/nps_ABS_B.inst.cfg b/resources/quality/nps/nps_ABS_B.inst.cfg new file mode 100644 index 0000000000..cf57c8afdc --- /dev/null +++ b/resources/quality/nps/nps_ABS_B.inst.cfg @@ -0,0 +1,42 @@ +[general] +version = 4 +name = B +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = b +weight = 0 +material = generic_abs + +[values] +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 14 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 13 +material_print_temperature_layer_0 = =243 +material_bed_temperature = 100 +material_flow = 96 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/nps/nps_ABS_C.inst.cfg b/resources/quality/nps/nps_ABS_C.inst.cfg new file mode 100644 index 0000000000..b0e435d9bc --- /dev/null +++ b/resources/quality/nps/nps_ABS_C.inst.cfg @@ -0,0 +1,42 @@ +[general] +version = 4 +name = C +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = c +weight = -1 +material = generic_abs + +[values] +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 35 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 9 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =245 +material_bed_temperature = 100 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/nps/nps_PC_A.inst.cfg b/resources/quality/nps/nps_PC_A.inst.cfg new file mode 100644 index 0000000000..96a84784ab --- /dev/null +++ b/resources/quality/nps/nps_PC_A.inst.cfg @@ -0,0 +1,56 @@ +[general] +version = 4 +name = A +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = a +weight = 1 +material = generic_pc + +[values] +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = =default_material_print_temperature + 10 +material_print_temperature_layer_0 = =280 +material_bed_temperature = 110 +material_flow = 100 +wall_line_count = 3 +retraction_extra_prime_amount = 0.1 +retraction_speed = 30 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 + diff --git a/resources/quality/nps/nps_PC_B.inst.cfg b/resources/quality/nps/nps_PC_B.inst.cfg new file mode 100644 index 0000000000..4700d063a1 --- /dev/null +++ b/resources/quality/nps/nps_PC_B.inst.cfg @@ -0,0 +1,56 @@ +[general] +version = 4 +name = B +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = b +weight = 0 +material = generic_pc + +[values] +speed_print = 35 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +cool_lift_head = true +support_angle = 60 +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = 275 +material_bed_temperature = 110 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/nps/nps_PC_C.inst.cfg b/resources/quality/nps/nps_PC_C.inst.cfg new file mode 100644 index 0000000000..7e85fe319c --- /dev/null +++ b/resources/quality/nps/nps_PC_C.inst.cfg @@ -0,0 +1,56 @@ +[general] +version = 4 +name = C +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = c +weight = -1 +material = generic_pc + +[values] +speed_print = 35 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 10 +cool_fan_speed_max = 10 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 2 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 12 +support_angle = 60 +cool_lift_head = true +material_print_temperature = =default_material_print_temperature +material_print_temperature_layer_0 = 275 +material_bed_temperature = 110 +material_flow = 88 +wall_line_count = 3 +retraction_speed = 30 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True + +adhesion_type = brim + +bridge_settings_enabled = True +bridge_wall_coast = 50 +bridge_wall_speed = 12 +bridge_wall_material_flow = 50 +bridge_skin_speed = 12.5 +bridge_skin_material_flow = 100 +bridge_skin_density = 80 +bridge_fan_speed = 100 diff --git a/resources/quality/nps/nps_PETG_A.inst.cfg b/resources/quality/nps/nps_PETG_A.inst.cfg new file mode 100644 index 0000000000..1881d25206 --- /dev/null +++ b/resources/quality/nps/nps_PETG_A.inst.cfg @@ -0,0 +1,42 @@ +[general] +version = 4 +name = A +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = a +weight = 1 +material = generic_petg + +[values] +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 20 +material_print_temperature_layer_0 = =230 +material_bed_temperature = 80 +material_flow = 98 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/nps/nps_PETG_B.inst.cfg b/resources/quality/nps/nps_PETG_B.inst.cfg new file mode 100644 index 0000000000..156959e020 --- /dev/null +++ b/resources/quality/nps/nps_PETG_B.inst.cfg @@ -0,0 +1,42 @@ +[general] +version = 4 +name = B +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = b +weight = 0 +material = generic_petg + +[values] +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 20 +material_print_temperature_layer_0 = =230 +material_bed_temperature = 80 +material_flow = 95 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 +prime_tower_enable = True \ No newline at end of file diff --git a/resources/quality/nps/nps_PETG_C.inst.cfg b/resources/quality/nps/nps_PETG_C.inst.cfg new file mode 100644 index 0000000000..d84858e55a --- /dev/null +++ b/resources/quality/nps/nps_PETG_C.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = C +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = c +weight = -1 +material = generic_petg + +[values] +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 3 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 20 +material_print_temperature_layer_0 = =230 +material_bed_temperature = 80 +material_flow = 91 +retraction_extra_prime_amount = 0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/nps/nps_PLA_A.inst.cfg b/resources/quality/nps/nps_PLA_A.inst.cfg new file mode 100644 index 0000000000..3c9d8e8b20 --- /dev/null +++ b/resources/quality/nps/nps_PLA_A.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = A +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = a +weight = 1 +material = generic_pla + +[values] +speed_print = 50 +speed_wall = =math.ceil(speed_print * 35/50) +speed_wall_0 = =math.ceil(speed_wall * 30/35) +speed_topbottom = =math.ceil(speed_print * 35/50) +speed_layer_0 = =math.ceil(speed_print * 20/50) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 65 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =210 +material_bed_temperature = 60 +material_flow = 98 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 10 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/nps/nps_PLA_B.inst.cfg b/resources/quality/nps/nps_PLA_B.inst.cfg new file mode 100644 index 0000000000..e870274500 --- /dev/null +++ b/resources/quality/nps/nps_PLA_B.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = B +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = b +weight = 0 +material = generic_pla + +[values] +speed_print = 55 +speed_wall = =math.ceil(speed_print * 37/55) +speed_wall_0 = =math.ceil(speed_wall * 33/37) +speed_topbottom = =math.ceil(speed_print * 37/55) +speed_layer_0 = =math.ceil(speed_print * 25/55) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 60 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =220 +material_bed_temperature = 60 +material_flow = 100 +retraction_extra_prime_amount = 0.0 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 15 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/nps/nps_PLA_C.inst.cfg b/resources/quality/nps/nps_PLA_C.inst.cfg new file mode 100644 index 0000000000..955ea3875c --- /dev/null +++ b/resources/quality/nps/nps_PLA_C.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = C +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = c +weight = -1 +material = generic_pla + +[values] +speed_print = 60 +speed_wall = =math.ceil(speed_print * 40/60) +speed_wall_0 = =math.ceil(speed_wall * 35/40) +speed_topbottom = =math.ceil(speed_print * 40/60) +speed_layer_0 = =math.ceil(speed_print * 30/60) +speed_slowdown_layers = 2 +cool_fan_enabled = True +cool_fan_speed = 100 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 2 * layer_height +cool_min_speed = 10 +support_angle = 55 +material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature_layer_0 = =220 +material_bed_temperature = 60 +material_flow = 91 +retraction_extra_prime_amount = 0.1 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = True +skin_overlap = 20 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 1.7 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 1 +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/nps/nps_TPU_A.inst.cfg b/resources/quality/nps/nps_TPU_A.inst.cfg new file mode 100644 index 0000000000..679b6f8e31 --- /dev/null +++ b/resources/quality/nps/nps_TPU_A.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = A +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = a +weight = 1 +material = generic_tpu + +[values] +speed_print = 30 +speed_wall = =math.ceil(speed_print * 30/30) +speed_wall_0 = =math.ceil(speed_print * 25/30) +speed_topbottom = =math.ceil(speed_print * 25/30) +speed_layer_0 = =math.ceil(speed_print * 20/30) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature - 13 +material_print_temperature_layer_0 = =215 +material_bed_temperature = 45 +material_flow = 107 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/nps/nps_TPU_B.inst.cfg b/resources/quality/nps/nps_TPU_B.inst.cfg new file mode 100644 index 0000000000..af4c9f26bf --- /dev/null +++ b/resources/quality/nps/nps_TPU_B.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = B +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = b +weight = 0 +material = generic_tpu + +[values] +speed_print = 35 +speed_wall = =math.ceil(speed_print * 35/35) +speed_wall_0 = =math.ceil(speed_print * 27/35) +speed_topbottom = =math.ceil(speed_print * 25/35) +speed_layer_0 = =math.ceil(speed_print * 20/35) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature - 13 +material_print_temperature_layer_0 = =210 +material_bed_temperature = 45 +material_flow = 103 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 \ No newline at end of file diff --git a/resources/quality/nps/nps_TPU_C.inst.cfg b/resources/quality/nps/nps_TPU_C.inst.cfg new file mode 100644 index 0000000000..809ffc91b6 --- /dev/null +++ b/resources/quality/nps/nps_TPU_C.inst.cfg @@ -0,0 +1,41 @@ +[general] +version = 4 +name = C +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = c +weight = -1 +material = generic_tpu + +[values] +speed_print = 40 +speed_wall = =math.ceil(speed_print * 40/40) +speed_wall_0 = =math.ceil(speed_print * 30/40) +speed_topbottom = =math.ceil(speed_print * 27/40) +speed_layer_0 = =math.ceil(speed_print * 20/40) +speed_slowdown_layers = 1 +cool_fan_enabled = True +cool_fan_speed = 50 +cool_fan_speed_max = 100 +cool_min_layer_time_fan_speed_max = 20 +cool_min_layer_time = 11 +cool_fan_full_at_height = =layer_height_0 + 4 * layer_height +cool_min_speed = 10 +support_angle = 50 +material_print_temperature = =default_material_print_temperature - 13 +material_print_temperature_layer_0 = =215 +material_bed_temperature = 45 +material_flow = 101 +retraction_extra_prime_amount = 0.2 +retraction_min_travel = =3*line_width +retraction_hop_only_when_collides = False +skin_overlap = 5 +support_z_distance = =layer_height*2 +support_bottom_distance = =support_z_distance*0.5 +support_xy_distance = =line_width * 2.5 +support_xy_distance_overhang = =wall_line_width_0 +support_offset = 0.5 +support_interface_density = 100 diff --git a/resources/quality/nps/nps_global_A.inst.cfg b/resources/quality/nps/nps_global_A.inst.cfg new file mode 100644 index 0000000000..aa3ba1c71a --- /dev/null +++ b/resources/quality/nps/nps_global_A.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Extra Fine Qualité +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = a +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 +top_bottom_thickness = =5*layer_height \ No newline at end of file diff --git a/resources/quality/nps/nps_global_B.inst.cfg b/resources/quality/nps/nps_global_B.inst.cfg new file mode 100644 index 0000000000..fcc9a5cc0b --- /dev/null +++ b/resources/quality/nps/nps_global_B.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine Qualité +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = b +weight = 0 +global_quality = True + +[values] +layer_height = 0.16 +top_bottom_thickness = =3*layer_height \ No newline at end of file diff --git a/resources/quality/nps/nps_global_C.inst.cfg b/resources/quality/nps/nps_global_C.inst.cfg new file mode 100644 index 0000000000..d5870296a3 --- /dev/null +++ b/resources/quality/nps/nps_global_C.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Haute qualité +definition = nps + +[metadata] +setting_version = 20 +type = quality +quality_type = c +weight = 0 +global_quality = True + +[values] +layer_height = 0.25 +top_bottom_thickness = =5*layer_height \ No newline at end of file diff --git a/resources/quality/tank_m_base_global_draft.inst.cfg b/resources/quality/tank_m_base_global_draft.inst.cfg new file mode 100644 index 0000000000..cd5d1a23c0 --- /dev/null +++ b/resources/quality/tank_m_base_global_draft.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Draft Quality +definition = tank_m_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +global_quality = True + +[values] +layer_height = 0.24 +layer_height_0 = 0.24 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/tank_m_base_global_high.inst.cfg b/resources/quality/tank_m_base_global_high.inst.cfg new file mode 100644 index 0000000000..26af4239b1 --- /dev/null +++ b/resources/quality/tank_m_base_global_high.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = tank_m_base + +[metadata] +setting_version = 20 +type = quality +quality_type = high +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/tank_m_base_global_standard.inst.cfg b/resources/quality/tank_m_base_global_standard.inst.cfg new file mode 100644 index 0000000000..eb7984c7ec --- /dev/null +++ b/resources/quality/tank_m_base_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = tank_m_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 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 881571c5a3..49703c592d 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 @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.38 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) 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 627eb26587..6503460702 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 @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.38 speed_layer_0 = =math.ceil(speed_print * 15 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) 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 afb26d0ddb..9dec35e4a5 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 @@ -22,13 +22,6 @@ infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.57 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 50) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) 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 cb9ade1813..b3751e0bbc 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 @@ -22,13 +22,6 @@ infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.57 -raft_surface_thickness = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg index 431e39c85f..492d54f63c 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_draft.inst.cfg @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) diff --git a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg index f0a60e8af3..79cd4cb0b2 100644 --- a/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_cpep_0.8_normal.inst.cfg @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg index 404023db87..21ed3ff9ee 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_high.inst.cfg @@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 25 layer_0_z_overlap = 0.1 raft_airgap = 0.15 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg index 2f77288341..4746d98537 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.25_normal.inst.cfg @@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 25 layer_0_z_overlap = 0.1 raft_airgap = 0.15 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg index 71f03adfd9..19d0dd03aa 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_fast.inst.cfg @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 raft_airgap = 0.57 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.5 -raft_surface_thickness = 0.15 speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg index bd2372dc16..4e7e6981a5 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.4_normal.inst.cfg @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.22 raft_airgap = 0.57 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.5 -raft_surface_thickness = 0.15 speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_travel = 150 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg index cd5a66151d..7e9be134b7 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_fast.inst.cfg @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.44 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg index 7c03a0faeb..c8bd8b8055 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.6_normal.inst.cfg @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.44 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg index 9f4c534c86..c3eeef66a6 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_draft.inst.cfg @@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 40 layer_0_z_overlap = 0.25 raft_airgap = 0.44 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg index 1239c43800..243169012a 100644 --- a/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_nylon_0.8_normal.inst.cfg @@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 40 layer_0_z_overlap = 0.25 raft_airgap = 0.44 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =round(speed_print * 30 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg index a3e95a3a88..6a15d8959d 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_high.inst.cfg @@ -22,12 +22,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 25 layer_0_z_overlap = 0.2 raft_airgap = 0.25 -raft_base_line_spacing = 1 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg index e81cece3d1..2c498c3e5b 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.25_normal.inst.cfg @@ -22,12 +22,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 25 layer_0_z_overlap = 0.2 raft_airgap = 0.25 -raft_base_line_spacing = 1 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg index bca94eb325..4bc50328e8 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_fast.inst.cfg @@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.3 raft_airgap = 0.35 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg index 7d8f4f7f74..f26d676a04 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.4_normal.inst.cfg @@ -21,11 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 30 layer_0_z_overlap = 0.3 raft_airgap = 0.35 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg index 2c3c3172ac..7adbef71a2 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_fast.inst.cfg @@ -21,13 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.52 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg index 80967c9543..8c627e7507 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.6_normal.inst.cfg @@ -21,13 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 35 layer_0_z_overlap = 0.22 raft_airgap = 0.52 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg index 952265384c..a0422892c3 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_draft.inst.cfg @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 raft_airgap = 0.47 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 diff --git a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg index c082f75d52..3fa7cd089f 100644 --- a/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_pc_0.8_normal.inst.cfg @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 40 layer_0_z_overlap = 0.22 raft_airgap = 0.47 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 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 f16b0747ab..29a303c877 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 @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -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) multiple_mesh_overlap = 0 retraction_count_max = 15 retraction_hop = 0.15 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 f3a1ea0e98..75b8deff80 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 @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -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) multiple_mesh_overlap = 0 retraction_count_max = 15 retraction_hop = 0.15 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 b902d16032..fc6a0aad3f 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 @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cubic' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -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) multiple_mesh_overlap = 0 retraction_count_max = 15 retraction_hop = 0.15 diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg index e8fcf8b392..0c0e9e8913 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.25_high.inst.cfg @@ -21,10 +21,6 @@ cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.1 raft_airgap = 0.2 -raft_base_line_spacing = 1 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.2 -raft_surface_line_width = 0.2 retraction_count_max = 15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg index 3a4c443011..48d88baa8d 100644 --- a/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus/um2p_tpu_0.4_normal.inst.cfg @@ -19,10 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60 cool_min_layer_time = 10 cool_min_speed = 15 infill_sparse_density = 10 -raft_base_line_spacing = 2 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_margin = 12 retraction_count_max = 15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) 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 7381cddcfc..7d32b1e6c4 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 @@ -20,12 +20,6 @@ cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.12 raft_airgap = 0.24 -raft_base_line_spacing = 1.2 -raft_base_line_width = 0.6 -raft_interface_line_spacing = 1.2 -raft_interface_line_width = 0.57 -raft_margin = 15 -raft_surface_line_width = 0.5 retraction_count_max = 15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 45) 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 076caebf21..a496c9b024 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 @@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.38 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 15 / 25) 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 eb2eb45552..67c5c16e65 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 @@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.38 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 15 / 35) 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 255979e3a6..90396b40a7 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 @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.57 -raft_surface_thickness = 0.2 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_layer_0 = =round(speed_print * 30 / 50) 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 88eda6c8ec..7df3ca1322 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 @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.57 -raft_surface_thickness = 0.2 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 35) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg index 9d7a3851d8..5ad74de77b 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_draft.inst.cfg @@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 20 / 25) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg index 4801f03a05..dec0f67c1e 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_cpep_0.8_normal.inst.cfg @@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.37 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg index f08257d7d6..bd76fb2c17 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_high.inst.cfg @@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.1 raft_airgap = 0.15 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg index ab17f0589d..2e3e72b354 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.25_normal.inst.cfg @@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.1 raft_airgap = 0.15 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) speed_print = 40 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg index d23859a47f..ecababf038 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_fast.inst.cfg @@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.57 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.5 -raft_surface_thickness = 0.15 retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg index e5d05294f2..3bc6cdd0de 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.4_normal.inst.cfg @@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.57 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 -raft_surface_line_width = 0.5 -raft_surface_thickness = 0.15 retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg index 59834b551d..5b71703b7f 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_fast.inst.cfg @@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.44 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 retraction_hop_enabled = 0.2 retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg index 25480e1e7d..f439ac8971 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.6_normal.inst.cfg @@ -19,13 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.44 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 retraction_hop_enabled = 0.2 retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 30 / 55) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg index ee0a2bd2a5..9fc2a85950 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_draft.inst.cfg @@ -19,12 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.25 raft_airgap = 0.44 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg index 9ac5d56bd7..560acf1335 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_nylon_0.8_normal.inst.cfg @@ -19,12 +19,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.25 raft_airgap = 0.44 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 retraction_hop_enabled = 0.2 speed_layer_0 = =round(speed_print * 30 / 55) speed_print = 55 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg index 4898c72327..8366aea6c2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_high.inst.cfg @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.2 raft_airgap = 0.25 -raft_base_line_spacing = 1 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg index 2d159792c9..2979294168 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.25_normal.inst.cfg @@ -21,12 +21,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.2 raft_airgap = 0.25 -raft_base_line_spacing = 1 -raft_base_line_width = 0.5 -raft_interface_line_spacing = 0.7 -raft_interface_line_width = 0.5 -raft_margin = 15 -raft_surface_line_width = 0.2 speed_layer_0 = =round(speed_print * 30 / 30) speed_print = 30 support_enable = True diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg index 86a965d441..f32a6969ad 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_fast.inst.cfg @@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.3 raft_airgap = 0.35 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg index b782ea63d4..0e52da4cca 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.4_normal.inst.cfg @@ -20,11 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.3 raft_airgap = 0.35 -raft_base_line_spacing = 1.6 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.8 -raft_margin = 15 speed_layer_0 = =round(speed_print * 30 / 45) speed_print = 45 speed_wall_0 = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg index 739d72072f..b8c0c431d4 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_fast.inst.cfg @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.52 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg index d95596953e..7668a9c941 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.6_normal.inst.cfg @@ -20,13 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.52 -raft_base_line_spacing = 2.4 -raft_base_line_width = 1.2 -raft_interface_line_spacing = 1.4 -raft_interface_line_width = 1.2 -raft_margin = 15 -raft_surface_line_width = 0.6 -raft_surface_thickness = 0.15 speed_layer_0 = =math.ceil(speed_print * 30 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 20 / 45) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg index 751696ca93..c170588b34 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_pc_0.8_normal.inst.cfg @@ -20,12 +20,6 @@ infill_overlap = =0 if infill_sparse_density > 80 else 5 infill_sparse_density = 20 layer_0_z_overlap = 0.22 raft_airgap = 0.47 -raft_base_line_width = 1.6 -raft_interface_line_spacing = 1.8 -raft_interface_line_width = 1.6 -raft_margin = 15 -raft_surface_line_width = 0.7 -raft_surface_thickness = 0.2 speed_layer_0 = =round(speed_print * 30 / 40) speed_print = 40 support_angle = 45 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 bb5876dcd6..b0fbab6934 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 @@ -29,15 +29,6 @@ cool_min_speed = 20 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0 -jerk_enabled = True -jerk_layer_0 = =jerk_topbottom -jerk_prime_tower = =math.ceil(jerk_print * 15 / 25) -jerk_print = 25 -jerk_support = =math.ceil(jerk_print * 15 / 25) -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) multiple_mesh_overlap = 0 retraction_count_max = 15 retraction_hop = 0.15 diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg index 42c185a769..c9cc3bb528 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.25_high.inst.cfg @@ -21,10 +21,6 @@ cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.1 raft_airgap = 0.2 -raft_base_line_spacing = 1 -raft_interface_line_spacing = 1 -raft_interface_line_width = 0.2 -raft_surface_line_width = 0.2 retraction_count_max = 15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) diff --git a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg index acf28f2ad3..752dcaadd2 100644 --- a/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg +++ b/resources/quality/ultimaker2_plus_connect/um2pc_tpu_0.4_normal.inst.cfg @@ -19,10 +19,6 @@ cool_fan_speed_min = =cool_fan_speed * 35 / 60 cool_min_layer_time = 10 cool_min_speed = 15 infill_sparse_density = 10 -raft_base_line_spacing = 2 -raft_base_line_width = 0.8 -raft_interface_line_spacing = 1 -raft_margin = 12 retraction_count_max = 15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 40) 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 db3a812f97..4a8a99ce10 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 @@ -20,12 +20,6 @@ cool_min_speed = 15 infill_sparse_density = 10 layer_0_z_overlap = 0.12 raft_airgap = 0.24 -raft_base_line_spacing = 1.2 -raft_base_line_width = 0.6 -raft_interface_line_spacing = 1.2 -raft_interface_line_width = 0.57 -raft_margin = 15 -raft_surface_line_width = 0.5 retraction_count_max = 15 retraction_hop_enabled = 0.2 speed_layer_0 = =math.ceil(speed_print * 30 / 45) 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 3507862091..7cb72ef3e0 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 @@ -17,12 +17,7 @@ cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 3) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +raft_airgap = 0.15 retraction_min_travel = 5 skin_overlap = 50 speed_print = 70 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 e4af6a3846..6e23de0aa7 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 @@ -21,14 +21,12 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 f26fcd025f..6ce295d546 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 @@ -19,8 +19,6 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_final_print_temperature = =material_print_temperature - 10 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg index f200457a62..5678217664 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Fast_Print.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 prime_tower_enable = False speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg index 2e2ae52399..bb2ed82e47 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_High_Quality.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 -material_standby_temperature = 100 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature + 15 material_initial_print_temperature = =material_print_temperature - 5 diff --git a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg index eae553f0ee..ea70e963cb 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_ABS_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature_layer_0 = =material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 prime_tower_enable = False speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) 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 7a69d14931..3bbbce3193 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 @@ -17,14 +17,12 @@ cool_min_speed = 5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True 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 e7b6c725dd..0963636810 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 @@ -17,14 +17,12 @@ cool_min_speed = 6 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_print = 25 layer_height = 0.15 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True 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 fb2e0330ef..714de20118 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 @@ -17,7 +17,6 @@ cool_min_speed = 5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_print = 25 layer_height = 0.06 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 @@ -26,7 +25,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True 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 074270e0ec..293fe24d6b 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 @@ -17,7 +17,6 @@ cool_min_speed = 7 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -25,7 +24,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = True prime_tower_wipe_enabled = True diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg index e43e125e89..7f33b0e11c 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 skin_overlap = 20 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg index b676573793..98a0b3c5a1 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Fast_Print.inst.cfg @@ -16,7 +16,6 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg index 5fe79e7351..de3842c18f 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_High_Quality.inst.cfg @@ -18,7 +18,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 speed_print = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_topbottom = =math.ceil(speed_print * 30 / 50) diff --git a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg index a21f8c3bdf..f9263edaf5 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -16,7 +16,6 @@ machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) 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 5d08d0534b..babf6f1306 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 @@ -18,14 +18,8 @@ cool_min_speed = 10 material_print_temperature = =default_material_print_temperature + 10 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +raft_airgap = 0.25 skin_overlap = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 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 0f6323ba1d..cbf61a838f 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 @@ -18,14 +18,8 @@ cool_min_speed = 10 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +raft_airgap = 0.25 skin_overlap = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 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 8e16021f89..31e1d559f3 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 @@ -17,14 +17,8 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +raft_airgap = 0.25 skin_overlap = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 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 432c6ef3d9..761ab7d56d 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 @@ -17,14 +17,8 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +raft_airgap = 0.25 skin_overlap = 50 speed_layer_0 = =math.ceil(speed_print * 20 / 70) switch_extruder_prime_speed = 30 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 df4ea5ffab..8627ccd4a3 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 @@ -23,7 +23,6 @@ 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' infill_wipe_dist = 0.1 -jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 @@ -31,13 +30,11 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 5d01ce5f28..1119e3e7ac 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 @@ -21,7 +21,6 @@ cool_min_speed = 7 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 -jerk_print = 25 layer_height = 0.15 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 @@ -29,13 +28,11 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 dd6b9063b9..5cfe7b7d62 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 @@ -23,7 +23,6 @@ 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' infill_wipe_dist = 0.1 -jerk_print = 25 layer_height = 0.06 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 @@ -31,13 +30,11 @@ machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 7bed5ac6d2..8f471a9507 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 @@ -22,19 +22,16 @@ cool_min_speed = 5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg index 77e631a969..3c815ce6bc 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Draft_Print.inst.cfg @@ -15,7 +15,6 @@ variant = AA 0.4 material_print_temperature = =default_material_print_temperature + 5 material_initial_print_temperature = =material_print_temperature material_final_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 skin_overlap = 20 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg index 3a6c9fcfd5..4bcf604e87 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Fast_Print.inst.cfg @@ -16,7 +16,6 @@ cool_min_speed = 7 material_print_temperature = =default_material_print_temperature material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 speed_print = 60 speed_layer_0 = =math.ceil(speed_print * 20 / 60) speed_topbottom = =math.ceil(speed_print * 30 / 60) diff --git a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg index 335593cab2..3b4676aedf 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -17,7 +17,6 @@ machine_nozzle_heat_up_speed = 1.5 material_print_temperature = =default_material_print_temperature - 5 material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 -material_standby_temperature = 100 speed_print = 55 speed_layer_0 = =math.ceil(speed_print * 20 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) 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 d260cfbc2d..94ebaaf3cd 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) 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 757d988b76..302e1284a0 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 @@ -16,7 +16,6 @@ cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 prime_tower_enable = False speed_print = 80 speed_layer_0 = =math.ceil(speed_print * 20 / 80) 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 7ee4ae5fd9..e12f054442 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 @@ -18,7 +18,6 @@ cool_min_speed = 10 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 10 speed_print = 60 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 35ffb3a3f3..b3579468ae 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 @@ -17,7 +17,6 @@ cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) 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 c151870622..b0e27707f6 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 @@ -21,8 +21,6 @@ cool_min_speed = 2.5 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 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 @@ -32,7 +30,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature + 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 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 7e21bec438..04fe8cfe38 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 @@ -21,8 +21,6 @@ cool_min_speed = 2.5 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 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 @@ -32,7 +30,6 @@ material_final_print_temperature = =material_print_temperature - 12 material_initial_print_temperature = =material_print_temperature - 2 material_print_temperature = =default_material_print_temperature - 13 material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 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 c47bfb3c18..6f9ee5672b 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 @@ -21,7 +21,6 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -30,7 +29,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 15 material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 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 227b16db92..8f018c5aa5 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,12 +15,10 @@ 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 -jerk_print = 25 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 -material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) 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 e668141c2f..984e51d1bf 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 @@ -18,7 +18,6 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 -material_standby_temperature = 100 prime_tower_enable = False speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 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 12d0256deb..29ddedf4a7 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 @@ -19,7 +19,6 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 -material_standby_temperature = 100 prime_tower_enable = False skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 45) 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 9c02ed5200..956f955055 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 @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 layer_height = 0.2 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 @@ -32,7 +31,6 @@ material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 fe3f453f9c..592916489d 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 @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 layer_height = 0.15 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 @@ -32,7 +31,6 @@ material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_amount = 7 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 c824bc59ab..5d00904dca 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 @@ -22,7 +22,6 @@ infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -30,7 +29,6 @@ material_final_print_temperature = =material_print_temperature material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature_layer_0 = =material_print_temperature + 17 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 2720faa577..af0ac8c663 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 @@ -13,7 +13,6 @@ variant = AA 0.8 [values] material_print_temperature = =default_material_print_temperature + 25 -material_standby_temperature = 100 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 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 fd8e40e1a6..f28d24c04c 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] layer_height = 0.4 material_print_temperature = =default_material_print_temperature + 30 -material_standby_temperature = 100 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 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 5936e1edbd..8ee24fed22 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] layer_height = 0.3 material_print_temperature = =default_material_print_temperature + 27 -material_standby_temperature = 100 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 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 4a92c4e0ef..c2d9a6d8c9 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 @@ -19,7 +19,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_hop = 0.1 retraction_hop_enabled = False 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 58a7da1b9d..e48299aba3 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 @@ -20,7 +20,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_hop = 0.1 retraction_hop_enabled = False 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 901db7e3ab..08181bd2ee 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 @@ -21,7 +21,6 @@ machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_hop = 0.1 retraction_hop_enabled = False 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 3f277bdf50..cd77fa7a1b 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 15 material_print_temperature = =default_material_print_temperature + 15 -material_standby_temperature = 100 prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) 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 1cfd1a7132..3758ea96f7 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 @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 layer_height = 0.4 material_print_temperature = =default_material_print_temperature + 20 -material_standby_temperature = 100 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) 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 0cb877bc19..9061c25db4 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 @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 15 layer_height = 0.3 material_print_temperature = =default_material_print_temperature + 17 -material_standby_temperature = 100 prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) 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 b90e50c955..a171427548 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 @@ -17,14 +17,9 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 cd6fa26ba8..e80a6c73fd 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 @@ -18,14 +18,9 @@ cool_min_speed = 10 layer_height = 0.4 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 b075a97c8e..a2ca3a769f 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 @@ -18,14 +18,9 @@ cool_min_speed = 10 layer_height = 0.3 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 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 30ed901c9e..4480855c43 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 @@ -17,9 +17,7 @@ brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 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 d1785e2892..757c716dad 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 @@ -18,9 +18,7 @@ cool_fan_full_at_height = =layer_height_0 + 7 * layer_height layer_height = 0.4 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 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 2b18f0b407..a8e3d3a957 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 @@ -19,9 +19,7 @@ cool_fan_full_at_height = =layer_height_0 + 9 * layer_height layer_height = 0.3 material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 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 fc1a36f83f..5e296b117a 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 7 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) 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 f8d6b4df20..7b203fe360 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 @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 7 layer_height = 0.4 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) 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 2e34cf5d2b..1117ab1a43 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 @@ -15,7 +15,6 @@ variant = AA 0.8 brim_width = 7 layer_height = 0.3 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) 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 7e0fdd459a..3e9965034b 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 @@ -22,9 +22,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) 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 228358c8a0..137e93d019 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 @@ -23,10 +23,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 -material_standby_temperature = 100 prime_tower_enable = True -raft_margin = 10 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) 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 df8a7a4d29..4afe312ac3 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 @@ -23,9 +23,7 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) 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 5ac58234fd..ed79b9ab61 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 @@ -20,12 +20,10 @@ 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 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 0975a2dcaa..ad6ecd7a11 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 @@ -20,12 +20,10 @@ 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 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 a18414cf7e..a146ef9313 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 @@ -20,12 +20,10 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' layer_height = 0.3 material_bed_temperature_layer_0 = =material_bed_temperature material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 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 569a214004..e05d0df6cb 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 @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False -retract_at_layer_change = False speed_print = 45 support_angle = 70 top_bottom_thickness = =layer_height * 6 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 85442a1a0e..7595124338 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 @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -raft_margin = 10 -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) 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 ffc82adfb2..13166a25f1 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 @@ -24,9 +24,7 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = False -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_topbottom = =math.ceil(speed_print * 20 / 35) speed_wall = =math.ceil(speed_print * 25/ 35) 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 9d5a364a53..3e7242fea2 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 @@ -25,11 +25,9 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature + 19 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 07c6aa807e..872c811411 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 @@ -26,11 +26,9 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature +15 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 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 bc8a252e97..d0e673c585 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 @@ -25,11 +25,9 @@ material_final_print_temperature = =material_print_temperature material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature_layer_0 = =material_print_temperature + 17 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg index 5ac88c13bc..d04b46e2d6 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Draft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = BB 0.4 [values] brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index 7ad6967e6b..e3d7255d36 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -15,7 +15,6 @@ variant = BB 0.4 support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index add681b5c6..e68bf36fc8 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -14,7 +14,6 @@ variant = BB 0.4 [values] support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 support_brim_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index fbf7d65477..e96a8afcfb 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -14,7 +14,6 @@ variant = BB 0.4 [values] support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 support_brim_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg index d7003ca582..21cce522c3 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Draft_Print.inst.cfg @@ -14,7 +14,6 @@ variant = BB 0.8 [values] brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index 07b91499e4..fba29334a2 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = BB 0.8 [values] brim_replaces_support = False -material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True support_interface_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index 6177272235..606515e129 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = BB 0.8 [values] brim_replaces_support = False -material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True support_interface_enable = True 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 671c079def..afb105b535 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 @@ -17,20 +17,13 @@ cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 3) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_min_travel = 5 skin_overlap = 50 +speed_layer_0 = 10 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - -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 886807a836..a269239781 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 @@ -11,9 +11,7 @@ weight = 0 material = generic_pc variant = AA 0.25 is_experimental = True - [values] -adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 @@ -21,15 +19,12 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 376af254f9..d9ee0e629b 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 @@ -12,10 +12,9 @@ material = generic_petg variant = AA 0.25 [values] +initial_layer_line_width_factor = 100 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 -initial_layer_line_width_factor = 100 - -material_print_temperature = =default_material_print_temperature - 5 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 8ae871f4fe..16c0c0d676 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 @@ -11,7 +11,6 @@ weight = 0 material = generic_pp variant = AA 0.25 is_experimental = True - [values] brim_width = 10 cool_fan_speed_max = 100 @@ -19,7 +18,6 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_final_print_temperature = =material_print_temperature - 10 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 1ba0ffd3cd..a695827302 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 @@ -14,16 +14,15 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 20 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = False +raft_airgap = 0.15 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = 10 +speed_print = 60 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) -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 33d620ede2..802e5c9d00 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 @@ -15,17 +15,14 @@ variant = AA 0.4 cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 15 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = False -speed_print = 60 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 45 / 60) speed_layer_0 = 10 +speed_print = 60 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) - - -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 5e6ec3e259..d83461ee9c 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 @@ -15,16 +15,13 @@ variant = AA 0.4 cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -speed_print = 50 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - - -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 4141c023aa..bed87d7b95 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 @@ -14,16 +14,13 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False -speed_print = 55 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 55) speed_layer_0 = 10 +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - - -speed_infill = =math.ceil(speed_print * 40 / 55) - -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg index 593781314a..2c4432db17 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Draft_Print.inst.cfg @@ -18,17 +18,16 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 577362391f..7886cc164f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,23 +12,22 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 -speed_print = 80 speed_layer_0 = =math.ceil(speed_print * 20 / 80) +speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 416a175c81..8731404e73 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,21 +12,20 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg index a8b51892c7..8de2272716 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_VeryDraft_Print.inst.cfg @@ -1,17 +1,16 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_bam variant = AA 0.4 is_experimental = True - [values] brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -25,10 +24,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = 0.3 -support_bottom_distance = 0.3 support_angle = 45 +support_bottom_distance = 0.3 +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = 0.3 +top_bottom_thickness = 1 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 35c97346bb..04df2951fa 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 @@ -14,10 +14,8 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 @@ -35,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) - speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height 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 e6270bd4c5..d90b6c0a04 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 @@ -14,11 +14,8 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 6 - infill_overlap = 0 infill_wipe_dist = 0 -jerk_enabled = True -jerk_print = 25 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 @@ -36,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) - speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height 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 ef8cb6847a..c043bb9bb7 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 @@ -14,10 +14,8 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 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 4f99061468..3196fc777f 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 @@ -14,10 +14,8 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 7 - infill_overlap = 0 infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg index 2553121d76..00dad75b09 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Draft_Print.inst.cfg @@ -12,17 +12,16 @@ material = generic_cpe variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg index b8c8538a00..df68316eb1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg index 360984cc12..4850bc393c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg index 8db4957fa9..41594ab90f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_CPE_Normal_Quality.inst.cfg @@ -12,16 +12,15 @@ material = generic_cpe variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file 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 e5b88f2d77..9d4069eead 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 @@ -12,26 +12,16 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -raft_surface_speed = 45 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 1c0ac78324..df0aa521c3 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 @@ -12,26 +12,16 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -raft_surface_speed = 45 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 1e133a2148..fcc766e14a 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 @@ -12,25 +12,15 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 - - -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -raft_surface_speed = 45 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 4256f134cc..bd46912a8d 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 @@ -12,25 +12,15 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 - - -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -raft_surface_speed = 45 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 c5c3570350..c34bf1bfde 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,32 +12,26 @@ material = generic_pc variant = AA 0.4 [values] -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_overlap = 0 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 -jerk_enabled = True -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 2c9f109400..6e115a9c37 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,7 +12,6 @@ material = generic_pc variant = AA 0.4 [values] -adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 85 @@ -21,20 +20,17 @@ cool_min_speed = 7 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 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 02454a7203..016a66ea60 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,32 +12,26 @@ material = generic_pc variant = AA 0.4 [values] -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_overlap = 0 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 -jerk_enabled = True -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 ce382e3dcf..3cb5249538 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,30 +12,24 @@ material = generic_pc variant = AA 0.4 [values] -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_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_enabled = True -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg index e77195665a..f40c3d9968 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Draft_Print.inst.cfg @@ -12,17 +12,16 @@ material = generic_petg variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 8 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg index 8117c60edc..496e5662ca 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature retraction_combing_max_distance = 8 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg index 85a05b576a..f710c0fa58 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 10 retraction_combing_max_distance = 8 -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg index b75ab359b4..a3ef8347f1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PETG_Normal_Quality.inst.cfg @@ -12,17 +12,16 @@ material = generic_petg variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) -initial_layer_line_width_factor = 100 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 420e250f71..9e4855a3cc 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 @@ -12,13 +12,17 @@ material = generic_pla variant = AA 0.4 [values] +acceleration_wall = 2000 +acceleration_wall_0 = 2000 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +infill_sparse_density = 15 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = 10 @@ -26,9 +30,3 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 -infill_sparse_density = 15 -layer_height_0 = 0.2 -acceleration_wall = 2000 -acceleration_wall_0 = 2000 - -raft_airgap = 0.25 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 50b3954774..cd95a1ec89 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 @@ -14,17 +14,15 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed -speed_print = 70 speed_layer_0 = 10 +speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 -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 99f977d17c..789bccd411 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 @@ -15,18 +15,16 @@ 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 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 50 speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 -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 210536340f..9ef1ae8e0a 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 @@ -15,14 +15,12 @@ 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 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 -layer_height_0 = 0.2 - -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg index e2f00681a6..d89657527b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -1,39 +1,33 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature + 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 0.9 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = =0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 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 88089479ad..a26e442819 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 @@ -17,11 +17,9 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -30,7 +28,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature + 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 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 dd35987ced..06cf202bc6 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 @@ -20,7 +20,6 @@ cool_min_speed = 2.5 infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -29,7 +28,6 @@ material_final_print_temperature = =material_print_temperature - 12 material_initial_print_temperature = =material_print_temperature - 2 material_print_temperature = =default_material_print_temperature - 13 material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 @@ -42,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 5eff4b3248..61453c278c 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 @@ -17,12 +17,9 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -31,7 +28,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 15 material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 @@ -44,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 a35ff96196..f2625cd9d7 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,12 +15,10 @@ 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 -jerk_print = 25 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 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 9c688e3995..3c1ec73d54 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 @@ -18,7 +18,6 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) 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 f6885552ba..72be73dc22 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 @@ -15,18 +15,16 @@ 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 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 45 speed_layer_0 = =math.ceil(speed_print * 20 / 45) +speed_print = 45 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 -layer_height_0 = 0.2 - 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 09146132d0..6e6a9216cf 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 @@ -19,7 +19,6 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 72c9981665..4f594f4dc4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -1,39 +1,33 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_tough_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 +material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 1.2 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = =0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) 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 90a68d134e..b461efb73b 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 @@ -17,12 +17,10 @@ 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_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -31,7 +29,6 @@ material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 d59d5c18f7..08fcbc3187 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 @@ -17,13 +17,10 @@ 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_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -32,7 +29,6 @@ material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 c0445e739c..0be0f52120 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 @@ -17,14 +17,10 @@ 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_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 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -32,7 +28,6 @@ material_final_print_temperature = =material_print_temperature material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature_layer_0 = =material_print_temperature + 17 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 516e103d1b..7afbea4788 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,11 +12,8 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 20 -material_standby_temperature = 100 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False 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 567f8b8c9f..e473cd6f28 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,12 +12,9 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 25 -material_standby_temperature = 100 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) -retract_at_layer_change = False 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 757f196340..2571776d35 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,11 +12,8 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 22 -material_standby_temperature = 100 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False 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 806da07969..4ba71e0357 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 @@ -1,27 +1,23 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_cpe_plus variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 retraction_hop = 0.1 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 11b2706b28..b54dec7fff 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 @@ -11,28 +11,24 @@ weight = -4 material = generic_cpe_plus variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 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) -speed_infill = =math.ceil(speed_print * 40 / 50) 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 5771c34f8d..47d12c3da7 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 @@ -11,17 +11,13 @@ weight = -3 material = generic_cpe_plus variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 retraction_hop = 0.1 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 46f1985be1..c05205a9f2 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,9 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 15 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 speed_print = 40 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 b72c4565ad..8cd5ba4ac2 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,14 +13,11 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 20 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) - -speed_infill = =math.ceil(speed_print * 33 / 45) \ No newline at end of file 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 43d518be56..1d619bf42c 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,9 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 17 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 speed_print = 40 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 d6887f655d..c11350773c 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,18 +15,11 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 c333d0e4b1..4539cab117 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,18 +15,11 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 766a84d843..3736e729e9 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,18 +15,11 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 3a16a00041..a5a7ff0018 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 @@ -1,27 +1,22 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_pc variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - - material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 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 ce043bc020..b34df4a1ac 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 @@ -11,21 +11,16 @@ weight = -4 material = generic_pc variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) 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 6343d64dc9..546f3a80ae 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 @@ -11,17 +11,12 @@ weight = -3 material = generic_pc variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height - - material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 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 be5ae977b5..9e900c5658 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,13 +13,11 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 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 ba58a799e9..8b9fa7de7f 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,15 +13,13 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 8 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 33 / 45) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 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 f121297ab7..4dbd1099f4 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,15 +13,12 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 +layer_height_0 = 0.27 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -layer_height_0 = 0.27 -initial_layer_line_width_factor = 100 - 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 5321690d9c..4aad3505c6 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,18 +16,17 @@ 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 +layer_height_0 = 0.4 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) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 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 a559d0f912..a5aef78a45 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,20 +16,18 @@ 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 +layer_height_0 = 0.4 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) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -raft_margin = 10 -support_angle = 70 -top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False +speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -speed_infill = =math.ceil(speed_print * 35 / 45) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 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 21425a4920..0e1200ea48 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,18 +16,17 @@ 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 +layer_height_0 = 0.4 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) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 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 ad56f48c17..2ed16d2428 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 @@ -15,17 +15,14 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 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 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 @@ -36,4 +33,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 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 ee9576aed8..932e74a409 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 @@ -15,26 +15,24 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 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 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -speed_wall_x = =math.ceil(speed_wall * 30 / 30) speed_infill = =math.ceil(speed_wall * 30 / 30) +speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 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 4f6c3fa1ed..19c2b14c99 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 @@ -15,16 +15,13 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 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 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 @@ -35,4 +32,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 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 aaa7981b3d..2c322c0565 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 @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False -retract_at_layer_change = False speed_print = 45 speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) 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 dfec5abf1b..3b47b687ab 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 @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -raft_margin = 10 -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) 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 445d4c6cfd..b024316179 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 @@ -24,9 +24,7 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = False -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) 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 2fba108a33..a03f52f4c2 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 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 @@ -23,11 +22,9 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature + 19 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 @@ -43,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 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 2fbc3d7118..b881b5d3a6 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -24,26 +23,25 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 retraction_prime_speed = 15 +speed_infill = =speed_print speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =speed_print speed_wall_x = =speed_print -speed_infill = =speed_print support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 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 2e06b86620..f8d758abb0 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -23,11 +22,9 @@ material_final_print_temperature = =material_print_temperature material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature_layer_0 = =material_print_temperature + 17 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 @@ -43,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg index 852256ec7d..8e517d0ee5 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Draft_Print.inst.cfg @@ -13,13 +13,12 @@ variant = BB 0.4 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 1df9f6b97b..e4bd6f7f98 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,15 +12,14 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 -support_brim_enable = True -support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_enable = True support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 7495130aa9..3708aaf544 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,13 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -support_brim_enable = True -support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +support_brim_enable = True +support_infill_sparse_thickness = =3*layer_height +support_interface_enable = True support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 308d26bf62..d9cdfe4f58 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,13 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -support_brim_enable = True -support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_enable = True support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg index da87e8211f..8a10923b48 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Verydraft_Print.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s3 [metadata] @@ -11,14 +11,12 @@ weight = -3 material = generic_pva variant = BB 0.4 is_experimental = True - [values] brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg index 7e2103043f..78d4987cab 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Draft_Print.inst.cfg @@ -13,11 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg index 9b1583ed51..97cc65b8ce 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,10 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg index 28f069a61a..87d10a7987 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,11 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True 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 88174ae66d..e90b9c6d2b 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 @@ -12,20 +12,15 @@ material = generic_cffcpe variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 86de01d997..36a0eb09c8 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 @@ -7,25 +7,20 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffcpe variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 8b4c50b81e..6c380d6295 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 @@ -12,20 +12,15 @@ material = generic_cffpa variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 bb4d52b0de..faf738c643 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 @@ -7,25 +7,20 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffpa variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 6df2857707..1173c7339c 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 @@ -12,20 +12,15 @@ material = generic_gffcpe variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 1fddab1122..6d5ccf3855 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 @@ -7,25 +7,20 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffcpe variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 33d8895bad..c91e9a0fff 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 @@ -12,20 +12,15 @@ material = generic_gffpa variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 1db3242244..b6d9f5e2a1 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 @@ -7,25 +7,20 @@ definition = ultimaker_s3 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffpa variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 83ac175c47..7e063af586 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.4 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 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 9c89527d1e..6844077345 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.4 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 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 c5843560c3..1e19814d67 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 @@ -12,7 +12,6 @@ material = generic_cffcpe variant = CC 0.6 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 @@ -21,9 +20,7 @@ initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 f2638e6bd6..662f167f69 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 @@ -12,7 +12,6 @@ material = generic_cffpa variant = CC 0.6 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 @@ -21,9 +20,7 @@ initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 2df0244992..6975526d71 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 @@ -12,7 +12,6 @@ material = generic_gffcpe variant = CC 0.6 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 @@ -21,9 +20,7 @@ initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 cf26243471..986dda1437 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 @@ -12,7 +12,6 @@ material = generic_gffpa variant = CC 0.6 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 @@ -21,9 +20,7 @@ initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 df7c944caf..981136de08 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.6 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 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 84169d31f7..7bcd60381e 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s3 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.6 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 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 1d3d811ba7..f31ea87a5c 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,16 +14,10 @@ variant = AA 0.25 [values] cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 3) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) +raft_airgap = 0.15 retraction_min_travel = 5 skin_overlap = 50 speed_print = 70 @@ -32,4 +26,3 @@ speed_wall = =math.ceil(speed_print * 30 / 70) switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 - 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 0ee0d7cbe9..93f97670ef 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 @@ -11,9 +11,7 @@ weight = 0 material = generic_pc variant = AA 0.25 is_experimental = True - [values] -adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 50 @@ -21,14 +19,12 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 3df31368bd..5f7d46dc8b 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 @@ -12,9 +12,9 @@ material = generic_petg variant = AA 0.25 [values] +initial_layer_line_width_factor = 100 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) top_bottom_thickness = 0.8 -initial_layer_line_width_factor = 100 -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 df673c641c..178e738069 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 @@ -11,7 +11,6 @@ weight = 0 material = generic_pp variant = AA 0.25 is_experimental = True - [values] brim_width = 10 cool_fan_speed_max = 100 @@ -19,7 +18,6 @@ cool_min_layer_time_fan_speed_max = 5 cool_min_speed = 2.5 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_final_print_temperature = =material_print_temperature - 10 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 4769b27977..41b2f693fd 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 @@ -14,15 +14,15 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 20 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 20 prime_tower_enable = False +raft_airgap = 0.15 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = 10 +speed_print = 60 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) -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 7001d74a46..a6fc9c5462 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 @@ -15,14 +15,14 @@ variant = AA 0.4 cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 15 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = False -speed_print = 60 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 45 / 60) speed_layer_0 = 10 +speed_print = 60 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) -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 0383c18746..496d17b2e8 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 @@ -15,16 +15,13 @@ variant = AA 0.4 cool_min_speed = 12 machine_nozzle_cool_down_speed = 0.8 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -speed_print = 50 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - - -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 004a29cf0a..d7f7be3a31 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 @@ -14,15 +14,13 @@ variant = AA 0.4 [values] machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 15 material_final_print_temperature = =material_print_temperature - 20 +material_initial_print_temperature = =material_print_temperature - 15 +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False -speed_print = 55 +raft_airgap = 0.15 +speed_infill = =math.ceil(speed_print * 40 / 55) speed_layer_0 = 10 +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - - -speed_infill = =math.ceil(speed_print * 40 / 55) -raft_airgap = 0.15 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg index 28d7691462..3271e26dba 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Draft_Print.inst.cfg @@ -18,17 +18,16 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index e2450cd6b0..2ff072d0e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,23 +12,22 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 -speed_print = 80 speed_layer_0 = =math.ceil(speed_print * 20 / 80) +speed_print = 80 speed_topbottom = =math.ceil(speed_print * 30 / 80) speed_wall = =math.ceil(speed_print * 40 / 80) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height +top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index 24f007b99b..5e6203dbbf 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,21 +12,20 @@ material = generic_bam variant = AA 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed cool_min_speed = 7 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -# prime_tower_enable: see CURA-4248 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_overlap = 10 speed_layer_0 = =math.ceil(speed_print * 20 / 70) -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height -support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height top_bottom_thickness = 1 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg index f6769a439f..7417ee6c6f 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_VeryDraft_Print.inst.cfg @@ -1,17 +1,16 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_bam variant = AA 0.4 is_experimental = True - [values] brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height @@ -25,10 +24,10 @@ speed_layer_0 = =math.ceil(speed_print * 20 / 70) speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 50 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 50) -top_bottom_thickness = 1 -support_brim_enable = True -support_interface_enable = True -support_interface_density = =min(extruderValues('material_surface_energy')) -support_top_distance = 0.3 -support_bottom_distance = 0.3 support_angle = 45 +support_bottom_distance = 0.3 +support_brim_enable = True +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_top_distance = 0.3 +top_bottom_thickness = 1 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 267a36d681..c39d1516af 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 @@ -14,10 +14,8 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 @@ -35,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) - speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) support_z_distance = =layer_height 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 c493b0d445..5d74e6164b 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 @@ -14,10 +14,8 @@ variant = AA 0.4 [values] cool_fan_speed_max = 80 cool_min_speed = 6 - infill_overlap = 0 infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 @@ -35,7 +33,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) - speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) support_z_distance = =layer_height 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 500f0a4428..cef6d64e99 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 @@ -14,10 +14,8 @@ variant = AA 0.4 [values] cool_fan_speed_max = 50 cool_min_speed = 5 - infill_overlap = 0 infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -37,7 +35,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) - speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height 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 ccedad12ec..2d33b40631 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 @@ -16,7 +16,6 @@ cool_fan_speed_max = 50 cool_min_speed = 7 infill_overlap = 0 infill_wipe_dist = 0 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -36,7 +35,6 @@ skin_overlap = 20 speed_layer_0 = =math.ceil(speed_print * 20 / 40) speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) - speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) support_z_distance = =layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg index bdfd6aadea..6b1f8504d2 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Draft_Print.inst.cfg @@ -12,16 +12,16 @@ material = generic_cpe variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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) -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg index 68d2879f47..de3910f816 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg index 40d950871d..546af06919 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg index a5cab8a96c..2614b40d60 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_CPE_Normal_Quality.inst.cfg @@ -12,16 +12,15 @@ material = generic_cpe variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 retraction_combing_max_distance = 50 retraction_prime_speed = =retraction_speed -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) \ No newline at end of file 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 9271ecc864..e4d6d270ee 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 @@ -12,24 +12,16 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 -material_print_temperature = =default_material_print_temperature + 10 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -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 eb4ced65c1..8b77d7010f 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 @@ -12,26 +12,16 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -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 7ba60c0fd4..72c3e257d1 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 @@ -12,25 +12,15 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 15 - - -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -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 e991199658..e3fbfc5b6e 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 @@ -12,25 +12,15 @@ material = generic_nylon variant = AA 0.4 [values] -adhesion_type = brim cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 12 - - -material_initial_print_temperature = =material_print_temperature - 5 material_final_print_temperature = =material_print_temperature - 10 -material_standby_temperature = 100 +material_initial_print_temperature = =material_print_temperature - 5 ooze_shield_angle = 40 -raft_acceleration = =acceleration_layer_0 raft_airgap = 0.4 -raft_interface_thickness = =round(machine_nozzle_size * 0.3 / 0.4, 2) -raft_jerk = =jerk_layer_0 -raft_margin = 10 -raft_surface_thickness = =round(machine_nozzle_size * 0.2 / 0.4, 2) retraction_prime_speed = =retraction_speed skin_overlap = 50 speed_layer_0 = 10 switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 -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 26184e715b..d2926843a6 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,7 +12,6 @@ material = generic_pc variant = AA 0.4 [values] -adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 90 @@ -22,20 +21,17 @@ 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' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 f739e1c5ac..739e168d62 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,7 +12,6 @@ material = generic_pc variant = AA 0.4 [values] -adhesion_type = brim brim_width = 20 cool_fan_full_at_height = =layer_height_0 + layer_height cool_fan_speed_max = 85 @@ -21,20 +20,17 @@ cool_min_speed = 7 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 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 @@ -42,7 +38,6 @@ skin_overlap = 30 speed_layer_0 = =math.ceil(speed_print * 25 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) - speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) support_interface_density = 87.5 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 aec7cc4293..e574b8cca5 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,31 +12,26 @@ material = generic_pc variant = AA 0.4 [values] -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_overlap = 0 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 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 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 3346f39efe..4103986e65 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,29 +12,24 @@ material = generic_pc variant = AA 0.4 [values] -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_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 ooze_shield_angle = 40 prime_tower_enable = True prime_tower_wipe_enabled = True raft_airgap = 0.25 -raft_interface_thickness = =max(layer_height * 1.5, 0.225) retraction_hop = 2 retraction_hop_only_when_collides = True retraction_min_travel = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg index 3e0bd8d4b8..62d24807b6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Draft_Print.inst.cfg @@ -12,16 +12,16 @@ material = generic_petg variant = AA 0.4 [values] -material_print_temperature = =default_material_print_temperature + 5 -material_initial_print_temperature = =material_print_temperature +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 5 +material_initial_print_temperature = =material_print_temperature +material_print_temperature = =default_material_print_temperature + 5 retraction_combing_max_distance = 8 skin_overlap = 20 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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) -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg index f9a8aa8915..d5a87efce1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Fast_Print.inst.cfg @@ -13,16 +13,15 @@ variant = AA 0.4 [values] cool_min_speed = 7 -material_print_temperature = =default_material_print_temperature -material_initial_print_temperature = =material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 material_final_print_temperature = =material_print_temperature - 10 +material_initial_print_temperature = =material_print_temperature - 5 +material_print_temperature = =default_material_print_temperature retraction_combing_max_distance = 8 -speed_print = 60 +speed_infill = =math.ceil(speed_print * 50 / 60) speed_layer_0 = =math.ceil(speed_print * 20 / 60) +speed_print = 60 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_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 50 / 60) -initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg index 289521bd01..49978a1b46 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_High_Quality.inst.cfg @@ -13,17 +13,16 @@ variant = AA 0.4 [values] cool_min_speed = 12 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 10 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 10 retraction_combing_max_distance = 8 -speed_print = 50 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 20 / 50) +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 40 / 50) -initial_layer_line_width_factor = 100 \ No newline at end of file diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg index 8129f66fc3..6e4a6907de 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PETG_Normal_Quality.inst.cfg @@ -12,16 +12,16 @@ material = generic_petg variant = AA 0.4 [values] +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +initial_layer_line_width_factor = 100 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 -material_print_temperature = =default_material_print_temperature - 5 -material_initial_print_temperature = =material_print_temperature - 10 material_final_print_temperature = =material_print_temperature - 15 +material_initial_print_temperature = =material_print_temperature - 10 +material_print_temperature = =default_material_print_temperature - 5 retraction_combing_max_distance = 8 -speed_print = 55 +speed_infill = =math.ceil(speed_print * 45 / 55) speed_layer_0 = =math.ceil(speed_print * 20 / 55) +speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' -speed_infill = =math.ceil(speed_print * 45 / 55) -initial_layer_line_width_factor = 100 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 bcd193268d..bda40276c4 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 @@ -12,13 +12,17 @@ material = generic_pla variant = AA 0.4 [values] +acceleration_wall = 2000 +acceleration_wall_0 = 2000 cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +infill_sparse_density = 15 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 speed_layer_0 = 10 @@ -26,8 +30,3 @@ speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) top_bottom_thickness = 0.8 -infill_sparse_density = 15 -layer_height_0 = 0.2 -acceleration_wall = 2000 -acceleration_wall_0 = 2000 -raft_airgap = 0.25 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 37ca77c51a..b58cabc738 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 @@ -14,16 +14,15 @@ variant = AA 0.4 [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed -speed_print = 70 speed_layer_0 = 10 +speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) top_bottom_thickness = 1 -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 98049f2d1c..5a7f57ac29 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 @@ -15,17 +15,16 @@ 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 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 50 speed_layer_0 = 10 +speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) top_bottom_thickness = 1 -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 b9acd3ba63..7d6815f135 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 @@ -15,13 +15,12 @@ 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 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 10 speed_layer_0 = 10 top_bottom_thickness = 1 -layer_height_0 = 0.2 -raft_airgap = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg index 4e5180032c..e89b30990c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_PLA_VeryDraft_Print.inst.cfg @@ -1,40 +1,33 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature + 10 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 - +material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 0.9 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = =0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 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 4ee2ec2f4e..ebb514af89 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 @@ -17,11 +17,9 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -30,7 +28,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature + 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 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 bd01a9e7e6..0abc43467b 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 @@ -17,11 +17,9 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -30,7 +28,6 @@ material_final_print_temperature = =material_print_temperature - 12 material_initial_print_temperature = =material_print_temperature - 2 material_print_temperature = =default_material_print_temperature - 13 material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 @@ -43,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 9cc83fa123..bd8ab98e55 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 @@ -17,12 +17,9 @@ cool_fan_speed_max = 100 cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 7 cool_min_speed = 2.5 - infill_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'tetrahedral' infill_wipe_dist = 0.1 -jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.85 machine_nozzle_heat_up_speed = 1.5 @@ -31,7 +28,6 @@ material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 material_print_temperature = =default_material_print_temperature - 15 material_print_temperature_layer_0 = =material_print_temperature + 3 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_size = 16 @@ -44,7 +40,6 @@ retraction_min_travel = 0.8 speed_layer_0 = =math.ceil(speed_print * 15 / 25) speed_print = 25 speed_topbottom = =math.ceil(speed_print * 25 / 25) - speed_travel_layer_0 = 50 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) 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 5b627b87f7..079a95b46c 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,12 +15,10 @@ 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 -jerk_print = 25 layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 20 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 f1370caaf0..0f731a673d 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 @@ -18,7 +18,6 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature -10 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed speed_layer_0 = =math.ceil(speed_print * 20 / 45) 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 8f1158bcbc..bf8686d358 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 @@ -15,17 +15,16 @@ 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 +layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 -speed_print = 45 speed_layer_0 = =math.ceil(speed_print * 20 / 45) +speed_print = 45 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 -layer_height_0 = 0.2 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 6f46c9c441..dd469f9403 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 @@ -19,7 +19,6 @@ layer_height_0 = 0.2 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 15 -material_standby_temperature = 100 prime_tower_enable = False retraction_prime_speed = =retraction_speed skin_overlap = 10 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg index 5138c25d0b..1758a95b61 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_TPLA_VeryDraft_Print.inst.cfg @@ -1,39 +1,33 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = verydraft -weight = -2 +weight = -3 material = generic_tough_pla variant = AA 0.4 is_experimental = True - [values] -infill_sparse_density = 15 acceleration_print = 2000 +acceleration_topbottom = 1000 acceleration_wall = 1500 acceleration_wall_0 = 1000 -acceleration_topbottom = 1000 -speed_print = 50 -speed_wall = 50 - cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed - -material_print_temperature = =default_material_print_temperature - 5 +infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' +infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -material_standby_temperature = 100 +material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False +raft_airgap = 0.25 retraction_prime_speed = =retraction_speed skin_overlap = 20 +speed_print = 50 +speed_wall = 50 top_bottom_thickness = 1.2 - -infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' - -raft_airgap = =0.25 -wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) \ No newline at end of file +wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) 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 dd4fe11a2c..19324e1777 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 @@ -17,13 +17,10 @@ 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_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -32,7 +29,6 @@ material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 346bb31931..86c8817c5d 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 @@ -17,13 +17,10 @@ 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_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -32,7 +29,6 @@ material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 e8617e309f..42ad6c4cd2 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 @@ -17,13 +17,10 @@ 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_overlap = 0 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 10 infill_wipe_dist = 0.1 -jerk_print = 25 - machine_min_cool_heat_time_window = 15 machine_nozzle_cool_down_speed = 0.5 machine_nozzle_heat_up_speed = 2.5 @@ -31,7 +28,6 @@ material_final_print_temperature = =material_print_temperature material_flow = 106 material_initial_print_temperature = =material_print_temperature material_print_temperature_layer_0 = =material_print_temperature + 17 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_wipe_enabled = True retraction_count_max = 15 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 ef542bed03..72f29e606b 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,11 +12,8 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 20 -material_standby_temperature = 100 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False 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 88c5aee1a2..6b352edb2d 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,12 +12,9 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 25 -material_standby_temperature = 100 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) -retract_at_layer_change = False 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 5b91e9ecc4..b90f30046d 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,11 +12,8 @@ material = generic_abs variant = AA 0.8 [values] - material_print_temperature = =default_material_print_temperature + 22 -material_standby_temperature = 100 speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -retract_at_layer_change = False 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 53f58530b9..b04bc2227f 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 @@ -1,26 +1,23 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_cpe_plus variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 10 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 retraction_hop = 0.1 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 b5a7bf5de0..d3f95d449f 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 @@ -11,28 +11,24 @@ weight = -4 material = generic_cpe_plus variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 retraction_hop = 0.1 retraction_hop_enabled = False skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 40 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 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) -speed_infill = =math.ceil(speed_print * 40 / 50) 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 4dcbf91e6a..a2c896836f 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 @@ -11,17 +11,13 @@ weight = -3 material = generic_cpe_plus variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 material_print_temperature = =default_material_print_temperature - 7 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 retraction_hop = 0.1 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 f79c57f967..19f7e7be37 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,9 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 15 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 speed_print = 40 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 3f9bec36ab..d15f1a7c84 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,13 +13,11 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 20 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 33 / 45) 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 d2ec9bdc00..721d0a8752 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,9 +13,7 @@ variant = AA 0.8 [values] brim_width = 15 - material_print_temperature = =default_material_print_temperature + 17 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 50 speed_print = 40 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 5a1a8ee5c1..addfe52641 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 @@ -17,14 +17,9 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 89a55e3f6f..aec980aa48 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 @@ -17,14 +17,9 @@ cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 c1b0737a24..8e73a5a755 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,18 +15,11 @@ variant = AA 0.8 brim_width = 5.6 cool_min_layer_time_fan_speed_max = 20 cool_min_speed = 10 - - machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 -material_standby_temperature = 100 ooze_shield_angle = 40 prime_tower_enable = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = =round(layer_height_0 * 0.85, 2) -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) +raft_airgap = 0.45 support_angle = 70 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 bb43019b98..354b187085 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 @@ -1,27 +1,22 @@ [general] version = 4 -name = Fast - Experimental +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality -quality_type = draft -weight = -2 +quality_type = fast +weight = -1 material = generic_pc variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 14 * layer_height - - material_print_temperature = =default_material_print_temperature - 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 @@ -29,4 +24,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) - 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 72be6682c6..6cfd2c8d94 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 @@ -11,21 +11,16 @@ weight = -4 material = generic_pc variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 7 * layer_height - - material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 +speed_infill = =math.ceil(speed_print * 37 / 50) speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 speed_slowdown_layers = 8 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 37 / 50) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 37 / 50) 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 0786997c50..0b9e0f27bf 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 @@ -11,15 +11,12 @@ weight = -3 material = generic_pc variant = AA 0.8 is_experimental = True - [values] brim_width = 14 cool_fan_full_at_height = =layer_height_0 + 9 * layer_height material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 raft_airgap = 0.5 -raft_margin = 15 skin_overlap = 0 speed_layer_0 = =math.ceil(speed_print * 15 / 50) speed_print = 50 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 b128d3a252..47a26097f5 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,13 +13,11 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 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 8aa0a748d4..f13991359d 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,15 +13,13 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 8 +speed_infill = =math.ceil(speed_print * 33 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 30 / 45) speed_wall = =math.ceil(speed_print * 33 / 45) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) -speed_infill = =math.ceil(speed_print * 33 / 45) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 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 ad9b43ab07..41e42809cf 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,14 +13,11 @@ variant = AA 0.8 [values] brim_width = 7 - +cool_fan_speed = 20 +initial_layer_line_width_factor = 100 material_print_temperature = =default_material_print_temperature - 5 -material_standby_temperature = 100 prime_tower_enable = True retraction_combing_max_distance = 8 speed_print = 40 speed_topbottom = =math.ceil(speed_print * 25 / 40) speed_wall = =math.ceil(speed_print * 30 / 40) -cool_fan_speed = 20 -initial_layer_line_width_factor = 100 - 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 b465c3d95c..cac2e008fc 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,18 +16,17 @@ 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 +layer_height_0 = 0.4 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) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 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 0f2aa42b8d..1703c141e2 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,20 +16,18 @@ 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 +layer_height_0 = 0.4 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) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 15 prime_tower_enable = True -raft_margin = 10 -support_angle = 70 -top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False +speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 35 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -speed_infill = =math.ceil(speed_print * 35 / 45) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 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 e6e1a9c718..07f93e993f 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,18 +16,17 @@ 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 +layer_height_0 = 0.4 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) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 prime_tower_enable = True -support_angle = 70 -top_bottom_thickness = =layer_height * 4 -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) -layer_height_0 = 0.4 +speed_wall_x = =speed_wall +support_angle = 70 +top_bottom_thickness = =layer_height * 4 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 e6f87c3442..4c262310e8 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 @@ -15,17 +15,14 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 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 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 10 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 @@ -36,4 +33,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 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 324b121ca7..539e6335c7 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 @@ -15,26 +15,24 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 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 material_print_temperature_layer_0 = =default_material_print_temperature + 2 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 20 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 retraction_min_travel = 1.5 retraction_prime_speed = 15 -speed_wall_x = =math.ceil(speed_wall * 30 / 30) speed_infill = =math.ceil(speed_wall * 30 / 30) +speed_wall_x = =math.ceil(speed_wall * 30 / 30) switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 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 67cd7d50ac..9c3cb44e07 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 @@ -15,16 +15,13 @@ variant = AA 0.8 brim_width = 25 cool_min_layer_time_fan_speed_max = 6 cool_min_speed = 17 -top_skin_expand_distance = =line_width * 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 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 prime_tower_min_volume = 15 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 0.5 @@ -35,4 +32,5 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.6 +top_skin_expand_distance = =line_width * 2 wall_0_wipe_dist = =line_width * 2 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 d0bbce15a0..d2d69e4870 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 @@ -24,7 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 0 prime_tower_enable = False -retract_at_layer_change = False speed_print = 45 speed_topbottom = =round(speed_print * 35 / 45) speed_wall = =round(speed_print * 40 / 45) 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 62a9b616b0..b298611623 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 @@ -24,8 +24,6 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False -raft_margin = 10 -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 30) speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) 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 b8e0103386..1133c1c194 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 @@ -24,9 +24,7 @@ material_final_print_temperature = =max(-273.15, material_print_temperature - 15 material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 5 material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 prime_tower_enable = False -retract_at_layer_change = False speed_infill = =math.ceil(speed_print * 30 / 35) speed_print = 35 speed_topbottom = =math.ceil(speed_print * 20 / 35) 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 e132129969..57dc15f243 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 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 @@ -23,11 +22,9 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature - 2 material_print_temperature_layer_0 = =material_print_temperature + 19 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 @@ -43,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 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 410d07b902..1d8cf0809c 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -24,25 +23,24 @@ material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature = =default_material_print_temperature + 2 material_print_temperature_layer_0 = =material_print_temperature + 15 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 retraction_hop_only_when_collides = False retraction_min_travel = =line_width * 2 +speed_infill = =speed_print speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =speed_print speed_wall_x = =speed_print -speed_infill = =speed_print support_angle = 50 switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 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 c4d48a2f6c..95e5da677d 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 @@ -14,7 +14,6 @@ variant = AA 0.8 [values] brim_width = 8.75 cool_min_layer_time_fan_speed_max = 6 -top_skin_expand_distance = =line_width * 2 infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'cross_3d' infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.5 @@ -23,11 +22,9 @@ material_final_print_temperature = =material_print_temperature material_flow = 105 material_initial_print_temperature = =material_print_temperature material_print_temperature_layer_0 = =material_print_temperature + 17 -material_standby_temperature = 100 multiple_mesh_overlap = 0.2 prime_tower_enable = True prime_tower_flow = 100 -retract_at_layer_change = False retraction_count_max = 15 retraction_extra_prime_amount = 0.5 retraction_hop = 1.5 @@ -43,5 +40,6 @@ switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 45 top_bottom_thickness = 1.2 +top_skin_expand_distance = =line_width * 2 travel_avoid_distance = 1.5 wall_0_wipe_dist = =line_width * 2 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg index cdb8384f68..325692a5b7 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Draft_Print.inst.cfg @@ -13,13 +13,12 @@ variant = BB 0.4 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 20 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index b98235718b..e445afe911 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,15 +12,14 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 prime_tower_enable = False retraction_count_max = 5 skin_overlap = 15 -support_brim_enable = True -support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_enable = True support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 40dcd5da35..4f70be3b8c 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -12,13 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -support_brim_enable = True -support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +support_brim_enable = True +support_infill_sparse_thickness = =3*layer_height +support_interface_enable = True support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index d5397c44eb..50ca204965 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,13 +12,12 @@ material = generic_pva variant = BB 0.4 [values] -support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 -support_brim_enable = True -support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +support_brim_enable = True +support_infill_sparse_thickness = =2*layer_height +support_interface_enable = True support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg index 6bacefc331..fd239c5343 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Verydraft_Print.inst.cfg @@ -1,6 +1,6 @@ [general] version = 4 -name = Extra Fast +name = Extra Fast - Experimental definition = ultimaker_s5 [metadata] @@ -11,15 +11,13 @@ weight = -3 material = generic_pva variant = BB 0.4 is_experimental = True - [values] brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) prime_tower_enable = False retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg index 0259c3040f..27618f9478 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Draft_Print.inst.cfg @@ -13,11 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) material_print_temperature = =default_material_print_temperature + 5 -material_standby_temperature = 100 retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg index c1768abc54..45c178e704 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,10 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg index 315ee5748f..60a70fcda4 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,11 +13,10 @@ variant = BB 0.8 [values] brim_replaces_support = False -material_standby_temperature = 100 +cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) retraction_count_max = 5 +skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) support_brim_enable = True support_infill_sparse_thickness = 0.3 support_interface_enable = True -skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) -cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) support_use_towers = True 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 44df638c2f..c0e20f1584 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 @@ -12,20 +12,15 @@ material = generic_cffcpe variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 c2e3a080a2..8b3030ce09 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 @@ -7,25 +7,20 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffcpe variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 3b6c3c2984..0307bbff4a 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 @@ -12,20 +12,15 @@ material = generic_cffpa variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 1115c306fd..ac6883ca44 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 @@ -7,25 +7,20 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_cffpa variant = CC 0.4 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 72f48e9c57..c44b25bd94 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 @@ -12,20 +12,15 @@ material = generic_gffcpe variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 169bd1365e..a79662a65d 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 @@ -7,25 +7,20 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffcpe variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 ac59de30b6..ee1ac1ef7a 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 @@ -12,20 +12,15 @@ material = generic_gffpa variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 0c4d2babbd..c0a4cb9a4a 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 @@ -7,25 +7,20 @@ definition = ultimaker_s5 setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_gffpa variant = CC 0.4 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 - material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 4b82c58a66..ec88e11d72 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.4 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 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 6c855696de..98da59afd9 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.4 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 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 48c31f4cd2..02430694b3 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 @@ -12,19 +12,15 @@ material = generic_cffcpe variant = CC 0.6 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 9ad29b3ab9..ab1c73641e 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 @@ -12,19 +12,15 @@ material = generic_cffpa variant = CC 0.6 [values] -adhesion_type = skirt cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 d169225a50..e4019fea55 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 @@ -12,19 +12,15 @@ material = generic_gffcpe variant = CC 0.6 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 cool_min_speed = 6 - initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 faa5070778..2d45c63fcf 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 @@ -12,7 +12,6 @@ material = generic_gffpa variant = CC 0.6 [values] -adhesion_type = brim cool_fan_enabled = True cool_min_layer_time = 7 cool_min_layer_time_fan_speed_max = 15 @@ -21,9 +20,7 @@ initial_layer_line_width_factor = 130.0 material_bed_temperature_layer_0 = =material_bed_temperature + 5 material_print_temperature = =default_material_print_temperature material_print_temperature_layer_0 = =material_print_temperature -material_standby_temperature = 100 skin_overlap = 20 support_bottom_distance = =support_z_distance / 2 support_top_distance = =support_z_distance support_z_distance = =layer_height * 2 - 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 d0cfbad066..0589c86926 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Fast +name = Fast - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = draft -weight = -3 +weight = -2 material = generic_pla variant = CC 0.6 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 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 14bc1dd211..fff2fdb4d2 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 @@ -1,17 +1,16 @@ [general] version = 4 -name = Normal +name = Normal - Experimental definition = ultimaker_s5 [metadata] setting_version = 20 type = quality quality_type = fast -weight = -2 +weight = -1 material = generic_pla variant = CC 0.6 is_experimental = True - [values] cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =100 @@ -23,13 +22,11 @@ machine_nozzle_heat_up_speed = 1.6 material_final_print_temperature = =max(-273.15, material_print_temperature - 15) material_initial_print_temperature = =max(-273.15, material_print_temperature - 10) material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 prime_tower_enable = True -retract_at_layer_change = False speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) -speed_wall_x = =speed_wall speed_wall_0 = =math.ceil(speed_wall * 35 / 40) +speed_wall_x = =speed_wall support_angle = 70 top_bottom_thickness = =layer_height * 4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..f99ae5b6b6 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_ultra.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..98f0cec759 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..46bd7ff59c --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_ultra.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..c1ca8cdaec --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..cd77d27698 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_ultra.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..4ce7e57ab8 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_adaptive.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..96491e5f33 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_low.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..78c7d967bf --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..b25bf07d6d --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..5481bbb7fa --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_adaptive.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..40461e12bd --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_low.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..6ab649f390 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..fc39cfe622 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..777f3bd180 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PETG_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_adaptive.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..4a39782cfe --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_low.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..0c0ee0e14d --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..39dd4ce0cc --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..6d3befd8ab --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_adaptive.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..6d956519d1 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..3374e6a002 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..f52548b0eb --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.6_ABS_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..c39987c4e6 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PETG_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..b4f13906f6 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PETG_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_draft.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..4bd83c9467 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_low.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..35810aec66 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..9fdce8acb6 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.6_TPU_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..4214a1084c --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.6_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.8_ABS_draft.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..a5c6a69ab6 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.8_PETG_draft.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..f8acd86c0a --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_PETG_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.8_PLA_draft.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..d4c0d0d998 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_0.8_TPU_draft.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..b17d0c9130 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_0.8_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex2plus/trex2plus_global_adaptive.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_global_adaptive.inst.cfg new file mode 100644 index 0000000000..749bbc7a7d --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/vivedino/trex2plus/trex2plus_global_draft.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_global_draft.inst.cfg new file mode 100644 index 0000000000..6d1beff1ec --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_global_low.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_global_low.inst.cfg new file mode 100644 index 0000000000..a6610dcad4 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_global_standard.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_global_standard.inst.cfg new file mode 100644 index 0000000000..e577d3f20a --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*5 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_global_super.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_global_super.inst.cfg new file mode 100644 index 0000000000..4355434c6a --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/vivedino/trex2plus/trex2plus_global_ultra.inst.cfg b/resources/quality/vivedino/trex2plus/trex2plus_global_ultra.inst.cfg new file mode 100644 index 0000000000..98cc762a68 --- /dev/null +++ b/resources/quality/vivedino/trex2plus/trex2plus_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/vivedino/trex3/trex3_0.2_ABS_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..c7a0b6b9bb --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex3/trex3_0.2_ABS_ultra.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..aa52a8ae49 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex3/trex3_0.2_PETG_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..b465c69bf6 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.2_PETG_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex3/trex3_0.2_PETG_ultra.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..c7d5a6cc27 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vivedino/trex3/trex3_0.2_PLA_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..852182aff7 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.2_PLA_ultra.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..69c24a35b3 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.4_ABS_adaptive.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..29cdecbf6e --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_ABS_low.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..7ea9d32ef7 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_ABS_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..efa77a35c4 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_ABS_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..94fe6aaffe --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PETG_adaptive.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..c733acc63a --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PETG_low.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..23e2890a9f --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PETG_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..81bb778563 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PETG_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..bc71d9fc30 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PETG_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PLA_adaptive.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..5ffc041592 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PLA_low.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..9dc6038f71 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PLA_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..e943c737ec --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.4_PLA_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..9f21138eaa --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.4_TPU_adaptive.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..3fcfe4fc0d --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.4_TPU_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..0d7a47db26 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.4_TPU_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..5ac8c78775 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.4_TPU_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.6_ABS_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..255fc6a027 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex3/trex3_0.6_PETG_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..7aa80259c3 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.6_PETG_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex3/trex3_0.6_PLA_draft.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..79243dffc6 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.6_PLA_low.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..a7a6ca0ff4 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.6_PLA_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..2adc9d9df2 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.6_TPU_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..3f9d1b4357 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.6_TPU_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.8_ABS_draft.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..aa4f49fded --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex3/trex3_0.8_PETG_draft.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..18c0196048 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.8_PETG_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vivedino/trex3/trex3_0.8_PLA_draft.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..1807b92ec0 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_0.8_TPU_draft.inst.cfg b/resources/quality/vivedino/trex3/trex3_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..c61b71e642 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_0.8_TPU_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/vivedino/trex3/trex3_global_adaptive.inst.cfg b/resources/quality/vivedino/trex3/trex3_global_adaptive.inst.cfg new file mode 100644 index 0000000000..acd544c611 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/vivedino/trex3/trex3_global_draft.inst.cfg b/resources/quality/vivedino/trex3/trex3_global_draft.inst.cfg new file mode 100644 index 0000000000..fbb8559ca1 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/vivedino/trex3/trex3_global_low.inst.cfg b/resources/quality/vivedino/trex3/trex3_global_low.inst.cfg new file mode 100644 index 0000000000..b0d02b9202 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/vivedino/trex3/trex3_global_standard.inst.cfg b/resources/quality/vivedino/trex3/trex3_global_standard.inst.cfg new file mode 100644 index 0000000000..eba6690e88 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*5 diff --git a/resources/quality/vivedino/trex3/trex3_global_super.inst.cfg b/resources/quality/vivedino/trex3/trex3_global_super.inst.cfg new file mode 100644 index 0000000000..5e440bfd03 --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/vivedino/trex3/trex3_global_ultra.inst.cfg b/resources/quality/vivedino/trex3/trex3_global_ultra.inst.cfg new file mode 100644 index 0000000000..219d13b6dc --- /dev/null +++ b/resources/quality/vivedino/trex3/trex3_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.2_ABS_super.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.2_ABS_super.inst.cfg new file mode 100644 index 0000000000..1172d8936e --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.2_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.2_ABS_ultra.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.2_ABS_ultra.inst.cfg new file mode 100644 index 0000000000..0edb3cc21e --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.2_ABS_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_abs +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_adaptive.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..4e0838328b --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_low.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_low.inst.cfg new file mode 100644 index 0000000000..b7e74e6828 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_standard.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_standard.inst.cfg new file mode 100644 index 0000000000..ffb06a5ed5 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_super.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_super.inst.cfg new file mode 100644 index 0000000000..096008f445 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.3_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_adaptive.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..44330c66ff --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_low.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_low.inst.cfg new file mode 100644 index 0000000000..db55af0707 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_standard.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_standard.inst.cfg new file mode 100644 index 0000000000..c900d791dc --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_super.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_super.inst.cfg new file mode 100644 index 0000000000..dee4930c45 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.4_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_adaptive.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_adaptive.inst.cfg new file mode 100644 index 0000000000..62503a0e57 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_low.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_low.inst.cfg new file mode 100644 index 0000000000..3893a57516 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_standard.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_standard.inst.cfg new file mode 100644 index 0000000000..074f737974 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_super.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_super.inst.cfg new file mode 100644 index 0000000000..d38191adf6 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.5_ABS_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_abs +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.6_ABS_standard.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.6_ABS_standard.inst.cfg new file mode 100644 index 0000000000..ff2a7be6f8 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.6_ABS_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_abs +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/ABS/vzbot_0.8_ABS_draft.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_0.8_ABS_draft.inst.cfg new file mode 100644 index 0000000000..f9f87c4bde --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_0.8_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_abs +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/ABS/vzbot_1.0_ABS_draft.inst.cfg b/resources/quality/vzbot/base/ABS/vzbot_1.0_ABS_draft.inst.cfg new file mode 100644 index 0000000000..49acfd6c32 --- /dev/null +++ b/resources/quality/vzbot/base/ABS/vzbot_1.0_ABS_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_abs +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.2_PC_super.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.2_PC_super.inst.cfg new file mode 100644 index 0000000000..d81e378b7e --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.2_PC_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pc +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.2_PC_ultra.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.2_PC_ultra.inst.cfg new file mode 100644 index 0000000000..0138d8a2b1 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.2_PC_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_pc +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.3_PC_adaptive.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_adaptive.inst.cfg new file mode 100644 index 0000000000..b05b418263 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pc +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.3_PC_low.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_low.inst.cfg new file mode 100644 index 0000000000..9ef0d4a9d5 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pc +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.3_PC_standard.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_standard.inst.cfg new file mode 100644 index 0000000000..ce4fa4ec3b --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pc +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.3_PC_super.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_super.inst.cfg new file mode 100644 index 0000000000..bccbe5fd30 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.3_PC_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pc +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.4_PC_adaptive.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_adaptive.inst.cfg new file mode 100644 index 0000000000..007bf4a739 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.4_PC_low.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_low.inst.cfg new file mode 100644 index 0000000000..258b44c446 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.4_PC_standard.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_standard.inst.cfg new file mode 100644 index 0000000000..066563b61e --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.4_PC_super.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_super.inst.cfg new file mode 100644 index 0000000000..4064f8105d --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.4_PC_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pc +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.5_PC_adaptive.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_adaptive.inst.cfg new file mode 100644 index 0000000000..d05afb5d20 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pc +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.5_PC_low.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_low.inst.cfg new file mode 100644 index 0000000000..237b0f5143 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pc +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.5_PC_standard.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_standard.inst.cfg new file mode 100644 index 0000000000..5a80deba10 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pc +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.5_PC_super.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_super.inst.cfg new file mode 100644 index 0000000000..274d9a325d --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.5_PC_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pc +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.6_PC_standard.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.6_PC_standard.inst.cfg new file mode 100644 index 0000000000..24f08de191 --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.6_PC_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pc +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/PC/vzbot_0.8_PC_draft.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_0.8_PC_draft.inst.cfg new file mode 100644 index 0000000000..4b677368fc --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_0.8_PC_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pc +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/PC/vzbot_1.0_PC_draft.inst.cfg b/resources/quality/vzbot/base/PC/vzbot_1.0_PC_draft.inst.cfg new file mode 100644 index 0000000000..e50c5f689f --- /dev/null +++ b/resources/quality/vzbot/base/PC/vzbot_1.0_PC_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pc +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.2_PETG_super.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.2_PETG_super.inst.cfg new file mode 100644 index 0000000000..04d751e946 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.2_PETG_super.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 + diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.2_PETG_ultra.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.2_PETG_ultra.inst.cfg new file mode 100644 index 0000000000..476c1d668b --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.2_PETG_ultra.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Ultra Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_petg +variant = 0.2mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*8 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_adaptive.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..a06d17c654 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_low.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_low.inst.cfg new file mode 100644 index 0000000000..d6ee8ad833 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_standard.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_standard.inst.cfg new file mode 100644 index 0000000000..043ba4c6c9 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_super.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_super.inst.cfg new file mode 100644 index 0000000000..9d4c369e21 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.3_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.3mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_adaptive.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..9fdd362428 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_low.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_low.inst.cfg new file mode 100644 index 0000000000..235f85aac9 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_standard.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_standard.inst.cfg new file mode 100644 index 0000000000..5d7cbd0316 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_super.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_super.inst.cfg new file mode 100644 index 0000000000..9bd75af91e --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.4_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.4mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_adaptive.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_adaptive.inst.cfg new file mode 100644 index 0000000000..2c81e446cd --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_adaptive.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_low.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_low.inst.cfg new file mode 100644 index 0000000000..9ac33529c2 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_low.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_standard.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_standard.inst.cfg new file mode 100644 index 0000000000..041afa5a51 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_super.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_super.inst.cfg new file mode 100644 index 0000000000..1774c159c8 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.5_PETG_super.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_petg +variant = 0.5mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*4 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.6_PETG_standard.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.6_PETG_standard.inst.cfg new file mode 100644 index 0000000000..b8bb0b9c2e --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.6_PETG_standard.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_petg +variant = 0.6mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_0.8_PETG_draft.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_0.8_PETG_draft.inst.cfg new file mode 100644 index 0000000000..6743af5426 --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_0.8_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_petg +variant = 0.8mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PETG/vzbot_1.0_PETG_draft.inst.cfg b/resources/quality/vzbot/base/PETG/vzbot_1.0_PETG_draft.inst.cfg new file mode 100644 index 0000000000..2d5ce7738a --- /dev/null +++ b/resources/quality/vzbot/base/PETG/vzbot_1.0_PETG_draft.inst.cfg @@ -0,0 +1,16 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_petg +variant = 1.0mm Nozzle + +[values] +speed_layer_0 = 15 +wall_thickness = =line_width*3 +#retraction_extra_prime_amount = 0.5 diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.2_PLA_super.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.2_PLA_super.inst.cfg new file mode 100644 index 0000000000..33a189c97a --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.2_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.2_PLA_ultra.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.2_PLA_ultra.inst.cfg new file mode 100644 index 0000000000..bdb0837012 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.2_PLA_ultra.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Ultra Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_pla +variant = 0.2mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_adaptive.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..e3b1f21133 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_low.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_low.inst.cfg new file mode 100644 index 0000000000..5c10f5fe44 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_standard.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_standard.inst.cfg new file mode 100644 index 0000000000..31cc0964cc --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_super.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_super.inst.cfg new file mode 100644 index 0000000000..db65a7a5fd --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.3_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.3mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_adaptive.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..5168a91040 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_low.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_low.inst.cfg new file mode 100644 index 0000000000..fb1bc859aa --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_standard.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_standard.inst.cfg new file mode 100644 index 0000000000..dbc0304fb1 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_super.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_super.inst.cfg new file mode 100644 index 0000000000..5d7ed6eda2 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.4_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.4mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_adaptive.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_adaptive.inst.cfg new file mode 100644 index 0000000000..1f34441e00 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_adaptive.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_low.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_low.inst.cfg new file mode 100644 index 0000000000..600905790b --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_standard.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_standard.inst.cfg new file mode 100644 index 0000000000..9beb4f15ed --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_super.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_super.inst.cfg new file mode 100644 index 0000000000..df89cc112f --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.5_PLA_super.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pla +variant = 0.5mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_draft.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_draft.inst.cfg new file mode 100644 index 0000000000..ea70262be7 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_low.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_low.inst.cfg new file mode 100644 index 0000000000..7b2de73fb6 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_low.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_standard.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_standard.inst.cfg new file mode 100644 index 0000000000..0cf308feed --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.6_PLA_standard.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pla +variant = 0.6mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_0.8_PLA_draft.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_0.8_PLA_draft.inst.cfg new file mode 100644 index 0000000000..f57384d4f8 --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_0.8_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 0.8mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PLA/vzbot_1.0_PLA_draft.inst.cfg b/resources/quality/vzbot/base/PLA/vzbot_1.0_PLA_draft.inst.cfg new file mode 100644 index 0000000000..a8ff4828cf --- /dev/null +++ b/resources/quality/vzbot/base/PLA/vzbot_1.0_PLA_draft.inst.cfg @@ -0,0 +1,13 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pla +variant = 1.0mm Nozzle + +[values] diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.2_PVA_super.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.2_PVA_super.inst.cfg new file mode 100644 index 0000000000..44cd9ab901 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.2_PVA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pva +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.2_PVA_ultra.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.2_PVA_ultra.inst.cfg new file mode 100644 index 0000000000..da03a40dbc --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.2_PVA_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_pva +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_adaptive.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_adaptive.inst.cfg new file mode 100644 index 0000000000..8d123ae44a --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pva +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_low.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_low.inst.cfg new file mode 100644 index 0000000000..028c68fc97 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pva +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_standard.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_standard.inst.cfg new file mode 100644 index 0000000000..430edb0ef4 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pva +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_super.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_super.inst.cfg new file mode 100644 index 0000000000..be21aab260 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.3_PVA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pva +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_adaptive.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_adaptive.inst.cfg new file mode 100644 index 0000000000..e5cb2b3206 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_low.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_low.inst.cfg new file mode 100644 index 0000000000..8b40061ad9 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_standard.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_standard.inst.cfg new file mode 100644 index 0000000000..fd3ae9365e --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_super.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_super.inst.cfg new file mode 100644 index 0000000000..51b94b8f25 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.4_PVA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pva +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_adaptive.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_adaptive.inst.cfg new file mode 100644 index 0000000000..71582cac63 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_pva +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_low.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_low.inst.cfg new file mode 100644 index 0000000000..4d05101be5 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_pva +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_standard.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_standard.inst.cfg new file mode 100644 index 0000000000..64033125b5 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pva +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_super.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_super.inst.cfg new file mode 100644 index 0000000000..cf53742dd9 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.5_PVA_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_pva +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.6_PVA_standard.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.6_PVA_standard.inst.cfg new file mode 100644 index 0000000000..fcd17e7c77 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.6_PVA_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_pva +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/PVA/vzbot_0.8_PVA_draft.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_0.8_PVA_draft.inst.cfg new file mode 100644 index 0000000000..b38d437bb6 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_0.8_PVA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pva +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/PVA/vzbot_1.0_PVA_draft.inst.cfg b/resources/quality/vzbot/base/PVA/vzbot_1.0_PVA_draft.inst.cfg new file mode 100644 index 0000000000..ef83c1e707 --- /dev/null +++ b/resources/quality/vzbot/base/PVA/vzbot_1.0_PVA_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_pva +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_adaptive.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..9ca773979e --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.3mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_standard.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_standard.inst.cfg new file mode 100644 index 0000000000..db460cc2ae --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.3mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_super.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_super.inst.cfg new file mode 100644 index 0000000000..d19f4e96ea --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.3_TPU_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.3mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_adaptive.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..4d40a7a6ac --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_standard.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_standard.inst.cfg new file mode 100644 index 0000000000..e3ba8d9aa2 --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_super.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_super.inst.cfg new file mode 100644 index 0000000000..26d5dd1e9e --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.4_TPU_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.4mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_adaptive.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_adaptive.inst.cfg new file mode 100644 index 0000000000..14a2dce709 --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_adaptive.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_standard.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_standard.inst.cfg new file mode 100644 index 0000000000..e139231910 --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_super.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_super.inst.cfg new file mode 100644 index 0000000000..ac167cee50 --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.5_TPU_super.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_tpu +variant = 0.5mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.6_TPU_standard.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.6_TPU_standard.inst.cfg new file mode 100644 index 0000000000..c1b93cdb67 --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.6_TPU_standard.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_tpu +variant = 0.6mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_0.8_TPU_draft.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_0.8_TPU_draft.inst.cfg new file mode 100644 index 0000000000..26fac84680 --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_0.8_TPU_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_tpu +variant = 0.8mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/TPU/vzbot_1.0_TPU_draft.inst.cfg b/resources/quality/vzbot/base/TPU/vzbot_1.0_TPU_draft.inst.cfg new file mode 100644 index 0000000000..3e0586e119 --- /dev/null +++ b/resources/quality/vzbot/base/TPU/vzbot_1.0_TPU_draft.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_tpu +variant = 1.0mm Nozzle + +[values] +retraction_enable = False +speed_print = 150 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.2_nylon_super.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.2_nylon_super.inst.cfg new file mode 100644 index 0000000000..e6a89b1c87 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.2_nylon_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_nylon +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.2_nylon_ultra.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.2_nylon_ultra.inst.cfg new file mode 100644 index 0000000000..9c86dcd8b1 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.2_nylon_ultra.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Ultra Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +material = generic_nylon +variant = 0.2mm Nozzle + +[values] +wall_thickness = =line_width*8 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_adaptive.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_adaptive.inst.cfg new file mode 100644 index 0000000000..1a81dca16b --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_nylon +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_low.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_low.inst.cfg new file mode 100644 index 0000000000..8aa09c3fad --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_nylon +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_standard.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_standard.inst.cfg new file mode 100644 index 0000000000..f7686ef1e9 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_nylon +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_super.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_super.inst.cfg new file mode 100644 index 0000000000..b9c5d88753 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.3_nylon_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_nylon +variant = 0.3mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_adaptive.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_adaptive.inst.cfg new file mode 100644 index 0000000000..b50b782a2c --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_nylon +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_low.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_low.inst.cfg new file mode 100644 index 0000000000..0cceeee6ba --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_nylon +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_standard.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_standard.inst.cfg new file mode 100644 index 0000000000..23e7d27895 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_nylon +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_super.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_super.inst.cfg new file mode 100644 index 0000000000..2f94a9aa13 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.4_nylon_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_nylon +variant = 0.4mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_adaptive.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_adaptive.inst.cfg new file mode 100644 index 0000000000..ccd20b204d --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_adaptive.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +material = generic_nylon +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_low.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_low.inst.cfg new file mode 100644 index 0000000000..cba8ccba33 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_low.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +material = generic_nylon +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_standard.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_standard.inst.cfg new file mode 100644 index 0000000000..964a50083b --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_nylon +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_super.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_super.inst.cfg new file mode 100644 index 0000000000..f2c7dab429 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.5_nylon_super.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +material = generic_nylon +variant = 0.5mm Nozzle + +[values] +wall_thickness = =line_width*4 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.6_nylon_standard.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.6_nylon_standard.inst.cfg new file mode 100644 index 0000000000..966e963d61 --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.6_nylon_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +material = generic_nylon +variant = 0.6mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/nylon/vzbot_0.8_nylon_draft.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_0.8_nylon_draft.inst.cfg new file mode 100644 index 0000000000..82589b81ac --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_0.8_nylon_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_nylon +variant = 0.8mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/nylon/vzbot_1.0_nylon_draft.inst.cfg b/resources/quality/vzbot/base/nylon/vzbot_1.0_nylon_draft.inst.cfg new file mode 100644 index 0000000000..bd465e599e --- /dev/null +++ b/resources/quality/vzbot/base/nylon/vzbot_1.0_nylon_draft.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +material = generic_nylon +variant = 1.0mm Nozzle + +[values] +wall_thickness = =line_width*3 diff --git a/resources/quality/vzbot/base/vzbot_global_adaptive.inst.cfg b/resources/quality/vzbot/base/vzbot_global_adaptive.inst.cfg new file mode 100644 index 0000000000..118d1d406d --- /dev/null +++ b/resources/quality/vzbot/base/vzbot_global_adaptive.inst.cfg @@ -0,0 +1,19 @@ +[general] +version = 4 +name = Dynamic Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = adaptive +weight = -2 +global_quality = True + +[values] +layer_height = 0.16 +layer_height_0 = 0.20 +top_bottom_thickness = =layer_height_0+layer_height*4 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*6 +adaptive_layer_height_enabled = true diff --git a/resources/quality/vzbot/base/vzbot_global_draft.inst.cfg b/resources/quality/vzbot/base/vzbot_global_draft.inst.cfg new file mode 100644 index 0000000000..5aa89ed91b --- /dev/null +++ b/resources/quality/vzbot/base/vzbot_global_draft.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Draft Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = draft +weight = -5 +global_quality = True + +[values] +layer_height = 0.32 +layer_height_0 = 0.32 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/vzbot/base/vzbot_global_low.inst.cfg b/resources/quality/vzbot/base/vzbot_global_low.inst.cfg new file mode 100644 index 0000000000..096f6243cc --- /dev/null +++ b/resources/quality/vzbot/base/vzbot_global_low.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Low Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = low +weight = -4 +global_quality = True + +[values] +layer_height = 0.28 +layer_height_0 = 0.28 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/vzbot/base/vzbot_global_standard.inst.cfg b/resources/quality/vzbot/base/vzbot_global_standard.inst.cfg new file mode 100644 index 0000000000..1728f05845 --- /dev/null +++ b/resources/quality/vzbot/base/vzbot_global_standard.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Standard Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = standard +weight = -3 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +top_bottom_thickness = =layer_height_0+layer_height*3 +wall_thickness = =line_width*2 +support_interface_height = =layer_height*4 diff --git a/resources/quality/vzbot/base/vzbot_global_super.inst.cfg b/resources/quality/vzbot/base/vzbot_global_super.inst.cfg new file mode 100644 index 0000000000..edaab249fd --- /dev/null +++ b/resources/quality/vzbot/base/vzbot_global_super.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Super Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = super +weight = -1 +global_quality = True + +[values] +layer_height = 0.12 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*6 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*8 diff --git a/resources/quality/vzbot/base/vzbot_global_ultra.inst.cfg b/resources/quality/vzbot/base/vzbot_global_ultra.inst.cfg new file mode 100644 index 0000000000..b0be2d68d1 --- /dev/null +++ b/resources/quality/vzbot/base/vzbot_global_ultra.inst.cfg @@ -0,0 +1,18 @@ +[general] +version = 4 +name = Ultra Quality +definition = vzbot_base + +[metadata] +setting_version = 20 +type = quality +quality_type = ultra +weight = 0 +global_quality = True + +[values] +layer_height = 0.08 +layer_height_0 = 0.12 +top_bottom_thickness = =layer_height_0+layer_height*10 +wall_thickness = =line_width*3 +support_interface_height = =layer_height*12 diff --git a/resources/texts/change_log.txt b/resources/texts/change_log.txt index d68840bba8..c402291178 100644 --- a/resources/texts/change_log.txt +++ b/resources/texts/change_log.txt @@ -1,3 +1,10 @@ +[5.1.1] +* New features: +- Added support for the Ultimaker S3 and Ultimaker S5 updated mainbord + + +MacOS 10.15 is no longer supported. Technically this means Ultimaker will stop testing and developing for such operating systems. However, even though it is no longer supported, there is still a high likelihood the application keeps functioning. + [5.1] For an overview of the new features in Cura 5.1, please watch our video. @@ -374,4 +381,4 @@ When searching in the settings visibility menu you will also search in the descr [4.10] -The release notes of versions <= 4.10 can be found in our releases GitHub page. \ No newline at end of file +The release notes of versions <= 4.10 can be found in our releases GitHub page. diff --git a/resources/themes/cura-dark/images/cura_connected_printers.svg b/resources/themes/cura-dark/images/cura_connected_printers.svg new file mode 100644 index 0000000000..d7d0dc9d23 --- /dev/null +++ b/resources/themes/cura-dark/images/cura_connected_printers.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/themes/cura-light/images/cura_connected_printers.svg b/resources/themes/cura-light/images/cura_connected_printers.svg new file mode 100644 index 0000000000..d18302bdf1 --- /dev/null +++ b/resources/themes/cura-light/images/cura_connected_printers.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/variants/mingda_1000pro_0.2.inst.cfg b/resources/variants/mingda_1000pro_0.2.inst.cfg new file mode 100644 index 0000000000..a3b44c9cd3 --- /dev/null +++ b/resources/variants/mingda_1000pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_1000pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_1000pro_0.3.inst.cfg b/resources/variants/mingda_1000pro_0.3.inst.cfg new file mode 100644 index 0000000000..67b65d8e88 --- /dev/null +++ b/resources/variants/mingda_1000pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_1000pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_1000pro_0.4.inst.cfg b/resources/variants/mingda_1000pro_0.4.inst.cfg new file mode 100644 index 0000000000..aa147e1904 --- /dev/null +++ b/resources/variants/mingda_1000pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_1000pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_1000pro_0.5.inst.cfg b/resources/variants/mingda_1000pro_0.5.inst.cfg new file mode 100644 index 0000000000..8bce8b1212 --- /dev/null +++ b/resources/variants/mingda_1000pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_1000pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_1000pro_0.6.inst.cfg b/resources/variants/mingda_1000pro_0.6.inst.cfg new file mode 100644 index 0000000000..e7e8282c61 --- /dev/null +++ b/resources/variants/mingda_1000pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_1000pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_1000pro_0.8.inst.cfg b/resources/variants/mingda_1000pro_0.8.inst.cfg new file mode 100644 index 0000000000..d48fbd6f78 --- /dev/null +++ b/resources/variants/mingda_1000pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_1000pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_1000pro_1.0.inst.cfg b/resources/variants/mingda_1000pro_1.0.inst.cfg new file mode 100644 index 0000000000..64169a9235 --- /dev/null +++ b/resources/variants/mingda_1000pro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_1000pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_4h_0.2.inst.cfg b/resources/variants/mingda_4h_0.2.inst.cfg new file mode 100644 index 0000000000..82979eaa2f --- /dev/null +++ b/resources/variants/mingda_4h_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_4h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_4h_0.3.inst.cfg b/resources/variants/mingda_4h_0.3.inst.cfg new file mode 100644 index 0000000000..f5fc189870 --- /dev/null +++ b/resources/variants/mingda_4h_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_4h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_4h_0.4.inst.cfg b/resources/variants/mingda_4h_0.4.inst.cfg new file mode 100644 index 0000000000..7b7ff66695 --- /dev/null +++ b/resources/variants/mingda_4h_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_4h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_4h_0.5.inst.cfg b/resources/variants/mingda_4h_0.5.inst.cfg new file mode 100644 index 0000000000..07b5993ac3 --- /dev/null +++ b/resources/variants/mingda_4h_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_4h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_4h_0.6.inst.cfg b/resources/variants/mingda_4h_0.6.inst.cfg new file mode 100644 index 0000000000..13ca72144e --- /dev/null +++ b/resources/variants/mingda_4h_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_4h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_4h_0.8.inst.cfg b/resources/variants/mingda_4h_0.8.inst.cfg new file mode 100644 index 0000000000..b9041d5a5f --- /dev/null +++ b/resources/variants/mingda_4h_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_4h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_4h_1.0.inst.cfg b/resources/variants/mingda_4h_1.0.inst.cfg new file mode 100644 index 0000000000..c02f646bbe --- /dev/null +++ b/resources/variants/mingda_4h_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_4h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_600pro_0.2.inst.cfg b/resources/variants/mingda_600pro_0.2.inst.cfg new file mode 100644 index 0000000000..5427e0b86d --- /dev/null +++ b/resources/variants/mingda_600pro_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_600pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_600pro_0.3.inst.cfg b/resources/variants/mingda_600pro_0.3.inst.cfg new file mode 100644 index 0000000000..31e8f8352b --- /dev/null +++ b/resources/variants/mingda_600pro_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_600pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_600pro_0.4.inst.cfg b/resources/variants/mingda_600pro_0.4.inst.cfg new file mode 100644 index 0000000000..a1a4d9826f --- /dev/null +++ b/resources/variants/mingda_600pro_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_600pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_600pro_0.5.inst.cfg b/resources/variants/mingda_600pro_0.5.inst.cfg new file mode 100644 index 0000000000..8d37c0040f --- /dev/null +++ b/resources/variants/mingda_600pro_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_600pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_600pro_0.6.inst.cfg b/resources/variants/mingda_600pro_0.6.inst.cfg new file mode 100644 index 0000000000..6ef72845ce --- /dev/null +++ b/resources/variants/mingda_600pro_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_600pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_600pro_0.8.inst.cfg b/resources/variants/mingda_600pro_0.8.inst.cfg new file mode 100644 index 0000000000..0282114c25 --- /dev/null +++ b/resources/variants/mingda_600pro_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_600pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_600pro_1.0.inst.cfg b/resources/variants/mingda_600pro_1.0.inst.cfg new file mode 100644 index 0000000000..e9f90e72f6 --- /dev/null +++ b/resources/variants/mingda_600pro_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_600pro + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/mingda_6h_0.2.inst.cfg b/resources/variants/mingda_6h_0.2.inst.cfg new file mode 100644 index 0000000000..d1a06c52c3 --- /dev/null +++ b/resources/variants/mingda_6h_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = mingda_6h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/mingda_6h_0.3.inst.cfg b/resources/variants/mingda_6h_0.3.inst.cfg new file mode 100644 index 0000000000..a6f08c9008 --- /dev/null +++ b/resources/variants/mingda_6h_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = mingda_6h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/mingda_6h_0.4.inst.cfg b/resources/variants/mingda_6h_0.4.inst.cfg new file mode 100644 index 0000000000..49a821f436 --- /dev/null +++ b/resources/variants/mingda_6h_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = mingda_6h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/mingda_6h_0.5.inst.cfg b/resources/variants/mingda_6h_0.5.inst.cfg new file mode 100644 index 0000000000..2878a0d31b --- /dev/null +++ b/resources/variants/mingda_6h_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = mingda_6h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/mingda_6h_0.6.inst.cfg b/resources/variants/mingda_6h_0.6.inst.cfg new file mode 100644 index 0000000000..d0964923b2 --- /dev/null +++ b/resources/variants/mingda_6h_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = mingda_6h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/mingda_6h_0.8.inst.cfg b/resources/variants/mingda_6h_0.8.inst.cfg new file mode 100644 index 0000000000..c028e29567 --- /dev/null +++ b/resources/variants/mingda_6h_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = mingda_6h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/mingda_6h_1.0.inst.cfg b/resources/variants/mingda_6h_1.0.inst.cfg new file mode 100644 index 0000000000..6a3cabaa84 --- /dev/null +++ b/resources/variants/mingda_6h_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = mingda_6h + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/renkforce_cubeone_0.7.inst.cfg b/resources/variants/renkforce_cubeone_0.7.inst.cfg new file mode 100644 index 0000000000..605bdf75f5 --- /dev/null +++ b/resources/variants/renkforce_cubeone_0.7.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.7mm Nozzle +version = 4 +definition = renkforce_cubeone + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.7 \ No newline at end of file diff --git a/resources/variants/renkforce_pro6plus_0.4.inst.cfg b/resources/variants/renkforce_pro6plus_0.4.inst.cfg new file mode 100644 index 0000000000..26de9bfac7 --- /dev/null +++ b/resources/variants/renkforce_pro6plus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/renkforce_pro6plus_0.6.inst.cfg b/resources/variants/renkforce_pro6plus_0.6.inst.cfg new file mode 100644 index 0000000000..7c337517ef --- /dev/null +++ b/resources/variants/renkforce_pro6plus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/renkforce_pro6plus_0.8.inst.cfg b/resources/variants/renkforce_pro6plus_0.8.inst.cfg new file mode 100644 index 0000000000..b3aba6d4a1 --- /dev/null +++ b/resources/variants/renkforce_pro6plus_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/renkforce_pro6plus_1.0.inst.cfg b/resources/variants/renkforce_pro6plus_1.0.inst.cfg new file mode 100644 index 0000000000..e5e51b82b3 --- /dev/null +++ b/resources/variants/renkforce_pro6plus_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = renkforce_pro6plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/renkforce_pro7dual_0.2.inst.cfg b/resources/variants/renkforce_pro7dual_0.2.inst.cfg new file mode 100755 index 0000000000..e1d2ca7fa9 --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/renkforce_pro7dual_0.4.inst.cfg b/resources/variants/renkforce_pro7dual_0.4.inst.cfg new file mode 100755 index 0000000000..62aff750be --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/renkforce_pro7dual_0.6.inst.cfg b/resources/variants/renkforce_pro7dual_0.6.inst.cfg new file mode 100755 index 0000000000..b903531f1a --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/renkforce_pro7dual_0.8.inst.cfg b/resources/variants/renkforce_pro7dual_0.8.inst.cfg new file mode 100755 index 0000000000..3fd935a04d --- /dev/null +++ b/resources/variants/renkforce_pro7dual_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/renkforce_pro7dual_1.0.inst.cfg b/resources/variants/renkforce_pro7dual_1.0.inst.cfg new file mode 100755 index 0000000000..5c27ee38dd --- /dev/null +++ b/resources/variants/renkforce_pro7dual_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = renkforce_pro7dual + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/ultimaker3_aa0.25.inst.cfg b/resources/variants/ultimaker3_aa0.25.inst.cfg index 79b8afeebd..15fc789f66 100644 --- a/resources/variants/ultimaker3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_aa0.25.inst.cfg @@ -18,14 +18,6 @@ machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.65 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_min_travel = 0.7 retraction_prime_speed = =retraction_speed skin_overlap = 15 diff --git a/resources/variants/ultimaker3_aa0.8.inst.cfg b/resources/variants/ultimaker3_aa0.8.inst.cfg index a5ae2a383e..4adec1540b 100644 --- a/resources/variants/ultimaker3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_aa0.8.inst.cfg @@ -27,11 +27,10 @@ machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize +raft_surface_layers = 1 retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker3_aa04.inst.cfg b/resources/variants/ultimaker3_aa04.inst.cfg index 68a3a8768f..c81caf4164 100644 --- a/resources/variants/ultimaker3_aa04.inst.cfg +++ b/resources/variants/ultimaker3_aa04.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_amount = 6.5 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed diff --git a/resources/variants/ultimaker3_bb0.8.inst.cfg b/resources/variants/ultimaker3_bb0.8.inst.cfg index d0cc437b1b..fd516c48b2 100644 --- a/resources/variants/ultimaker3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_bb0.8.inst.cfg @@ -28,20 +28,9 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = 0 -raft_base_speed = 20 -raft_base_thickness = 0.3 -raft_interface_line_spacing = 0.5 -raft_interface_line_width = 0.5 -raft_interface_speed = 20 -raft_interface_thickness = 0.2 -raft_margin = 10 -raft_speed = 25 raft_surface_layers = 1 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker3_bb04.inst.cfg b/resources/variants/ultimaker3_bb04.inst.cfg index 49837e24ea..05e91d0752 100644 --- a/resources/variants/ultimaker3_bb04.inst.cfg +++ b/resources/variants/ultimaker3_bb04.inst.cfg @@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_base_speed = 20 -raft_interface_speed = 20 -raft_speed = 25 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg index ea9b294671..e6a9abfe1e 100644 --- a/resources/variants/ultimaker3_extended_aa0.25.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.25.inst.cfg @@ -18,14 +18,6 @@ machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.65 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_min_travel = 0.7 retraction_prime_speed = =retraction_speed skin_overlap = 15 diff --git a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg index de525e3caf..a215c4f455 100644 --- a/resources/variants/ultimaker3_extended_aa0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa0.8.inst.cfg @@ -27,11 +27,10 @@ machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = True +raft_surface_layers = 1 retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker3_extended_aa04.inst.cfg b/resources/variants/ultimaker3_extended_aa04.inst.cfg index e928d24745..be07b56cdc 100644 --- a/resources/variants/ultimaker3_extended_aa04.inst.cfg +++ b/resources/variants/ultimaker3_extended_aa04.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_amount = 6.5 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed diff --git a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg index 205ae4b0f2..e052df63eb 100644 --- a/resources/variants/ultimaker3_extended_bb0.8.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb0.8.inst.cfg @@ -28,20 +28,9 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = 0 -raft_base_speed = 20 -raft_base_thickness = 0.3 -raft_interface_line_spacing = 0.5 -raft_interface_line_width = 0.5 -raft_interface_speed = 20 -raft_interface_thickness = 0.2 -raft_margin = 10 -raft_speed = 25 raft_surface_layers = 1 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker3_extended_bb04.inst.cfg b/resources/variants/ultimaker3_extended_bb04.inst.cfg index 94a687c951..69968e721e 100644 --- a/resources/variants/ultimaker3_extended_bb04.inst.cfg +++ b/resources/variants/ultimaker3_extended_bb04.inst.cfg @@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_base_speed = 20 -raft_interface_speed = 20 -raft_speed = 25 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker_s3_aa0.25.inst.cfg b/resources/variants/ultimaker_s3_aa0.25.inst.cfg index c62479b084..059f3ece2f 100644 --- a/resources/variants/ultimaker_s3_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.25.inst.cfg @@ -18,15 +18,6 @@ machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.65 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 - retraction_min_travel = 0.7 retraction_prime_speed = =retraction_speed skin_overlap = 15 diff --git a/resources/variants/ultimaker_s3_aa0.8.inst.cfg b/resources/variants/ultimaker_s3_aa0.8.inst.cfg index bc1f092e63..6e477f15e6 100644 --- a/resources/variants/ultimaker_s3_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_aa0.8.inst.cfg @@ -27,11 +27,10 @@ machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize +raft_surface_layers = 1 retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker_s3_aa04.inst.cfg b/resources/variants/ultimaker_s3_aa04.inst.cfg index d69988c9f5..fb995635ff 100644 --- a/resources/variants/ultimaker_s3_aa04.inst.cfg +++ b/resources/variants/ultimaker_s3_aa04.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_amount = 6.5 retraction_min_travel = =line_width * 2 skin_overlap = 15 diff --git a/resources/variants/ultimaker_s3_bb0.8.inst.cfg b/resources/variants/ultimaker_s3_bb0.8.inst.cfg index 60dfcafd33..0305245e08 100644 --- a/resources/variants/ultimaker_s3_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s3_bb0.8.inst.cfg @@ -27,20 +27,9 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = 0 -raft_base_speed = 20 -raft_base_thickness = 0.3 -raft_interface_line_spacing = 0.5 -raft_interface_line_width = 0.5 -raft_interface_speed = 20 -raft_interface_thickness = 0.2 -raft_margin = 10 -raft_speed = 25 raft_surface_layers = 1 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker_s3_bb04.inst.cfg b/resources/variants/ultimaker_s3_bb04.inst.cfg index 526f724eea..9c18713818 100644 --- a/resources/variants/ultimaker_s3_bb04.inst.cfg +++ b/resources/variants/ultimaker_s3_bb04.inst.cfg @@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_base_speed = 20 -raft_interface_speed = 20 -raft_speed = 25 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker_s3_cc04.inst.cfg b/resources/variants/ultimaker_s3_cc04.inst.cfg index ce432577ac..0c22958955 100644 --- a/resources/variants/ultimaker_s3_cc04.inst.cfg +++ b/resources/variants/ultimaker_s3_cc04.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.4 machine_nozzle_size = 0.4 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print diff --git a/resources/variants/ultimaker_s3_cc06.inst.cfg b/resources/variants/ultimaker_s3_cc06.inst.cfg index 69f478d128..caa1616d4d 100644 --- a/resources/variants/ultimaker_s3_cc06.inst.cfg +++ b/resources/variants/ultimaker_s3_cc06.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.6 machine_nozzle_size = 0.6 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print diff --git a/resources/variants/ultimaker_s5_aa0.25.inst.cfg b/resources/variants/ultimaker_s5_aa0.25.inst.cfg index 664c252577..3b9d08b278 100644 --- a/resources/variants/ultimaker_s5_aa0.25.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.25.inst.cfg @@ -18,14 +18,6 @@ machine_nozzle_size = 0.25 machine_nozzle_tip_outer_diameter = 0.65 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_min_travel = 0.7 retraction_prime_speed = =retraction_speed skin_overlap = 15 diff --git a/resources/variants/ultimaker_s5_aa0.8.inst.cfg b/resources/variants/ultimaker_s5_aa0.8.inst.cfg index 9b1dfa0dc8..4433739430 100644 --- a/resources/variants/ultimaker_s5_aa0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_aa0.8.inst.cfg @@ -17,7 +17,6 @@ default_material_print_temperature = 200 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 machine_min_cool_heat_time_window = 15 @@ -28,11 +27,10 @@ machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_final_print_temperature = =material_print_temperature - 10 material_initial_print_temperature = =material_print_temperature - 5 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -retract_at_layer_change = =not magic_spiralize +raft_surface_layers = 1 retraction_amount = 6.5 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker_s5_aa04.inst.cfg b/resources/variants/ultimaker_s5_aa04.inst.cfg index bb1c355321..4d361e51c8 100644 --- a/resources/variants/ultimaker_s5_aa04.inst.cfg +++ b/resources/variants/ultimaker_s5_aa04.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = AA 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_amount = 6.5 retraction_min_travel = =line_width * 2 skin_overlap = 15 diff --git a/resources/variants/ultimaker_s5_bb0.8.inst.cfg b/resources/variants/ultimaker_s5_bb0.8.inst.cfg index 4e9d687d8a..3c2e9d14cb 100644 --- a/resources/variants/ultimaker_s5_bb0.8.inst.cfg +++ b/resources/variants/ultimaker_s5_bb0.8.inst.cfg @@ -27,20 +27,9 @@ machine_nozzle_id = BB 0.8 machine_nozzle_size = 0.8 machine_nozzle_tip_outer_diameter = 2.0 material_print_temperature = =default_material_print_temperature + 10 -material_standby_temperature = 100 multiple_mesh_overlap = 0 prime_tower_enable = False prime_tower_wipe_enabled = True -raft_acceleration = =acceleration_layer_0 -raft_airgap = 0 -raft_base_speed = 20 -raft_base_thickness = 0.3 -raft_interface_line_spacing = 0.5 -raft_interface_line_width = 0.5 -raft_interface_speed = 20 -raft_interface_thickness = 0.2 -raft_margin = 10 -raft_speed = 25 raft_surface_layers = 1 retraction_hop = 2 retraction_hop_only_when_collides = True diff --git a/resources/variants/ultimaker_s5_bb04.inst.cfg b/resources/variants/ultimaker_s5_bb04.inst.cfg index 18770b1c4d..6e378bbb82 100644 --- a/resources/variants/ultimaker_s5_bb04.inst.cfg +++ b/resources/variants/ultimaker_s5_bb04.inst.cfg @@ -17,9 +17,6 @@ cool_fan_speed_max = =cool_fan_speed machine_nozzle_heat_up_speed = 1.5 machine_nozzle_id = BB 0.4 machine_nozzle_tip_outer_diameter = 1.0 -raft_base_speed = 20 -raft_interface_speed = 20 -raft_speed = 25 retraction_min_travel = =3 * line_width speed_layer_0 = 20 speed_prime_tower = =math.ceil(speed_print * 10 / 35) diff --git a/resources/variants/ultimaker_s5_cc04.inst.cfg b/resources/variants/ultimaker_s5_cc04.inst.cfg index 36c9a0e417..174a4f7c62 100644 --- a/resources/variants/ultimaker_s5_cc04.inst.cfg +++ b/resources/variants/ultimaker_s5_cc04.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.4 machine_nozzle_size = 0.4 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print diff --git a/resources/variants/ultimaker_s5_cc06.inst.cfg b/resources/variants/ultimaker_s5_cc06.inst.cfg index c5ade7780f..e8934377a1 100644 --- a/resources/variants/ultimaker_s5_cc06.inst.cfg +++ b/resources/variants/ultimaker_s5_cc06.inst.cfg @@ -13,15 +13,6 @@ brim_width = 7 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_id = CC 0.6 machine_nozzle_size = 0.6 -raft_acceleration = =acceleration_print -raft_airgap = 0.3 -raft_base_thickness = =resolveOrValue('layer_height_0') * 1.2 -raft_interface_line_spacing = =raft_interface_line_width + 0.2 -raft_interface_line_width = =line_width * 2 -raft_interface_thickness = =layer_height * 1.5 -raft_jerk = =jerk_print -raft_margin = 15 -raft_surface_layers = 2 retraction_min_travel = =line_width * 2 retraction_prime_speed = =retraction_speed speed_infill = =speed_print diff --git a/resources/variants/vivedino_trex2plus_0.2.inst.cfg b/resources/variants/vivedino_trex2plus_0.2.inst.cfg new file mode 100644 index 0000000000..d2cfe24e79 --- /dev/null +++ b/resources/variants/vivedino_trex2plus_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/vivedino_trex2plus_0.4.inst.cfg b/resources/variants/vivedino_trex2plus_0.4.inst.cfg new file mode 100644 index 0000000000..ca1590f819 --- /dev/null +++ b/resources/variants/vivedino_trex2plus_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/vivedino_trex2plus_0.6.inst.cfg b/resources/variants/vivedino_trex2plus_0.6.inst.cfg new file mode 100644 index 0000000000..8a69ab0161 --- /dev/null +++ b/resources/variants/vivedino_trex2plus_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/vivedino_trex2plus_0.8.inst.cfg b/resources/variants/vivedino_trex2plus_0.8.inst.cfg new file mode 100644 index 0000000000..d9843d5497 --- /dev/null +++ b/resources/variants/vivedino_trex2plus_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = vivedino_trex2plus + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/vivedino_trex3_0.2.inst.cfg b/resources/variants/vivedino_trex3_0.2.inst.cfg new file mode 100644 index 0000000000..30548fd3d3 --- /dev/null +++ b/resources/variants/vivedino_trex3_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/vivedino_trex3_0.4.inst.cfg b/resources/variants/vivedino_trex3_0.4.inst.cfg new file mode 100644 index 0000000000..fedd92b5a9 --- /dev/null +++ b/resources/variants/vivedino_trex3_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/vivedino_trex3_0.6.inst.cfg b/resources/variants/vivedino_trex3_0.6.inst.cfg new file mode 100644 index 0000000000..6dd8ddf460 --- /dev/null +++ b/resources/variants/vivedino_trex3_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 \ No newline at end of file diff --git a/resources/variants/vivedino_trex3_0.8.inst.cfg b/resources/variants/vivedino_trex3_0.8.inst.cfg new file mode 100644 index 0000000000..f207d55bf3 --- /dev/null +++ b/resources/variants/vivedino_trex3_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = vivedino_trex3 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/vzbot_235_0.2.inst.cfg b/resources/variants/vzbot_235_0.2.inst.cfg new file mode 100644 index 0000000000..5c2b903dda --- /dev/null +++ b/resources/variants/vzbot_235_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = vzbot_235 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/vzbot_235_0.3.inst.cfg b/resources/variants/vzbot_235_0.3.inst.cfg new file mode 100644 index 0000000000..4a5bced2d4 --- /dev/null +++ b/resources/variants/vzbot_235_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = vzbot_235 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/vzbot_235_0.4.inst.cfg b/resources/variants/vzbot_235_0.4.inst.cfg new file mode 100644 index 0000000000..9ecffce8ed --- /dev/null +++ b/resources/variants/vzbot_235_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = vzbot_235 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/vzbot_235_0.5.inst.cfg b/resources/variants/vzbot_235_0.5.inst.cfg new file mode 100644 index 0000000000..893d31971f --- /dev/null +++ b/resources/variants/vzbot_235_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = vzbot_235 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/vzbot_235_0.6.inst.cfg b/resources/variants/vzbot_235_0.6.inst.cfg new file mode 100644 index 0000000000..817d15cc1e --- /dev/null +++ b/resources/variants/vzbot_235_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = vzbot_235 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/vzbot_235_0.8.inst.cfg b/resources/variants/vzbot_235_0.8.inst.cfg new file mode 100644 index 0000000000..2fc4f93e35 --- /dev/null +++ b/resources/variants/vzbot_235_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = vzbot_235 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/vzbot_235_1.0.inst.cfg b/resources/variants/vzbot_235_1.0.inst.cfg new file mode 100644 index 0000000000..a7579393f4 --- /dev/null +++ b/resources/variants/vzbot_235_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = vzbot_235 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/vzbot_330_0.2.inst.cfg b/resources/variants/vzbot_330_0.2.inst.cfg new file mode 100644 index 0000000000..8282d0b515 --- /dev/null +++ b/resources/variants/vzbot_330_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = vzbot_330 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/vzbot_330_0.3.inst.cfg b/resources/variants/vzbot_330_0.3.inst.cfg new file mode 100644 index 0000000000..47aa3da7a4 --- /dev/null +++ b/resources/variants/vzbot_330_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = vzbot_330 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/vzbot_330_0.4.inst.cfg b/resources/variants/vzbot_330_0.4.inst.cfg new file mode 100644 index 0000000000..0ab8682c14 --- /dev/null +++ b/resources/variants/vzbot_330_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = vzbot_330 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/vzbot_330_0.5.inst.cfg b/resources/variants/vzbot_330_0.5.inst.cfg new file mode 100644 index 0000000000..2f6c769157 --- /dev/null +++ b/resources/variants/vzbot_330_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = vzbot_330 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/vzbot_330_0.6.inst.cfg b/resources/variants/vzbot_330_0.6.inst.cfg new file mode 100644 index 0000000000..af6056193b --- /dev/null +++ b/resources/variants/vzbot_330_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = vzbot_330 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/vzbot_330_0.8.inst.cfg b/resources/variants/vzbot_330_0.8.inst.cfg new file mode 100644 index 0000000000..e3cc83dc14 --- /dev/null +++ b/resources/variants/vzbot_330_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = vzbot_330 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/vzbot_330_1.0.inst.cfg b/resources/variants/vzbot_330_1.0.inst.cfg new file mode 100644 index 0000000000..941923dbc4 --- /dev/null +++ b/resources/variants/vzbot_330_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = vzbot_330 + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/vzbot_base_0.2.inst.cfg b/resources/variants/vzbot_base_0.2.inst.cfg new file mode 100644 index 0000000000..096566ba7e --- /dev/null +++ b/resources/variants/vzbot_base_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = vzbot_base + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/vzbot_base_0.3.inst.cfg b/resources/variants/vzbot_base_0.3.inst.cfg new file mode 100644 index 0000000000..30846ff01e --- /dev/null +++ b/resources/variants/vzbot_base_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = vzbot_base + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/vzbot_base_0.4.inst.cfg b/resources/variants/vzbot_base_0.4.inst.cfg new file mode 100644 index 0000000000..0a688f554f --- /dev/null +++ b/resources/variants/vzbot_base_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = vzbot_base + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/vzbot_base_0.5.inst.cfg b/resources/variants/vzbot_base_0.5.inst.cfg new file mode 100644 index 0000000000..a0f1a78052 --- /dev/null +++ b/resources/variants/vzbot_base_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = vzbot_base + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/vzbot_base_0.6.inst.cfg b/resources/variants/vzbot_base_0.6.inst.cfg new file mode 100644 index 0000000000..f6b8b1e26e --- /dev/null +++ b/resources/variants/vzbot_base_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = vzbot_base + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/vzbot_base_0.8.inst.cfg b/resources/variants/vzbot_base_0.8.inst.cfg new file mode 100644 index 0000000000..e8edeebd0c --- /dev/null +++ b/resources/variants/vzbot_base_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = vzbot_base + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/vzbot_base_1.0.inst.cfg b/resources/variants/vzbot_base_1.0.inst.cfg new file mode 100644 index 0000000000..146af12ed5 --- /dev/null +++ b/resources/variants/vzbot_base_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = vzbot_base + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/resources/variants/vzbot_custom_0.2.inst.cfg b/resources/variants/vzbot_custom_0.2.inst.cfg new file mode 100644 index 0000000000..0995beb6aa --- /dev/null +++ b/resources/variants/vzbot_custom_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm Nozzle +version = 4 +definition = vzbot_custom + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/vzbot_custom_0.3.inst.cfg b/resources/variants/vzbot_custom_0.3.inst.cfg new file mode 100644 index 0000000000..e69dccecf5 --- /dev/null +++ b/resources/variants/vzbot_custom_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm Nozzle +version = 4 +definition = vzbot_custom + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/vzbot_custom_0.4.inst.cfg b/resources/variants/vzbot_custom_0.4.inst.cfg new file mode 100644 index 0000000000..92aa190807 --- /dev/null +++ b/resources/variants/vzbot_custom_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm Nozzle +version = 4 +definition = vzbot_custom + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/vzbot_custom_0.5.inst.cfg b/resources/variants/vzbot_custom_0.5.inst.cfg new file mode 100644 index 0000000000..eecc26ea6d --- /dev/null +++ b/resources/variants/vzbot_custom_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm Nozzle +version = 4 +definition = vzbot_custom + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/vzbot_custom_0.6.inst.cfg b/resources/variants/vzbot_custom_0.6.inst.cfg new file mode 100644 index 0000000000..3b094400b2 --- /dev/null +++ b/resources/variants/vzbot_custom_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm Nozzle +version = 4 +definition = vzbot_custom + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/vzbot_custom_0.8.inst.cfg b/resources/variants/vzbot_custom_0.8.inst.cfg new file mode 100644 index 0000000000..d8a16a7e99 --- /dev/null +++ b/resources/variants/vzbot_custom_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm Nozzle +version = 4 +definition = vzbot_custom + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/vzbot_custom_1.0.inst.cfg b/resources/variants/vzbot_custom_1.0.inst.cfg new file mode 100644 index 0000000000..74b029a6a0 --- /dev/null +++ b/resources/variants/vzbot_custom_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm Nozzle +version = 4 +definition = vzbot_custom + +[metadata] +setting_version = 20 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 diff --git a/run_coverage.py b/run_coverage.py deleted file mode 100644 index 2fd60f9342..0000000000 --- a/run_coverage.py +++ /dev/null @@ -1,22 +0,0 @@ -import pytest -from pathlib import Path - -# Small helper script to run the coverage of main code & all plugins - -path = Path("plugins") -args = ["--cov" ,"cura" , "--cov-report", "html"] -all_paths = [] -for p in path.glob('**/*'): - if p.is_dir(): - if p.name in ["__pycache__", "tests"]: - continue - args.append("--cov") - args.append(str(p)) - all_paths.append(str(p)) - -for path in all_paths: - args.append(path) -args.append(".") -args.append("-x") -pytest.main(args) - diff --git a/run_mypy.py b/run_mypy.py deleted file mode 100644 index 4486085064..0000000000 --- a/run_mypy.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env python -import os -import sys -from multiprocessing.dummy import Pool -from functools import partial -from subprocess import call - -# A quick Python implementation of unix 'where' command. -def where(exe_name: str, search_path: str = os.getenv("PATH")) -> str: - if search_path is None: - search_path = "" - paths = search_path.split(os.pathsep) - result = "" - print(" -> sys.executable location: %s" % sys.executable) - sys_exec_dir = os.path.dirname(sys.executable) - root_dir = os.path.dirname(sys_exec_dir) - paths += [sys_exec_dir, - os.path.join(root_dir, "bin"), - os.path.join(root_dir, "scripts"), - ] - paths = set(paths) - - for path in sorted(paths): - print(" -> Searching %s" % path) - candidate_path = os.path.join(path, exe_name) - if os.path.exists(candidate_path): - result = candidate_path - break - return result - - -def findModules(path): - result = [] - for entry in os.scandir(path): - if entry.is_dir() and os.path.exists(os.path.join(path, entry.name, "__init__.py")): - result.append(entry.name) - return result - - -def main(): - # Find Uranium via the PYTHONPATH var - uraniumUMPath = where("UM", os.getenv("PYTHONPATH")) - if uraniumUMPath is None: - uraniumUMPath = os.path.join("..", "Uranium") - uraniumPath = os.path.dirname(uraniumUMPath) - - mypy_path_parts = [".", os.path.join(".", "plugins"), os.path.join(".", "plugins", "VersionUpgrade"), - uraniumPath, os.path.join(uraniumPath, "stubs")] - if sys.platform == "win32": - os.putenv("MYPYPATH", ";".join(mypy_path_parts)) - else: - os.putenv("MYPYPATH", ":".join(mypy_path_parts)) - - # Mypy really needs to be run via its Python script otherwise it can't find its data files. - mypy_exe_name = "mypy.exe" if sys.platform == "win32" else "mypy" - mypy_exe_dir = where(mypy_exe_name) - mypy_module = os.path.join(os.path.dirname(mypy_exe_dir), mypy_exe_name) - print("Found mypy exe path: %s" % mypy_exe_dir) - print("Found mypy module path: %s" % mypy_module) - - plugins = findModules("plugins") - plugins.sort() - - mods = ["cura"] + plugins + findModules("plugins/VersionUpgrade") - success_code = 0 - - pool = Pool(2) # Run two commands at once - - if sys.platform == "win32": - commands = ["%s -p %s --ignore-missing-imports" % (mypy_module, mod) for mod in mods] - else: - commands = ["%s %s -p %s --ignore-missing-imports" % (sys.executable, mypy_module, mod) for mod in mods] - - for i, returncode in enumerate(pool.imap(partial(call, shell=True), commands)): - if returncode != 0: - print("\nCommand {command} failed checking (code {errcode}). :(".format(command = commands[i], errcode = returncode)) - success_code = 1 - if success_code: - print("MYPY check was completed, but did not pass") - else: - print("MYPY check was completed and passed with flying colors") - return success_code - -if __name__ == "__main__": - sys.exit(main()) \ No newline at end of file